fix for fdo#37103

reset toolbar command handler when toolbarmanager is destroyed

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;
 }