summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Lohmann <pl@openoffice.org>2009-02-16 15:03:31 +0000
committerPhilipp Lohmann <pl@openoffice.org>2009-02-16 15:03:31 +0000
commit00ec906f84d97a97ec92a9cb92042fbbf12c0d55 (patch)
tree1d5351aae2be98d52ce7300dd83b8dd5500fe862
parent337a1ee590de50c923e38ee0a8e86f4213fcd14e (diff)
#i99167# revert change from issue 93173#
-rw-r--r--framework/source/uielement/toolbarmanager.cxx7
1 files changed, 5 insertions, 2 deletions
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index d4948a90ce..b5c1dd8273 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -336,8 +336,11 @@ void ToolBarManager::Destroy()
delete static_cast< AddonsParams* >( m_pToolBar->GetItemData( nItemId ));
}
- // #i93173# delete toolbar lazily as we can still be in one of its handlers
- m_pToolBar->doLazyDelete();
+ /* #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();
+ */
+ delete m_pToolBar;
m_pToolBar = 0;
}