diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-09-17 09:32:56 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-09-17 10:11:08 +0100 |
| commit | 0cd21c2bedb2eacc3d0898046d43047bcc3ac1a9 (patch) | |
| tree | aff9e2b018bc13a6a7385e2e7ed56631b2cbe759 /framework | |
| parent | f2be92b68d936c6e9d5e8a96deb1580bcbf8c17f (diff) | |
drop intermediate Strings
Change-Id: I7f730d4f5329525eda9f78514dcaa3788149d077
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/source/uielement/headermenucontroller.cxx | 2 | ||||
| -rw-r--r-- | framework/source/uielement/langselectionmenucontroller.cxx | 6 | ||||
| -rw-r--r-- | framework/source/uielement/toolbarsmenucontroller.cxx | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/framework/source/uielement/headermenucontroller.cxx b/framework/source/uielement/headermenucontroller.cxx index 08485e35431e..1eb35521b17f 100644 --- a/framework/source/uielement/headermenucontroller.cxx +++ b/framework/source/uielement/headermenucontroller.cxx @@ -162,7 +162,7 @@ void HeaderMenuController::fillPopupMenu( const Reference< ::com::sun::star::fra if ( bAllOneState && ( nCount > 1 )) { // Insert special item for all command - pVCLPopupMenu->InsertItem( ALL_MENUITEM_ID, OUString( FwlResId( STR_MENU_HEADFOOTALL )), 0, OString(), 0 ); + pVCLPopupMenu->InsertItem( ALL_MENUITEM_ID, FwlResId(STR_MENU_HEADFOOTALL).toString(), 0, OString(), 0 ); OUStringBuffer aStrBuf( aCmd ); aStrBuf.appendAscii( "?On:bool=" ); diff --git a/framework/source/uielement/langselectionmenucontroller.cxx b/framework/source/uielement/langselectionmenucontroller.cxx index 5fd07ce5eb39..3c38e1945467 100644 --- a/framework/source/uielement/langselectionmenucontroller.cxx +++ b/framework/source/uielement/langselectionmenucontroller.cxx @@ -261,19 +261,19 @@ void LanguageSelectionMenuController::fillPopupMenu( Reference< css::awt::XPopup // entry for LANGUAGE_NONE ++nItemId; - pPopupMenu->InsertItem( nItemId, OUString(FwlResId( STR_LANGSTATUS_NONE )) ); + pPopupMenu->InsertItem( nItemId, FwlResId(STR_LANGSTATUS_NONE).toString() ); aCmd = aCmd_Language + "LANGUAGE_NONE"; pPopupMenu->SetItemCommand( nItemId, aCmd ); // entry for 'Reset to default language' ++nItemId; - pPopupMenu->InsertItem( nItemId, OUString(FwlResId( STR_RESET_TO_DEFAULT_LANGUAGE )) ); + pPopupMenu->InsertItem( nItemId, FwlResId(STR_RESET_TO_DEFAULT_LANGUAGE).toString() ); aCmd = aCmd_Language + "RESET_LANGUAGES"; pPopupMenu->SetItemCommand( nItemId, aCmd ); // entry for opening the Format/Character dialog ++nItemId; - pPopupMenu->InsertItem( nItemId, OUString(FwlResId( STR_LANGSTATUS_MORE ))); + pPopupMenu->InsertItem( nItemId, FwlResId(STR_LANGSTATUS_MORE).toString()); pPopupMenu->SetItemCommand( nItemId, aCmd_Dialog ); } diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx index 423028d966f2..358d948fd3eb 100644 --- a/framework/source/uielement/toolbarsmenucontroller.cxx +++ b/framework/source/uielement/toolbarsmenucontroller.cxx @@ -519,7 +519,7 @@ void ToolbarsMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r } } - OUString aLabelStr( FwkResId( STR_RESTORE_TOOLBARS )); + OUString aLabelStr(FWK_RESSTR(STR_RESTORE_TOOLBARS)); OUString aRestoreCmd( CMD_RESTOREVISIBILITY ); addCommand( m_xPopupMenu, aRestoreCmd, aLabelStr ); } |