diff options
| author | Noel Power <noel.power@novell.com> | 2011-05-11 13:51:03 +0100 |
|---|---|---|
| committer | Noel Power <noel.power@novell.com> | 2011-05-11 13:53:24 +0100 |
| commit | fcbe10ce74bd9c9675bc84e58f1e0f0a16cebb0d (patch) | |
| tree | f5e55d5c71801ceeefd24e997d51d6e6ddb2dcd6 /framework | |
| parent | 50f4454fab79d38840ec4563d1420fad212b58d8 (diff) | |
fix for fdo#37103
reset toolbar command handler when toolbarmanager is destroyed
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/source/uielement/toolbarmanager.cxx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx index f6f59c4e51d6..fceaf63305fb 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; } |