[Libreoffice-commits] core.git: Branch 'feature/vclptr' - sw/source

[Michael Meeks]

 sw/source/uibase/utlui/glbltree.cxx |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 16f7f5899bddc32ddfdf3b0e23faee528883e36c
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Thu Apr 16 17:12:11 2015 +0100

    SwGlobalTree timer dispose.
    
    Change-Id: I9a626f67b1552445beca72ca47b388525f653d8c

diff --git a/sw/source/uibase/utlui/glbltree.cxx b/sw/source/uibase/utlui/glbltree.cxx
index c93db9b..a4e24b6 100644
--- a/sw/source/uibase/utlui/glbltree.cxx
+++ b/sw/source/uibase/utlui/glbltree.cxx
@@ -186,8 +186,11 @@ SwGlobalTree::~SwGlobalTree()
 void SwGlobalTree::dispose()
 {
     delete pSwGlblDocContents;
+    pSwGlblDocContents = NULL;
     delete pDocInserter;
+    pDocInserter = NULL;
     pDefParentWin.clear();
+    aUpdateTimer.Stop();
     SvTreeListBox::dispose();
 }
 
@@ -1008,7 +1011,7 @@ void    SwGlobalTree::ExcecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry
 
 IMPL_LINK_NOARG(SwGlobalTree, Timeout)
 {
-    if(!HasFocus() && Update( false ))
+    if(!IsDisposed() && !HasFocus() && Update( false ))
         Display();
     return 0;
 }