summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@collabora.com>2015-02-28 09:54:57 +0000
committerMichael Meeks <michael.meeks@collabora.com>2015-04-09 22:26:25 +0100
commitd0cc0d3735b9ada26ee7b3d54b82a3ed60bc4a74 (patch)
treefa16f92fe9254e33947576a24148ab612a93156e
parent562109b8357eb0690034844e097e0acafbdc39b6 (diff)
more double dispose protection.
Change-Id: I729040288868ad521cc1ff09e200ef7ea3bd0058
-rw-r--r--sc/source/ui/app/inputwin.cxx3
-rw-r--r--sfx2/source/sidebar/SidebarToolBox.cxx2
2 files changed, 5 insertions, 0 deletions
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index a5b8c88ebc1f..4e32f8c7d8d7 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -289,6 +289,9 @@ void ScInputWindow::dispose()
SfxImageManager::GetImageManager( *SC_MOD() )->ReleaseToolBox( this );
aWndPos.disposeAndClear();
+
+ pRuntimeWindow.reset();
+
ToolBox::dispose();
}
diff --git a/sfx2/source/sidebar/SidebarToolBox.cxx b/sfx2/source/sidebar/SidebarToolBox.cxx
index f5a7643f876d..4d9f9f4c8c83 100644
--- a/sfx2/source/sidebar/SidebarToolBox.cxx
+++ b/sfx2/source/sidebar/SidebarToolBox.cxx
@@ -81,7 +81,9 @@ void SidebarToolBox::dispose()
SetSelectHdl(Link());
SetActivateHdl(Link());
SetDeactivateHdl(Link());
+ mbAreHandlersRegistered = false;
}
+
ToolBox::dispose();
}