diff options
| author | Oliver Bolte <obo@openoffice.org> | 2009-03-05 11:59:11 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2009-03-05 11:59:11 +0000 |
| commit | 02521a1acab864cb2e1293f0ea3c34abddfa5325 (patch) | |
| tree | 5b57dd66a422f93e3cc11b943c5026d6796b1664 /framework | |
| parent | fad439eb34517b8679853a344933dfe74a11c3dd (diff) | |
CWS-TOOLING: integrate CWS ooo31gsl2_DEV300
2009-02-18 16:57:37 +0100 hdu r268244 : #i99367# force logical-width of diacritic glyphs to zero
2009-02-18 14:51:18 +0100 pl r268224 : #i98525# correct popup menu position on right side in RTL UI
2009-02-18 13:17:20 +0100 pl r268213 : #i99299# check for NULL ptr
2009-02-18 10:51:48 +0100 pl r268204 : #i99167# revert change from issue 93173
2009-02-17 16:56:47 +0100 hdu r268181 : #i99295# src-=debug
2009-02-17 16:43:40 +0100 hdu r268180 : #i99295# retarget unresolved pLogCluster[n] to a glyph inside the cluster
2009-02-17 16:15:45 +0100 sj r268178 : #i94831# fixed performance of table import, no longer looping
2009-02-17 13:19:00 +0100 hdu r268165 : #i97304# reapplied SJ's fix for OOo31
2009-02-17 12:04:53 +0100 hdu r267989 : #i99241# revert upstream change from icu-trac issue 6249
2009-02-16 18:35:07 +0100 pl r267832 : #i99166# convolute the already convoluted RTL positioning code some more
2009-02-16 17:25:24 +0100 hdu r267828 : #i99227# do not export the glyph-flags for the i97326-workaround
2009-02-13 16:26:10 +0100 pl r267729 : #i98525# remove unused typeinfo header
2009-02-13 16:25:02 +0100 pl r267728 : #i98525# fix scrolling and native menu issues in RTL UI
2009-02-13 11:18:37 +0100 pl r267705 : #i98525# merge from CWS vcl99
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/source/uielement/toolbarmanager.cxx | 7 |
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; } |