commit 35178d188a91cd30012c25ade39fcbb437d7cbab
author Michael Meeks <michael.meeks@collabora.com> Thu Apr 16 10:40:04 2015 +0100
committer Michael Meeks <michael.meeks@collabora.com> Thu Apr 16 10:40:04 2015 +0100
tree 18f4c95ad9381048b282cf0f252c15d74b859a04
parent 93f9f9cc132fda19a8860c80f40a872e4158110e

Another malingering timer.

Change-Id: Id101fe2023a1f9d6b66e7621516a1710a494ff34

sw/source/uibase/utlui/content.cxx

diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx
index 40b1154..4e37206 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -850,6 +850,7 @@ void SwContentTree::dispose()
{
    Clear(); // If applicable erase content types previously.
    bIsInDrag = false;
    aUpdTimer.Stop();
    SvTreeListBox::dispose();
}

@@ -2453,6 +2454,9 @@ void    SwContentTree::HideTree()

IMPL_LINK_NOARG(SwContentTree, TimerUpdate)
{
    if (IsDisposed())
        return 0;

    // No update while drag and drop.
    // Query view because the Navigator is cleared too late.
    SwView* pView = GetParentWindow()->GetCreateView();