commit d0cc0d3735b9ada26ee7b3d54b82a3ed60bc4a74
author Michael Meeks <michael.meeks@collabora.com> Sat Feb 28 09:54:57 2015 +0000
committer Michael Meeks <michael.meeks@collabora.com> Thu Apr 09 22:26:25 2015 +0100
tree fa16f92fe9254e33947576a24148ab612a93156e
parent 562109b8357eb0690034844e097e0acafbdc39b6

more double dispose protection.

Change-Id: I729040288868ad521cc1ff09e200ef7ea3bd0058

sc/source/ui/app/inputwin.cxx

diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index a5b8c88e..4e32f8c 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();
}

sfx2/source/sidebar/SidebarToolBox.cxx

diff --git a/sfx2/source/sidebar/SidebarToolBox.cxx b/sfx2/source/sidebar/SidebarToolBox.cxx
index f5a7643..4d9f9f4 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();
}