commit 93f9f9cc132fda19a8860c80f40a872e4158110e
author Michael Meeks <michael.meeks@collabora.com> Thu Apr 16 09:54:40 2015 +0100
committer Michael Meeks <michael.meeks@collabora.com> Thu Apr 16 09:54:40 2015 +0100
tree 69942edffe010c4a7fae882ef9e50c209e1a7ef0
parent 83dbbfe52d280f8b18423f83b68ffb8147998c85

Stop timers, and guard against emission on disposed navigator.

Change-Id: Ide1f94c07c83a5b8d9a522e02177ad2fe481eff2

sw/source/uibase/utlui/navipi.cxx

diff --git a/sw/source/uibase/utlui/navipi.cxx b/sw/source/uibase/utlui/navipi.cxx
index f5f788f..ed513a5 100644
--- a/sw/source/uibase/utlui/navipi.cxx
+++ b/sw/source/uibase/utlui/navipi.cxx
@@ -878,6 +878,9 @@ void SwNavigationPI::dispose()
    aContentTree.disposeAndClear();
    aGlobalTree.disposeAndClear();
    aDocListBox.disposeAndClear();

    aPageChgIdle.Stop();

    vcl::Window::dispose();
}

@@ -1249,8 +1252,11 @@ bool    SwNavigationPI::IsGlobalDoc() const

IMPL_LINK_NOARG(SwNavigationPI, ChangePageHdl)
{
    EditAction(&GetPageEdit());
    GetPageEdit().GrabFocus();
    if (!IsDisposed())
    {
        EditAction(&GetPageEdit());
        GetPageEdit().GrabFocus();
    }
    return 0;
}