[Libreoffice-commits] core.git: Branch 'feature/vclref' - sc/source sfx2/source

[Michael Meeks]

 sc/source/ui/app/inputwin.cxx          |    3 +++
 sfx2/source/sidebar/SidebarToolBox.cxx |    2 ++
 2 files changed, 5 insertions(+)

New commits:
commit 4930515b84abb7a17c0cf7cc11a14d0367438586
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Sat Feb 28 09:54:57 2015 +0000

    more double dispose protection.
    
    Change-Id: I729040288868ad521cc1ff09e200ef7ea3bd0058

diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index c9fc51c..d262201 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 d87fca8..f74efd3 100644
--- a/sfx2/source/sidebar/SidebarToolBox.cxx
+++ b/sfx2/source/sidebar/SidebarToolBox.cxx
@@ -84,7 +84,9 @@ void SidebarToolBox::dispose()
         SetSelectHdl(Link());
         SetActivateHdl(Link());
         SetDeactivateHdl(Link());
+        mbAreHandlersRegistered = false;
     }
+
     ToolBox::dispose();
 }