summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Power <noel.power@novell.com>2011-05-11 13:51:03 +0100
committerFridrich Štrba <fridrich.strba@bluewin.ch>2011-05-12 11:51:17 +0200
commit347c67da659f3e387ff215fe3914760c4e0b3988 (patch)
tree840d8a06c5e65658c48522ac1d8fea7304f805e5
parent3191c706333cdd92f66b019a55eddfdfcfba8a1b (diff)
fix for fdo#37103
reset toolbar command handler when toolbarmanager is destroyed Signed-off-by: Fridrich Štrba <fridrich.strba@bluewin.ch>
-rw-r--r--framework/source/uielement/toolbarmanager.cxx2
1 files changed, 2 insertions, 0 deletions
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index dcbecf06b7..8a0578fd0f 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -314,6 +314,7 @@ ToolBarManager::~ToolBarManager()
void ToolBarManager::Destroy()
{
+ OSL_ASSERT( m_pToolBar != 0 );
ResetableGuard aGuard( m_aLock );
if ( m_bAddedToTaskPaneList )
{
@@ -349,6 +350,7 @@ void ToolBarManager::Destroy()
m_pToolBar->SetDoubleClickHdl( aEmpty );
m_pToolBar->SetStateChangedHdl( aEmpty );
m_pToolBar->SetDataChangedHdl( aEmpty );
+ m_pToolBar->SetCommandHdl( aEmpty );
m_pToolBar = 0;
}