sw/source/uibase/utlui/content.cxx | 1 +
sw/source/uibase/utlui/navipi.cxx | 10 +++++-----
2 files changed, 6 insertions(+), 5 deletions(-)
New commits:
commit 5e1dce449654198956c6c027b308cd20e4d0d828
Author: Caolán McNamara <caol...@redhat.com>
Date: Fri May 29 20:18:49 2015 +0100
VclPtr: tdf#91396 crash after tool options and sidebar switching
Change-Id: I86c23ffc08c8dec275608d9bc0bbe5eaf7ce0993
Reviewed-on: https://gerrit.libreoffice.org/15986
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sw/source/uibase/utlui/content.cxx
b/sw/source/uibase/utlui/content.cxx
index f79b378..d0c72c3 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -845,6 +845,7 @@ void SwContentTree::dispose()
Clear(); // If applicable erase content types previously.
bIsInDrag = false;
aUpdTimer.Stop();
+ SetActiveShell(0);
SvTreeListBox::dispose();
}
diff --git a/sw/source/uibase/utlui/navipi.cxx
b/sw/source/uibase/utlui/navipi.cxx
index c3abce9..c1a69cc 100644
--- a/sw/source/uibase/utlui/navipi.cxx
+++ b/sw/source/uibase/utlui/navipi.cxx
@@ -867,13 +867,13 @@ void SwNavigationPI::dispose()
if ( IsBound() )
rBindings.Release(*this);
- pPopupWindow.disposeAndClear();
pFloatingWindow.disposeAndClear();
- aContentToolBox.disposeAndClear();
- aGlobalToolBox.disposeAndClear();
- aContentTree.disposeAndClear();
- aGlobalTree.disposeAndClear();
+ pPopupWindow.disposeAndClear();
aDocListBox.disposeAndClear();
+ aGlobalTree.disposeAndClear();
+ aContentTree.disposeAndClear();
+ aGlobalToolBox.disposeAndClear();
+ aContentToolBox.disposeAndClear();
aPageChgIdle.Stop();
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
