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 <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

2 files changed, 6 insertions, 5 deletions

diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx
index f79b378abc98..d0c72c307a73 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 c3abce92e64b..c1a69ccd42a2 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();