diff options
| author | Kurt Zenker <kz@openoffice.org> | 2004-12-16 11:35:24 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2004-12-16 11:35:24 +0000 |
| commit | 29bc713ede3dc083712ec497677a72eb93371b9a (patch) | |
| tree | 0255d525c8ea2ca4d7e24768717de22462bbeba6 /framework | |
| parent | fb2e4302de0ddc43c4cdc04264ef9096832abfe2 (diff) | |
INTEGRATION: CWS pbbeta03 (1.14.16); FILE MERGED
2004/12/15 11:43:57 pb 1.14.16.1: fix: #i38743# no menubar if frame isn't top
Diffstat (limited to 'framework')
| -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 bfcc9859524a..e825048f7df8 100644 --- a/framework/source/layoutmanager/layoutmanager.cxx +++ b/framework/source/layoutmanager/layoutmanager.cxx @@ -2,9 +2,9 @@ * * $RCSfile: layoutmanager.cxx,v $ * - * $Revision: 1.15 $ + * $Revision: 1.16 $ * - * last change: $Author: rt $ $Date: 2004-12-10 17:13:38 $ + * last change: $Author: kz $ $Date: 2004-12-16 12:35:24 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -3434,7 +3434,8 @@ throw (RuntimeException) if ( aElementName.equalsIgnoreAsciiCaseAscii( "menubar" ) && !bInPlaceMenu && !bPreview ) { vos::OGuard aGuard( Application::GetSolarMutex() ); - if ( !m_xMenuBar.is() ) + // PB 2004-12-15 #i38743# don't create a menubar if frame isn't top + if ( !m_xMenuBar.is() && xFrame->isTop() ) m_xMenuBar = implts_createElement( aName ); if ( m_xMenuBar.is() && xFrame->isTop() ) |