diff options
author | Vladimir Glazunov <vg@openoffice.org> | 2009-12-11 17:56:47 +0100 |
---|---|---|
committer | Vladimir Glazunov <vg@openoffice.org> | 2009-12-11 17:56:47 +0100 |
commit | 55a6583623008179f51a01416e5a3eef885835c2 (patch) | |
tree | 0c5a519ad939d7a2fe5849ce91f89e4687225dfc /framework/source | |
parent | e7f2e7c26b6f53e86e48d4cfa3e45d59252c39f0 (diff) | |
parent | 121fdea1bf20434091bf1f862be5611dfddd83ae (diff) |
CWS-TOOLING: integrate CWS fwk129_DEV300
Diffstat (limited to 'framework/source')
-rw-r--r-- | framework/source/uielement/toolbarmanager.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx index 5e1c7cc93da2..6463dd634c20 100644 --- a/framework/source/uielement/toolbarmanager.cxx +++ b/framework/source/uielement/toolbarmanager.cxx @@ -341,9 +341,11 @@ void ToolBarManager::Destroy() delete static_cast< AddonsParams* >( m_pToolBar->GetItemData( nItemId )); } + // Hide toolbar as lazy delete can destroy the toolbar much later. + m_pToolBar->Hide(); /* #i99167# removed change for i93173 since there is some weird crash */ // #i93173# delete toolbar lazily as we can still be in one of its handlers - m_pToolBar->doLazyDelete(); + m_pToolBar->doLazyDelete(); Link aEmpty; m_pToolBar->SetSelectHdl( aEmpty ); |