diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2015-04-16 17:12:11 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-04-16 17:12:11 +0100 |
| commit | 16f7f5899bddc32ddfdf3b0e23faee528883e36c (patch) | |
| tree | 63f870c4bba87d588d3f23c9519bd8f983209f69 | |
| parent | bf82918e53422ebfbe1f1d71cc0ed4b556966b11 (diff) | |
SwGlobalTree timer dispose.
Change-Id: I9a626f67b1552445beca72ca47b388525f653d8c
| -rw-r--r-- | sw/source/uibase/utlui/glbltree.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sw/source/uibase/utlui/glbltree.cxx b/sw/source/uibase/utlui/glbltree.cxx index c93db9beda26..a4e24b6356f8 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; } |