diff options
| author | Noel Grandin <noel@peralex.com> | 2013-09-16 09:58:03 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-09-17 09:05:49 +0200 |
| commit | e8ecf30ea61625c3397a635c5c409bbc004685bc (patch) | |
| tree | 36052ce7f57e3c39f5c96f9aaeaaf6cc469290ea /framework/source/uielement/macrosmenucontroller.cxx | |
| parent | 1591130dc2b62e5fdec45274b1b06d63df0051b3 (diff) | |
convert FRAMEWORK module from String to OUString
Change-Id: Iafa6b5f213d37093e7e46065c9264c7bb7fae377
Diffstat (limited to 'framework/source/uielement/macrosmenucontroller.cxx')
| -rw-r--r-- | framework/source/uielement/macrosmenucontroller.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/framework/source/uielement/macrosmenucontroller.cxx b/framework/source/uielement/macrosmenucontroller.cxx index f7feca02d4bc..9db444cf8048 100644 --- a/framework/source/uielement/macrosmenucontroller.cxx +++ b/framework/source/uielement/macrosmenucontroller.cxx @@ -87,7 +87,7 @@ void MacrosMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& rPo // insert basic OUString aCommand(".uno:MacroDialog"); - String aDisplayName = RetrieveLabelFromCommand( aCommand ); + OUString aDisplayName = RetrieveLabelFromCommand( aCommand ); pPopupMenu->InsertItem( 2, aDisplayName ); pPopupMenu->SetItemCommand( 2, aCommand ); @@ -189,15 +189,15 @@ void MacrosMenuController::addScriptItems( PopupMenu* pPopupMenu, sal_uInt16 sta if ( serviceNames[ index ].indexOf( providerKey ) == 0 ) { OUString serviceName = serviceNames[ index ]; - String aCommand = aCmdBase; - String aDisplayName = String( serviceName.copy( providerKey.getLength() ) ); - if( aDisplayName.Equals( OUString("Java") ) || aDisplayName.Equals( OUString("Basic") ) ) + OUString aCommand = aCmdBase; + OUString aDisplayName = serviceName.copy( providerKey.getLength() ); + if( aDisplayName == "Java" || aDisplayName == "Basic" ) { // no entries for Java & Basic added elsewhere break; } - aCommand.Append( aDisplayName ); - aDisplayName.Append( ellipsis ); + aCommand += aDisplayName; + aDisplayName += ellipsis; pPopupMenu->InsertItem( itemId, aDisplayName ); pPopupMenu->SetItemCommand( itemId, aCommand ); itemId++; |