diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-01-31 07:36:39 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-01-31 07:36:39 +0000 |
| commit | 9247688607a6be393d194e4faa798fbc01d72520 (patch) | |
| tree | 718f8c44d2cebac3450ee4b570ec42b9fb048f67 | |
| parent | 82d33f388ce00d7bc65f178980ec04f506862d52 (diff) | |
INTEGRATION: CWS fwkbugfix05 (1.15.4); FILE MERGED
2005/01/19 11:30:19 mba 1.15.4.2: RESYNC: (1.15-1.16); FILE MERGED
2005/01/06 16:09:48 mba 1.15.4.1: #i37381#: doLayout was called much too often
| -rw-r--r-- | framework/source/layoutmanager/layoutmanager.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx index 3e6322f88577..86b9ce46963c 100644 --- a/framework/source/layoutmanager/layoutmanager.cxx +++ b/framework/source/layoutmanager/layoutmanager.cxx @@ -2,9 +2,9 @@ * * $RCSfile: layoutmanager.cxx,v $ * - * $Revision: 1.17 $ + * $Revision: 1.18 $ * - * last change: $Author: kz $ $Date: 2005-01-21 09:51:14 $ + * last change: $Author: rt $ $Date: 2005-01-31 08:36:39 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -457,6 +457,8 @@ void LayoutManager::impl_clearUpMenuBar() { implts_lock(); + lock(); + // Clear up VCL menu bar to prepare shutdown if ( m_xContainerWindow.is() ) { @@ -514,7 +516,6 @@ void LayoutManager::impl_clearUpMenuBar() if ( xComp.is() ) xComp->dispose(); m_xMenuBar.clear(); - implts_unlock(); } |