diff options
author | Kurt Zenker <kz@openoffice.org> | 2005-07-12 13:14:50 +0000 |
---|---|---|
committer | Kurt Zenker <kz@openoffice.org> | 2005-07-12 13:14:50 +0000 |
commit | 00ff725e4a932de1fd6237c7c08a0bef2c204306 (patch) | |
tree | d4c21266bfb56e0c6901ffdaac855993b964b326 /framework | |
parent | d76c504aa04cf6fe112b46479fdb4f82bb5b72cf (diff) |
INTEGRATION: CWS fwk16 (1.34.2); FILE MERGED
2005/07/07 09:32:09 cd 1.34.2.1: #124193# Layout manager must call implts_destroyElements in disposing as COMPONENT_DETACHING is not always called by frame (frame->dispose()).
Diffstat (limited to 'framework')
-rw-r--r-- | framework/source/layoutmanager/layoutmanager.cxx | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx index 6fe22913f6d5..bbd98ff1ae97 100644 --- a/framework/source/layoutmanager/layoutmanager.cxx +++ b/framework/source/layoutmanager/layoutmanager.cxx @@ -2,9 +2,9 @@ * * $RCSfile: layoutmanager.cxx,v $ * - * $Revision: 1.34 $ + * $Revision: 1.35 $ * - * last change: $Author: kz $ $Date: 2005-07-01 13:09:15 $ + * last change: $Author: kz $ $Date: 2005-07-12 14:14:50 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -6631,6 +6631,9 @@ throw( RuntimeException ) delete m_pAddonOptions; m_pAddonOptions = 0; + // destroy all elements, it's possible that dettaching is NOT called! + implts_destroyElements(); + m_aUIElements.clear(); impl_clearUpMenuBar(); m_xMenuBar.clear(); |