diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-07-19 12:35:15 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-07-19 12:35:15 +0000 |
| commit | 692040c81178469c4d9668bd4426a1ebb6eb48d2 (patch) | |
| tree | 4924a9e1f412acdd2d4250d87ace37654ea03e2c /framework/source/uielement/menubarmanager.cxx | |
| parent | 6c8eb38fd22287b386e41160398a6817d6ee2023 (diff) | |
INTEGRATION: CWS vcl61 (1.35.24); FILE MERGED
2006/07/11 13:51:42 pl 1.35.24.1: #137902# Don't retrieve label from CommandToLabel method for custom and add-on menu items
Diffstat (limited to 'framework/source/uielement/menubarmanager.cxx')
| -rw-r--r-- | framework/source/uielement/menubarmanager.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx index 01479e195b..21c6b66177 100644 --- a/framework/source/uielement/menubarmanager.cxx +++ b/framework/source/uielement/menubarmanager.cxx @@ -4,9 +4,9 @@ * * $RCSfile: menubarmanager.cxx,v $ * - * $Revision: 1.35 $ + * $Revision: 1.36 $ * - * last change: $Author: hr $ $Date: 2006-06-19 11:39:09 $ + * last change: $Author: kz $ $Date: 2006-07-19 13:35:15 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1647,8 +1647,8 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, Reference< XFrame >& rFrame, pMenu->SetItemCommand( nItemId, aItemCommand ); } - if (( pMenu->IsMenuBar() && ( pMenu->GetItemText( nItemId ).Len() == 0 )) || - bAccessibilityEnabled ) + if (( pMenu->IsMenuBar() || bAccessibilityEnabled ) && + ( pMenu->GetItemText( nItemId ).Len() == 0 )) { if ( aItemCommand.getLength() > 0 ) pMenu->SetItemText( nItemId, RetrieveLabelFromCommand( aItemCommand )); |