diff options
| author | Kohei Yoshida <kohei.yoshida@gmail.com> | 2013-07-31 13:01:36 -0400 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@gmail.com> | 2013-07-31 14:09:15 -0400 |
| commit | f89637e329e765bce0bd513c843e4e2b673c38fd (patch) | |
| tree | 76b0945f131cc7e386b26b23f082f081f3dc9d4c /framework | |
| parent | fe010c7c1905f76e2c1dcddfa3bf8b4bc70b858a (diff) | |
Revert "convert vcl/menu.hxx from XubString to OUString"
This reverts commit 43b1ac3651732a1ceb193268ab72b4aaa90dee65.
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/source/uielement/menubarmanager.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx index 23baa7468916..7f7f69a575fb 100644 --- a/framework/source/uielement/menubarmanager.cxx +++ b/framework/source/uielement/menubarmanager.cxx @@ -845,7 +845,7 @@ IMPL_LINK( MenuBarManager, Activate, Menu *, pMenu ) { sal_uInt16 nItemId = pMenu->GetItemId( nPos ); if (( pMenu->GetItemType( nPos ) != MENUITEM_SEPARATOR ) && - ( pMenu->GetItemText( nItemId ).isEmpty() )) + ( pMenu->GetItemText( nItemId ).Len() == 0 )) { String aCommand = pMenu->GetItemCommand( nItemId ); if ( aCommand.Len() > 0 ) { @@ -1252,7 +1252,7 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF } if (( pMenu->IsMenuBar() || bAccessibilityEnabled ) && - ( pMenu->GetItemText( nItemId ).isEmpty() )) + ( pMenu->GetItemText( nItemId ).Len() == 0 )) { if ( !aItemCommand.isEmpty() ) pMenu->SetItemText( nItemId, RetrieveLabelFromCommand( aItemCommand )); @@ -1272,7 +1272,7 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF { // Retrieve module identifier from Help Command entry OUString aModuleIdentifier( rModuleIdentifier ); - if ( !pMenu->GetHelpCommand( nItemId ).isEmpty() ) + if ( pMenu->GetHelpCommand( nItemId ).Len() > 0 ) { aModuleIdentifier = pMenu->GetHelpCommand( nItemId ); pMenu->SetHelpCommand( nItemId, aEmpty ); |