[Libreoffice-commits] .: framework/source

[Noel Power]

 framework/source/uielement/toolbarmanager.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 17e8ee1d7b9b4464af73657679df7b0bbdffa028
Author: Noel Power <noel.power at novell.com>
Date:   Wed May 11 13:51:03 2011 +0100

    fix for fdo#37103
    
    reset toolbar command handler when toolbarmanager is destroyed

diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index dcbecf0..8a0578f 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;
 }