diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-07-27 17:01:36 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-07-28 16:45:48 +0100 |
| commit | 5efc15f0006866ac4c422c1b2bde173ded47893f (patch) | |
| tree | 119b46339aae67b9a5b1a76ea2a955a548e5016e | |
| parent | e39a959429234aef5348a8b5800b27c29de02a6f (diff) | |
reduce use of UniString from ResID ctor
Change-Id: I8d7619e7807ff2d400ec5c7fd181375130245728
137 files changed, 683 insertions, 695 deletions
diff --git a/avmedia/source/inc/mediamisc.hxx b/avmedia/source/inc/mediamisc.hxx index b87fe432df3e..f460161bc909 100644 --- a/avmedia/source/inc/mediamisc.hxx +++ b/avmedia/source/inc/mediamisc.hxx @@ -20,6 +20,7 @@ class ResMgr; #define AVMEDIA_RESID( nId ) ResId( nId, * ::avmedia::GetResMgr() ) +#define AVMEDIA_RESSTR( nId ) AVMEDIA_RESID( nId ).toString() #define AVMEDIA_MANAGER_SERVICE_PREFERRED "com.sun.star.comp.avmedia.Manager_VLC" #ifdef WNT diff --git a/avmedia/source/viewer/mediawindow.cxx b/avmedia/source/viewer/mediawindow.cxx index 310d5640a72f..835e3626810a 100644 --- a/avmedia/source/viewer/mediawindow.cxx +++ b/avmedia/source/viewer/mediawindow.cxx @@ -255,7 +255,7 @@ bool MediaWindow::executeMediaURLDialog(Window* /* pParent */, const OUString aSeparator( ";" ); OUString aAllTypes; - aDlg.SetTitle( AVMEDIA_RESID( (o_pbLink) + aDlg.SetTitle( AVMEDIA_RESSTR( (o_pbLink) ? AVMEDIA_STR_INSERTMEDIA_DLG : AVMEDIA_STR_OPENMEDIA_DLG ) ); getMediaFilters( aFilters ); @@ -273,7 +273,7 @@ bool MediaWindow::executeMediaURLDialog(Window* /* pParent */, } // add filter for all media types - aDlg.AddFilter( AVMEDIA_RESID( AVMEDIA_STR_ALL_MEDIAFILES ), aAllTypes ); + aDlg.AddFilter( AVMEDIA_RESSTR( AVMEDIA_STR_ALL_MEDIAFILES ), aAllTypes ); for( i = 0; i < aFilters.size(); ++i ) { @@ -292,7 +292,7 @@ bool MediaWindow::executeMediaURLDialog(Window* /* pParent */, } // add filter for all types - aDlg.AddFilter( AVMEDIA_RESID( AVMEDIA_STR_ALL_FILES ), OUString( "*.*" ) ); + aDlg.AddFilter( AVMEDIA_RESSTR( AVMEDIA_STR_ALL_FILES ), OUString( "*.*" ) ); uno::Reference<ui::dialogs::XFilePicker> const xFP(aDlg.GetFilePicker()); uno::Reference<ui::dialogs::XFilePickerControlAccess> const xCtrlAcc(xFP, diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx index 962658ffda91..0593c12c867e 100644 --- a/basctl/source/basicide/baside2.cxx +++ b/basctl/source/basicide/baside2.cxx @@ -455,7 +455,7 @@ bool ModulWindow::LoadBasic() AssertValidEditEngine(); sal_uLong nLines = CalcLineCount( *pStream ); // nLines*4: ReadText/Formatting/Highlighting/Formatting - GetEditorWindow().CreateProgress( String( IDEResId( RID_STR_GENERATESOURCE ) ), nLines*4 ); + GetEditorWindow().CreateProgress( IDEResId(RID_STR_GENERATESOURCE).toString(), nLines*4 ); GetEditEngine()->SetUpdateMode( false ); GetEditView()->Read( *pStream ); GetEditEngine()->SetUpdateMode( true ); @@ -516,7 +516,7 @@ bool ModulWindow::SaveBasicSource() bDone = true; } else - ErrorBox( this, WB_OK | WB_DEF_OK, IDEResId( RID_STR_COULDNTWRITE) ).Execute(); + ErrorBox( this, WB_OK | WB_DEF_OK, IDEResId(RID_STR_COULDNTWRITE).toString() ).Execute(); } return bDone; @@ -1468,7 +1468,7 @@ void ModulWindowLayout::UpdateDebug (bool bBasicStopped) void ModulWindowLayout::Paint (Rectangle const&) { - DrawText(Point(), String(IDEResId(RID_STR_NOMODULE))); + DrawText(Point(), IDEResId(RID_STR_NOMODULE).toString()); } // virtual diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx index cde1f42c7d3c..2347616bdb48 100644 --- a/basctl/source/basicide/baside2b.cxx +++ b/basctl/source/basicide/baside2b.cxx @@ -466,7 +466,7 @@ bool EditorWindow::ImpCanModify() { // If in Trace-mode, abort the trace or refuse input // Remove markers in the modules in Notify at Basic::Stoped - if ( QueryBox( 0, WB_OK_CANCEL, String( IDEResId( RID_STR_WILLSTOPPRG ) ) ).Execute() == RET_OK ) + if ( QueryBox( 0, WB_OK_CANCEL, IDEResId(RID_STR_WILLSTOPPRG).toString() ).Execute() == RET_OK ) { rModulWindow.GetBasicStatus().bIsRunning = false; StopBasic(); @@ -624,7 +624,7 @@ void EditorWindow::CreateEditEngine() // for the text then if the source code is long... pProgress.reset(new ProgressInfo( GetShell()->GetViewFrame()->GetObjectShell(), - String(IDEResId(RID_STR_GENERATESOURCE)), + IDEResId(RID_STR_GENERATESOURCE).toString(), nLines*4 )); setTextEngineText(*pEditEngine, aOUSource); @@ -1220,8 +1220,8 @@ WatchWindow::WatchWindow (Layout* pParent) : | WB_HASLINESATROOT | WB_HASBUTTONSATROOT ), aHeaderBar( this, WB_BUTTONSTYLE | WB_BORDER ) { - aXEdit.SetAccessibleName(String(IDEResId( RID_STR_WATCHNAME))); - aTreeListBox.SetAccessibleName(String(IDEResId(RID_STR_WATCHNAME))); + aXEdit.SetAccessibleName(IDEResId(RID_STR_WATCHNAME).toString()); + aTreeListBox.SetAccessibleName(IDEResId(RID_STR_WATCHNAME).toString()); long nTextLen = GetTextWidth( aWatchStr ) + DWBORDER + 3; aXEdit.SetPosPixel( Point( nTextLen, 3 ) ); @@ -1260,9 +1260,9 @@ WatchWindow::WatchWindow (Layout* pParent) : long nVarTabWidth = 220; long nValueTabWidth = 100; long nTypeTabWidth = 1250; - aHeaderBar.InsertItem( ITEM_ID_VARIABLE, String( IDEResId( RID_STR_WATCHVARIABLE ) ), nVarTabWidth ); - aHeaderBar.InsertItem( ITEM_ID_VALUE, String( IDEResId( RID_STR_WATCHVALUE ) ), nValueTabWidth ); - aHeaderBar.InsertItem( ITEM_ID_TYPE, String( IDEResId( RID_STR_WATCHTYPE ) ), nTypeTabWidth ); + aHeaderBar.InsertItem( ITEM_ID_VARIABLE, IDEResId(RID_STR_WATCHVARIABLE).toString(), nVarTabWidth ); + aHeaderBar.InsertItem( ITEM_ID_VALUE, IDEResId(RID_STR_WATCHVALUE).toString(), nValueTabWidth ); + aHeaderBar.InsertItem( ITEM_ID_TYPE, IDEResId(RID_STR_WATCHTYPE).toString(), nTypeTabWidth ); long tabs[ 4 ]; tabs[ 0 ] = 3; // two tabs @@ -1278,7 +1278,7 @@ WatchWindow::WatchWindow (Layout* pParent) : aTreeListBox.Show(); - SetText( String( IDEResId( RID_STR_WATCHNAME ) ) ); + SetText(IDEResId(RID_STR_WATCHNAME).toString()); SetHelpId( HID_BASICIDE_WATCHWINDOW ); @@ -1510,14 +1510,14 @@ StackWindow::StackWindow (Layout* pParent) : aStackStr( IDEResId( RID_STR_STACK ) ) { aTreeListBox.SetHelpId(HID_BASICIDE_STACKWINDOW_LIST); - aTreeListBox.SetAccessibleName(String( IDEResId(RID_STR_STACKNAME))); + aTreeListBox.SetAccessibleName(IDEResId(RID_STR_STACKNAME).toString()); aTreeListBox.SetPosPixel( Point( DWBORDER, nVirtToolBoxHeight ) ); aTreeListBox.SetHighlightRange(); aTreeListBox.SetSelectionMode( NO_SELECTION ); aTreeListBox.InsertEntry( String(), 0, false, LIST_APPEND ); aTreeListBox.Show(); - SetText( String( IDEResId( RID_STR_STACKNAME ) ) ); + SetText(IDEResId(RID_STR_STACKNAME).toString()); SetHelpId( HID_BASICIDE_STACKWINDOW ); diff --git a/basctl/source/basicide/basides1.cxx b/basctl/source/basicide/basides1.cxx index 474e792eb5c5..1ccc4ada2ea7 100644 --- a/basctl/source/basicide/basides1.cxx +++ b/basctl/source/basicide/basides1.cxx @@ -101,7 +101,7 @@ void Shell::ExecuteCurrent( SfxRequest& rReq ) nActModWindows++; } - if ( nActModWindows <= 1 || ( !rSearchItem.GetSelection() && QueryBox( pCurWin, WB_YES_NO|WB_DEF_YES, String(IDEResId(RID_STR_SEARCHALLMODULES)) ).Execute() == RET_YES ) ) + if ( nActModWindows <= 1 || ( !rSearchItem.GetSelection() && QueryBox( pCurWin, WB_YES_NO|WB_DEF_YES, IDEResId(RID_STR_SEARCHALLMODULES).toString() ).Execute() == RET_YES ) ) { for (WindowTableIt it = aWindowTable.begin(); it != aWindowTable.end(); ++it) { @@ -180,7 +180,7 @@ void Shell::ExecuteCurrent( SfxRequest& rReq ) SetCurWindow( pWin, true ); } if ( !nFound && !bCanceled ) - InfoBox( pCurWin, String(IDEResId(RID_STR_SEARCHNOTFOUND)) ).Execute(); + InfoBox( pCurWin, IDEResId(RID_STR_SEARCHNOTFOUND).toString() ).Execute(); } rReq.Done(); diff --git a/basctl/source/basicide/basobj2.cxx b/basctl/source/basicide/basobj2.cxx index d5e4b919e7e6..321f282c4a48 100644 --- a/basctl/source/basicide/basobj2.cxx +++ b/basctl/source/basicide/basobj2.cxx @@ -359,7 +359,7 @@ OUString ChooseMacro( const uno::Reference< frame::XModel >& rxLimitToDocument, { // error bError = true; - ErrorBox( NULL, WB_OK | WB_DEF_OK, String( IDEResId( RID_STR_ERRORCHOOSEMACRO ) ) ).Execute(); + ErrorBox( NULL, WB_OK | WB_DEF_OK, IDEResId(RID_STR_ERRORCHOOSEMACRO).toString() ).Execute(); } } } diff --git a/basctl/source/basicide/bastypes.cxx b/basctl/source/basicide/bastypes.cxx index 83cf3ba98c2c..41c2491a05ca 100644 --- a/basctl/source/basicide/bastypes.cxx +++ b/basctl/source/basicide/bastypes.cxx @@ -562,7 +562,7 @@ long TabBar::AllowRenaming() bool const bValid = IsValidSbxName(GetEditText()); if ( !bValid ) - ErrorBox( this, WB_OK | WB_DEF_OK, String( IDEResId( RID_STR_BADSBXNAME ) ) ).Execute(); + ErrorBox( this, WB_OK | WB_DEF_OK, IDEResId(RID_STR_BADSBXNAME).toString() ).Execute(); return bValid ? TABBAR_RENAMING_YES : TABBAR_RENAMING_NO; } diff --git a/basctl/source/basicide/macrodlg.cxx b/basctl/source/basicide/macrodlg.cxx index f172160dc0dc..36dae438cc8b 100644 --- a/basctl/source/basicide/macrodlg.cxx +++ b/basctl/source/basicide/macrodlg.cxx @@ -440,7 +440,7 @@ void MacroChooser::CheckButtons() bNewDelIsDel = pMethod ? true : false; if (bPrev != bNewDelIsDel && nMode == All) { - String aBtnText( bNewDelIsDel ? IDEResId( RID_STR_BTNDEL) : IDEResId( RID_STR_BTNNEW ) ); + OUString aBtnText( bNewDelIsDel ? IDEResId(RID_STR_BTNDEL).toString() : IDEResId(RID_STR_BTNNEW).toString() ); m_pDelButton->SetText( aBtnText ); } @@ -622,7 +622,7 @@ IMPL_LINK( MacroChooser, ButtonHdl, Button *, pButton ) ScriptDocument aDocument( ScriptDocument::getDocumentForBasicManager( pBasMgr ) ); if ( aDocument.isDocument() && !aDocument.allowMacros() ) { - WarningBox( this, WB_OK, String( IDEResId( RID_STR_CANNOTRUNMACRO ) ) ).Execute(); + WarningBox( this, WB_OK, IDEResId(RID_STR_CANNOTRUNMACRO).toString() ).Execute(); return 0; } } @@ -631,7 +631,7 @@ IMPL_LINK( MacroChooser, ButtonHdl, Button *, pButton ) { if ( !IsValidSbxName(m_pMacroNameEdit->GetText()) ) { - ErrorBox( this, WB_OK | WB_DEF_OK, String( IDEResId( RID_STR_BADSBXNAME ) ) ).Execute(); + ErrorBox( this, WB_OK | WB_DEF_OK, IDEResId(RID_STR_BADSBXNAME).toString() ).Execute(); m_pMacroNameEdit->SetSelection( Selection( 0, m_pMacroNameEdit->GetText().getLength() ) ); m_pMacroNameEdit->GrabFocus(); return 0; @@ -699,7 +699,7 @@ IMPL_LINK( MacroChooser, ButtonHdl, Button *, pButton ) { if ( !IsValidSbxName(m_pMacroNameEdit->GetText()) ) { - ErrorBox( this, WB_OK | WB_DEF_OK, String( IDEResId( RID_STR_BADSBXNAME ) ) ).Execute(); + ErrorBox( this, WB_OK | WB_DEF_OK, IDEResId(RID_STR_BADSBXNAME).toString() ).Execute(); m_pMacroNameEdit->SetSelection( Selection( 0, m_pMacroNameEdit->GetText().getLength() ) ); m_pMacroNameEdit->GrabFocus(); return 1; @@ -804,7 +804,7 @@ void MacroChooser::SetMode (Mode nM) { case All: { - m_pRunButton->SetText( String( IDEResId( RID_STR_RUN ) ) ); + m_pRunButton->SetText(IDEResId(RID_STR_RUN).toString()); EnableButton(*m_pDelButton, true); EnableButton(*m_pOrganizeButton, true); break; @@ -812,7 +812,7 @@ void MacroChooser::SetMode (Mode nM) case ChooseOnly: { - m_pRunButton->SetText( String( IDEResId( RID_STR_CHOOSE ) ) ); + m_pRunButton->SetText(IDEResId(RID_STR_CHOOSE).toString()); EnableButton(*m_pDelButton, false); EnableButton(*m_pOrganizeButton, false); break; @@ -820,7 +820,7 @@ void MacroChooser::SetMode (Mode nM) case Recording: { - m_pRunButton->SetText( String( IDEResId( RID_STR_RECORD ) ) ); + m_pRunButton->SetText(IDEResId(RID_STR_RECORD).toString()); EnableButton(*m_pDelButton, false); EnableButton(*m_pOrganizeButton, false); diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx index ae513291a8fb..8952742bd145 100644 --- a/basctl/source/basicide/moduldl2.cxx +++ b/basctl/source/basicide/moduldl2.cxx @@ -785,10 +785,10 @@ void LibPage::InsertLib() Reference< uno::XComponentContext > xContext( ::comphelper::getProcessComponentContext() ); // file open dialog Reference < XFilePicker3 > xFP = FilePicker::createWithMode(xContext, TemplateDescription::FILEOPEN_SIMPLE); - xFP->setTitle( String( IDEResId( RID_STR_APPENDLIBS ) ) ); + xFP->setTitle(IDEResId(RID_STR_APPENDLIBS).toString()); // filter - OUString aTitle = String( IDEResId( RID_STR_BASIC ) ); + OUString aTitle(IDEResId(RID_STR_BASIC).toString()); OUString aFilter; aFilter = "*.sbl;*.xlc;*.xlb" ; // library files aFilter += ";*.sdw;*.sxw;*.odt" ; // text @@ -1245,10 +1245,10 @@ void LibPage::ExportAsPackage( const String& aLibName ) Reference < XFilePicker3 > xFP = FilePicker::createWithMode(xContext, TemplateDescription::FILESAVE_SIMPLE); - xFP->setTitle( String( IDEResId( RID_STR_EXPORTPACKAGE ) ) ); + xFP->setTitle(IDEResId(RID_STR_EXPORTPACKAGE).toString()); // filter - OUString aTitle = String( IDEResId( RID_STR_PACKAGE_BUNDLE ) ); + OUString aTitle(IDEResId(RID_STR_PACKAGE_BUNDLE).toString()); OUString aFilter; aFilter = "*.oxt" ; // library files xFP->appendFilter( aTitle, aFilter ); @@ -1365,7 +1365,7 @@ void LibPage::ExportAsBasic( const String& aLibName ) Reference< XFolderPicker2 > xFolderPicker = FolderPicker::create(xContext); Reference< task::XInteractionHandler2 > xHandler( task::InteractionHandler::createWithParent(xContext, 0) ); - xFolderPicker->setTitle( String( IDEResId( RID_STR_EXPORTBASIC ) ) ); + xFolderPicker->setTitle(IDEResId(RID_STR_EXPORTBASIC).toString()); // set display directory and filter String aPath =GetExtraData()->GetAddLibPath(); @@ -1569,17 +1569,17 @@ void createLibImpl( Window* pWin, const ScriptDocument& rDocument, if ( aLibName.getLength() > 30 ) { - ErrorBox( pWin, WB_OK | WB_DEF_OK, String( IDEResId( RID_STR_LIBNAMETOLONG ) ) ).Execute(); + ErrorBox( pWin, WB_OK | WB_DEF_OK, IDEResId(RID_STR_LIBNAMETOLONG).toString() ).Execute(); } else if ( !IsValidSbxName( aLibName ) ) { ErrorBox( pWin, WB_OK | WB_DEF_OK, - String( IDEResId( RID_STR_BADSBXNAME ) ) ).Execute(); + IDEResId(RID_STR_BADSBXNAME).toString() ).Execute(); } else if ( rDocument.hasLibrary( E_SCRIPTS, aLibName ) || rDocument.hasLibrary( E_DIALOGS, aLibName ) ) { ErrorBox( pWin, WB_OK | WB_DEF_OK, - String( IDEResId( RID_STR_SBXNAMEALLREADYUSED2 ) ) ).Execute(); + IDEResId(RID_STR_SBXNAMEALLREADYUSED2).toString() ).Execute(); } else { diff --git a/basctl/source/basicide/objdlg.cxx b/basctl/source/basicide/objdlg.cxx index cb707e9119fe..3244507fc9ab 100644 --- a/basctl/source/basicide/objdlg.cxx +++ b/basctl/source/basicide/objdlg.cxx @@ -43,10 +43,10 @@ ObjectCatalog::ObjectCatalog (Window* pParent) : aTree(this, IDEResId(RID_TLB_MACROS)) { SetHelpId("basctl:FloatingWindow:RID_BASICIDE_OBJCAT"); - SetText(String(IDEResId(RID_BASICIDE_OBJCAT))); + SetText(IDEResId(RID_BASICIDE_OBJCAT).toString()); // title - aTitle.SetText(String(IDEResId(RID_BASICIDE_OBJCAT))); + aTitle.SetText(IDEResId(RID_BASICIDE_OBJCAT).toString()); aTitle.SetStyle(WB_CENTER); // tree list @@ -56,7 +56,7 @@ ObjectCatalog::ObjectCatalog (Window* pParent) : WB_HASLINES | WB_HASLINESATROOT | WB_HASBUTTONS | WB_HASBUTTONSATROOT ); - aTree.SetAccessibleName(String(IDEResId(RID_STR_TLB_MACROS))); + aTree.SetAccessibleName(IDEResId(RID_STR_TLB_MACROS).toString()); aTree.SetHelpId(HID_BASICIDE_OBJECTCAT); aTree.ScanAllEntries(); aTree.GrabFocus(); diff --git a/chart2/source/controller/accessibility/AccessibleChartView.cxx b/chart2/source/controller/accessibility/AccessibleChartView.cxx index 3b1be85ad49b..ecf9290287ab 100644 --- a/chart2/source/controller/accessibility/AccessibleChartView.cxx +++ b/chart2/source/controller/accessibility/AccessibleChartView.cxx @@ -110,7 +110,7 @@ awt::Point AccessibleChartView::GetUpperLeftOnScreen() const OUString SAL_CALL AccessibleChartView::getAccessibleName() throw (uno::RuntimeException) { - return OUString( String( SchResId( STR_OBJECT_DIAGRAM ))); + return SCH_RESSTR(STR_OBJECT_DIAGRAM); } OUString SAL_CALL AccessibleChartView::getAccessibleDescription() diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx index 12a01eb4cc18..78e3e14c1e0a 100644 --- a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx +++ b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx @@ -430,7 +430,7 @@ ColumnChartDialogController::~ColumnChartDialogController() } String ColumnChartDialogController::getName() { - return String( SchResId( STR_TYPE_COLUMN )); + return SCH_RESSTR( STR_TYPE_COLUMN ); } Image ColumnChartDialogController::getImage() { @@ -491,10 +491,10 @@ void ColumnChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const rSubTypeList.InsertItem( 3, Bitmap( SchResId( BMP_COLUMNS_2D_3 ))); } - rSubTypeList.SetItemText( 1, String( SchResId( STR_NORMAL )) ); - rSubTypeList.SetItemText( 2, String( SchResId( STR_STACKED )) ); - rSubTypeList.SetItemText( 3, String( SchResId( STR_PERCENT )) ); - rSubTypeList.SetItemText( 4, String( SchResId( STR_DEEP )) ); + rSubTypeList.SetItemText( 1, SCH_RESSTR( STR_NORMAL ) ); + rSubTypeList.SetItemText( 2, SCH_RESSTR( STR_STACKED ) ); + rSubTypeList.SetItemText( 3, SCH_RESSTR( STR_PERCENT ) ); + rSubTypeList.SetItemText( 4, SCH_RESSTR( STR_DEEP ) ); } //-------------------------------------------------------------------------- @@ -507,7 +507,7 @@ BarChartDialogController::~BarChartDialogController() } String BarChartDialogController::getName() { - return String( SchResId( STR_TYPE_BAR )); + return SCH_RESSTR( STR_TYPE_BAR ); } Image BarChartDialogController::getImage() { @@ -567,10 +567,10 @@ void BarChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const Ch rSubTypeList.InsertItem( 2, Bitmap( SchResId( BMP_BARS_2D_2 ))); rSubTypeList.InsertItem( 3, Bitmap( SchResId( BMP_BARS_2D_3 ))); } - rSubTypeList.SetItemText( 1, String( SchResId( STR_NORMAL )) ); - rSubTypeList.SetItemText( 2, String( SchResId( STR_STACKED )) ); - rSubTypeList.SetItemText( 3, String( SchResId( STR_PERCENT )) ); - rSubTypeList.SetItemText( 4, String( SchResId( STR_DEEP )) ); + rSubTypeList.SetItemText( 1, SCH_RESSTR( STR_NORMAL ) ); + rSubTypeList.SetItemText( 2, SCH_RESSTR( STR_STACKED ) ); + rSubTypeList.SetItemText( 3, SCH_RESSTR( STR_PERCENT ) ); + rSubTypeList.SetItemText( 4, SCH_RESSTR( STR_DEEP ) ); } //-------------------------------------------------------------------------- @@ -583,7 +583,7 @@ PieChartDialogController::~PieChartDialogController() } String PieChartDialogController::getName() { - return String( SchResId( STR_TYPE_PIE )); + return SCH_RESSTR( STR_TYPE_PIE ); } Image PieChartDialogController::getImage() { @@ -622,10 +622,10 @@ void PieChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const Ch rSubTypeList.InsertItem( 3, Bitmap( SchResId( BMP_DONUT_2D ))); rSubTypeList.InsertItem( 4, Bitmap( SchResId( BMP_DONUT_2D_EXPLODED ))); } - rSubTypeList.SetItemText( 1, String( SchResId( STR_NORMAL ) ) ); - rSubTypeList.SetItemText( 2, String( SchResId( STR_PIE_EXPLODED ) ) ); - rSubTypeList.SetItemText( 3, String( SchResId( STR_DONUT ) ) ); - rSubTypeList.SetItemText( 4, String( SchResId( STR_DONUT_EXPLODED ) ) ); + rSubTypeList.SetItemText( 1, SCH_RESSTR( STR_NORMAL ) ); + rSubTypeList.SetItemText( 2, SCH_RESSTR( STR_PIE_EXPLODED ) ); + rSubTypeList.SetItemText( 3, SCH_RESSTR( STR_DONUT ) ); + rSubTypeList.SetItemText( 4, SCH_RESSTR( STR_DONUT_EXPLODED ) ); } bool PieChartDialogController::shouldShow_3DLookControl() const @@ -646,7 +646,7 @@ LineChartDialogController::~LineChartDialogController() } String LineChartDialogController::getName() { - return String( SchResId( STR_TYPE_LINE )); + return SCH_RESSTR( STR_TYPE_LINE ); } Image LineChartDialogController::getImage() { @@ -734,10 +734,10 @@ void LineChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const C } } - rSubTypeList.SetItemText( 1, String( SchResId( STR_POINTS_ONLY )) ); - rSubTypeList.SetItemText( 2, String( SchResId( STR_POINTS_AND_LINES )) ); - rSubTypeList.SetItemText( 3, String( SchResId( STR_LINES_ONLY )) ); - rSubTypeList.SetItemText( 4, String( SchResId( STR_LINES_3D )) ); + rSubTypeList.SetItemText( 1, SCH_RESSTR( STR_POINTS_ONLY ) ); + rSubTypeList.SetItemText( 2, SCH_RESSTR( STR_POINTS_AND_LINES ) ); + rSubTypeList.SetItemText( 3, SCH_RESSTR( STR_LINES_ONLY ) ); + rSubTypeList.SetItemText( 4, SCH_RESSTR( STR_LINES_3D ) ); } bool LineChartDialogController::shouldShow_StackingControl() const { @@ -798,7 +798,7 @@ XYChartDialogController::~XYChartDialogController() } String XYChartDialogController::getName() { - return String( SchResId( STR_TYPE_XY )); + return SCH_RESSTR( STR_TYPE_XY ); } Image XYChartDialogController::getImage() { @@ -849,10 +849,10 @@ void XYChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const Cha rSubTypeList.InsertItem( 4, Bitmap( SchResId( BMP_LINE3D_XVALUES ))); } - rSubTypeList.SetItemText( 1, String( SchResId( STR_POINTS_ONLY )) ); - rSubTypeList.SetItemText( 2, String( SchResId( STR_POINTS_AND_LINES )) ); - rSubTypeList.SetItemText( 3, String( SchResId( STR_LINES_ONLY )) ); - rSubTypeList.SetItemText( 4, String( SchResId( STR_LINES_3D )) ); + rSubTypeList.SetItemText( 1, SCH_RESSTR( STR_POINTS_ONLY ) ); + rSubTypeList.SetItemText( 2, SCH_RESSTR( STR_POINTS_AND_LINES ) ); + rSubTypeList.SetItemText( 3, SCH_RESSTR( STR_LINES_ONLY ) ); + rSubTypeList.SetItemText( 4, SCH_RESSTR( STR_LINES_3D ) ); } bool XYChartDialogController::shouldShow_SplineControl() const { @@ -898,7 +898,7 @@ AreaChartDialogController::~AreaChartDialogController() } String AreaChartDialogController::getName() { - return String( SchResId( STR_TYPE_AREA )); + return SCH_RESSTR(STR_TYPE_AREA); } Image AreaChartDialogController::getImage() { @@ -938,9 +938,9 @@ void AreaChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const C rSubTypeList.InsertItem( 3, Bitmap( SchResId( BMP_AREAS_2D_3 ))); } - rSubTypeList.SetItemText( 1, String( SchResId( rParameter.b3DLook ? STR_DEEP : STR_NORMAL )) ); - rSubTypeList.SetItemText( 2, String( SchResId( STR_STACKED )) ); - rSubTypeList.SetItemText( 3, String( SchResId( STR_PERCENT )) ); + rSubTypeList.SetItemText( 1, SCH_RESSTR( rParameter.b3DLook ? STR_DEEP : STR_NORMAL ) ); + rSubTypeList.SetItemText( 2, SCH_RESSTR( STR_STACKED ) ); + rSubTypeList.SetItemText( 3, SCH_RESSTR( STR_PERCENT ) ); } void AreaChartDialogController::adjustParameterToSubType( ChartTypeParameter& rParameter ) { @@ -981,7 +981,7 @@ NetChartDialogController::~NetChartDialogController() } String NetChartDialogController::getName() { - return String( SchResId( STR_TYPE_NET )); + return SCH_RESSTR(STR_TYPE_NET); } Image NetChartDialogController::getImage() { @@ -1033,10 +1033,10 @@ void NetChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const Ch rSubTypeList.InsertItem( 4, Bitmap( SchResId( BMP_NET_FILL_STACK ))); } - rSubTypeList.SetItemText( 1, String( SchResId( STR_POINTS_ONLY )) ); - rSubTypeList.SetItemText( 2, String( SchResId( STR_POINTS_AND_LINES )) ); - rSubTypeList.SetItemText( 3, String( SchResId( STR_LINES_ONLY )) ); - rSubTypeList.SetItemText( 4, String( SchResId( STR_FILLED )) ); + rSubTypeList.SetItemText( 1, SCH_RESSTR( STR_POINTS_ONLY ) ); + rSubTypeList.SetItemText( 2, SCH_RESSTR( STR_POINTS_AND_LINES ) ); + rSubTypeList.SetItemText( 3, SCH_RESSTR( STR_LINES_ONLY ) ); + rSubTypeList.SetItemText( 4, SCH_RESSTR( STR_FILLED ) ); } void NetChartDialogController::adjustParameterToSubType( ChartTypeParameter& rParameter ) { @@ -1076,7 +1076,7 @@ StockChartDialogController::~StockChartDialogController() String StockChartDialogController::getName() { - return String( SchResId( STR_TYPE_STOCK )); + return SCH_RESSTR(STR_TYPE_STOCK); } Image StockChartDialogController::getImage() { @@ -1102,10 +1102,10 @@ void StockChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const rSubTypeList.InsertItem( 3, Bitmap( SchResId( BMP_STOCK_3 ))); rSubTypeList.InsertItem( 4, Bitmap( SchResId( BMP_STOCK_4 ))); - rSubTypeList.SetItemText( 1, String( SchResId( STR_STOCK_1 )) ); - rSubTypeList.SetItemText( 2, String( SchResId( STR_STOCK_2 )) ); - rSubTypeList.SetItemText( 3, String( SchResId( STR_STOCK_3 )) ); - rSubTypeList.SetItemText( 4, String( SchResId( STR_STOCK_4 )) ); + rSubTypeList.SetItemText( 1, SCH_RESSTR(STR_STOCK_1) ); + rSubTypeList.SetItemText( 2, SCH_RESSTR(STR_STOCK_2) ); + rSubTypeList.SetItemText( 3, SCH_RESSTR(STR_STOCK_3) ); + rSubTypeList.SetItemText( 4, SCH_RESSTR(STR_STOCK_4) ); } void StockChartDialogController::adjustParameterToSubType( ChartTypeParameter& rParameter ) { @@ -1130,7 +1130,7 @@ CombiColumnLineChartDialogController::~CombiColumnLineChartDialogController() String CombiColumnLineChartDialogController::getName() { - return String( SchResId( STR_TYPE_COMBI_COLUMN_LINE )); + return SCH_RESSTR(STR_TYPE_COMBI_COLUMN_LINE); } Image CombiColumnLineChartDialogController::getImage( ) @@ -1153,15 +1153,15 @@ void CombiColumnLineChartDialogController::fillSubTypeList( ValueSet& rSubTypeLi rSubTypeList.InsertItem( 1, Bitmap( SchResId( BMP_COLUMN_LINE ))); rSubTypeList.InsertItem( 2, Bitmap( SchResId( BMP_COLUMN_LINE_STACKED ))); - rSubTypeList.SetItemText( 1, String( SchResId( STR_LINE_COLUMN )) ); - rSubTypeList.SetItemText( 2, String( SchResId( STR_LINE_STACKEDCOLUMN )) ); + rSubTypeList.SetItemText(1, SCH_RESSTR(STR_LINE_COLUMN)); + rSubTypeList.SetItemText(2, SCH_RESSTR(STR_LINE_STACKEDCOLUMN)); } void CombiColumnLineChartDialogController::showExtraControls( Window* pParent, const Point& rPosition, const Size& rSize ) { if(!m_pFT_NumberOfLines) { m_pFT_NumberOfLines = new FixedText(pParent,pParent->GetStyle()); - m_pFT_NumberOfLines->SetText( String( SchResId( STR_NUMBER_OF_LINES )) ); + m_pFT_NumberOfLines->SetText(SCH_RESSTR(STR_NUMBER_OF_LINES)); } if(!m_pMF_NumberOfLines) { @@ -1276,7 +1276,7 @@ BubbleChartDialogController::~BubbleChartDialogController() } String BubbleChartDialogController::getName() { - return String( SchResId( STR_TYPE_BUBBLE )); + return SCH_RESSTR(STR_TYPE_BUBBLE); } Image BubbleChartDialogController::getImage() { @@ -1294,7 +1294,7 @@ void BubbleChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const rSubTypeList.Clear(); rSubTypeList.InsertItem( 1, Bitmap( SchResId( BMP_BUBBLE_1 ))); - rSubTypeList.SetItemText( 1, String( SchResId( STR_BUBBLE_1 )) ); + rSubTypeList.SetItemText( 1, SCH_RESSTR(STR_BUBBLE_1) ); } void BubbleChartDialogController::adjustParameterToSubType( ChartTypeParameter& rParameter ) { diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx index 6f9ced43d519..9f107573fa9a 100644 --- a/chart2/source/controller/dialogs/DataBrowser.cxx +++ b/chart2/source/controller/dialogs/DataBrowser.cxx @@ -146,8 +146,8 @@ void SeriesHeaderEdit::MouseButtonDown( const MouseEvent& rMEvt ) Edit::MouseButtonDown( rMEvt ); if( m_bShowWarningBox ) - WarningBox( this, WinBits( WB_OK ), - String( SchResId( STR_INVALID_NUMBER ))).Execute(); + WarningBox(this, WinBits( WB_OK ), + SCH_RESSTR(STR_INVALID_NUMBER)).Execute(); } class SeriesHeader @@ -779,13 +779,13 @@ void DataBrowser::MouseButtonDown( const BrowserMouseEvent& rEvt ) void DataBrowser::ShowWarningBox() { - WarningBox( this, WinBits( WB_OK ), - String( SchResId( STR_INVALID_NUMBER ))).Execute(); + WarningBox(this, WinBits( WB_OK ), + SCH_RESSTR(STR_INVALID_NUMBER)).Execute(); } bool DataBrowser::ShowQueryBox() { - QueryBox* pQueryBox = new QueryBox( this, WB_YES_NO, String( SchResId( STR_DATA_EDITOR_INCORRECT_INPUT ))); + QueryBox* pQueryBox = new QueryBox(this, WB_YES_NO, SCH_RESSTR(STR_DATA_EDITOR_INCORRECT_INPUT)); return ( pQueryBox->Execute() == RET_YES ); } diff --git a/chart2/source/controller/dialogs/DialogModel.cxx b/chart2/source/controller/dialogs/DialogModel.cxx index 161e3440b0ce..57b6f42c7c89 100644 --- a/chart2/source/controller/dialogs/DialogModel.cxx +++ b/chart2/source/controller/dialogs/DialogModel.cxx @@ -82,21 +82,21 @@ OUString lcl_ConvertRole( const OUString & rRoleString, bool bFromInternalToUI ) if( aTranslationMap.empty() ) { - aTranslationMap[ "categories" ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_CATEGORIES ))); - aTranslationMap[ "error-bars-x" ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_X_ERROR ))); - aTranslationMap[ "error-bars-x-positive" ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_X_ERROR_POSITIVE ))); - aTranslationMap[ "error-bars-x-negative" ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_X_ERROR_NEGATIVE ))); - aTranslationMap[ "error-bars-y" ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_Y_ERROR ))); - aTranslationMap[ "error-bars-y-positive" ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_Y_ERROR_POSITIVE ))); - aTranslationMap[ "error-bars-y-negative" ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_Y_ERROR_NEGATIVE ))); - aTranslationMap[ "label" ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_LABEL ))); - aTranslationMap[ "values-first" ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_FIRST ))); - aTranslationMap[ "values-last" ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_LAST ))); - aTranslationMap[ "values-max" ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_MAX ))); - aTranslationMap[ "values-min" ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_MIN ))); - aTranslationMap[ "values-x" ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_X ))); - aTranslationMap[ "values-y" ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_Y ))); - aTranslationMap[ "values-size" ] = OUString( String( ::chart::SchResId( STR_DATA_ROLE_SIZE ))); + aTranslationMap[ "categories" ] = ::chart::SchResId( STR_DATA_ROLE_CATEGORIES ).toString(); + aTranslationMap[ "error-bars-x" ] = ::chart::SchResId( STR_DATA_ROLE_X_ERROR ).toString(); + aTranslationMap[ "error-bars-x-positive" ] = ::chart::SchResId( STR_DATA_ROLE_X_ERROR_POSITIVE ).toString(); + aTranslationMap[ "error-bars-x-negative" ] = ::chart::SchResId( STR_DATA_ROLE_X_ERROR_NEGATIVE ).toString(); + aTranslationMap[ "error-bars-y" ] = ::chart::SchResId( STR_DATA_ROLE_Y_ERROR ).toString(); + aTranslationMap[ "error-bars-y-positive" ] = ::chart::SchResId( STR_DATA_ROLE_Y_ERROR_POSITIVE ).toString(); + aTranslationMap[ "error-bars-y-negative" ] = ::chart::SchResId( STR_DATA_ROLE_Y_ERROR_NEGATIVE ).toString(); + aTranslationMap[ "label" ] = ::chart::SchResId( STR_DATA_ROLE_LABEL ).toString(); + aTranslationMap[ "values-first" ] = ::chart::SchResId( STR_DATA_ROLE_FIRST ).toString(); + aTranslationMap[ "values-last" ] = ::chart::SchResId( STR_DATA_ROLE_LAST ).toString(); + aTranslationMap[ "values-max" ] = ::chart::SchResId( STR_DATA_ROLE_MAX ).toString(); + aTranslationMap[ "values-min" ] = ::chart::SchResId( STR_DATA_ROLE_MIN ).toString(); + aTranslationMap[ "values-x" ] = ::chart::SchResId( STR_DATA_ROLE_X ).toString(); + aTranslationMap[ "values-y" ] = ::chart::SchResId( STR_DATA_ROLE_Y ).toString(); + aTranslationMap[ "values-size" ] = ::chart::SchResId( STR_DATA_ROLE_SIZE ).toString(); } if( bFromInternalToUI ) @@ -308,7 +308,7 @@ Reference< XDataSeries > lcl_CreateNewSeries( { ::std::vector< Reference< data::XLabeledDataSequence > > aNewSequences; const OUString aRoleOfSeqForSeriesLabel = xChartType->getRoleOfSequenceForSeriesLabel(); - const OUString aLabel( String( ::chart::SchResId( STR_DATA_UNNAMED_SERIES ))); + const OUString aLabel(::chart::SchResId(STR_DATA_UNNAMED_SERIES).toString()); const Sequence< OUString > aRoles( xChartType->getSupportedMandatoryRoles()); const Sequence< OUString > aOptRoles( xChartType->getSupportedOptionalRoles()); sal_Int32 nI = 0; @@ -721,7 +721,7 @@ OUString DialogModel::ConvertRoleFromInternalToUI( const OUString & rRoleString OUString DialogModel::GetRoleDataLabel() { - return OUString( String( ::chart::SchResId( STR_OBJECT_DATALABELS ))); + return ::chart::SchResId(STR_OBJECT_DATALABELS).toString(); } sal_Int32 DialogModel::GetRoleIndexForSorting( const OUString & rInternalRoleString ) diff --git a/chart2/source/controller/dialogs/ObjectNameProvider.cxx b/chart2/source/controller/dialogs/ObjectNameProvider.cxx index 29a3f38be4be..b630f3a055e4 100644 --- a/chart2/source/controller/dialogs/ObjectNameProvider.cxx +++ b/chart2/source/controller/dialogs/ObjectNameProvider.cxx @@ -72,7 +72,7 @@ OUString lcl_getDataSeriesName( const OUString& rObjectCID, const Reference< fra OUString lcl_getFullSeriesName( const OUString& rObjectCID, const Reference< frame::XModel >& xChartModel ) { - OUString aRet = String(SchResId(STR_TIP_DATASERIES)); + OUString aRet(SCH_RESSTR(STR_TIP_DATASERIES)); OUString aWildcard( "%SERIESNAME" ); sal_Int32 nIndex = aRet.indexOf( aWildcard ); if( nIndex != -1 ) @@ -206,103 +206,103 @@ OUString ObjectNameProvider::getName( ObjectType eObjectType, bool bPlural ) switch( eObjectType ) { case OBJECTTYPE_PAGE: - aRet=String(SchResId(STR_OBJECT_PAGE)); + aRet=SCH_RESSTR(STR_OBJECT_PAGE); break; case OBJECTTYPE_TITLE: { if(bPlural) - aRet=String(SchResId(STR_OBJECT_TITLES)); + aRet=SCH_RESSTR(STR_OBJECT_TITLES); else - aRet=String(SchResId(STR_OBJECT_TITLE)); + aRet=SCH_RESSTR(STR_OBJECT_TITLE); } break; case OBJECTTYPE_LEGEND: - aRet=String(SchResId(STR_OBJECT_LEGEND)); + aRet=SCH_RESSTR(STR_OBJECT_LEGEND); break; case OBJECTTYPE_LEGEND_ENTRY: - aRet=String(SchResId(STR_OBJECT_LEGEND_SYMBOL));//@todo change string if we do differenciate symbol and legend entry in future + aRet=SCH_RESSTR(STR_OBJECT_LEGEND_SYMBOL);//@todo change string if we do differenciate symbol and legend entry in future break; case OBJECTTYPE_DIAGRAM: - aRet=String(SchResId(STR_OBJECT_DIAGRAM)); + aRet=SCH_RESSTR(STR_OBJECT_DIAGRAM); break; case OBJECTTYPE_DIAGRAM_WALL: - aRet=String(SchResId(STR_OBJECT_DIAGRAM_WALL)); + aRet=SCH_RESSTR(STR_OBJECT_DIAGRAM_WALL); break; case OBJECTTYPE_DIAGRAM_FLOOR: - aRet=String(SchResId(STR_OBJECT_DIAGRAM_FLOOR)); + aRet=SCH_RESSTR(STR_OBJECT_DIAGRAM_FLOOR); break; case OBJECTTYPE_AXIS: { if(bPlural) - aRet=String(SchResId(STR_OBJECT_AXES)); + aRet=SCH_RESSTR(STR_OBJECT_AXES); else - aRet=String(SchResId(STR_OBJECT_AXIS)); + aRet=SCH_RESSTR(STR_OBJECT_AXIS); } break; case OBJECTTYPE_AXIS_UNITLABEL: - aRet=String(SchResId(STR_OBJECT_LABEL));//@todo maybe a more concrete name + aRet=SCH_RESSTR(STR_OBJECT_LABEL);//@todo maybe a more concrete name break; case OBJECTTYPE_GRID: case OBJECTTYPE_SUBGRID: //maybe todo: different names for subgrids { if(bPlural) - aRet=String(SchResId(STR_OBJECT_GRIDS)); + aRet=SCH_RESSTR(STR_OBJECT_GRIDS); else - aRet=String(SchResId(STR_OBJECT_GRID)); + aRet=SCH_RESSTR(STR_OBJECT_GRID); } break; case OBJECTTYPE_DATA_SERIES: { if(bPlural) - aRet=String(SchResId(STR_OBJECT_DATASERIES_PLURAL)); + aRet=SCH_RESSTR(STR_OBJECT_DATASERIES_PLURAL); else - aRet=String(SchResId(STR_OBJECT_DATASERIES)); + aRet=SCH_RESSTR(STR_OBJECT_DATASERIES); } break; case OBJECTTYPE_DATA_POINT: { if(bPlural) - aRet=String(SchResId(STR_OBJECT_DATAPOINTS)); + aRet=SCH_RESSTR(STR_OBJECT_DATAPOINTS); else - aRet=String(SchResId(STR_OBJECT_DATAPOINT)); + aRet=SCH_RESSTR(STR_OBJECT_DATAPOINT); } break; case OBJECTTYPE_DATA_LABELS: - aRet=String(SchResId(STR_OBJECT_DATALABELS)); + aRet=SCH_RESSTR(STR_OBJECT_DATALABELS); break; case OBJECTTYPE_DATA_LABEL: - aRet=String(SchResId(STR_OBJECT_LABEL)); + aRet=SCH_RESSTR(STR_OBJECT_LABEL); break; case OBJECTTYPE_DATA_ERRORS_X: - aRet=String(SchResId(STR_OBJECT_ERROR_BARS_X)); + aRet=SCH_RESSTR(STR_OBJECT_ERROR_BARS_X); break; case OBJECTTYPE_DATA_ERRORS_Y: - aRet=String(SchResId(STR_OBJECT_ERROR_BARS_Y)); + aRet=SCH_RESSTR(STR_OBJECT_ERROR_BARS_Y); break; case OBJECTTYPE_DATA_ERRORS_Z: - aRet=String(SchResId(STR_OBJECT_ERROR_BARS_Z)); + aRet=SCH_RESSTR(STR_OBJECT_ERROR_BARS_Z); break; case OBJECTTYPE_DATA_AVERAGE_LINE: - aRet=String(SchResId(STR_OBJECT_AVERAGE_LINE)); + aRet=SCH_RESSTR(STR_OBJECT_AVERAGE_LINE); break; case OBJECTTYPE_DATA_CURVE: { if(bPlural) - aRet=String(SchResId(STR_OBJECT_CURVES)); + aRet=SCH_RESSTR(STR_OBJECT_CURVES); else - aRet=String(SchResId(STR_OBJECT_CURVE)); + aRet=SCH_RESSTR(STR_OBJECT_CURVE); } break; case OBJECTTYPE_DATA_STOCK_RANGE: break; case OBJECTTYPE_DATA_STOCK_LOSS: - aRet=String(SchResId(STR_OBJECT_STOCK_LOSS)); + aRet=SCH_RESSTR(STR_OBJECT_STOCK_LOSS); break; case OBJECTTYPE_DATA_STOCK_GAIN: - aRet=String(SchResId(STR_OBJECT_STOCK_GAIN)); + aRet=SCH_RESSTR(STR_OBJECT_STOCK_GAIN); break; case OBJECTTYPE_DATA_CURVE_EQUATION: - aRet=String(SchResId(STR_OBJECT_CURVE_EQUATION)); + aRet=SCH_RESSTR(STR_OBJECT_CURVE_EQUATION); break; default: //OBJECTTYPE_UNKNOWN ; @@ -329,21 +329,21 @@ OUString ObjectNameProvider::getAxisName( const OUString& rObjectCID { case 0://x-axis if( nAxisIndex == 0 ) - aRet=String(SchResId(STR_OBJECT_AXIS_X)); + aRet=SCH_RESSTR(STR_OBJECT_AXIS_X); else - aRet=String(SchResId(STR_OBJECT_SECONDARY_X_AXIS)); + aRet=SCH_RESSTR(STR_OBJECT_SECONDARY_X_AXIS); break; case 1://y-axis if( nAxisIndex == 0 ) - aRet=String(SchResId(STR_OBJECT_AXIS_Y)); + aRet=SCH_RESSTR(STR_OBJECT_AXIS_Y); else - aRet=String(SchResId(STR_OBJECT_SECONDARY_Y_AXIS)); + aRet=SCH_RESSTR(STR_OBJECT_SECONDARY_Y_AXIS); break; case 2://z-axis - aRet=String(SchResId(STR_OBJECT_AXIS_Z)); + aRet=SCH_RESSTR(STR_OBJECT_AXIS_Z); break; default://axis - aRet=String(SchResId(STR_OBJECT_AXIS)); + aRet=SCH_RESSTR(STR_OBJECT_AXIS); break; } @@ -357,25 +357,25 @@ OUString ObjectNameProvider::getTitleNameByType( TitleHelper::eTitleType eType ) switch(eType) { case TitleHelper::MAIN_TITLE: - aRet=String(SchResId(STR_OBJECT_TITLE_MAIN)); + aRet=SCH_RESSTR(STR_OBJECT_TITLE_MAIN); break; case TitleHelper::SUB_TITLE: - aRet=String(SchResId(STR_OBJECT_TITLE_SUB)); + aRet=SCH_RESSTR(STR_OBJECT_TITLE_SUB); break; case TitleHelper::X_AXIS_TITLE: - aRet=String(SchResId(STR_OBJECT_TITLE_X_AXIS)); + aRet=SCH_RESSTR(STR_OBJECT_TITLE_X_AXIS); break; case TitleHelper::Y_AXIS_TITLE: - aRet=String(SchResId(STR_OBJECT_TITLE_Y_AXIS)); + aRet=SCH_RESSTR(STR_OBJECT_TITLE_Y_AXIS); break; case TitleHelper::Z_AXIS_TITLE: - aRet=String(SchResId(STR_OBJECT_TITLE_Z_AXIS)); + aRet=SCH_RESSTR(STR_OBJECT_TITLE_Z_AXIS); break; case TitleHelper::SECONDARY_X_AXIS_TITLE: - aRet=String(SchResId(STR_OBJECT_TITLE_SECONDARY_X_AXIS)); + aRet=SCH_RESSTR(STR_OBJECT_TITLE_SECONDARY_X_AXIS); break; case TitleHelper::SECONDARY_Y_AXIS_TITLE: - aRet=String(SchResId(STR_OBJECT_TITLE_SECONDARY_Y_AXIS)); + aRet=SCH_RESSTR(STR_OBJECT_TITLE_SECONDARY_Y_AXIS); break; default: OSL_FAIL("unknown title type"); @@ -383,7 +383,7 @@ OUString ObjectNameProvider::getTitleNameByType( TitleHelper::eTitleType eType ) } if( aRet.isEmpty() ) - aRet=String(SchResId(STR_OBJECT_TITLE)); + aRet=SCH_RESSTR(STR_OBJECT_TITLE); return aRet; } @@ -402,7 +402,7 @@ OUString ObjectNameProvider::getTitleName( const OUString& rObjectCID aRet = ObjectNameProvider::getTitleNameByType( eType ); } if( aRet.isEmpty() ) - aRet=String(SchResId(STR_OBJECT_TITLE)); + aRet=SCH_RESSTR(STR_OBJECT_TITLE); return aRet; } @@ -427,16 +427,16 @@ OUString ObjectNameProvider::getGridName( const OUString& rObjectCID switch(nDimensionIndex) { case 0://x-axis - aRet=String(SchResId(STR_OBJECT_GRID_MAJOR_X)); + aRet=SCH_RESSTR(STR_OBJECT_GRID_MAJOR_X); break; case 1://y-axis - aRet=String(SchResId(STR_OBJECT_GRID_MAJOR_Y)); + aRet=SCH_RESSTR(STR_OBJECT_GRID_MAJOR_Y); break; case 2://z-axis - aRet=String(SchResId(STR_OBJECT_GRID_MAJOR_Z)); + aRet=SCH_RESSTR(STR_OBJECT_GRID_MAJOR_Z); break; default://axis - aRet=String(SchResId(STR_OBJECT_GRID)); + aRet=SCH_RESSTR(STR_OBJECT_GRID); break; } } @@ -445,16 +445,16 @@ OUString ObjectNameProvider::getGridName( const OUString& rObjectCID switch(nDimensionIndex) { case 0://x-axis - aRet=String(SchResId(STR_OBJECT_GRID_MINOR_X)); + aRet=SCH_RESSTR(STR_OBJECT_GRID_MINOR_X); break; case 1://y-axis - aRet=String(SchResId(STR_OBJECT_GRID_MINOR_Y)); + aRet=SCH_RESSTR(STR_OBJECT_GRID_MINOR_Y); break; case 2://z-axis - aRet=String(SchResId(STR_OBJECT_GRID_MINOR_Z)); + aRet=SCH_RESSTR(STR_OBJECT_GRID_MINOR_Z); break; default://axis - aRet=String(SchResId(STR_OBJECT_GRID)); + aRet=SCH_RESSTR(STR_OBJECT_GRID); break; } } @@ -493,14 +493,14 @@ OUString ObjectNameProvider::getHelpText( const OUString& rObjectCID, const Refe { OUString aNewLine( "\n" ); - aRet=String(SchResId(STR_TIP_DATAPOINT_INDEX)); + aRet=SCH_RESSTR(STR_TIP_DATAPOINT_INDEX); aRet+=aNewLine; - aRet+=String(SchResId(STR_TIP_DATASERIES)); + aRet+=SCH_RESSTR(STR_TIP_DATASERIES); aRet+=aNewLine; - aRet+=String(SchResId(STR_TIP_DATAPOINT_VALUES)); + aRet+=SCH_RESSTR(STR_TIP_DATAPOINT_VALUES); } else - aRet=String(SchResId(STR_TIP_DATAPOINT)); + aRet=SCH_RESSTR(STR_TIP_DATAPOINT); Reference< XDiagram > xDiagram( ChartModelHelper::findDiagram( xChartModel ) ); Reference< XDataSeries > xSeries( ObjectIdentifier::getDataSeriesForCID( rObjectCID , xChartModel ), uno::UNO_QUERY ); @@ -554,7 +554,7 @@ OUString ObjectNameProvider::getHelpText( const OUString& rObjectCID, const Refe { if( bVerbose ) { - aRet = String( SchResId( STR_OBJECT_CURVE_WITH_PARAMETERS )); + aRet = SCH_RESSTR( STR_OBJECT_CURVE_WITH_PARAMETERS ); Reference< chart2::XDataSeries > xSeries( ObjectIdentifier::getDataSeriesForCID( rObjectCID , xChartModel )); Reference< chart2::XRegressionCurveContainer > xCurveCnt( xSeries, uno::UNO_QUERY ); if( xCurveCnt.is()) @@ -603,7 +603,7 @@ OUString ObjectNameProvider::getHelpText( const OUString& rObjectCID, const Refe { if( bVerbose ) { - aRet = String( SchResId( STR_OBJECT_AVERAGE_LINE_WITH_PARAMETERS )); + aRet = SCH_RESSTR(STR_OBJECT_AVERAGE_LINE_WITH_PARAMETERS); Reference< chart2::XDataSeries > xSeries( ObjectIdentifier::getDataSeriesForCID( rObjectCID , xChartModel )); Reference< chart2::XRegressionCurveContainer > xCurveCnt( xSeries, uno::UNO_QUERY ); if( xCurveCnt.is()) @@ -670,7 +670,7 @@ OUString ObjectNameProvider::getSelectedObjectText( const OUString & rObjectCID, if( OBJECTTYPE_DATA_POINT == eObjectType ) { - aRet = String( SchResId( STR_STATUS_DATAPOINT_MARKED )); + aRet = SCH_RESSTR( STR_STATUS_DATAPOINT_MARKED ); Reference< XDiagram > xDiagram( ChartModelHelper::findDiagram( xChartModel ) ); Reference< XDataSeries > xSeries( ObjectIdentifier::getDataSeriesForCID( rObjectCID , xChartModel ), uno::UNO_QUERY ); @@ -706,7 +706,7 @@ OUString ObjectNameProvider::getSelectedObjectText( const OUString & rObjectCID, const OUString aHelpText( getHelpText( rObjectCID, xChartModel, bVerbose )); if( !aHelpText.isEmpty()) { - aRet = String( SchResId( STR_STATUS_OBJECT_MARKED )); + aRet = SCH_RESSTR( STR_STATUS_OBJECT_MARKED ); replaceParamterInString( aRet, "%OBJECTNAME", aHelpText ); } } @@ -778,7 +778,7 @@ OUString ObjectNameProvider::getName_ObjectForSeries( Reference< XDataSeries > xSeries( ObjectIdentifier::getDataSeriesForCID( rSeriesCID , xChartModel ), uno::UNO_QUERY ); if( xSeries.is() ) { - OUString aRet = String(SchResId(STR_OBJECT_FOR_SERIES)); + OUString aRet = SCH_RESSTR(STR_OBJECT_FOR_SERIES); replaceParamterInString( aRet, "%OBJECTNAME", getName( eObjectType, false /*bPlural*/ ) ); replaceParamterInString( aRet, "%SERIESNAME", lcl_getDataSeriesName( rSeriesCID, xChartModel ) ); return aRet; @@ -789,7 +789,7 @@ OUString ObjectNameProvider::getName_ObjectForSeries( OUString ObjectNameProvider::getName_ObjectForAllSeries( ObjectType eObjectType ) { - OUString aRet = String(SchResId(STR_OBJECT_FOR_ALL_SERIES)); + OUString aRet = SCH_RESSTR(STR_OBJECT_FOR_ALL_SERIES); replaceParamterInString( aRet, "%OBJECTNAME", getName( eObjectType, true /*bPlural*/ ) ); return aRet; } diff --git a/chart2/source/controller/dialogs/RangeSelectionButton.cxx b/chart2/source/controller/dialogs/RangeSelectionButton.cxx index 2105aef78e56..04a970c8a1cd 100644 --- a/chart2/source/controller/dialogs/RangeSelectionButton.cxx +++ b/chart2/source/controller/dialogs/RangeSelectionButton.cxx @@ -32,7 +32,7 @@ RangeSelectionButton::RangeSelectionButton( Window *pParent, const ResId& rResId ImageButton( pParent, rResId ) { SetModeImage( Image( SchResId( IMG_SELECTRANGE) ) ); - this->SetQuickHelpText(SchResId(STR_TIP_SELECT_RANGE)); + this->SetQuickHelpText(SCH_RESSTR(STR_TIP_SELECT_RANGE)); } RangeSelectionButton::~RangeSelectionButton() diff --git a/chart2/source/controller/dialogs/TextDirectionListBox.cxx b/chart2/source/controller/dialogs/TextDirectionListBox.cxx index 99667e40f39c..91863c84f723 100644 --- a/chart2/source/controller/dialogs/TextDirectionListBox.cxx +++ b/chart2/source/controller/dialogs/TextDirectionListBox.cxx @@ -30,9 +30,9 @@ namespace chart TextDirectionListBox::TextDirectionListBox( Window* pParent, const ResId& rResId, Window* pWindow1, Window* pWindow2 ) : svx::FrameDirectionListBox( pParent, rResId ) { - InsertEntryValue( String( SchResId( STR_TEXT_DIRECTION_LTR ) ), FRMDIR_HORI_LEFT_TOP ); - InsertEntryValue( String( SchResId( STR_TEXT_DIRECTION_RTL ) ), FRMDIR_HORI_RIGHT_TOP ); - InsertEntryValue( String( SchResId( STR_TEXT_DIRECTION_SUPER ) ), FRMDIR_ENVIRONMENT ); + InsertEntryValue( SCH_RESSTR( STR_TEXT_DIRECTION_LTR ), FRMDIR_HORI_LEFT_TOP ); + InsertEntryValue( SCH_RESSTR( STR_TEXT_DIRECTION_RTL ), FRMDIR_HORI_RIGHT_TOP ); + InsertEntryValue( SCH_RESSTR( STR_TEXT_DIRECTION_SUPER ), FRMDIR_ENVIRONMENT ); if( !SvtLanguageOptions().IsCTLFontEnabled() ) { diff --git a/chart2/source/controller/dialogs/dlg_ChartType.cxx b/chart2/source/controller/dialogs/dlg_ChartType.cxx index 9d046590640e..b40d3db3281f 100644 --- a/chart2/source/controller/dialogs/dlg_ChartType.cxx +++ b/chart2/source/controller/dialogs/dlg_ChartType.cxx @@ -50,7 +50,7 @@ ChartTypeDialog::ChartTypeDialog( Window* pParent { FreeResource(); - this->SetText(String(SchResId(STR_PAGE_CHARTTYPE))); + this->SetText(SCH_RESSTR(STR_PAGE_CHARTTYPE)); //don't create the tabpages before FreeResource, otherwise the help ids are not matched correctly m_pChartTypeTabPage = new ChartTypeTabPage(this,uno::Reference< XChartDocument >::query(m_xChartModel),m_xCC,true/*live update*/,true/*hide title description*/); diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx index fd7feb196fdd..a89d323dd627 100644 --- a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx +++ b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx @@ -78,10 +78,10 @@ CreationWizard::CreationWizard( Window* pParent, const uno::Reference< frame::XM if( m_nOnePageOnlyIndex < 0 || m_nOnePageOnlyIndex >= nPageCount ) { m_nOnePageOnlyIndex = -1; - this->setTitleBase(String(SchResId(STR_DLG_CHART_WIZARD))); + this->setTitleBase(SCH_RESSTR(STR_DLG_CHART_WIZARD)); } else - this->setTitleBase(String()); + this->setTitleBase(OUString()); declarePath( PATH_FULL , STATE_CHARTTYPE @@ -219,7 +219,7 @@ String CreationWizard::getStateDisplayName( WizardState nState ) const default: break; } - return String(SchResId(nResId)); + return SCH_RESSTR(nResId); } //............................................................................. diff --git a/chart2/source/controller/dialogs/dlg_DataSource.cxx b/chart2/source/controller/dialogs/dlg_DataSource.cxx index 80bc72355acf..e601d84f5152 100644 --- a/chart2/source/controller/dialogs/dlg_DataSource.cxx +++ b/chart2/source/controller/dialogs/dlg_DataSource.cxx @@ -167,8 +167,8 @@ DataSourceDialog::DataSourceDialog( m_pDataSourceTabPage = new DataSourceTabPage( m_pTabControl, *(m_apDialogModel.get()), m_apDocTemplateProvider.get(), this, true /* bHideDescription */ ); - m_pTabControl->InsertPage( TP_RANGECHOOSER, String( SchResId( STR_PAGE_DATA_RANGE ))); - m_pTabControl->InsertPage( TP_DATA_SOURCE, String( SchResId( STR_OBJECT_DATASERIES_PLURAL ))); + m_pTabControl->InsertPage( TP_RANGECHOOSER, SCH_RESSTR(STR_PAGE_DATA_RANGE) ); + m_pTabControl->InsertPage( TP_DATA_SOURCE, SCH_RESSTR(STR_OBJECT_DATASERIES_PLURAL) ); m_pTabControl->SetTabPage( TP_RANGECHOOSER, m_pRangeChooserTabePage ); m_pTabControl->SetTabPage( TP_DATA_SOURCE, m_pDataSourceTabPage ); diff --git a/chart2/source/controller/dialogs/dlg_View3D.cxx b/chart2/source/controller/dialogs/dlg_View3D.cxx index 081b39fcb0fc..eb5bfaf50c6a 100644 --- a/chart2/source/controller/dialogs/dlg_View3D.cxx +++ b/chart2/source/controller/dialogs/dlg_View3D.cxx @@ -67,9 +67,9 @@ View3DDialog::View3DDialog(Window* pParent, const uno::Reference< frame::XModel m_pAppearance = new ThreeD_SceneAppearance_TabPage(&m_aTabControl,xChartModel,m_aControllerLocker); m_pIllumination = new ThreeD_SceneIllumination_TabPage(&m_aTabControl,xSceneProperties,xChartModel,pColorTable); - m_aTabControl.InsertPage( TP_3D_SCENEGEOMETRY, String(SchResId(STR_PAGE_PERSPECTIVE)) ); - m_aTabControl.InsertPage( TP_3D_SCENEAPPEARANCE, String(SchResId(STR_PAGE_APPEARANCE)) ); - m_aTabControl.InsertPage( TP_3D_SCENEILLUMINATION, String(SchResId(STR_PAGE_ILLUMINATION)) ); + m_aTabControl.InsertPage( TP_3D_SCENEGEOMETRY, SCH_RESSTR(STR_PAGE_PERSPECTIVE) ); + m_aTabControl.InsertPage( TP_3D_SCENEAPPEARANCE, SCH_RESSTR(STR_PAGE_APPEARANCE) ); + m_aTabControl.InsertPage( TP_3D_SCENEILLUMINATION, SCH_RESSTR(STR_PAGE_ILLUMINATION) ); m_aTabControl.SetTabPage( TP_3D_SCENEGEOMETRY, m_pGeometry ); m_aTabControl.SetTabPage( TP_3D_SCENEAPPEARANCE, m_pAppearance ); diff --git a/chart2/source/controller/dialogs/res_BarGeometry.cxx b/chart2/source/controller/dialogs/res_BarGeometry.cxx index 791b9c889242..9550871a3432 100644 --- a/chart2/source/controller/dialogs/res_BarGeometry.cxx +++ b/chart2/source/controller/dialogs/res_BarGeometry.cxx @@ -34,7 +34,7 @@ BarGeometryResources::BarGeometryResources( Window* pWindow ) : m_aFT_Geometry( pWindow, pWindow->GetStyle() ) , m_aLB_Geometry( pWindow, SchResId( LB_BAR_GEOMETRY ) ) { - m_aFT_Geometry.SetText( String( SchResId( STR_BAR_GEOMETRY )) ); + m_aFT_Geometry.SetText( SCH_RESSTR( STR_BAR_GEOMETRY ) ); m_aFT_Geometry.SetSizePixel( m_aFT_Geometry.CalcMinimumSize() ); m_aLB_Geometry.SetAccessibleName(m_aFT_Geometry.GetText()); m_aLB_Geometry.SetAccessibleRelationLabeledBy(&m_aFT_Geometry); diff --git a/chart2/source/controller/dialogs/res_DataLabel.cxx b/chart2/source/controller/dialogs/res_DataLabel.cxx index 3bd3a13afc82..3b247553b5c9 100644 --- a/chart2/source/controller/dialogs/res_DataLabel.cxx +++ b/chart2/source/controller/dialogs/res_DataLabel.cxx @@ -250,7 +250,7 @@ IMPL_LINK( DataLabelResources, NumberFormatDialogHdl, PushButton *, pButton ) NumberFormatDialog aDlg(m_pWindow, aNumberSet); if( bPercent ) - aDlg.SetText( String( SchResId( STR_DLG_NUMBERFORMAT_FOR_PERCENTAGE_VALUE ) ) ); + aDlg.SetText( SCH_RESSTR( STR_DLG_NUMBERFORMAT_FOR_PERCENTAGE_VALUE ) ); if( RET_OK == aDlg.Execute() ) { const SfxItemSet* pResult = aDlg.GetOutputItemSet(); diff --git a/chart2/source/controller/dialogs/res_ErrorBar.cxx b/chart2/source/controller/dialogs/res_ErrorBar.cxx index 1a8c2feddc67..713fed233640 100644 --- a/chart2/source/controller/dialogs/res_ErrorBar.cxx +++ b/chart2/source/controller/dialogs/res_ErrorBar.cxx @@ -153,8 +153,8 @@ ErrorBarResources::ErrorBarResources( Window* pParent, Dialog * pParentDialog, m_aIbRangePositive.SetClickHdl( LINK( this, ErrorBarResources, ChooseRange )); m_aIbRangeNegative.SetClickHdl( LINK( this, ErrorBarResources, ChooseRange )); - m_aIbRangePositive.SetQuickHelpText( String( SchResId( STR_TIP_SELECT_RANGE ))); - m_aIbRangeNegative.SetQuickHelpText( String( SchResId( STR_TIP_SELECT_RANGE ))); + m_aIbRangePositive.SetQuickHelpText(SCH_RESSTR(STR_TIP_SELECT_RANGE)); + m_aIbRangeNegative.SetQuickHelpText(SCH_RESSTR(STR_TIP_SELECT_RANGE)); FillValueSets(); Reset( rInAttrs ); @@ -198,7 +198,7 @@ void ErrorBarResources::SetChartDocumentForRangeChoosing( OSL_ASSERT( m_apRangeSelectionHelper.get()); if( m_bHasInternalDataProvider ) { - m_aRbRange.SetText( String( SchResId( STR_CONTROLTEXT_ERROR_BARS_FROM_DATA ))); + m_aRbRange.SetText(SCH_RESSTR(STR_CONTROLTEXT_ERROR_BARS_FROM_DATA)); } if( m_aRbRange.IsChecked()) @@ -451,12 +451,12 @@ IMPL_LINK( ErrorBarResources, ChooseRange, RangeSelectionButton *, pButton ) if( pButton == &m_aIbRangePositive ) { m_pCurrentRangeChoosingField = &m_aEdRangePositive; - aUIString = String( SchResId( STR_DATA_SELECT_RANGE_FOR_POSITIVE_ERRORBARS )); + aUIString = SCH_RESSTR( STR_DATA_SELECT_RANGE_FOR_POSITIVE_ERRORBARS ); } else { m_pCurrentRangeChoosingField = &m_aEdRangeNegative; - aUIString = String( SchResId( STR_DATA_SELECT_RANGE_FOR_NEGATIVE_ERRORBARS )); + aUIString = SCH_RESSTR( STR_DATA_SELECT_RANGE_FOR_NEGATIVE_ERRORBARS ); } assert( m_pParentDialog ); diff --git a/chart2/source/controller/dialogs/res_TextSeparator.cxx b/chart2/source/controller/dialogs/res_TextSeparator.cxx index 9b7fc8ce3a65..61804776560a 100644 --- a/chart2/source/controller/dialogs/res_TextSeparator.cxx +++ b/chart2/source/controller/dialogs/res_TextSeparator.cxx @@ -37,7 +37,7 @@ TextSeparatorResources::TextSeparatorResources( Window* pWindow ) , m_aEntryMap() , m_nDefaultPos(0) { - m_aFT_Separator.SetText( String( SchResId( STR_TEXT_SEPARATOR )) ); + m_aFT_Separator.SetText( SCH_RESSTR( STR_TEXT_SEPARATOR ) ); m_aFT_Separator.SetSizePixel( m_aFT_Separator.CalcMinimumSize() ); m_aLB_Separator.SetDropDownLineCount(m_aLB_Separator.GetEntryCount()); diff --git a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx index 8f7b0cdb8146..7c16bd2e153d 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx @@ -108,8 +108,8 @@ ThreeD_SceneAppearance_TabPage::ThreeD_SceneAppearance_TabPage( , m_rControllerLockHelper( rControllerLockHelper ) { FreeResource(); - m_aLB_Scheme.InsertEntry(String(SchResId(STR_3DSCHEME_SIMPLE)),POS_3DSCHEME_SIMPLE); - m_aLB_Scheme.InsertEntry(String(SchResId(STR_3DSCHEME_REALISTIC)),POS_3DSCHEME_REALISTIC); + m_aLB_Scheme.InsertEntry(SCH_RESSTR(STR_3DSCHEME_SIMPLE),POS_3DSCHEME_SIMPLE); + m_aLB_Scheme.InsertEntry(SCH_RESSTR(STR_3DSCHEME_REALISTIC),POS_3DSCHEME_REALISTIC); m_aLB_Scheme.SetDropDownLineCount(2); m_aLB_Scheme.SetSelectHdl( LINK( this, ThreeD_SceneAppearance_TabPage, SelectSchemeHdl ) ); @@ -281,7 +281,7 @@ void ThreeD_SceneAppearance_TabPage::updateScheme() break; case ThreeDLookScheme_Unknown: { - m_aLB_Scheme.InsertEntry(String(SchResId(STR_3DSCHEME_CUSTOM)),POS_3DSCHEME_CUSTOM); + m_aLB_Scheme.InsertEntry(SCH_RESSTR(STR_3DSCHEME_CUSTOM),POS_3DSCHEME_CUSTOM); m_aLB_Scheme.SelectEntryPos( POS_3DSCHEME_CUSTOM ); m_aLB_Scheme.SetDropDownLineCount(3); } diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx index f838433b0dab..ec691e58c013 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx @@ -54,7 +54,7 @@ LightButton::LightButton( Window* pParent, const ResId& rResId, sal_Int32 nLight { SetModeImage( Image( SVX_RES(RID_SVXIMAGE_LIGHT_OFF) ) ); - String aTipHelpStr( SchResId(STR_TIP_LIGHTSOURCE_X) ); + String aTipHelpStr( SCH_RESSTR(STR_TIP_LIGHTSOURCE_X) ); OUString aTipHelp( aTipHelpStr ); const OUString aReplacementStr( "%LIGHTNUMBER" ); sal_Int32 nIndex = aTipHelp.indexOf( aReplacementStr ); @@ -96,7 +96,7 @@ ColorButton::ColorButton( Window* pParent, const ResId& rResId ) : ImageButton( pParent, rResId ) { SetModeImage( Image( SVX_RES(RID_SVXIMAGE_COLORDLG) ) ); - this->SetQuickHelpText( String( SchResId(STR_TIP_CHOOSECOLOR) ) ); + this->SetQuickHelpText( SCH_RESSTR(STR_TIP_CHOOSECOLOR) ); } ColorButton::~ColorButton() @@ -345,7 +345,7 @@ ThreeD_SceneIllumination_TabPage::ThreeD_SceneIllumination_TabPage( Window* pWin m_aBtn_Light6.SetAccessibleRelationLabeledBy(&m_aFT_LightSource); m_aBtn_Light7.SetAccessibleRelationLabeledBy(&m_aFT_LightSource); m_aBtn_Light8.SetAccessibleRelationLabeledBy(&m_aFT_LightSource); - m_aCtl_Preview.SetAccessibleName(String(SchResId( STR_LIGHT_PREVIEW ))); + m_aCtl_Preview.SetAccessibleName(SCH_RESSTR( STR_LIGHT_PREVIEW )); } ThreeD_SceneIllumination_TabPage::~ThreeD_SceneIllumination_TabPage() diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx b/chart2/source/controller/dialogs/tp_ChartType.cxx index 34446a98cdb7..3e4ff3c9a950 100644 --- a/chart2/source/controller/dialogs/tp_ChartType.cxx +++ b/chart2/source/controller/dialogs/tp_ChartType.cxx @@ -162,8 +162,8 @@ Dim3DLookResourceGroup::Dim3DLookResourceGroup( Window* pWindow ) { m_aCB_3DLook.SetToggleHdl( LINK( this, Dim3DLookResourceGroup, Dim3DLookCheckHdl ) ); - m_aLB_Scheme.InsertEntry(String(SchResId(STR_3DSCHEME_SIMPLE))); - m_aLB_Scheme.InsertEntry(String(SchResId(STR_3DSCHEME_REALISTIC))); + m_aLB_Scheme.InsertEntry(SCH_RESSTR(STR_3DSCHEME_SIMPLE)); + m_aLB_Scheme.InsertEntry(SCH_RESSTR(STR_3DSCHEME_REALISTIC)); m_aLB_Scheme.SetDropDownLineCount(2); m_aLB_Scheme.SetSelectHdl( LINK( this, Dim3DLookResourceGroup, SelectSchemeHdl ) ); @@ -459,7 +459,7 @@ SplinePropertiesDialog::SplinePropertiesDialog( Window* pParent ) get(m_pFT_SplineOrder, "PolynomialsLabel"); get(m_pMF_SplineOrder, "PolynomialsSpinButton"); - this->SetText( String( SchResId( STR_DLG_SMOOTH_LINE_PROPERTIES ) ) ); + this->SetText( SCH_RESSTR( STR_DLG_SMOOTH_LINE_PROPERTIES ) ); m_pLB_Spline_Type->SetSelectHdl( LINK (this, SplinePropertiesDialog, SplineTypeListBoxHdl ) ); } @@ -627,9 +627,9 @@ SplineResourceGroup::SplineResourceGroup( Window* pWindow ) , m_aPB_DetailsDialog( pWindow, SchResId( PB_SPLINE_DIALOG ) ) , m_pSplinePropertiesDialog() { - m_aLB_LineType.InsertEntry(String(SchResId(STR_LINETYPE_STRAIGHT))); - m_aLB_LineType.InsertEntry(String(SchResId(STR_LINETYPE_SMOOTH))); - m_aLB_LineType.InsertEntry(String(SchResId(STR_LINETYPE_STEPPED))); + m_aLB_LineType.InsertEntry(SCH_RESSTR(STR_LINETYPE_STRAIGHT)); + m_aLB_LineType.InsertEntry(SCH_RESSTR(STR_LINETYPE_SMOOTH)); + m_aLB_LineType.InsertEntry(SCH_RESSTR(STR_LINETYPE_STEPPED)); m_aLB_LineType.SetDropDownLineCount(3); m_aLB_LineType.SetSelectHdl( LINK( this, SplineResourceGroup, LineTypeChangeHdl ) ); m_aLB_LineType.SetAccessibleName(m_aFT_LineType.GetText()); @@ -716,7 +716,7 @@ void SplineResourceGroup::fillControls( const ChartTypeParameter& rParameter ) m_aLB_LineType.SelectEntryPos(POS_LINETYPE_SMOOTH); m_aPB_DetailsDialog.Enable(true); m_aPB_DetailsDialog.SetClickHdl( LINK( this, SplineResourceGroup, SplineDetailsDialogHdl ) ); - m_aPB_DetailsDialog.SetQuickHelpText( String( SchResId(STR_DLG_SMOOTH_LINE_PROPERTIES) ) ); + m_aPB_DetailsDialog.SetQuickHelpText( SCH_RESSTR(STR_DLG_SMOOTH_LINE_PROPERTIES) ); getSplinePropertiesDialog().fillControls( rParameter ); break; case CurveStyle_STEP_START: @@ -726,7 +726,7 @@ void SplineResourceGroup::fillControls( const ChartTypeParameter& rParameter ) m_aLB_LineType.SelectEntryPos(POS_LINETYPE_STEPPED); m_aPB_DetailsDialog.Enable(true); m_aPB_DetailsDialog.SetClickHdl( LINK( this, SplineResourceGroup, SteppedDetailsDialogHdl ) ); - m_aPB_DetailsDialog.SetQuickHelpText( String( SchResId(STR_DLG_STEPPED_LINE_PROPERTIES) ) ); + m_aPB_DetailsDialog.SetQuickHelpText( SCH_RESSTR(STR_DLG_STEPPED_LINE_PROPERTIES) ); getSteppedPropertiesDialog().fillControls( rParameter ); break; default: @@ -915,7 +915,7 @@ ChartTypeTabPage::ChartTypeTabPage( Window* pParent m_aFT_ChooseType.SetStyle( m_aFT_ChooseType.GetStyle() | WB_NOLABEL ); } - this->SetText( String(SchResId(STR_PAGE_CHARTTYPE)) ); + this->SetText( SCH_RESSTR(STR_PAGE_CHARTTYPE) ); m_aMainTypeList.SetStyle(m_aMainTypeList.GetStyle() | WB_ITEMBORDER | WB_DOUBLEBORDER | WB_FLATVALUESET | WB_3DLOOK ); m_aMainTypeList.SetSelectHdl( LINK( this, ChartTypeTabPage, SelectMainTypeHdl ) ); diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx index 13a2fe4517e9..43d7d1956da7 100644 --- a/chart2/source/controller/dialogs/tp_DataSource.cxx +++ b/chart2/source/controller/dialogs/tp_DataSource.cxx @@ -294,7 +294,7 @@ DataSourceTabPage::DataSourceTabPage( } m_aFixedTextRange = OUString( m_aFT_RANGE.GetText() ); - this->SetText( String( SchResId( STR_OBJECT_DATASERIES_PLURAL ) ) ); + this->SetText( SCH_RESSTR( STR_OBJECT_DATASERIES_PLURAL ) ); // set handlers m_apLB_SERIES->SetSelectHdl( LINK( this, DataSourceTabPage, SeriesSelectionChangedHdl )); @@ -347,8 +347,8 @@ DataSourceTabPage::DataSourceTabPage( if( m_apLB_SERIES->First()) m_apLB_SERIES->Select( m_apLB_SERIES->First()); m_apLB_SERIES->GrabFocus(); - m_aBTN_UP.SetAccessibleName(String(SchResId(STR_BUTTON_UP))); - m_aBTN_DOWN.SetAccessibleName(String(SchResId(STR_BUTTON_DOWN))); + m_aBTN_UP.SetAccessibleName(SCH_RESSTR(STR_BUTTON_UP)); + m_aBTN_DOWN.SetAccessibleName(SCH_RESSTR(STR_BUTTON_DOWN)); } DataSourceTabPage::~DataSourceTabPage() @@ -472,7 +472,7 @@ void DataSourceTabPage::fillSeriesListBox() { if( nUnnamedSeriesIndex > 1 ) { - OUString aResString( String( ::chart::SchResId( STR_DATA_UNNAMED_SERIES_WITH_INDEX ))); + OUString aResString(::chart::SchResId( STR_DATA_UNNAMED_SERIES_WITH_INDEX ).toString()); // replace index of unnamed series const OUString aReplacementStr( "%NUMBER" ); @@ -483,7 +483,7 @@ void DataSourceTabPage::fillSeriesListBox() OUString::valueOf(nUnnamedSeriesIndex))); } if( aLabel.isEmpty() ) - aLabel = String( ::chart::SchResId( STR_DATA_UNNAMED_SERIES )); + aLabel = ::chart::SchResId( STR_DATA_UNNAMED_SERIES ).toString(); ++nUnnamedSeriesIndex; } @@ -637,8 +637,7 @@ IMPL_LINK_NOARG(DataSourceTabPage, MainRangeButtonClickedHdl) if( bHasSelectedEntry && (m_aLB_ROLE.FirstSelected() != 0)) { - String aStr( SchResId( STR_DATA_SELECT_RANGE_FOR_SERIES )); - OUString aUIStr( aStr ); + OUString aUIStr(SCH_RESSTR(STR_DATA_SELECT_RANGE_FOR_SERIES)); // replace role OUString aReplacement( "%VALUETYPE" ); @@ -674,10 +673,10 @@ IMPL_LINK_NOARG(DataSourceTabPage, CategoriesRangeButtonClickedHdl) ! updateModelFromControl( m_pCurrentRangeChoosingField )) return 0; - String aStr( SchResId( m_aFT_CATEGORIES.IsVisible() ? STR_DATA_SELECT_RANGE_FOR_CATEGORIES : STR_DATA_SELECT_RANGE_FOR_DATALABELS )); + OUString aStr( SCH_RESSTR( m_aFT_CATEGORIES.IsVisible() ? STR_DATA_SELECT_RANGE_FOR_CATEGORIES : STR_DATA_SELECT_RANGE_FOR_DATALABELS )); lcl_enableRangeChoosing( true, m_pParentDialog ); m_rDialogModel.getRangeSelectionHelper()->chooseRange( - m_rDialogModel.getCategoriesRange(), OUString( aStr ), *this ); + m_rDialogModel.getCategoriesRange(), aStr, *this ); return 0; } diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.cxx b/chart2/source/controller/dialogs/tp_RangeChooser.cxx index 1ce4107c2e64..c3cfe0325640 100644 --- a/chart2/source/controller/dialogs/tp_RangeChooser.cxx +++ b/chart2/source/controller/dialogs/tp_RangeChooser.cxx @@ -133,8 +133,8 @@ RangeChooserTabPage::RangeChooserTabPage( Window* pParent m_aFT_Caption.SetStyle( m_aFT_Caption.GetStyle() | WB_NOLABEL ); } - this->SetText( String(SchResId(STR_PAGE_DATA_RANGE)) ); - m_aIB_Range.SetQuickHelpText( String(SchResId(STR_TIP_SELECT_RANGE)) ); + this->SetText( SCH_RESSTR(STR_PAGE_DATA_RANGE) ); + m_aIB_Range.SetQuickHelpText( SCH_RESSTR(STR_TIP_SELECT_RANGE) ); // set defaults as long as DetectArguments does not work m_aRB_Columns.Check(); @@ -354,7 +354,7 @@ IMPL_LINK_NOARG(RangeChooserTabPage, ChooseRangeHdl) { OUString aRange = m_aED_Range.GetText(); // using assignment for broken gcc 3.3 - OUString aTitle = String( SchResId( STR_PAGE_DATA_RANGE ) ); + OUString aTitle = SCH_RESSTR( STR_PAGE_DATA_RANGE ); lcl_enableRangeChoosing( true, m_pParentDialog ); m_rDialogModel.getRangeSelectionHelper()->chooseRange( aRange, aTitle, *this ); diff --git a/chart2/source/controller/dialogs/tp_Scale.cxx b/chart2/source/controller/dialogs/tp_Scale.cxx index 0acab303de87..e1e062a8339b 100644 --- a/chart2/source/controller/dialogs/tp_Scale.cxx +++ b/chart2/source/controller/dialogs/tp_Scale.cxx @@ -752,7 +752,7 @@ bool ScaleTabPage::ShowWarning( sal_uInt16 nResIdMessage, Control* pControl /* = if( nResIdMessage == 0 ) return false; - WarningBox( this, WinBits( WB_OK ), String( SchResId( nResIdMessage ))).Execute(); + WarningBox( this, WinBits( WB_OK ), SCH_RESSTR( nResIdMessage ) ).Execute(); if( pControl ) { pControl->GrabFocus(); diff --git a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx index fced71d07551..72c0b6a56a59 100644 --- a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx +++ b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx @@ -59,7 +59,7 @@ TitlesAndObjectsTabPage::TitlesAndObjectsTabPage( svt::OWizardMachine* pParent { FreeResource(); - this->SetText( String( SchResId( STR_PAGE_CHART_ELEMENTS ) ) ); + this->SetText( SCH_RESSTR( STR_PAGE_CHART_ELEMENTS ) ); Font aFont( m_aFT_TitleDescription.GetControlFont() ); aFont.SetWeight( WEIGHT_BOLD ); diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx index e10133ca676e..4f7a4a1978c4 100644 --- a/chart2/source/controller/main/ChartController.cxx +++ b/chart2/source/controller/main/ChartController.cxx @@ -1289,7 +1289,7 @@ void SAL_CALL ChartController::executeDispatch_ChartType() { // using assignment for broken gcc 3.3 UndoLiveUpdateGuard aUndoGuard = UndoLiveUpdateGuard( - String( SchResId( STR_ACTION_EDIT_CHARTTYPE )), m_xUndoManager ); + SCH_RESSTR( STR_ACTION_EDIT_CHARTTYPE ), m_xUndoManager ); SolarMutexGuard aSolarGuard; //prepare and open dialog @@ -1310,7 +1310,7 @@ void SAL_CALL ChartController::executeDispatch_SourceData() return; UndoLiveUpdateGuard aUndoGuard = UndoLiveUpdateGuard( - String( SchResId( STR_ACTION_EDIT_DATA_RANGES )), m_xUndoManager ); + SCH_RESSTR(STR_ACTION_EDIT_DATA_RANGES), m_xUndoManager ); if( xChartDoc.is()) { SolarMutexGuard aSolarGuard; @@ -1335,7 +1335,7 @@ void SAL_CALL ChartController::executeDispatch_MoveSeries( sal_Bool bForward ) UndoGuardWithSelection aUndoGuard( ActionDescriptionProvider::createDescription( (bForward ? ActionDescriptionProvider::MOVE_TOTOP : ActionDescriptionProvider::MOVE_TOBOTTOM), - String( SchResId( STR_OBJECT_DATASERIES ))), + SCH_RESSTR(STR_OBJECT_DATASERIES)), m_xUndoManager ); bool bChanged = DiagramHelper::moveSeries( ChartModelHelper::findDiagram( getModel() ), xGivenDataSeries, bForward ); diff --git a/chart2/source/controller/main/ChartController_EditData.cxx b/chart2/source/controller/main/ChartController_EditData.cxx index 8d9dd5d63179..ec72c7c912f1 100644 --- a/chart2/source/controller/main/ChartController_EditData.cxx +++ b/chart2/source/controller/main/ChartController_EditData.cxx @@ -55,7 +55,7 @@ void ChartController::executeDispatch_EditData() SolarMutexGuard aSolarGuard; // using assignment for broken gcc 3.3 UndoLiveUpdateGuardWithData aUndoGuard = UndoLiveUpdateGuardWithData( - String( SchResId( STR_ACTION_EDIT_CHART_DATA )), + SCH_RESSTR( STR_ACTION_EDIT_CHART_DATA ), m_xUndoManager ); DataEditor aDataEditorDialog( pParent, xChartDoc, m_xCC ); // the dialog has no OK/Cancel diff --git a/chart2/source/controller/main/ChartController_Insert.cxx b/chart2/source/controller/main/ChartController_Insert.cxx index 08c46107c5e6..d7bc61d64ae4 100644 --- a/chart2/source/controller/main/ChartController_Insert.cxx +++ b/chart2/source/controller/main/ChartController_Insert.cxx @@ -109,7 +109,7 @@ void ChartController::executeDispatch_InsertAxes() { UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( - ActionDescriptionProvider::INSERT, String( SchResId( STR_OBJECT_AXES ))), + ActionDescriptionProvider::INSERT, SCH_RESSTR( STR_OBJECT_AXES )), m_xUndoManager ); try @@ -147,7 +147,7 @@ void ChartController::executeDispatch_InsertGrid() { UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( - ActionDescriptionProvider::INSERT, String( SchResId( STR_OBJECT_GRIDS ))), + ActionDescriptionProvider::INSERT, SCH_RESSTR( STR_OBJECT_GRIDS )), m_xUndoManager ); try @@ -184,7 +184,7 @@ void ChartController::executeDispatch_InsertTitles() { UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( - ActionDescriptionProvider::INSERT, String( SchResId( STR_OBJECT_TITLES ))), + ActionDescriptionProvider::INSERT, SCH_RESSTR( STR_OBJECT_TITLES )), m_xUndoManager ); try @@ -215,7 +215,7 @@ void ChartController::executeDispatch_DeleteLegend() { UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( - ActionDescriptionProvider::DELETE, String( SchResId( STR_OBJECT_LEGEND ))), + ActionDescriptionProvider::DELETE, SCH_RESSTR( STR_OBJECT_LEGEND )), m_xUndoManager ); LegendHelper::hideLegend( getModel() ); @@ -226,7 +226,7 @@ void ChartController::executeDispatch_InsertLegend() { UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( - ActionDescriptionProvider::INSERT, String( SchResId( STR_OBJECT_LEGEND ))), + ActionDescriptionProvider::INSERT, SCH_RESSTR( STR_OBJECT_LEGEND )), m_xUndoManager ); Reference< chart2::XLegend > xLegend = LegendHelper::showLegend( getModel(), m_xCC ); @@ -237,7 +237,7 @@ void ChartController::executeDispatch_OpenLegendDialog() { UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( - ActionDescriptionProvider::INSERT, String( SchResId( STR_OBJECT_LEGEND ))), + ActionDescriptionProvider::INSERT, SCH_RESSTR( STR_OBJECT_LEGEND )), m_xUndoManager ); try @@ -268,7 +268,7 @@ void ChartController::executeDispatch_InsertMenu_DataLabels() { UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( - ActionDescriptionProvider::INSERT, String( SchResId( STR_OBJECT_DATALABELS ))), + ActionDescriptionProvider::INSERT, SCH_RESSTR( STR_OBJECT_DATALABELS )), m_xUndoManager ); //if a series is selected insert labels for that series only: @@ -330,7 +330,7 @@ void ChartController::executeDispatch_InsertMeanValue() { UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( - ActionDescriptionProvider::INSERT, String( SchResId( STR_OBJECT_AVERAGE_LINE ))), + ActionDescriptionProvider::INSERT, SCH_RESSTR( STR_OBJECT_AVERAGE_LINE )), m_xUndoManager ); lcl_InsertMeanValueLine( m_xCC ).operator()( ObjectIdentifier::getDataSeriesForCID( m_aSelection.getSelectedCID(), getModel() )); @@ -341,7 +341,7 @@ void ChartController::executeDispatch_InsertMenu_MeanValues() { UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( - ActionDescriptionProvider::INSERT, String( SchResId( STR_OBJECT_AVERAGE_LINE ))), + ActionDescriptionProvider::INSERT, SCH_RESSTR( STR_OBJECT_AVERAGE_LINE )), m_xUndoManager ); uno::Reference< chart2::XDataSeries > xSeries( @@ -383,7 +383,7 @@ void ChartController::executeDispatch_InsertTrendline() UndoLiveUpdateGuard aUndoGuard( ActionDescriptionProvider::createDescription( - ActionDescriptionProvider::INSERT, String( SchResId( STR_OBJECT_CURVE ))), + ActionDescriptionProvider::INSERT, SCH_RESSTR( STR_OBJECT_CURVE )), m_xUndoManager ); uno::Reference< chart2::XRegressionCurve > xCurve = @@ -442,7 +442,7 @@ void ChartController::executeDispatch_InsertErrorBars( bool bYError ) UndoLiveUpdateGuard aUndoGuard( ActionDescriptionProvider::createDescription( ActionDescriptionProvider::INSERT, - String( SchResId( bYError ? STR_OBJECT_ERROR_BARS_Y : STR_OBJECT_ERROR_BARS_X ))), + SCH_RESSTR( bYError ? STR_OBJECT_ERROR_BARS_Y : STR_OBJECT_ERROR_BARS_X )), m_xUndoManager ); // add error bars with standard deviation @@ -549,7 +549,7 @@ void ChartController::executeDispatch_InsertTrendlineEquation( bool bInsertR2 ) // using assignment for broken gcc 3.3 UndoGuard aUndoGuard = UndoGuard( ActionDescriptionProvider::createDescription( - ActionDescriptionProvider::INSERT, String( SchResId( STR_OBJECT_CURVE_EQUATION ))), + ActionDescriptionProvider::INSERT, SCH_RESSTR( STR_OBJECT_CURVE_EQUATION )), m_xUndoManager ); xEqProp->setPropertyValue( "ShowEquation", uno::makeAny( true )); xEqProp->setPropertyValue( "ShowCorrelationCoefficient", uno::makeAny( bInsertR2 )); @@ -566,7 +566,7 @@ void ChartController::executeDispatch_InsertR2Value() { UndoGuard aUndoGuard = UndoGuard( ActionDescriptionProvider::createDescription( - ActionDescriptionProvider::INSERT, String( SchResId( STR_OBJECT_CURVE_EQUATION ))), + ActionDescriptionProvider::INSERT, SCH_RESSTR( STR_OBJECT_CURVE_EQUATION )), m_xUndoManager ); xEqProp->setPropertyValue( "ShowCorrelationCoefficient", uno::makeAny( true )); aUndoGuard.commit(); @@ -581,7 +581,7 @@ void ChartController::executeDispatch_DeleteR2Value() { UndoGuard aUndoGuard = UndoGuard( ActionDescriptionProvider::createDescription( - ActionDescriptionProvider::INSERT, String( SchResId( STR_OBJECT_CURVE_EQUATION ))), + ActionDescriptionProvider::INSERT, SCH_RESSTR( STR_OBJECT_CURVE_EQUATION )), m_xUndoManager ); xEqProp->setPropertyValue( "ShowCorrelationCoefficient", uno::makeAny( false )); aUndoGuard.commit(); @@ -596,7 +596,7 @@ void ChartController::executeDispatch_DeleteMeanValue() { UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( - ActionDescriptionProvider::DELETE, String( SchResId( STR_OBJECT_AVERAGE_LINE ))), + ActionDescriptionProvider::DELETE, SCH_RESSTR( STR_OBJECT_AVERAGE_LINE )), m_xUndoManager ); RegressionCurveHelper::removeMeanValueLine( xRegCurveCnt ); aUndoGuard.commit(); @@ -611,7 +611,7 @@ void ChartController::executeDispatch_DeleteTrendline() { UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( - ActionDescriptionProvider::DELETE, String( SchResId( STR_OBJECT_CURVE ))), + ActionDescriptionProvider::DELETE, SCH_RESSTR( STR_OBJECT_CURVE )), m_xUndoManager ); RegressionCurveHelper::removeAllExceptMeanValueLine( xRegCurveCnt ); aUndoGuard.commit(); @@ -626,7 +626,7 @@ void ChartController::executeDispatch_DeleteTrendlineEquation() { UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( - ActionDescriptionProvider::DELETE, String( SchResId( STR_OBJECT_CURVE_EQUATION ))), + ActionDescriptionProvider::DELETE, SCH_RESSTR( STR_OBJECT_CURVE_EQUATION )), m_xUndoManager ); RegressionCurveHelper::removeEquations( xRegCurveCnt ); aUndoGuard.commit(); @@ -641,7 +641,7 @@ void ChartController::executeDispatch_DeleteErrorBars( bool bYError ) { UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( - ActionDescriptionProvider::DELETE, String( SchResId( STR_OBJECT_CURVE ))), + ActionDescriptionProvider::DELETE, SCH_RESSTR( STR_OBJECT_CURVE )), m_xUndoManager ); StatisticsHelper::removeErrorBars( xDataSeries, bYError ); aUndoGuard.commit(); @@ -655,7 +655,7 @@ void ChartController::executeDispatch_InsertDataLabels() if( xSeries.is() ) { UndoGuard aUndoGuard = UndoGuard( ActionDescriptionProvider::createDescription( ActionDescriptionProvider::INSERT, - String( SchResId( STR_OBJECT_DATALABELS ))), + SCH_RESSTR( STR_OBJECT_DATALABELS )), m_xUndoManager ); DataSeriesHelper::insertDataLabelsToSeriesAndAllPoints( xSeries ); aUndoGuard.commit(); @@ -665,7 +665,7 @@ void ChartController::executeDispatch_InsertDataLabels() void ChartController::executeDispatch_InsertDataLabel() { UndoGuard aUndoGuard = UndoGuard( ActionDescriptionProvider::createDescription( ActionDescriptionProvider::INSERT, - String( SchResId( STR_OBJECT_LABEL ))), + SCH_RESSTR( STR_OBJECT_LABEL )), m_xUndoManager ); DataSeriesHelper::insertDataLabelToPoint( ObjectIdentifier::getObjectPropertySet( m_aSelection.getSelectedCID(), getModel() ) ); aUndoGuard.commit(); @@ -678,7 +678,7 @@ void ChartController::executeDispatch_DeleteDataLabels() if( xSeries.is() ) { UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( ActionDescriptionProvider::DELETE, - String( SchResId( STR_OBJECT_DATALABELS ))), + SCH_RESSTR( STR_OBJECT_DATALABELS )), m_xUndoManager ); DataSeriesHelper::deleteDataLabelsFromSeriesAndAllPoints( xSeries ); aUndoGuard.commit(); @@ -688,7 +688,7 @@ void ChartController::executeDispatch_DeleteDataLabels() void ChartController::executeDispatch_DeleteDataLabel() { UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( ActionDescriptionProvider::DELETE, - String( SchResId( STR_OBJECT_LABEL ))), + SCH_RESSTR( STR_OBJECT_LABEL )), m_xUndoManager ); DataSeriesHelper::deleteDataLabelsFromPoint( ObjectIdentifier::getObjectPropertySet( m_aSelection.getSelectedCID(), getModel() ) ); aUndoGuard.commit(); @@ -697,7 +697,7 @@ void ChartController::executeDispatch_DeleteDataLabel() void ChartController::executeDispatch_ResetAllDataPoints() { UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( ActionDescriptionProvider::FORMAT, - String( SchResId( STR_OBJECT_DATAPOINTS ))), + SCH_RESSTR( STR_OBJECT_DATAPOINTS )), m_xUndoManager ); uno::Reference< chart2::XDataSeries > xSeries( ObjectIdentifier::getDataSeriesForCID( m_aSelection.getSelectedCID(), getModel() ), uno::UNO_QUERY ); if( xSeries.is() ) @@ -707,7 +707,7 @@ void ChartController::executeDispatch_ResetAllDataPoints() void ChartController::executeDispatch_ResetDataPoint() { UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( ActionDescriptionProvider::FORMAT, - String( SchResId( STR_OBJECT_DATAPOINT ))), + SCH_RESSTR( STR_OBJECT_DATAPOINT )), m_xUndoManager ); uno::Reference< chart2::XDataSeries > xSeries( ObjectIdentifier::getDataSeriesForCID( m_aSelection.getSelectedCID(), getModel() ), uno::UNO_QUERY ); if( xSeries.is() ) @@ -726,7 +726,7 @@ void ChartController::executeDispatch_InsertAxisTitle() { UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( - ActionDescriptionProvider::INSERT, String( SchResId( STR_OBJECT_TITLE ))), + ActionDescriptionProvider::INSERT, SCH_RESSTR( STR_OBJECT_TITLE )), m_xUndoManager ); Reference< XAxis > xAxis = ObjectIdentifier::getAxisForCID( m_aSelection.getSelectedCID(), getModel() ); @@ -758,7 +758,7 @@ void ChartController::executeDispatch_InsertAxis() { UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( - ActionDescriptionProvider::INSERT, String( SchResId( STR_OBJECT_AXIS ))), + ActionDescriptionProvider::INSERT, SCH_RESSTR( STR_OBJECT_AXIS )), m_xUndoManager ); try @@ -780,7 +780,7 @@ void ChartController::executeDispatch_DeleteAxis() { UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( - ActionDescriptionProvider::DELETE, String( SchResId( STR_OBJECT_AXIS ))), + ActionDescriptionProvider::DELETE, SCH_RESSTR( STR_OBJECT_AXIS )), m_xUndoManager ); try @@ -802,7 +802,7 @@ void ChartController::executeDispatch_InsertMajorGrid() { UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( - ActionDescriptionProvider::INSERT, String( SchResId( STR_OBJECT_GRID ))), + ActionDescriptionProvider::INSERT, SCH_RESSTR( STR_OBJECT_GRID )), m_xUndoManager ); try @@ -824,7 +824,7 @@ void ChartController::executeDispatch_DeleteMajorGrid() { UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( - ActionDescriptionProvider::DELETE, String( SchResId( STR_OBJECT_GRID ))), + ActionDescriptionProvider::DELETE, SCH_RESSTR( STR_OBJECT_GRID )), m_xUndoManager ); try @@ -846,7 +846,7 @@ void ChartController::executeDispatch_InsertMinorGrid() { UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( - ActionDescriptionProvider::INSERT, String( SchResId( STR_OBJECT_GRID ))), + ActionDescriptionProvider::INSERT, SCH_RESSTR( STR_OBJECT_GRID )), m_xUndoManager ); try @@ -870,7 +870,7 @@ void ChartController::executeDispatch_DeleteMinorGrid() { UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( - ActionDescriptionProvider::DELETE, String( SchResId( STR_OBJECT_GRID ))), + ActionDescriptionProvider::DELETE, SCH_RESSTR(STR_OBJECT_GRID)), m_xUndoManager ); try diff --git a/chart2/source/controller/main/ChartController_Properties.cxx b/chart2/source/controller/main/ChartController_Properties.cxx index f06c271b5c89..09c24ea36475 100644 --- a/chart2/source/controller/main/ChartController_Properties.cxx +++ b/chart2/source/controller/main/ChartController_Properties.cxx @@ -825,7 +825,7 @@ void SAL_CALL ChartController::executeDispatch_View3D() { // using assignment for broken gcc 3.3 UndoLiveUpdateGuard aUndoGuard = UndoLiveUpdateGuard( - String( SchResId( STR_ACTION_EDIT_3D_VIEW )), + SCH_RESSTR( STR_ACTION_EDIT_3D_VIEW ), m_xUndoManager ); //open dialog diff --git a/chart2/source/controller/main/ChartController_TextEdit.cxx b/chart2/source/controller/main/ChartController_TextEdit.cxx index 8fd50b0a64d7..1db54ebadefd 100644 --- a/chart2/source/controller/main/ChartController_TextEdit.cxx +++ b/chart2/source/controller/main/ChartController_TextEdit.cxx @@ -73,7 +73,7 @@ void ChartController::StartTextEdit( const Point* pMousePixel ) OSL_PRECOND( !m_pTextActionUndoGuard.get(), "ChartController::StartTextEdit: already have a TextUndoGuard!?" ); m_pTextActionUndoGuard.reset( new UndoGuard( - String( SchResId( STR_ACTION_EDIT_TEXT ) ), m_xUndoManager ) ); + SCH_RESSTR( STR_ACTION_EDIT_TEXT ), m_xUndoManager ) ); SdrOutliner* pOutliner = m_pDrawViewWrapper->getOutliner(); //#i77362 change notification for changes on additional shapes are missing diff --git a/chart2/source/controller/main/ChartController_Tools.cxx b/chart2/source/controller/main/ChartController_Tools.cxx index 18359d334b41..cd25717fcaf5 100644 --- a/chart2/source/controller/main/ChartController_Tools.cxx +++ b/chart2/source/controller/main/ChartController_Tools.cxx @@ -107,7 +107,7 @@ bool lcl_deleteDataSeries( { UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( - ActionDescriptionProvider::DELETE, String( SchResId( STR_OBJECT_DATASERIES ))), + ActionDescriptionProvider::DELETE, SCH_RESSTR( STR_OBJECT_DATASERIES )), xUndoManager ); Reference< chart2::XDiagram > xDiagram( ChartModelHelper::findDiagram( xModel ) ); @@ -146,7 +146,7 @@ bool lcl_deleteDataCurve( { UndoGuard aUndoGuard = UndoGuard( ActionDescriptionProvider::createDescription( - ActionDescriptionProvider::DELETE, String( SchResId( STR_OBJECT_CURVE ))), + ActionDescriptionProvider::DELETE, SCH_RESSTR( STR_OBJECT_CURVE )), xUndoManager ); xRegressionCurveContainer->removeRegressionCurve( xRegressionCurve ); @@ -194,7 +194,7 @@ void ChartController::executeDispatch_NewArrangement() { // using assignment for broken gcc 3.3 UndoGuard aUndoGuard = UndoGuard( - String( SchResId( STR_ACTION_REARRANGE_CHART )), + SCH_RESSTR( STR_ACTION_REARRANGE_CHART ), m_xUndoManager ); ControllerLockGuard aCtlLockGuard( xModel ); @@ -248,7 +248,7 @@ void ChartController::executeDispatch_ScaleText() SolarMutexGuard aSolarGuard; // using assignment for broken gcc 3.3 UndoGuard aUndoGuard = UndoGuard( - String( SchResId( STR_ACTION_SCALE_TEXT )), + SCH_RESSTR( STR_ACTION_SCALE_TEXT ), m_xUndoManager ); ControllerLockGuard aCtlLockGuard( getModel() ); SAL_WNODEPRECATED_DECLARATIONS_PUSH @@ -630,7 +630,7 @@ bool ChartController::executeDispatch_Delete() // using assignment for broken gcc 3.3 UndoGuard aUndoGuard = UndoGuard( ActionDescriptionProvider::createDescription( - ActionDescriptionProvider::DELETE, String( SchResId( STR_OBJECT_TITLE ))), + ActionDescriptionProvider::DELETE, SCH_RESSTR( STR_OBJECT_TITLE )), m_xUndoManager ); TitleHelper::removeTitle( ObjectIdentifier::getTitleTypeForCID( aCID ), getModel() ); @@ -649,7 +649,7 @@ bool ChartController::executeDispatch_Delete() // using assignment for broken gcc 3.3 UndoGuard aUndoGuard = UndoGuard( ActionDescriptionProvider::createDescription( - ActionDescriptionProvider::DELETE, String( SchResId( STR_OBJECT_LEGEND ))), + ActionDescriptionProvider::DELETE, SCH_RESSTR( STR_OBJECT_LEGEND )), m_xUndoManager ); xLegendProp->setPropertyValue( "Show", uno::makeAny( false )); bReturn = true; @@ -696,7 +696,7 @@ bool ChartController::executeDispatch_Delete() // using assignment for broken gcc 3.3 UndoGuard aUndoGuard = UndoGuard( ActionDescriptionProvider::createDescription( - ActionDescriptionProvider::DELETE, String( SchResId( STR_OBJECT_AVERAGE_LINE ))), + ActionDescriptionProvider::DELETE, SCH_RESSTR( STR_OBJECT_AVERAGE_LINE )), m_xUndoManager ); RegressionCurveHelper::removeMeanValueLine( xRegCurveCnt ); bReturn = true; @@ -722,7 +722,7 @@ bool ChartController::executeDispatch_Delete() // using assignment for broken gcc 3.3 UndoGuard aUndoGuard = UndoGuard( ActionDescriptionProvider::createDescription( - ActionDescriptionProvider::DELETE, String( SchResId( STR_OBJECT_CURVE_EQUATION ))), + ActionDescriptionProvider::DELETE, SCH_RESSTR( STR_OBJECT_CURVE_EQUATION )), m_xUndoManager ); { ControllerLockGuard aCtlLockGuard( xModel ); @@ -756,7 +756,7 @@ bool ChartController::executeDispatch_Delete() // using assignment for broken gcc 3.3 UndoGuard aUndoGuard = UndoGuard( ActionDescriptionProvider::createDescription( - ActionDescriptionProvider::DELETE, String( SchResId( nId ))), + ActionDescriptionProvider::DELETE, SCH_RESSTR( nId )), m_xUndoManager ); { ControllerLockGuard aCtlLockGuard( xModel ); @@ -779,8 +779,8 @@ bool ChartController::executeDispatch_Delete() { UndoGuard aUndoGuard = UndoGuard( ActionDescriptionProvider::createDescription( - ActionDescriptionProvider::DELETE, OUString( String( - SchResId( aObjectType == OBJECTTYPE_DATA_LABEL ? STR_OBJECT_LABEL : STR_OBJECT_DATALABELS )))), + ActionDescriptionProvider::DELETE, + SCH_RESSTR( aObjectType == OBJECTTYPE_DATA_LABEL ? STR_OBJECT_LABEL : STR_OBJECT_DATALABELS )), m_xUndoManager ); chart2::DataPointLabel aLabel; xObjectProperties->getPropertyValue( "Label" ) >>= aLabel; @@ -845,7 +845,7 @@ void ChartController::executeDispatch_ToggleLegend() { Reference< frame::XModel > xModel( getModel() ); UndoGuard aUndoGuard = UndoGuard( - String( SchResId( STR_ACTION_TOGGLE_LEGEND )), m_xUndoManager ); + SCH_RESSTR( STR_ACTION_TOGGLE_LEGEND ), m_xUndoManager ); Reference< beans::XPropertySet > xLegendProp( LegendHelper::getLegend( xModel ), uno::UNO_QUERY ); bool bChanged = false; if( xLegendProp.is()) @@ -879,7 +879,7 @@ void ChartController::executeDispatch_ToggleGridHorizontal() { Reference< frame::XModel > xModel( getModel() ); UndoGuard aUndoGuard = UndoGuard( - String( SchResId( STR_ACTION_TOGGLE_GRID_HORZ )), m_xUndoManager ); + SCH_RESSTR( STR_ACTION_TOGGLE_GRID_HORZ ), m_xUndoManager ); Reference< chart2::XDiagram > xDiagram( ChartModelHelper::findDiagram( getModel() )); if( xDiagram.is()) { @@ -913,7 +913,7 @@ void ChartController::executeDispatch_ToggleGridVertical() { Reference< frame::XModel > xModel( getModel() ); UndoGuard aUndoGuard = UndoGuard( - String( SchResId( STR_ACTION_TOGGLE_GRID_VERTICAL )), m_xUndoManager ); + SCH_RESSTR( STR_ACTION_TOGGLE_GRID_VERTICAL ), m_xUndoManager ); Reference< chart2::XDiagram > xDiagram( ChartModelHelper::findDiagram( getModel() )); if( xDiagram.is()) { diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx index 208bf0aeed0d..0dd17f619f0d 100644 --- a/chart2/source/controller/main/ChartController_Window.cxx +++ b/chart2/source/controller/main/ChartController_Window.cxx @@ -1556,7 +1556,7 @@ bool ChartController::execute_KeyInput( const KeyEvent& rKEvt ) if( ! bReturn ) { SolarMutexGuard aGuard; - InfoBox( m_pChartWindow, String(SchResId( STR_ACTION_NOTPOSSIBLE ))).Execute(); + InfoBox( m_pChartWindow, SCH_RESSTR( STR_ACTION_NOTPOSSIBLE )).Execute(); } } diff --git a/chart2/source/controller/main/DrawCommandDispatch.cxx b/chart2/source/controller/main/DrawCommandDispatch.cxx index ffe3ccb95cb8..c03404fa2d45 100644 --- a/chart2/source/controller/main/DrawCommandDispatch.cxx +++ b/chart2/source/controller/main/DrawCommandDispatch.cxx @@ -111,7 +111,7 @@ bool DrawCommandDispatch::isFeatureSupported( const OUString& rCommandURL ) XLineEndListRef pLineEndList = rModel.GetLineEndList(); if ( pLineEndList.is() ) { - String aName( SVX_RES( nResId ) ); + String aName( SVX_RESSTR( nResId ) ); long nCount = pLineEndList->Count(); for ( long nIndex = 0; nIndex < nCount; ++nIndex ) { diff --git a/chart2/source/controller/main/ElementSelector.cxx b/chart2/source/controller/main/ElementSelector.cxx index 2711702d8e7f..601cf82d9e6b 100644 --- a/chart2/source/controller/main/ElementSelector.cxx +++ b/chart2/source/controller/main/ElementSelector.cxx @@ -145,7 +145,7 @@ void SelectorListBox::UpdateChartElementsListAndSelection() ListBoxEntryData aEntry; SdrObject* pSelectedObj = DrawViewWrapper::getSdrObject( aSelectedOID.getAdditionalShape() ); OUString aName = pSelectedObj ? pSelectedObj->GetName() : OUString(); - aEntry.UIName = ( aName.isEmpty() ? OUString( String( SchResId( STR_OBJECT_SHAPE ) ) ) : aName ); + aEntry.UIName = ( aName.isEmpty() ? SCH_RESSTR( STR_OBJECT_SHAPE ) : aName ); aEntry.OID = aSelectedOID; m_aEntries.push_back( aEntry ); } diff --git a/chart2/source/controller/main/UndoCommandDispatch.cxx b/chart2/source/controller/main/UndoCommandDispatch.cxx index 5d059915da4d..cf9b537f5478 100644 --- a/chart2/source/controller/main/UndoCommandDispatch.cxx +++ b/chart2/source/controller/main/UndoCommandDispatch.cxx @@ -72,13 +72,13 @@ void UndoCommandDispatch::fireStatusEvent( if( m_xUndoManager->isUndoPossible()) { // using assignment for broken gcc 3.3 - OUString aUndo = OUString( String( SvtResId( STR_UNDO ))); + OUString aUndo = SvtResId( STR_UNDO ).toString(); aUndoState <<= ( aUndo + m_xUndoManager->getCurrentUndoActionTitle()); } if( m_xUndoManager->isRedoPossible()) { // using assignment for broken gcc 3.3 - OUString aRedo = OUString( String( SvtResId( STR_REDO ))); + OUString aRedo = SvtResId( STR_REDO ).toString(); aRedoState <<= ( aRedo + m_xUndoManager->getCurrentRedoActionTitle()); } diff --git a/extensions/source/abpilot/abspilot.cxx b/extensions/source/abpilot/abspilot.cxx index 96f1b59f484e..c213b7b1dd8b 100644 --- a/extensions/source/abpilot/abspilot.cxx +++ b/extensions/source/abpilot/abspilot.cxx @@ -116,7 +116,7 @@ namespace abp #else m_aSettings.eType = AST_OTHER; #endif - m_aSettings.sDataSourceName = String(ModuleRes(RID_STR_DEFAULT_NAME)); + m_aSettings.sDataSourceName = ModuleRes(RID_STR_DEFAULT_NAME).toString(); m_aSettings.bRegisterDataSource = false; m_aSettings.bIgnoreNoTable = false; @@ -150,7 +150,7 @@ namespace abp if ( nResId ) { svt::OLocalResourceAccess aAccess( ModuleRes( RID_DLG_ADDRESSBOOKSOURCEPILOT ), RSC_MODALDIALOG ); - sDisplayName = String( ModuleRes( nResId ) ); + sDisplayName = ModuleRes(nResId).toString(); } return sDisplayName; diff --git a/extensions/source/abpilot/admininvokationimpl.cxx b/extensions/source/abpilot/admininvokationimpl.cxx index 7339d1420b45..db24269e2cf5 100644 --- a/extensions/source/abpilot/admininvokationimpl.cxx +++ b/extensions/source/abpilot/admininvokationimpl.cxx @@ -79,8 +79,8 @@ namespace abp *pArguments++ <<= PropertyValue(OUString("ParentWindow"), -1, makeAny(xDialogParent), PropertyState_DIRECT_VALUE); // the title of the dialog - String sAdminDialogTitle(ModuleRes(RID_STR_ADMINDIALOGTITLE)); - *pArguments++ <<= PropertyValue(OUString("Title"), -1, makeAny(OUString(sAdminDialogTitle)), PropertyState_DIRECT_VALUE); + OUString sAdminDialogTitle(ModuleRes(RID_STR_ADMINDIALOGTITLE).toString()); + *pArguments++ <<= PropertyValue(OUString("Title"), -1, makeAny(sAdminDialogTitle), PropertyState_DIRECT_VALUE); // the name of the new data source *pArguments++ <<= PropertyValue(OUString("InitialSelection"), -1, makeAny(m_xDataSource), PropertyState_DIRECT_VALUE); diff --git a/extensions/source/abpilot/datasourcehandling.cxx b/extensions/source/abpilot/datasourcehandling.cxx index bc0f78eb63a0..68ba6fe5e5f0 100644 --- a/extensions/source/abpilot/datasourcehandling.cxx +++ b/extensions/source/abpilot/datasourcehandling.cxx @@ -566,8 +566,8 @@ namespace abp { // prepend some context info SQLContext aDetailedError; - aDetailedError.Message = String( ModuleRes( RID_STR_NOCONNECTION ) ); - aDetailedError.Details = String( ModuleRes( RID_STR_PLEASECHECKSETTINGS ) ); + aDetailedError.Message = ModuleRes(RID_STR_NOCONNECTION).toString(); + aDetailedError.Details = ModuleRes(RID_STR_PLEASECHECKSETTINGS).toString(); aDetailedError.NextException = aError; // handle (aka display) the new context info xInteractions->handle( new OInteractionRequest( makeAny( aDetailedError ) ) ); diff --git a/extensions/source/abpilot/fieldmappingimpl.cxx b/extensions/source/abpilot/fieldmappingimpl.cxx index 2f482e6575f1..f220fd0b078c 100644 --- a/extensions/source/abpilot/fieldmappingimpl.cxx +++ b/extensions/source/abpilot/fieldmappingimpl.cxx @@ -84,7 +84,7 @@ namespace abp // ........................................................ // create an instance of the dialog service Reference< XWindow > xDialogParent = VCLUnoHelper::GetInterface( _pParent ); - OUString sTitle = String( ModuleRes( RID_STR_FIELDDIALOGTITLE ) ); + OUString sTitle(ModuleRes(RID_STR_FIELDDIALOGTITLE).toString()); Reference< XExecutableDialog > xDialog = AddressBookSourceDialog::createWithDataSource(_rxORB, // the parent window xDialogParent, diff --git a/extensions/source/abpilot/fieldmappingpage.cxx b/extensions/source/abpilot/fieldmappingpage.cxx index 12a51bd5985c..8776d5d1e063 100644 --- a/extensions/source/abpilot/fieldmappingpage.cxx +++ b/extensions/source/abpilot/fieldmappingpage.cxx @@ -80,9 +80,9 @@ namespace abp void FieldMappingPage::implUpdateHint() { const AddressSettings& rSettings = getSettings(); - String sHint; + OUString sHint; if ( 0 == rSettings.aFieldMapping.size() ) - sHint = String( ModuleRes( RID_STR_NOFIELDSASSIGNED ) ); + sHint = ModuleRes(RID_STR_NOFIELDSASSIGNED).toString(); m_aHint.SetText( sHint ); } diff --git a/extensions/source/bibliography/bibload.cxx b/extensions/source/bibliography/bibload.cxx index 9d6c6e7c08a4..9dbb7be0469b 100644 --- a/extensions/source/bibliography/bibload.cxx +++ b/extensions/source/bibliography/bibload.cxx @@ -239,7 +239,7 @@ void BibliographyLoader::load(const Reference< XFrame > & rFrame, const OUString if(xPrSet.is()) { Any aTitle; - aTitle <<= OUString(String(BibResId(RID_BIB_STR_FRAME_TITLE))); + aTitle <<= BibResId(RID_BIB_STR_FRAME_TITLE).toString(); xPrSet->setPropertyValue("Title", aTitle); } if(aPartName.EqualsAscii("View") || aPartName.EqualsAscii("View1")) diff --git a/extensions/source/bibliography/bibresid.hxx b/extensions/source/bibliography/bibresid.hxx index 8188c4e17df4..daa100db103b 100644 --- a/extensions/source/bibliography/bibresid.hxx +++ b/extensions/source/bibliography/bibresid.hxx @@ -30,7 +30,7 @@ class BibResId : public ResId BibResId( sal_uInt16 nId ); }; - +#define BIB_RESSTR(i) BibResId(i).toString() #endif // ADRRESID_HXX diff --git a/extensions/source/bibliography/bibview.cxx b/extensions/source/bibliography/bibview.cxx index dac90718d065..9063b8031bd8 100644 --- a/extensions/source/bibliography/bibview.cxx +++ b/extensions/source/bibliography/bibview.cxx @@ -134,7 +134,7 @@ namespace bib else if(bExecute) { sErrorString += '\n'; - sErrorString += String( BibResId( RID_MAP_QUESTION ) ); + sErrorString += BIB_RESSTR(RID_MAP_QUESTION); QueryBox aQuery( this, WB_YES_NO, sErrorString ); aQuery.SetDefaultCheckBoxText(); short nResult = aQuery.Execute(); diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx index 60a1fc95e94f..668dcc31a9b5 100644 --- a/extensions/source/bibliography/datman.cxx +++ b/extensions/source/bibliography/datman.cxx @@ -360,42 +360,42 @@ MappingDialog_Impl::MappingDialog_Impl(Window* pParent, BibDataManager* pMan) : aCustom4LB(this, BibResId( LB_CUSTOM4 )), aCustom5FT(this, BibResId( FT_CUSTOM5 )), aCustom5LB(this, BibResId( LB_CUSTOM5 )), - sNone(BibResId(ST_NONE)), + sNone(BIB_RESSTR(ST_NONE)), bModified(sal_False) { FreeResource(); - aIdentifierFT.SetText(String( BibResId( ST_IDENTIFIER ))); - aAuthorityTypeFT.SetText(String( BibResId( ST_AUTHTYPE ))); - aAuthorFT.SetText(String( BibResId( ST_AUTHOR ))); - aTitleFT.SetText(String( BibResId( ST_TITLE ))); - aMonthFT.SetText(String( BibResId( ST_MONTH ))); - aYearFT.SetText(String( BibResId( ST_YEAR ))); - aISBNFT.SetText(String( BibResId( ST_ISBN ))); - aBooktitleFT.SetText(String( BibResId( ST_BOOKTITLE ))); - aChapterFT.SetText(String( BibResId( ST_CHAPTER ))); - aEditionFT.SetText(String( BibResId( ST_EDITION ))); - aEditorFT.SetText(String( BibResId( ST_EDITOR ))); - aHowpublishedFT.SetText(String( BibResId( ST_HOWPUBLISHED ))); - aInstitutionFT.SetText(String( BibResId( ST_INSTITUTION ))); - aJournalFT.SetText(String( BibResId( ST_JOURNAL ))); - aNoteFT.SetText(String( BibResId( ST_NOTE ))); - aAnnoteFT.SetText(String( BibResId( ST_ANNOTE ))); - aNumberFT.SetText(String( BibResId( ST_NUMBER ))); - aOrganizationsFT.SetText(String( BibResId( ST_ORGANIZATION ))); - aPagesFT.SetText(String( BibResId( ST_PAGE ))); - aPublisherFT.SetText(String( BibResId( ST_PUBLISHER ))); - aAddressFT.SetText(String( BibResId( ST_ADDRESS ))); - aSchoolFT.SetText(String( BibResId( ST_SCHOOL ))); - aSeriesFT.SetText(String( BibResId( ST_SERIES ))); - aReportTypeFT.SetText(String( BibResId( ST_REPORT ))); - aVolumeFT.SetText(String( BibResId( ST_VOLUME ))); - aURLFT.SetText(String( BibResId( ST_URL ))); - aCustom1FT.SetText(String( BibResId( ST_CUSTOM1 ))); - aCustom2FT.SetText(String( BibResId( ST_CUSTOM2 ))); - aCustom3FT.SetText(String( BibResId( ST_CUSTOM3 ))); - aCustom4FT.SetText(String( BibResId( ST_CUSTOM4 ))); - aCustom5FT.SetText(String( BibResId( ST_CUSTOM5 ))); + aIdentifierFT.SetText(BIB_RESSTR(ST_IDENTIFIER)); + aAuthorityTypeFT.SetText(BIB_RESSTR(ST_AUTHTYPE)); + aAuthorFT.SetText(BIB_RESSTR(ST_AUTHOR)); + aTitleFT.SetText(BIB_RESSTR(ST_TITLE)); + aMonthFT.SetText(BIB_RESSTR(ST_MONTH)); + aYearFT.SetText(BIB_RESSTR(ST_YEAR)); + aISBNFT.SetText(BIB_RESSTR(ST_ISBN)); + aBooktitleFT.SetText(BIB_RESSTR(ST_BOOKTITLE)); + aChapterFT.SetText(BIB_RESSTR(ST_CHAPTER)); + aEditionFT.SetText(BIB_RESSTR(ST_EDITION)); + aEditorFT.SetText(BIB_RESSTR(ST_EDITOR)); + aHowpublishedFT.SetText(BIB_RESSTR(ST_HOWPUBLISHED)); + aInstitutionFT.SetText(BIB_RESSTR(ST_INSTITUTION)); + aJournalFT.SetText(BIB_RESSTR(ST_JOURNAL)); + aNoteFT.SetText(BIB_RESSTR(ST_NOTE)); + aAnnoteFT.SetText(BIB_RESSTR(ST_ANNOTE)); + aNumberFT.SetText(BIB_RESSTR(ST_NUMBER)); + aOrganizationsFT.SetText(BIB_RESSTR(ST_ORGANIZATION)); + aPagesFT.SetText(BIB_RESSTR(ST_PAGE)); + aPublisherFT.SetText(BIB_RESSTR(ST_PUBLISHER)); + aAddressFT.SetText(BIB_RESSTR(ST_ADDRESS)); + aSchoolFT.SetText(BIB_RESSTR(ST_SCHOOL)); + aSeriesFT.SetText(BIB_RESSTR(ST_SERIES)); + aReportTypeFT.SetText(BIB_RESSTR(ST_REPORT)); + aVolumeFT.SetText(BIB_RESSTR(ST_VOLUME)); + aURLFT.SetText(BIB_RESSTR(ST_URL)); + aCustom1FT.SetText(BIB_RESSTR(ST_CUSTOM1)); + aCustom2FT.SetText(BIB_RESSTR(ST_CUSTOM2)); + aCustom3FT.SetText(BIB_RESSTR(ST_CUSTOM3)); + aCustom4FT.SetText(BIB_RESSTR(ST_CUSTOM4)); + aCustom5FT.SetText(BIB_RESSTR(ST_CUSTOM5)); aOKBT.SetClickHdl(LINK(this, MappingDialog_Impl, OkHdl)); String sTitle = GetText(); @@ -556,8 +556,8 @@ DBChangeDialog_Impl::DBChangeDialog_Impl(Window* pParent, BibDataManager* pMan ) aSelectionGB(this, BibResId( GB_SELECTION )), aSelectionLB(this, BibResId( LB_SELECTION )), aSelectionHB(this, BibResId( HB_SELECTION )), - aEntryST(BibResId(ST_ENTRY)), - aURLST( BibResId(ST_URL)), + aEntryST(BIB_RESSTR(ST_ENTRY)), + aURLST(BIB_RESSTR(ST_URL)), pDatMan(pMan) { FreeResource(); diff --git a/extensions/source/bibliography/general.cxx b/extensions/source/bibliography/general.cxx index 25bc0f92d6b8..4b226f5604df 100644 --- a/extensions/source/bibliography/general.cxx +++ b/extensions/source/bibliography/general.cxx @@ -215,35 +215,35 @@ BibGeneralPage::BibGeneralPage(Window* pParent, BibDataManager* pMan): aCustom5FT(&aControlParentWin, BibResId(FT_CUSTOM5 )), aHoriScroll(this, WB_HORZ), aVertScroll(this, WB_VERT), - sErrorPrefix(BibResId(ST_ERROR_PREFIX)), + sErrorPrefix(BIB_RESSTR(ST_ERROR_PREFIX)), pDatMan(pMan) { aControlParentWin.Show(); aControlParentWin.SetHelpId(HID_BIB_CONTROL_PARENT); aStdSize = GetOutputSizePixel(); - aBibTypeArr[0] = String(BibResId(ST_TYPE_ARTICLE)); - aBibTypeArr[1] = String(BibResId(ST_TYPE_BOOK)); - aBibTypeArr[2] = String(BibResId(ST_TYPE_BOOKLET)); - aBibTypeArr[3] = String(BibResId(ST_TYPE_CONFERENCE)); - aBibTypeArr[4] = String(BibResId(ST_TYPE_INBOOK )); - aBibTypeArr[5] = String(BibResId(ST_TYPE_INCOLLECTION)); - aBibTypeArr[6] = String(BibResId(ST_TYPE_INPROCEEDINGS)); - aBibTypeArr[7] = String(BibResId(ST_TYPE_JOURNAL )); - aBibTypeArr[8] = String(BibResId(ST_TYPE_MANUAL )); - aBibTypeArr[9] = String(BibResId(ST_TYPE_MASTERSTHESIS)); - aBibTypeArr[10] = String(BibResId(ST_TYPE_MISC )); - aBibTypeArr[11] = String(BibResId(ST_TYPE_PHDTHESIS )); - aBibTypeArr[12] = String(BibResId(ST_TYPE_PROCEEDINGS )); - aBibTypeArr[13] = String(BibResId(ST_TYPE_TECHREPORT )); - aBibTypeArr[14] = String(BibResId(ST_TYPE_UNPUBLISHED )); - aBibTypeArr[15] = String(BibResId(ST_TYPE_EMAIL )); - aBibTypeArr[16] = String(BibResId(ST_TYPE_WWW )); - aBibTypeArr[17] = String(BibResId(ST_TYPE_CUSTOM1 )); - aBibTypeArr[18] = String(BibResId(ST_TYPE_CUSTOM2 )); - aBibTypeArr[19] = String(BibResId(ST_TYPE_CUSTOM3 )); - aBibTypeArr[20] = String(BibResId(ST_TYPE_CUSTOM4 )); - aBibTypeArr[21] = String(BibResId(ST_TYPE_CUSTOM5 )); + aBibTypeArr[0] = BIB_RESSTR(ST_TYPE_ARTICLE); + aBibTypeArr[1] = BIB_RESSTR(ST_TYPE_BOOK); + aBibTypeArr[2] = BIB_RESSTR(ST_TYPE_BOOKLET); + aBibTypeArr[3] = BIB_RESSTR(ST_TYPE_CONFERENCE); + aBibTypeArr[4] = BIB_RESSTR(ST_TYPE_INBOOK ); + aBibTypeArr[5] = BIB_RESSTR(ST_TYPE_INCOLLECTION); + aBibTypeArr[6] = BIB_RESSTR(ST_TYPE_INPROCEEDINGS); + aBibTypeArr[7] = BIB_RESSTR(ST_TYPE_JOURNAL ); + aBibTypeArr[8] = BIB_RESSTR(ST_TYPE_MANUAL ); + aBibTypeArr[9] = BIB_RESSTR(ST_TYPE_MASTERSTHESIS); + aBibTypeArr[10] = BIB_RESSTR(ST_TYPE_MISC ); + aBibTypeArr[11] = BIB_RESSTR(ST_TYPE_PHDTHESIS ); + aBibTypeArr[12] = BIB_RESSTR(ST_TYPE_PROCEEDINGS ); + aBibTypeArr[13] = BIB_RESSTR(ST_TYPE_TECHREPORT ); + aBibTypeArr[14] = BIB_RESSTR(ST_TYPE_UNPUBLISHED ); + aBibTypeArr[15] = BIB_RESSTR(ST_TYPE_EMAIL ); + aBibTypeArr[16] = BIB_RESSTR(ST_TYPE_WWW ); + aBibTypeArr[17] = BIB_RESSTR(ST_TYPE_CUSTOM1 ); + aBibTypeArr[18] = BIB_RESSTR(ST_TYPE_CUSTOM2 ); + aBibTypeArr[19] = BIB_RESSTR(ST_TYPE_CUSTOM3 ); + aBibTypeArr[20] = BIB_RESSTR(ST_TYPE_CUSTOM4 ); + aBibTypeArr[21] = BIB_RESSTR(ST_TYPE_CUSTOM5 ); FreeResource(); @@ -617,37 +617,37 @@ void BibGeneralPage::InitFixedTexts( void ) { String aFixedStrings[ FIELD_COUNT ] = { - String( BibResId( ST_IDENTIFIER ) ), - String( BibResId( ST_AUTHTYPE ) ), - String( BibResId( ST_AUTHOR ) ), - String( BibResId( ST_TITLE ) ), - String( BibResId( ST_MONTH ) ), - String( BibResId( ST_YEAR ) ), - String( BibResId( ST_ISBN ) ), - String( BibResId( ST_BOOKTITLE ) ), - String( BibResId( ST_CHAPTER ) ), - String( BibResId( ST_EDITION ) ), - String( BibResId( ST_EDITOR ) ), - String( BibResId( ST_HOWPUBLISHED ) ), - String( BibResId( ST_INSTITUTION ) ), - String( BibResId( ST_JOURNAL ) ), - String( BibResId( ST_NOTE ) ), - String( BibResId( ST_ANNOTE ) ), - String( BibResId( ST_NUMBER ) ), - String( BibResId( ST_ORGANIZATION ) ), - String( BibResId( ST_PAGE ) ), - String( BibResId( ST_PUBLISHER ) ), - String( BibResId( ST_ADDRESS ) ), - String( BibResId( ST_SCHOOL ) ), - String( BibResId( ST_SERIES ) ), - String( BibResId( ST_REPORT ) ), - String( BibResId( ST_VOLUME ) ), - String( BibResId( ST_URL ) ), - String( BibResId( ST_CUSTOM1 ) ), - String( BibResId( ST_CUSTOM2 ) ), - String( BibResId( ST_CUSTOM3 ) ), - String( BibResId( ST_CUSTOM4 ) ), - String( BibResId( ST_CUSTOM5 ) ) + BIB_RESSTR( ST_IDENTIFIER ), + BIB_RESSTR( ST_AUTHTYPE ), + BIB_RESSTR( ST_AUTHOR ), + BIB_RESSTR( ST_TITLE ), + BIB_RESSTR( ST_MONTH ), + BIB_RESSTR( ST_YEAR ), + BIB_RESSTR( ST_ISBN ), + BIB_RESSTR( ST_BOOKTITLE ), + BIB_RESSTR( ST_CHAPTER ), + BIB_RESSTR( ST_EDITION ), + BIB_RESSTR( ST_EDITOR ), + BIB_RESSTR( ST_HOWPUBLISHED ), + BIB_RESSTR( ST_INSTITUTION ), + BIB_RESSTR( ST_JOURNAL ), + BIB_RESSTR( ST_NOTE ), + BIB_RESSTR( ST_ANNOTE ), + BIB_RESSTR( ST_NUMBER ), + BIB_RESSTR( ST_ORGANIZATION ), + BIB_RESSTR( ST_PAGE ), + BIB_RESSTR( ST_PUBLISHER ), + BIB_RESSTR( ST_ADDRESS ), + BIB_RESSTR( ST_SCHOOL ), + BIB_RESSTR( ST_SERIES ), + BIB_RESSTR( ST_REPORT ), + BIB_RESSTR( ST_VOLUME ), + BIB_RESSTR( ST_URL ), + BIB_RESSTR( ST_CUSTOM1 ), + BIB_RESSTR( ST_CUSTOM2 ), + BIB_RESSTR( ST_CUSTOM3 ), + BIB_RESSTR( ST_CUSTOM4 ), + BIB_RESSTR( ST_CUSTOM5 ) }; aFixedTexts[0] = &aIdentifierFT; diff --git a/extensions/source/dbpilots/controlwizard.cxx b/extensions/source/dbpilots/controlwizard.cxx index 507525ce80a4..f1e4aef9ea60 100644 --- a/extensions/source/dbpilots/controlwizard.cxx +++ b/extensions/source/dbpilots/controlwizard.cxx @@ -262,7 +262,7 @@ namespace dbp nCommandTypeResourceId = RID_STR_TYPE_COMMAND; break; } - m_pFormContentType->SetText(String(ModuleRes(nCommandTypeResourceId))); + m_pFormContentType->SetText(ModuleRes(nCommandTypeResourceId).toString()); } OControlWizardPage_Base::initializePage(); @@ -653,7 +653,7 @@ namespace dbp // prepend an extra SQLContext explaining what we were doing SQLContext aContext; - aContext.Message = String(ModuleRes(RID_STR_COULDNOTOPENTABLE)); + aContext.Message = ModuleRes(RID_STR_COULDNOTOPENTABLE).toString(); aContext.NextException = aSQLException; // create an interaction handler to display this exception diff --git a/extensions/source/dbpilots/gridwizard.cxx b/extensions/source/dbpilots/gridwizard.cxx index d0885644cedd..4df071e8000b 100644 --- a/extensions/source/dbpilots/gridwizard.cxx +++ b/extensions/source/dbpilots/gridwizard.cxx @@ -166,11 +166,11 @@ namespace dbp case DataType::TIMESTAMP: aColumnServiceNames.push_back(OUString("DateField")); - aColumnLabelPostfixes.push_back(String(ModuleRes(RID_STR_DATEPOSTFIX))); + aColumnLabelPostfixes.push_back(ModuleRes(RID_STR_DATEPOSTFIX).toString()); aFormFieldNames.push_back(*pSelectedFields); aColumnServiceNames.push_back(OUString("TimeField")); - aColumnLabelPostfixes.push_back(String(ModuleRes(RID_STR_TIMEPOSTFIX))); + aColumnLabelPostfixes.push_back(ModuleRes(RID_STR_TIMEPOSTFIX).toString()); break; default: diff --git a/extensions/source/dbpilots/groupboxwiz.cxx b/extensions/source/dbpilots/groupboxwiz.cxx index 597e73943c6f..3097b8eba621 100644 --- a/extensions/source/dbpilots/groupboxwiz.cxx +++ b/extensions/source/dbpilots/groupboxwiz.cxx @@ -490,7 +490,7 @@ namespace dbp OOptionDBFieldPage::OOptionDBFieldPage( OControlWizard* _pParent ) :ODBFieldPage(_pParent) { - setDescriptionText(String(ModuleRes(RID_STR_GROUPWIZ_DBFIELD))); + setDescriptionText(ModuleRes(RID_STR_GROUPWIZ_DBFIELD).toString()); } //--------------------------------------------------------------------- diff --git a/extensions/source/dbpilots/listcombowizard.cxx b/extensions/source/dbpilots/listcombowizard.cxx index 20eae70f083e..ca189c3410ab 100644 --- a/extensions/source/dbpilots/listcombowizard.cxx +++ b/extensions/source/dbpilots/listcombowizard.cxx @@ -77,11 +77,11 @@ namespace dbp { case FormComponentType::LISTBOX: m_bListBox = sal_True; - setTitleBase(String(ModuleRes(RID_STR_LISTWIZARD_TITLE))); + setTitleBase(ModuleRes(RID_STR_LISTWIZARD_TITLE).toString()); return sal_True; case FormComponentType::COMBOBOX: m_bListBox = sal_False; - setTitleBase(String(ModuleRes(RID_STR_COMBOWIZARD_TITLE))); + setTitleBase(ModuleRes(RID_STR_COMBOWIZARD_TITLE).toString()); return sal_True; } return sal_False; @@ -370,7 +370,7 @@ namespace dbp ,m_aDisplayedField (this, ModuleRes(ET_DISPLAYEDFIELD)) ,m_aInfo (this, ModuleRes(FT_CONTENTFIELD_INFO)) { - m_aInfo.SetText(String(ModuleRes( isListBox() ? STR_FIELDINFO_LISTBOX : STR_FIELDINFO_COMBOBOX))); + m_aInfo.SetText(ModuleRes( isListBox() ? STR_FIELDINFO_LISTBOX : STR_FIELDINFO_COMBOBOX).toString()); FreeResource(); m_aSelectTableField.SetSelectHdl(LINK(this, OContentFieldSelection, OnFieldSelected)); m_aSelectTableField.SetDoubleClickHdl(LINK(this, OContentFieldSelection, OnTableDoubleClicked)); @@ -517,7 +517,7 @@ namespace dbp OComboDBFieldPage::OComboDBFieldPage( OControlWizard* _pParent ) :ODBFieldPage(_pParent) { - setDescriptionText(String(ModuleRes(RID_STR_COMBOWIZ_DBFIELD))); + setDescriptionText(ModuleRes(RID_STR_COMBOWIZ_DBFIELD).toString()); } //--------------------------------------------------------------------- diff --git a/extensions/source/propctrlr/defaultforminspection.cxx b/extensions/source/propctrlr/defaultforminspection.cxx index c5346473d0b4..0b0abf35f459 100644 --- a/extensions/source/propctrlr/defaultforminspection.cxx +++ b/extensions/source/propctrlr/defaultforminspection.cxx @@ -181,7 +181,7 @@ namespace pcr for ( sal_Int32 i=0; i<nCategories; ++i, ++pReturn ) { pReturn->ProgrammaticName = OUString::createFromAscii( aCategories[i].programmaticName ); - pReturn->UIName = String( PcrRes( aCategories[i].uiNameResId ) ); + pReturn->UIName = PcrRes( aCategories[i].uiNameResId ).toString(); pReturn->HelpURL = HelpIdUrl::getHelpURL( aCategories[i].helpId ); } diff --git a/extensions/source/propctrlr/eformshelper.cxx b/extensions/source/propctrlr/eformshelper.cxx index 45352357d809..bdd203cbc8a4 100644 --- a/extensions/source/propctrlr/eformshelper.cxx +++ b/extensions/source/propctrlr/eformshelper.cxx @@ -548,7 +548,7 @@ namespace pcr if ( xBinding.is() ) { // find a nice name for it - String sBaseName( PcrRes( RID_STR_BINDING_UI_NAME ) ); + String sBaseName(PcrRes(RID_STR_BINDING_UI_NAME).toString()); sBaseName += OUString(" "); String sNewName; sal_Int32 nNumber = 1; diff --git a/extensions/source/propctrlr/eventhandler.cxx b/extensions/source/propctrlr/eventhandler.cxx index eb1c4adb1956..9388665d518c 100644 --- a/extensions/source/propctrlr/eventhandler.cxx +++ b/extensions/source/propctrlr/eventhandler.cxx @@ -143,7 +143,7 @@ namespace pcr //==================================================================== EventDescription::EventDescription( EventId _nId, const sal_Char* _pListenerNamespaceAscii, const sal_Char* _pListenerClassAsciiName, const sal_Char* _pListenerMethodAsciiName, sal_uInt16 _nDisplayNameResId, const OString& _sHelpId, const OString& _sUniqueBrowseId ) - :sDisplayName( String( PcrRes( _nDisplayNameResId ) ) ) + :sDisplayName(PcrRes( _nDisplayNameResId ).toString()) ,sListenerMethodName( OUString::createFromAscii( _pListenerMethodAsciiName ) ) ,sHelpId( _sHelpId ) ,sUniqueBrowseId( _sUniqueBrowseId ) diff --git a/extensions/source/propctrlr/formbrowsertools.cxx b/extensions/source/propctrlr/formbrowsertools.cxx index b2e56658b628..d7b0660c36ac 100644 --- a/extensions/source/propctrlr/formbrowsertools.cxx +++ b/extensions/source/propctrlr/formbrowsertools.cxx @@ -49,12 +49,12 @@ namespace pcr { Reference< XInterface > xIFace; aUnoObj >>= xIFace; - sClassName = String(PcrRes(RID_STR_PROPTITLE_EDIT)); + sClassName = PcrRes(RID_STR_PROPTITLE_EDIT).toString(); if (xIFace.is()) { // we have a chance to check if it's a formatted field model Reference< XServiceInfo > xInfo(xIFace, UNO_QUERY); if (xInfo.is() && (xInfo->supportsService(SERVICE_COMPONENT_FORMATTEDFIELD))) - sClassName = String(PcrRes(RID_STR_PROPTITLE_FORMATTED)); + sClassName = PcrRes(RID_STR_PROPTITLE_FORMATTED).toString(); else if (!xInfo.is()) { // couldn't distinguish between formatted and edit with the service name, so try with the properties @@ -63,7 +63,7 @@ namespace pcr { Reference< XPropertySetInfo > xPropsInfo = xProps->getPropertySetInfo(); if (xPropsInfo.is() && xPropsInfo->hasPropertyByName(PROPERTY_FORMATSSUPPLIER)) - sClassName = String(PcrRes(RID_STR_PROPTITLE_FORMATTED)); + sClassName = PcrRes(RID_STR_PROPTITLE_FORMATTED).toString(); } } } @@ -71,44 +71,44 @@ namespace pcr break; case FormComponentType::COMMANDBUTTON: - sClassName = String(PcrRes(RID_STR_PROPTITLE_PUSHBUTTON)); break; + sClassName = PcrRes(RID_STR_PROPTITLE_PUSHBUTTON).toString(); break; case FormComponentType::RADIOBUTTON: - sClassName = String(PcrRes(RID_STR_PROPTITLE_RADIOBUTTON)); break; + sClassName = PcrRes(RID_STR_PROPTITLE_RADIOBUTTON).toString(); break; case FormComponentType::CHECKBOX: - sClassName = String(PcrRes(RID_STR_PROPTITLE_CHECKBOX)); break; + sClassName = PcrRes(RID_STR_PROPTITLE_CHECKBOX).toString(); break; case FormComponentType::LISTBOX: - sClassName = String(PcrRes(RID_STR_PROPTITLE_LISTBOX)); break; + sClassName = PcrRes(RID_STR_PROPTITLE_LISTBOX).toString(); break; case FormComponentType::COMBOBOX: - sClassName = String(PcrRes(RID_STR_PROPTITLE_COMBOBOX)); break; + sClassName = PcrRes(RID_STR_PROPTITLE_COMBOBOX).toString(); break; case FormComponentType::GROUPBOX: - sClassName = String(PcrRes(RID_STR_PROPTITLE_GROUPBOX)); break; + sClassName = PcrRes(RID_STR_PROPTITLE_GROUPBOX).toString(); break; case FormComponentType::IMAGEBUTTON: - sClassName = String(PcrRes(RID_STR_PROPTITLE_IMAGEBUTTON)); break; + sClassName = PcrRes(RID_STR_PROPTITLE_IMAGEBUTTON).toString(); break; case FormComponentType::FIXEDTEXT: - sClassName = String(PcrRes(RID_STR_PROPTITLE_FIXEDTEXT)); break; + sClassName = PcrRes(RID_STR_PROPTITLE_FIXEDTEXT).toString(); break; case FormComponentType::GRIDCONTROL: - sClassName = String(PcrRes(RID_STR_PROPTITLE_DBGRID)); break; + sClassName = PcrRes(RID_STR_PROPTITLE_DBGRID).toString(); break; case FormComponentType::FILECONTROL: - sClassName = String(PcrRes(RID_STR_PROPTITLE_FILECONTROL)); break; + sClassName = PcrRes(RID_STR_PROPTITLE_FILECONTROL).toString(); break; case FormComponentType::DATEFIELD: - sClassName = String(PcrRes(RID_STR_PROPTITLE_DATEFIELD)); break; + sClassName = PcrRes(RID_STR_PROPTITLE_DATEFIELD).toString(); break; case FormComponentType::TIMEFIELD: - sClassName = String(PcrRes(RID_STR_PROPTITLE_TIMEFIELD)); break; + sClassName = PcrRes(RID_STR_PROPTITLE_TIMEFIELD).toString(); break; case FormComponentType::NUMERICFIELD: - sClassName = String(PcrRes(RID_STR_PROPTITLE_NUMERICFIELD)); break; + sClassName = PcrRes(RID_STR_PROPTITLE_NUMERICFIELD).toString(); break; case FormComponentType::CURRENCYFIELD: - sClassName = String(PcrRes(RID_STR_PROPTITLE_CURRENCYFIELD)); break; + sClassName = PcrRes(RID_STR_PROPTITLE_CURRENCYFIELD).toString(); break; case FormComponentType::PATTERNFIELD: - sClassName = String(PcrRes(RID_STR_PROPTITLE_PATTERNFIELD)); break; + sClassName = PcrRes(RID_STR_PROPTITLE_PATTERNFIELD).toString(); break; case FormComponentType::IMAGECONTROL: - sClassName = String(PcrRes(RID_STR_PROPTITLE_IMAGECONTROL)); break; + sClassName = PcrRes(RID_STR_PROPTITLE_IMAGECONTROL).toString(); break; case FormComponentType::HIDDENCONTROL: - sClassName = String(PcrRes(RID_STR_PROPTITLE_HIDDENCONTROL)); break; + sClassName = PcrRes(RID_STR_PROPTITLE_HIDDENCONTROL).toString(); break; case FormComponentType::CONTROL: default: - sClassName = String(PcrRes(RID_STR_PROPTITLE_UNKNOWNCONTROL)); break; + sClassName = PcrRes(RID_STR_PROPTITLE_UNKNOWNCONTROL).toString(); break; } return sClassName; diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx index 4db154965a10..9ab0cbae4b70 100644 --- a/extensions/source/propctrlr/formcomponenthandler.cxx +++ b/extensions/source/propctrlr/formcomponenthandler.cxx @@ -141,7 +141,7 @@ namespace pcr FormComponentPropertyHandler::FormComponentPropertyHandler( const Reference< XComponentContext >& _rxContext ) :FormComponentPropertyHandler_Base( _rxContext ) ,::comphelper::OPropertyContainer(FormComponentPropertyHandler_Base::rBHelper) - ,m_sDefaultValueString( String( PcrRes( RID_STR_STANDARD ) ) ) + ,m_sDefaultValueString( PcrRes(RID_STR_STANDARD).toString() ) ,m_eComponentClass( eUnknown ) ,m_bComponentIsSubForm( false ) ,m_bHaveListSource( false ) @@ -562,7 +562,7 @@ namespace pcr OUString sControlValue; OSL_VERIFY( _rControlValue >>= sControlValue ); // Don't convert a placeholder - if ( nPropId == PROPERTY_ID_IMAGE_URL && sControlValue.equals( String( PcrRes( RID_EMBED_IMAGE_PLACEHOLDER ) ) ) ) + if ( nPropId == PROPERTY_ID_IMAGE_URL && sControlValue.equals( PcrRes(RID_EMBED_IMAGE_PLACEHOLDER).toString() ) ) aPropertyValue <<= sControlValue; else { @@ -760,7 +760,7 @@ namespace pcr OUStringBuffer displayName; if ( aFont.Name.isEmpty() ) { - displayName.append( String( PcrRes( RID_STR_FONT_DEFAULT ) ) ); + displayName.append( PcrRes(RID_STR_FONT_DEFAULT).toString() ); } else { @@ -783,7 +783,7 @@ namespace pcr if ( eWeight > WEIGHT_NORMAL ) nStyleResID = RID_STR_FONTSTYLE_BOLD; } - displayName.append( String( PcrRes( nStyleResID ) ) ); + displayName.append(PcrRes(nStyleResID).toString()); // font size if ( aFont.Height ) @@ -2717,7 +2717,7 @@ namespace pcr SvNumberFormatter* pFormatter = pSupplier->GetNumberFormatter(); double dPreviewVal = OFormatSampleControl::getPreviewValue(pFormatter,nFormatKey); - SvxNumberInfoItem aFormatter( pFormatter, dPreviewVal, String( PcrRes( RID_STR_TEXT_FORMAT ) ), SID_ATTR_NUMBERFORMAT_INFO ); + SvxNumberInfoItem aFormatter( pFormatter, dPreviewVal, PcrRes(RID_STR_TEXT_FORMAT).toString(), SID_ATTR_NUMBERFORMAT_INFO ); aCoreSet.Put( aFormatter ); // a tab dialog with a single page diff --git a/extensions/source/propctrlr/formlinkdialog.cxx b/extensions/source/propctrlr/formlinkdialog.cxx index f88455a5a543..0f9d6d59d35a 100644 --- a/extensions/source/propctrlr/formlinkdialog.cxx +++ b/extensions/source/propctrlr/formlinkdialog.cxx @@ -272,7 +272,7 @@ namespace pcr if ( m_sDetailLabel.isEmpty() ) { ::svt::OLocalResourceAccess aStringAccess( PcrRes( RID_DLG_FORMLINKS ), RSC_MODALDIALOG ); - m_sDetailLabel = String( PcrRes( STR_DETAIL_FORM ) ); + m_sDetailLabel = PcrRes(STR_DETAIL_FORM).toString(); } sDetailType = m_sDetailLabel; } @@ -285,7 +285,7 @@ namespace pcr if ( m_sMasterLabel.isEmpty() ) { ::svt::OLocalResourceAccess aStringAccess( PcrRes( RID_DLG_FORMLINKS ), RSC_MODALDIALOG ); - m_sMasterLabel = String( PcrRes( STR_MASTER_FORM ) ); + m_sMasterLabel = PcrRes(STR_MASTER_FORM).toString(); } sMasterType = m_sMasterLabel; } diff --git a/extensions/source/propctrlr/formmetadata.cxx b/extensions/source/propctrlr/formmetadata.cxx index f1cb08caff6e..ad2febdd64fb 100644 --- a/extensions/source/propctrlr/formmetadata.cxx +++ b/extensions/source/propctrlr/formmetadata.cxx @@ -80,7 +80,7 @@ namespace pcr //======================================================================== #define DEF_INFO( ident, uinameres, helpid, flags ) \ OPropertyInfoImpl( PROPERTY_##ident, PROPERTY_ID_##ident, \ - String( PcrRes( RID_STR_##uinameres ) ), HID_PROP_##helpid, flags ) + PcrRes( RID_STR_##uinameres ).toString(), HID_PROP_##helpid, flags ) #define DEF_INFO_1( ident, uinameres, helpid, flag1 ) \ DEF_INFO( ident, uinameres, helpid, PROP_FLAG_##flag1 ) @@ -517,7 +517,7 @@ namespace pcr PcrRes aLocalId( i ); while ( aEnumStrings.IsAvailableRes( aLocalId.SetRT( RSC_STRING ) ) ) { - aReturn.push_back( String( aLocalId ) ); + aReturn.push_back( aLocalId.toString() ); aLocalId = PcrRes( ++i ); } } diff --git a/extensions/source/propctrlr/inspectorhelpwindow.cxx b/extensions/source/propctrlr/inspectorhelpwindow.cxx index 1a47a5ce2e6d..dbff2de8a03f 100644 --- a/extensions/source/propctrlr/inspectorhelpwindow.cxx +++ b/extensions/source/propctrlr/inspectorhelpwindow.cxx @@ -36,7 +36,7 @@ namespace pcr { SetBackground(); SetPaintTransparent(sal_True); - m_aSeparator.SetText( String( PcrRes( RID_STR_HELP_SECTION_LABEL ) ) ); + m_aSeparator.SetText( PcrRes(RID_STR_HELP_SECTION_LABEL).toString() ); m_aSeparator.SetBackground(); m_aSeparator.Show(); diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx index 647a2e33e0c2..eeab02ce297a 100644 --- a/extensions/source/propctrlr/propcontroller.cxx +++ b/extensions/source/propctrlr/propcontroller.cxx @@ -1376,7 +1376,7 @@ namespace pcr { try { - OUString sPlcHolder = String( PcrRes( RID_EMBED_IMAGE_PLACEHOLDER ) ); + OUString sPlcHolder = PcrRes(RID_EMBED_IMAGE_PLACEHOLDER).toString(); bool bIsPlaceHolderValue = false; if ( rName.equals( PROPERTY_IMAGE_URL ) ) diff --git a/extensions/source/propctrlr/selectlabeldialog.cxx b/extensions/source/propctrlr/selectlabeldialog.cxx index 376be4d4be22..f4d3643b52d4 100644 --- a/extensions/source/propctrlr/selectlabeldialog.cxx +++ b/extensions/source/propctrlr/selectlabeldialog.cxx @@ -116,7 +116,7 @@ namespace pcr // insert the root Image aRootImage = m_aModelImages.GetImage(RID_SVXIMG_FORMS); - SvTreeListEntry* pRoot = m_aControlTree.InsertEntry(PcrRes(RID_STR_FORMS), aRootImage, aRootImage); + SvTreeListEntry* pRoot = m_aControlTree.InsertEntry(PcrRes(RID_STR_FORMS).toString(), aRootImage, aRootImage); // build the tree m_pInitialSelection = NULL; diff --git a/extensions/source/propctrlr/sqlcommanddesign.cxx b/extensions/source/propctrlr/sqlcommanddesign.cxx index d4d6bb7429c8..67522ddb29de 100644 --- a/extensions/source/propctrlr/sqlcommanddesign.cxx +++ b/extensions/source/propctrlr/sqlcommanddesign.cxx @@ -272,7 +272,7 @@ namespace pcr if ( xTitle.is() ) { ::svt::OLocalResourceAccess aEnumStrings( PcrRes( RID_RSC_ENUM_COMMAND_TYPE ), RSC_RESOURCE ); - OUString sDisplayName = String( PcrRes( CommandType::COMMAND + 1 ) ); + OUString sDisplayName = PcrRes(CommandType::COMMAND + 1).toString(); xTitle->setTitle( sDisplayName ); } } diff --git a/extensions/source/propctrlr/usercontrol.cxx b/extensions/source/propctrlr/usercontrol.cxx index 16a4e75bca40..d3a9f4ff2382 100644 --- a/extensions/source/propctrlr/usercontrol.cxx +++ b/extensions/source/propctrlr/usercontrol.cxx @@ -107,7 +107,7 @@ namespace pcr const bool bIsTextFormat = ( pEntry && pEntry->IsTextFormat() ); if ( bIsTextFormat ) - getTypedControlWindow()->SetText( String( PcrRes( RID_STR_TEXT_FORMAT ) ) ); + getTypedControlWindow()->SetText( PcrRes( RID_STR_TEXT_FORMAT ).toString() ); else getTypedControlWindow()->SetValue( pEntry ? getPreviewValue( *pEntry ) : 1234.56789 ); } @@ -269,7 +269,7 @@ namespace pcr :OFileUrlControl_Base( PropertyControlType::Unknown, pParent, nWinStyle | WB_DROPDOWN ) { getTypedControlWindow()->SetDropDownLineCount( 10 ); - getTypedControlWindow()->SetPlaceHolder( String( PcrRes( RID_EMBED_IMAGE_PLACEHOLDER ) ) ) ; + getTypedControlWindow()->SetPlaceHolder( PcrRes( RID_EMBED_IMAGE_PLACEHOLDER ).toString() ) ; } //------------------------------------------------------------------ diff --git a/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx b/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx index 3f97f953f293..d13a4ee7120f 100644 --- a/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx +++ b/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx @@ -534,7 +534,7 @@ namespace pcr } // confirmation message - String sConfirmation( PcrRes( RID_STR_CONFIRM_DELETE_DATA_TYPE ) ); + String sConfirmation( PcrRes( RID_STR_CONFIRM_DELETE_DATA_TYPE ).toString() ); sConfirmation.SearchAndReplaceAscii( "#type#", pType->getName() ); QueryBox aQuery( NULL, WB_YES_NO, sConfirmation ); // TODO/eForms: proper parent if ( aQuery.Execute() != RET_YES ) diff --git a/extensions/source/resource/ResourceIndexAccess.cxx b/extensions/source/resource/ResourceIndexAccess.cxx index 83e0933dab46..aff2218f832c 100644 --- a/extensions/source/resource/ResourceIndexAccess.cxx +++ b/extensions/source/resource/ResourceIndexAccess.cxx @@ -161,7 +161,7 @@ Any SAL_CALL ResourceStringIndexAccess::getByIndex(sal_Int32 nIdx) OUString("string resource for id not available"), Reference<XInterface>()); - return makeAny(OUString(String(aId))); + return makeAny(aId.toString()); } Any SAL_CALL ResourceStringListIndexAccess::getByIndex(sal_Int32 nIdx) diff --git a/extensions/source/scanner/grid.cxx b/extensions/source/scanner/grid.cxx index dc017f0c3628..7707dd1f19d7 100644 --- a/extensions/source/scanner/grid.cxx +++ b/extensions/source/scanner/grid.cxx @@ -56,16 +56,16 @@ GridWindow::GridWindow(double* pXValues, double* pYValues, int nValues, Window* m_aResetTypeBox( this, SaneResId( GRID_DIALOG_TYPE_BOX ) ), m_aResetButton( this, SaneResId( GRID_DIALOG_RESET_BTN ) ) { - sal_uInt16 nPos = m_aResetTypeBox.InsertEntry( String( SaneResId( RESET_TYPE_LINEAR_ASCENDING ) ) ); + sal_uInt16 nPos = m_aResetTypeBox.InsertEntry( SaneResId( RESET_TYPE_LINEAR_ASCENDING ).toString() ); m_aResetTypeBox.SetEntryData( nPos, (void *)RESET_TYPE_LINEAR_ASCENDING ); - nPos = m_aResetTypeBox.InsertEntry( String( SaneResId( RESET_TYPE_LINEAR_DESCENDING ) ) ); + nPos = m_aResetTypeBox.InsertEntry( SaneResId( RESET_TYPE_LINEAR_DESCENDING ).toString() ); m_aResetTypeBox.SetEntryData( nPos, (void *)RESET_TYPE_LINEAR_DESCENDING ); - nPos = m_aResetTypeBox.InsertEntry( String( SaneResId( RESET_TYPE_RESET ) ) ); + nPos = m_aResetTypeBox.InsertEntry( SaneResId( RESET_TYPE_RESET ).toString() ); m_aResetTypeBox.SetEntryData( nPos, (void *)RESET_TYPE_RESET ); - nPos = m_aResetTypeBox.InsertEntry( String( SaneResId( RESET_TYPE_EXPONENTIAL ) ) ); + nPos = m_aResetTypeBox.InsertEntry( SaneResId( RESET_TYPE_EXPONENTIAL ).toString() ); m_aResetTypeBox.SetEntryData( nPos, (void *)RESET_TYPE_EXPONENTIAL ); m_aResetTypeBox.SelectEntryPos( 0 ); diff --git a/extensions/source/scanner/sanedlg.cxx b/extensions/source/scanner/sanedlg.cxx index 42fd73a8f526..86f2a8fbb73c 100644 --- a/extensions/source/scanner/sanedlg.cxx +++ b/extensions/source/scanner/sanedlg.cxx @@ -132,7 +132,7 @@ short SaneDlg::Execute() if( ! Sane::IsSane() ) { ErrorBox aErrorBox( NULL, WB_OK | WB_DEF_OK, - String( SaneResId( RID_SANE_NOSANELIB_TXT ) ) ); + SaneResId(RID_SANE_NOSANELIB_TXT).toString() ); aErrorBox.Execute(); return sal_False; } @@ -411,7 +411,7 @@ IMPL_LINK( SaneDlg, ClickBtnHdl, Button*, pButton ) { if( pButton == &maDeviceInfoButton ) { - String aString( SaneResId( RID_SANE_DEVICEINFO_TXT ) ); + String aString(SaneResId(RID_SANE_DEVICEINFO_TXT).toString()); String aSR( RTL_CONSTASCII_USTRINGPARAM( "%s" ) ); aString.SearchAndReplace( aSR, Sane::GetName( mrSane.GetDeviceNumber() ) ); aString.SearchAndReplace( aSR, Sane::GetVendor( mrSane.GetDeviceNumber() ) ); @@ -711,7 +711,7 @@ void SaneDlg::AcquirePreview() int nOption = mrSane.GetOptionByName( "preview" ); if( nOption == -1 ) { - String aString( SaneResId( RID_SANE_NORESOLUTIONOPTION_TXT ) ); + OUString aString(SaneResId(RID_SANE_NORESOLUTIONOPTION_TXT).toString()); WarningBox aBox( this, WB_OK_CANCEL | WB_DEF_OK, aString ); if( aBox.Execute() == RET_CANCEL ) return; @@ -723,7 +723,7 @@ void SaneDlg::AcquirePreview() if( ! mrSane.Start( aTransporter ) ) { ErrorBox aErrorBox( this, WB_OK | WB_DEF_OK, - String( SaneResId( RID_SANE_SCANERROR_TXT ) ) ); + SaneResId( RID_SANE_SCANERROR_TXT).toString() ); aErrorBox.Execute(); } else diff --git a/filter/source/graphicfilter/eps/eps.cxx b/filter/source/graphicfilter/eps/eps.cxx index faea36f7218e..eb93e47e7df8 100644 --- a/filter/source/graphicfilter/eps/eps.cxx +++ b/filter/source/graphicfilter/eps/eps.cxx @@ -438,7 +438,7 @@ sal_Bool PSWriter::WritePS( const Graphic& rGraphic, SvStream& rTargetStream, Fi pResMgr = ResMgr::CreateResMgr( "eps", Application::GetSettings().GetUILanguageTag() ); if( pResMgr ) { - InfoBox aInfoBox( NULL, String( ResId( KEY_VERSION_CHECK, *pResMgr ) ) ); + InfoBox aInfoBox( NULL, ResId(KEY_VERSION_CHECK, *pResMgr).toString() ); aInfoBox.Execute(); delete pResMgr; } diff --git a/formula/source/core/api/FormulaCompiler.cxx b/formula/source/core/api/FormulaCompiler.cxx index afd6746411df..6556257c1e78 100644 --- a/formula/source/core/api/FormulaCompiler.cxx +++ b/formula/source/core/api/FormulaCompiler.cxx @@ -231,7 +231,7 @@ void OpCodeList::putDefaultOpCode( FormulaCompiler::NonConstOpCodeMapPtr xMap, s ResId aRes(nOp,*ResourceManager::getResManager()); aRes.SetRT(RSC_STRING); if (IsAvailableRes(aRes)) - xMap->putOpCode(aRes, OpCode(nOp)); + xMap->putOpCode(aRes.toString(), OpCode(nOp)); } // ----------------------------------------------------------------------------- // static diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx index f4c8d3a9ba87..21a789110574 100644 --- a/fpicker/source/office/iodlg.cxx +++ b/fpicker/source/office/iodlg.cxx @@ -789,7 +789,7 @@ IMPL_STATIC_LINK( SvtFileDialog, NewFolderHdl_Impl, PushButton*, EMPTYARG ) SmartContent aContent( pThis->_pFileView->GetViewURL( ) ); OUString aTitle; aContent.getTitle( aTitle ); - svtools::QueryFolderNameDialog aDlg( pThis, aTitle, String( SvtResId( STR_SVT_NEW_FOLDER ) ) ); + svtools::QueryFolderNameDialog aDlg( pThis, aTitle, SVT_RESSTR(STR_SVT_NEW_FOLDER) ); sal_Bool bHandled = sal_False; while ( !bHandled ) @@ -1176,7 +1176,7 @@ IMPL_STATIC_LINK( SvtFileDialog, OpenHdl_Impl, void*, pVoid ) { if ( ::utl::UCBContentHelper::Exists( aFileObj.GetMainURL( INetURLObject::NO_DECODE ) ) ) { - String aMsg = SvtResId( STR_SVT_ALREADYEXISTOVERWRITE ); + String aMsg = SVT_RESSTR( STR_SVT_ALREADYEXISTOVERWRITE ); aMsg.SearchAndReplace( String( RTL_CONSTASCII_USTRINGPARAM( "$filename$" ) ), aFileObj.getName(INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET) @@ -1216,7 +1216,7 @@ IMPL_STATIC_LINK( SvtFileDialog, OpenHdl_Impl, void*, pVoid ) if ( !bExists ) { - String sError( SvtResId( RID_FILEOPEN_NOTEXISTENTFILE ) ); + String sError( SVT_RESSTR( RID_FILEOPEN_NOTEXISTENTFILE ) ); String sInvalidFile( aFileObj.GetMainURL( INetURLObject::DECODE_TO_IURI ) ); if ( INET_PROT_FILE == aFileObj.GetProtocol() ) @@ -2064,7 +2064,7 @@ short SvtFileDialog::PrepareExecute() if ( bEmpty ) { - ErrorBox aBox( this, WB_OK, SvtResId( STR_SVT_NOREMOVABLEDEVICE ) ); + ErrorBox aBox( this, WB_OK, SVT_RESSTR( STR_SVT_NOREMOVABLEDEVICE ) ); aBox.Execute(); return 0; } @@ -2908,7 +2908,7 @@ void SvtFileDialog::AddControls_Impl( ) _pPrevBmp = new FixedBitmap( this, WinBits( WB_BORDER ) ); _pPrevBmp->SetBackground( Wallpaper( Color( COL_WHITE ) ) ); _pPrevBmp->Show(); - _pPrevBmp->SetAccessibleName(SvtResId(STR_PREVIEW)); + _pPrevBmp->SetAccessibleName(SVT_RESSTR(STR_PREVIEW)); } if ( _nExtraBits & SFX_EXTRA_AUTOEXTENSION ) diff --git a/fpicker/source/office/iodlgimp.cxx b/fpicker/source/office/iodlgimp.cxx index f2c4da7d8053..2d8a195434a8 100644 --- a/fpicker/source/office/iodlgimp.cxx +++ b/fpicker/source/office/iodlgimp.cxx @@ -196,7 +196,7 @@ void SvtUpButton_Impl::FillURLMenu( PopupMenu* _pMenu ) if ( nCount == 1 ) { // adjust the title of the top level entry (the workspace) - _pMenu->SetItemText( --nItemId, SvtSimpleResId( STR_SVT_MIMETYPE_CNT_FSYSBOX ) ); + _pMenu->SetItemText( --nItemId, SvtSimpleResId(STR_SVT_MIMETYPE_CNT_FSYSBOX).toString() ); } --nCount; } diff --git a/framework/source/accelerators/presethandler.cxx b/framework/source/accelerators/presethandler.cxx index 6c6539d1f6ae..c69b8336b69e 100644 --- a/framework/source/accelerators/presethandler.cxx +++ b/framework/source/accelerators/presethandler.cxx @@ -182,16 +182,16 @@ OUString lcl_getLocalizedMessage(::sal_Int32 nID) switch(nID) { case ID_CORRUPT_UICONFIG_SHARE : - sMessage = OUString( String( FwkResId( STR_CORRUPT_UICFG_SHARE ))); + sMessage = FWK_RESSTR(STR_CORRUPT_UICFG_SHARE); break; case ID_CORRUPT_UICONFIG_USER : - sMessage = OUString( String( FwkResId( STR_CORRUPT_UICFG_USER ))); + sMessage = FWK_RESSTR(STR_CORRUPT_UICFG_USER); break; case ID_CORRUPT_UICONFIG_GENERAL : - sMessage = OUString( String( FwkResId( STR_CORRUPT_UICFG_GENERAL ))); + sMessage = FWK_RESSTR(STR_CORRUPT_UICFG_GENERAL); break; } diff --git a/framework/source/classes/menumanager.cxx b/framework/source/classes/menumanager.cxx index 63b363633683..b1095a2fe181 100644 --- a/framework/source/classes/menumanager.cxx +++ b/framework/source/classes/menumanager.cxx @@ -159,7 +159,7 @@ MenuManager::MenuManager( pPopupMenu->InsertSeparator(); // Use resource to load popup menu title - String aAddonsStrRes = String( FwkResId( STR_MENU_ADDONS )); + OUString aAddonsStrRes(FWK_RESSTR(STR_MENU_ADDONS)); pPopupMenu->InsertItem( ITEMID_ADDONLIST, aAddonsStrRes ); pPopupMenu->SetPopupMenu( ITEMID_ADDONLIST, pSubMenu ); diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx b/framework/source/layoutmanager/toolbarlayoutmanager.cxx index 13dfb80c939d..cc4569a3c4f6 100644 --- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx +++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx @@ -970,9 +970,7 @@ void ToolbarLayoutManager::setDockingAreaOffsets( const ::Rectangle aOffsets ) OUString ToolbarLayoutManager::implts_generateGenericAddonToolbarTitle( sal_Int32 nNumber ) const { - String aAddonGenericTitle; - - aAddonGenericTitle = String( FwkResId( STR_TOOLBAR_TITLE_ADDON )); + String aAddonGenericTitle(FWK_RESSTR(STR_TOOLBAR_TITLE_ADDON)); const vcl::I18nHelper& rI18nHelper = Application::GetSettings().GetUILocaleI18nHelper(); String aNumStr = rI18nHelper.GetNum( nNumber, 0, sal_False, sal_False ); diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx index f9da2de0e469..51ba3e5ea542 100644 --- a/framework/source/services/desktop.cxx +++ b/framework/source/services/desktop.cxx @@ -117,7 +117,7 @@ DEFINE_INIT_SERVICE ( Desktop, m_xDispatchHelper = css::uno::Reference< css::frame::XDispatchProvider >( static_cast< ::cppu::OWeakObject* >(pInterceptionHelper), css::uno::UNO_QUERY ); OUStringBuffer sUntitledPrefix (256); - sUntitledPrefix.append (OUString( String( FwkResId( STR_UNTITLED_DOCUMENT )))); + sUntitledPrefix.append (FWK_RESSTR(STR_UNTITLED_DOCUMENT)); sUntitledPrefix.appendAscii (" "); ::comphelper::NumberedCollection* pNumbers = new ::comphelper::NumberedCollection (); diff --git a/framework/source/uielement/generictoolbarcontroller.cxx b/framework/source/uielement/generictoolbarcontroller.cxx index 386fda57385f..340fd28386f1 100644 --- a/framework/source/uielement/generictoolbarcontroller.cxx +++ b/framework/source/uielement/generictoolbarcontroller.cxx @@ -227,23 +227,20 @@ throw ( RuntimeException ) // Replacement for place holders if ( aStrValue.matchAsciiL( "($1)", 4 )) { - String aResStr = String( FwkResId( STR_UPDATEDOC )); - OUString aTmp( aResStr ); + OUString aTmp(FwkResId(STR_UPDATEDOC)); aTmp += OUString( " " ); aTmp += aStrValue.copy( 4 ); aStrValue = aTmp; } else if ( aStrValue.matchAsciiL( "($2)", 4 )) { - String aResStr = String( FwkResId( STR_CLOSEDOC_ANDRETURN )); - OUString aTmp( aResStr ); + OUString aTmp(FWK_RESSTR(STR_CLOSEDOC_ANDRETURN)); aTmp += aStrValue.copy( 4 ); aStrValue = aTmp; } else if ( aStrValue.matchAsciiL( "($3)", 4 )) { - String aResStr = String( FwkResId( STR_SAVECOPYDOC )); - OUString aTmp( aResStr ); + OUString aTmp(FWK_RESSTR(STR_SAVECOPYDOC)); aTmp += aStrValue.copy( 4 ); aStrValue = aTmp; } diff --git a/framework/source/uielement/langselectionstatusbarcontroller.cxx b/framework/source/uielement/langselectionstatusbarcontroller.cxx index c6073c98a37a..095cca7b095f 100644 --- a/framework/source/uielement/langselectionstatusbarcontroller.cxx +++ b/framework/source/uielement/langselectionstatusbarcontroller.cxx @@ -98,7 +98,7 @@ throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException if ( m_xStatusbarItem.is() ) { - m_xStatusbarItem->setText( String( FwkResId( STR_LANGSTATUS_MULTIPLE_LANGUAGES ) ) ); + m_xStatusbarItem->setText( FWK_RESSTR(STR_LANGSTATUS_MULTIPLE_LANGUAGES) ); } } @@ -147,11 +147,11 @@ throw (::com::sun::star::uno::RuntimeException) } } - xPopupMenu->insertItem( MID_LANG_SEL_NONE, String( FwkResId( STR_LANGSTATUS_NONE )), 0, MID_LANG_SEL_NONE ); + xPopupMenu->insertItem( MID_LANG_SEL_NONE, FWK_RESSTR(STR_LANGSTATUS_NONE), 0, MID_LANG_SEL_NONE ); if ( aLanguageTable.GetString( LANGUAGE_NONE ) == m_aCurLang ) xPopupMenu->checkItem( MID_LANG_SEL_NONE, sal_True ); - xPopupMenu->insertItem( MID_LANG_SEL_RESET, String( FwkResId( STR_RESET_TO_DEFAULT_LANGUAGE )), 0, MID_LANG_SEL_RESET ); - xPopupMenu->insertItem( MID_LANG_SEL_MORE, String( FwkResId( STR_LANGSTATUS_MORE )), 0, MID_LANG_SEL_MORE ); + xPopupMenu->insertItem( MID_LANG_SEL_RESET, FWK_RESSTR(STR_RESET_TO_DEFAULT_LANGUAGE), 0, MID_LANG_SEL_RESET ); + xPopupMenu->insertItem( MID_LANG_SEL_MORE, FWK_RESSTR(STR_LANGSTATUS_MORE), 0, MID_LANG_SEL_MORE ); // add entries to submenu ('set language for paragraph') nItemId = static_cast< sal_Int16 >(MID_LANG_PARA_1); @@ -169,13 +169,13 @@ throw (::com::sun::star::uno::RuntimeException) ++nItemId; } } - subPopupMenu->insertItem( MID_LANG_PARA_NONE, String( FwkResId( STR_LANGSTATUS_NONE )), 0, MID_LANG_PARA_NONE ); - subPopupMenu->insertItem( MID_LANG_PARA_RESET, String( FwkResId( STR_RESET_TO_DEFAULT_LANGUAGE )), 0, MID_LANG_PARA_RESET ); - subPopupMenu->insertItem( MID_LANG_PARA_MORE, String( FwkResId( STR_LANGSTATUS_MORE )), 0, MID_LANG_PARA_MORE ); + subPopupMenu->insertItem( MID_LANG_PARA_NONE, FWK_RESSTR(STR_LANGSTATUS_NONE), 0, MID_LANG_PARA_NONE ); + subPopupMenu->insertItem( MID_LANG_PARA_RESET, FWK_RESSTR(STR_RESET_TO_DEFAULT_LANGUAGE), 0, MID_LANG_PARA_RESET ); + subPopupMenu->insertItem( MID_LANG_PARA_MORE, FWK_RESSTR(STR_LANGSTATUS_MORE), 0, MID_LANG_PARA_MORE ); // add last two entries to main menu xPopupMenu->insertSeparator( MID_LANG_PARA_SEPARATOR ); - xPopupMenu->insertItem( MID_LANG_PARA_STRING, String( FwkResId( STR_SET_LANGUAGE_FOR_PARAGRAPH )), 0, MID_LANG_PARA_STRING ); + xPopupMenu->insertItem( MID_LANG_PARA_STRING, FWK_RESSTR(STR_SET_LANGUAGE_FOR_PARAGRAPH), 0, MID_LANG_PARA_STRING ); xPopupMenu->setPopupMenu( MID_LANG_PARA_STRING, subPopupMenu ); @@ -290,7 +290,7 @@ throw ( RuntimeException ) OUString aStatusText = aSeq[0]; if (aStatusText == "*") { - aStatusText = String( FwkResId( STR_LANGSTATUS_MULTIPLE_LANGUAGES ) ); + aStatusText = FWK_RESSTR(STR_LANGSTATUS_MULTIPLE_LANGUAGES); } m_xStatusbarItem->setText( aStatusText ); diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx index bec9d490414a..7f7f69a575fb 100644 --- a/framework/source/uielement/menubarmanager.cxx +++ b/framework/source/uielement/menubarmanager.cxx @@ -506,23 +506,20 @@ throw ( RuntimeException ) // Replacement for place holders if ( aItemText.matchAsciiL( "($1)", 4 )) { - String aResStr = String( FwkResId( STR_UPDATEDOC )); - OUString aTmp( aResStr ); + OUString aTmp(FWK_RESSTR(STR_UPDATEDOC)); aTmp += OUString( " " ); aTmp += aItemText.copy( 4 ); aItemText = aTmp; } else if ( aItemText.matchAsciiL( "($2)", 4 )) { - String aResStr = String( FwkResId( STR_CLOSEDOC_ANDRETURN )); - OUString aTmp( aResStr ); + OUString aTmp(FWK_RESSTR(STR_CLOSEDOC_ANDRETURN)); aTmp += aItemText.copy( 4 ); aItemText = aTmp; } else if ( aItemText.matchAsciiL( "($3)", 4 )) { - String aResStr = String( FwkResId( STR_SAVECOPYDOC )); - OUString aTmp( aResStr ); + OUString aTmp(FWK_RESSTR(STR_SAVECOPYDOC)); aTmp += aItemText.copy( 4 ); aItemText = aTmp; } @@ -1339,7 +1336,7 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF pPopup->InsertSeparator(); // Use resource to load popup menu title - String aAddonsStrRes = String( FwkResId( STR_MENU_ADDONS )); + OUString aAddonsStrRes(FWK_RESSTR(STR_MENU_ADDONS)); pPopup->InsertItem( ITEMID_ADDONLIST, aAddonsStrRes ); pPopup->SetPopupMenu( ITEMID_ADDONLIST, pSubMenu ); diff --git a/framework/source/uielement/recentfilesmenucontroller.cxx b/framework/source/uielement/recentfilesmenucontroller.cxx index 47f08687d9cd..7b01a110db80 100644 --- a/framework/source/uielement/recentfilesmenucontroller.cxx +++ b/framework/source/uielement/recentfilesmenucontroller.cxx @@ -176,16 +176,16 @@ void RecentFilesMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu > pVCLPopupMenu->InsertSeparator(); // Clear List menu entry pVCLPopupMenu->InsertItem( sal_uInt16( nCount + 1 ), - String( FwkResId( STR_CLEAR_RECENT_FILES ) ) ); + FWK_RESSTR(STR_CLEAR_RECENT_FILES) ); pVCLPopupMenu->SetItemCommand( sal_uInt16( nCount + 1 ), OUString( RTL_CONSTASCII_USTRINGPARAM( CMD_CLEAR_LIST ) ) ); pVCLPopupMenu->SetHelpText( sal_uInt16( nCount + 1 ), - String( FwkResId( STR_CLEAR_RECENT_FILES_HELP ) ) ); + FWK_RESSTR(STR_CLEAR_RECENT_FILES_HELP) ); } else { // No recent documents => insert "no document" string - pVCLPopupMenu->InsertItem( 1, String( FwkResId( STR_NODOCUMENT ) ) ); + pVCLPopupMenu->InsertItem( 1, FWK_RESSTR(STR_NODOCUMENT) ); // Do not disable it, otherwise the Toolbar controller and MenuButton // will display SV_RESID_STRING_NOSELECTIONPOSSIBLE instead of STR_NODOCUMENT pVCLPopupMenu->SetItemBits( 1, pVCLPopupMenu->GetItemBits( 1 ) | MIB_NOSELECT ); diff --git a/include/tools/StringListResource.hxx b/include/tools/StringListResource.hxx index 52f22e48a8ef..dd61dadf02bc 100644 --- a/include/tools/StringListResource.hxx +++ b/include/tools/StringListResource.hxx @@ -34,8 +34,7 @@ namespace tools sal_uInt16 i = 1; while( IsAvailableRes(ResId(i,*m_pResMgr).SetRT(RSC_STRING)) ) { - String sStr = String(ResId(i,*m_pResMgr)); - _rToFill.push_back(sStr); + _rToFill.push_back(ResId(i,*m_pResMgr).toString()); ++i; } } diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx index 2db2c8bbfb97..ba600604fab7 100644 --- a/sfx2/source/doc/templatedlg.cxx +++ b/sfx2/source/doc/templatedlg.cxx @@ -936,7 +936,7 @@ void SfxTemplateManagerDlg::OnTemplateImport () sfx2::FileDialogHelper aFileDlg(nDialogType, SFXWB_MULTISELECTION); // add "All" filter - aFileDlg.AddFilter( String(SfxResId( STR_SFX_FILTERNAME_ALL) ), + aFileDlg.AddFilter( SfxResId(STR_SFX_FILTERNAME_ALL).toString(), OUString(FILEDIALOG_FILTER_ALL) ); // add template filter diff --git a/sfx2/source/sidebar/DeckTitleBar.cxx b/sfx2/source/sidebar/DeckTitleBar.cxx index fc4c50b0c163..7c8c3f93432e 100644 --- a/sfx2/source/sidebar/DeckTitleBar.cxx +++ b/sfx2/source/sidebar/DeckTitleBar.cxx @@ -77,7 +77,7 @@ void DeckTitleBar::SetCloserVisible (const bool bIsCloserVisible) Theme::GetImage(Theme::Image_Closer)); maToolBox.SetQuickHelpText( mnCloserItemIndex, - String(SfxResId(SFX_STR_SIDEBAR_CLOSE_DECK))); + SFX2_RESSTR(SFX_STR_SIDEBAR_CLOSE_DECK)); } else maToolBox.RemoveItem( diff --git a/sfx2/source/sidebar/PanelTitleBar.cxx b/sfx2/source/sidebar/PanelTitleBar.cxx index 3f3712d73e20..33fe8cfa4bfa 100644 --- a/sfx2/source/sidebar/PanelTitleBar.cxx +++ b/sfx2/source/sidebar/PanelTitleBar.cxx @@ -51,7 +51,7 @@ PanelTitleBar::PanelTitleBar ( mnMenuItemIndex(1), mxFrame(), msMoreOptionsCommand(), - msAccessibleNamePrefix(String(SfxResId(SFX_STR_SIDEBAR_ACCESSIBILITY_PANEL_PREFIX))) + msAccessibleNamePrefix(SFX2_RESSTR(SFX_STR_SIDEBAR_ACCESSIBILITY_PANEL_PREFIX)) { OSL_ASSERT(mpPanel != NULL); @@ -99,7 +99,7 @@ void PanelTitleBar::SetMoreOptionsCommand ( maToolBox.SetOutStyle(TOOLBOX_STYLE_FLAT); maToolBox.SetQuickHelpText( mnMenuItemIndex, - String(SfxResId(SFX_STR_SIDEBAR_MORE_OPTIONS))); + SFX2_RESSTR(SFX_STR_SIDEBAR_MORE_OPTIONS)); } } } diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx index d0e4d01501a0..a3337ea6818a 100644 --- a/sfx2/source/sidebar/SidebarController.cxx +++ b/sfx2/source/sidebar/SidebarController.cxx @@ -874,14 +874,14 @@ void SidebarController::ShowDetailMenu (const ::rtl::OUString& rsMenuCommand) co // Add entry for docking or un-docking the tool panel. if (mpParentWindow->IsFloatingMode()) - pMenu->InsertItem(MID_LOCK_TASK_PANEL, String(SfxResId(STR_SFX_DOCK))); + pMenu->InsertItem(MID_LOCK_TASK_PANEL, SFX2_RESSTR(STR_SFX_DOCK)); else - pMenu->InsertItem(MID_UNLOCK_TASK_PANEL, String(SfxResId(STR_SFX_UNDOCK))); + pMenu->InsertItem(MID_UNLOCK_TASK_PANEL, SFX2_RESSTR(STR_SFX_UNDOCK)); pCustomizationMenu->InsertSeparator(); - pCustomizationMenu->InsertItem(MID_RESTORE_DEFAULT, String(SfxResId(STRING_RESTORE))); + pCustomizationMenu->InsertItem(MID_RESTORE_DEFAULT, SFX2_RESSTR(STRING_RESTORE)); - pMenu->InsertItem(MID_CUSTOMIZATION, String(SfxResId(STRING_CUSTOMIZATION))); + pMenu->InsertItem(MID_CUSTOMIZATION, SFX2_RESSTR(STRING_CUSTOMIZATION)); pMenu->SetPopupMenu(MID_CUSTOMIZATION, pCustomizationMenu); pMenu->RemoveDisabledEntries(sal_False, sal_False); diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx index d932210f3a96..15f83ee6c6f3 100644 --- a/svx/source/dialog/_bmpmask.cxx +++ b/svx/source/dialog/_bmpmask.cxx @@ -575,7 +575,7 @@ void SvxBmpMask::SetColorList( const XColorListRef &pList ) { if ( pList.is() && ( pList != pColLst ) ) { - const String aTransp( BMP_RESID( RID_SVXDLG_BMPMASK_STR_TRANSP ) ); + const String aTransp(BMP_RESID(RID_SVXDLG_BMPMASK_STR_TRANSP).toString()); pColLst = pList; @@ -1210,7 +1210,7 @@ void SvxBmpMask::ApplyStyle() */ void SvxBmpMask::SetAccessibleNames (void) { - String sSourceColor (BMP_RESID( RID_SVXDLG_BMPMASK_STR_SOURCECOLOR)); + String sSourceColor(BMP_RESID(RID_SVXDLG_BMPMASK_STR_SOURCECOLOR).toString()); String sSourceColorN; sSourceColorN = sSourceColor; diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx index 1b961bee0135..d594ee026770 100644 --- a/svx/source/dialog/_contdlg.cxx +++ b/svx/source/dialog/_contdlg.cxx @@ -304,7 +304,7 @@ sal_Bool SvxSuperContourDlg::Close() if ( aTbx1.IsItemEnabled( TBI_APPLY ) ) { QueryBox aQBox( this, WB_YES_NO_CANCEL | WB_DEF_YES, - String( CONT_RESID( STR_CONTOURDLG_MODIFY ) ) ); + CONT_RESID(STR_CONTOURDLG_MODIFY).toString() ); const long nRet = aQBox.Execute(); if ( nRet == RET_YES ) @@ -439,7 +439,7 @@ IMPL_LINK( SvxSuperContourDlg, Tbx1ClickHdl, ToolBox*, pTbx ) { if ( aTbx1.IsItemChecked( TBI_WORKPLACE ) ) { - QueryBox aQBox( this, WB_YES_NO | WB_DEF_NO, String( CONT_RESID( STR_CONTOURDLG_WORKPLACE ) ) ); + QueryBox aQBox( this, WB_YES_NO | WB_DEF_NO, CONT_RESID(STR_CONTOURDLG_WORKPLACE).toString() ); if ( !aContourWnd.IsContourChanged() || ( aQBox.Execute() == RET_YES ) ) aContourWnd.SetWorkplaceMode( sal_True ); @@ -535,7 +535,7 @@ IMPL_LINK( SvxSuperContourDlg, Tbx1ClickHdl, ToolBox*, pTbx ) aStbStatus.Invalidate(); else if ( bGraphicLinked ) { - QueryBox aQBox( this, WB_YES_NO | WB_DEF_YES, String( CONT_RESID( STR_CONTOURDLG_LINKED ) ) ); + QueryBox aQBox( this, WB_YES_NO | WB_DEF_YES, CONT_RESID(STR_CONTOURDLG_LINKED).toString() ); if ( aQBox.Execute() != RET_YES ) { @@ -733,7 +733,7 @@ IMPL_LINK( SvxSuperContourDlg, PipetteClickHdl, ContourWindow*, pWnd ) if( !!aMask ) { - QueryBox aQBox( this, WB_YES_NO | WB_DEF_YES, String( CONT_RESID( STR_CONTOURDLG_NEWPIPETTE ) ) ); + QueryBox aQBox( this, WB_YES_NO | WB_DEF_YES, CONT_RESID(STR_CONTOURDLG_NEWPIPETTE).toString() ); sal_Bool bNewContour; aRedoGraphic = Graphic(); diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx index 907d9f80b083..c68b3928bcf2 100644 --- a/svx/source/dialog/charmap.cxx +++ b/svx/source/dialog/charmap.cxx @@ -775,7 +775,7 @@ const Subset* SubsetMap::GetSubsetByUnicode( sal_UCS4 cChar ) const } inline Subset::Subset( sal_UCS4 nMin, sal_UCS4 nMax, int resId) -: mnRangeMin(nMin), mnRangeMax(nMax), maRangeName( SVX_RES(resId) ) +: mnRangeMin(nMin), mnRangeMax(nMax), maRangeName( SVX_RESSTR(resId) ) {} void SubsetMap::InitList() diff --git a/svx/source/dialog/dlgctl3d.cxx b/svx/source/dialog/dlgctl3d.cxx index 3d0a0c56015e..d8429e737e13 100644 --- a/svx/source/dialog/dlgctl3d.cxx +++ b/svx/source/dialog/dlgctl3d.cxx @@ -966,7 +966,7 @@ void SvxLightCtl3D::Init() maHorScroller.SetHelpId(HID_CTRL3D_HSCROLL); maVerScroller.SetHelpId(HID_CTRL3D_VSCROLL); maSwitcher.SetHelpId(HID_CTRL3D_SWITCHER); - maSwitcher.SetAccessibleName(String(SVX_RES(STR_SWITCH))); + maSwitcher.SetAccessibleName(SVX_RESSTR(STR_SWITCH)); // Light preview maLightControl.Show(); diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx index 00c0b5081778..1b0b1268995f 100644 --- a/svx/source/dialog/dlgctrl.cxx +++ b/svx/source/dialog/dlgctrl.cxx @@ -1406,11 +1406,11 @@ void FillTypeLB::Fill() { SetUpdateMode( sal_False ); - InsertEntry( String( SVX_RES( RID_SVXSTR_INVISIBLE ) ) ); - InsertEntry( String( SVX_RES( RID_SVXSTR_COLOR ) ) ); - InsertEntry( String( SVX_RES( RID_SVXSTR_GRADIENT ) ) ); - InsertEntry( String( SVX_RES( RID_SVXSTR_HATCH ) ) ); - InsertEntry( String( SVX_RES( RID_SVXSTR_BITMAP ) ) ); + InsertEntry( SVX_RESSTR(RID_SVXSTR_INVISIBLE) ); + InsertEntry( SVX_RESSTR(RID_SVXSTR_COLOR) ); + InsertEntry( SVX_RESSTR(RID_SVXSTR_GRADIENT) ); + InsertEntry( SVX_RESSTR(RID_SVXSTR_HATCH) ); + InsertEntry( SVX_RESSTR(RID_SVXSTR_BITMAP) ); AdaptDropDownLineCountToMaximum(); SetUpdateMode( sal_True ); diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx index 316a2b0a3240..9d59e82b0b62 100644 --- a/svx/source/dialog/docrecovery.cxx +++ b/svx/source/dialog/docrecovery.cxx @@ -951,11 +951,11 @@ RecoveryDialog::RecoveryDialog(Window* pParent, , m_aBottomFL ( this , SVX_RES ( FL_RECOV_BOTTOM ) ) , m_aNextBtn ( this , SVX_RES ( BTN_RECOV_NEXT ) ) , m_aCancelBtn ( this , SVX_RES ( BTN_RECOV_CANCEL ) ) - , m_aNextStr ( SVX_RES ( STR_RECOVERY_NEXT ) ) - , m_aTitleRecoveryInProgress( SVX_RES ( STR_RECOVERY_INPROGRESS ) ) - , m_aTitleRecoveryReport( SVX_RES ( STR_RECOVERY_REPORT ) ) - , m_aRecoveryOnlyFinish ( SVX_RES ( STR_RECOVERYONLY_FINISH ) ) - , m_aRecoveryOnlyFinishDescr( SVX_RES ( STR_RECOVERYONLY_FINISH_DESCR ) ) + , m_aNextStr (SVX_RESSTR(STR_RECOVERY_NEXT)) + , m_aTitleRecoveryInProgress(SVX_RESSTR(STR_RECOVERY_INPROGRESS)) + , m_aTitleRecoveryReport(SVX_RESSTR(STR_RECOVERY_REPORT)) + , m_aRecoveryOnlyFinish (SVX_RESSTR(STR_RECOVERYONLY_FINISH)) + , m_aRecoveryOnlyFinishDescr(SVX_RESSTR(STR_RECOVERYONLY_FINISH_DESCR)) , m_pDefButton ( NULL ) , m_pCore ( pCore ) , m_eRecoveryState (RecoveryDialog::E_RECOVERY_PREPARED) @@ -967,7 +967,7 @@ RecoveryDialog::RecoveryDialog(Window* pParent, { static long nTabs[] = { 2, 0, 40*RECOV_CONTROLWIDTH/100 }; m_aFileListLB.SetTabs( &nTabs[0] ); - m_aFileListLB.InsertHeaderEntry( String( SVX_RES( STR_HEADERBAR ) ) ); + m_aFileListLB.InsertHeaderEntry(SVX_RESSTR(STR_HEADERBAR)); FreeResource(); diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx index 6273a71debfe..762acd83e45b 100644 --- a/svx/source/dialog/imapdlg.cxx +++ b/svx/source/dialog/imapdlg.cxx @@ -226,7 +226,7 @@ sal_Bool SvxIMapDlg::Close() if ( aTbxIMapDlg1.IsItemEnabled( TBI_APPLY ) ) { QueryBox aQBox( this, WB_YES_NO_CANCEL | WB_DEF_YES, - String( SVX_RES( STR_IMAPDLG_MODIFY ) ) ); + SVX_RESSTR( STR_IMAPDLG_MODIFY ) ); const long nRet = aQBox.Execute(); if( nRet == RET_YES ) @@ -241,7 +241,7 @@ sal_Bool SvxIMapDlg::Close() else if( pIMapWnd->IsChanged() ) { QueryBox aQBox( this, WB_YES_NO_CANCEL | WB_DEF_YES, - String( SVX_RES( STR_IMAPDLG_SAVE ) ) ); + SVX_RESSTR( STR_IMAPDLG_SAVE ) ); const long nRet = aQBox.Execute(); if( nRet == RET_YES ) @@ -730,7 +730,7 @@ IMPL_LINK_NOARG(SvxIMapDlg, UpdateHdl) { if ( pIMapWnd->IsChanged() && ( QueryBox( this, WB_YES_NO | WB_DEF_YES, - String( SVX_RES( STR_IMAPDLG_SAVE ) ) ).Execute() == RET_YES ) ) + SVX_RESSTR( STR_IMAPDLG_SAVE ) ).Execute() == RET_YES ) ) { DoSave(); } diff --git a/svx/source/dialog/passwd.cxx b/svx/source/dialog/passwd.cxx index 541926fe6e40..349cffa40f77 100644 --- a/svx/source/dialog/passwd.cxx +++ b/svx/source/dialog/passwd.cxx @@ -88,8 +88,8 @@ SvxPasswordDialog::SvxPasswordDialog( Window* pParent, sal_Bool bAllowEmptyPassw aOKBtn ( this, SVX_RES( BTN_PASSWD_OK ) ), aEscBtn ( this, SVX_RES( BTN_PASSWD_ESC ) ), aHelpBtn ( this, SVX_RES( BTN_PASSWD_HELP ) ), - aOldPasswdErrStr ( SVX_RES( STR_ERR_OLD_PASSWD ) ), - aRepeatPasswdErrStr ( SVX_RES( STR_ERR_REPEAT_PASSWD ) ), + aOldPasswdErrStr ( SVX_RESSTR( STR_ERR_OLD_PASSWD ) ), + aRepeatPasswdErrStr ( SVX_RESSTR( STR_ERR_REPEAT_PASSWD ) ), bEmpty ( bAllowEmptyPasswords ) { FreeResource(); diff --git a/svx/source/dialog/pfiledlg.cxx b/svx/source/dialog/pfiledlg.cxx index 8782fcb343db..c8b2d39f6461 100644 --- a/svx/source/dialog/pfiledlg.cxx +++ b/svx/source/dialog/pfiledlg.cxx @@ -167,7 +167,7 @@ SvxPluginFileDlg::SvxPluginFileDlg (Window *, sal_uInt16 nKind ) } // add the All-Filter - String aAllFilter( ResId( STR_EXTFILTER_ALL, DIALOG_MGR() ) ); + String aAllFilter( ResId( STR_EXTFILTER_ALL, DIALOG_MGR() ).toString() ); maFileDlg.AddFilter(aAllFilter, OUString("*.*")); // and activate him diff --git a/svx/source/dialog/prtqry.cxx b/svx/source/dialog/prtqry.cxx index 94b684dd8760..c405fbf8ea51 100644 --- a/svx/source/dialog/prtqry.cxx +++ b/svx/source/dialog/prtqry.cxx @@ -25,15 +25,15 @@ SvxPrtQryBox::SvxPrtQryBox(Window* pParent) : MessBox(pParent, 0, - String(SVX_RES(RID_SVXSTR_QRY_PRINT_TITLE)), - String(SVX_RES(RID_SVXSTR_QRY_PRINT_MSG))) + SVX_RESSTR(RID_SVXSTR_QRY_PRINT_TITLE), + SVX_RESSTR(RID_SVXSTR_QRY_PRINT_MSG)) { SetImage( QueryBox::GetStandardImage() ); - AddButton(String(SVX_RES(RID_SVXSTR_QRY_PRINT_SELECTION)), RET_OK, + AddButton(SVX_RESSTR(RID_SVXSTR_QRY_PRINT_SELECTION), RET_OK, BUTTONDIALOG_DEFBUTTON | BUTTONDIALOG_OKBUTTON | BUTTONDIALOG_FOCUSBUTTON); - AddButton(String(SVX_RES(RID_SVXSTR_QRY_PRINT_ALL)), 2, 0); + AddButton(SVX_RESSTR(RID_SVXSTR_QRY_PRINT_ALL), 2, 0); AddButton(BUTTON_CANCEL, RET_CANCEL, BUTTONDIALOG_CANCELBUTTON); SetButtonHelpText( RET_OK, OUString() ); } diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx index 1c9021eba109..bc78b82579a1 100644 --- a/svx/source/dialog/svxruler.cxx +++ b/svx/source/dialog/svxruler.cxx @@ -3335,7 +3335,7 @@ void SvxRuler::Command( const CommandEvent& rCEvt ) nStyle |= (sal_uInt16)(bHorz ? WB_HORZ : WB_VERT); DrawTab(&aDev, aFillColor, aPt, nStyle); aMenu.InsertItem(i+1, - String(ResId(RID_SVXSTR_RULER_START+i, DIALOG_MGR())), + ResId(RID_SVXSTR_RULER_START+i, DIALOG_MGR()).toString(), Image(aDev.GetBitmap(Point(), aSz), Color(COL_WHITE))); aMenu.CheckItem(i+1, i == pTabs[pRuler_Imp->nIdx+TAB_GAP].nStyle); aDev.SetOutputSize(aSz); // delete device diff --git a/svx/source/dialog/swframeposstrings.cxx b/svx/source/dialog/swframeposstrings.cxx index edf7ca0b8f6b..ad4f1ecd3e28 100644 --- a/svx/source/dialog/swframeposstrings.cxx +++ b/svx/source/dialog/swframeposstrings.cxx @@ -36,7 +36,7 @@ SvxSwFramePosString_Impl::SvxSwFramePosString_Impl() : for(sal_uInt16 i = 0; i < SvxSwFramePosString::STR_MAX; i++) { //string ids have to start at 1 - aStrings[i] = String(SVX_RES(i + 1)); + aStrings[i] = SVX_RESSTR(i + 1); } FreeResource(); } diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx index e07010238dd0..5463145efc42 100644 --- a/svx/source/engine3d/float3d.cxx +++ b/svx/source/engine3d/float3d.cxx @@ -228,7 +228,7 @@ Svx3DWin::Svx3DWin( SfxBindings* pInBindings, mpRemember2DAttributes(NULL), bOnly3DChanged ( sal_False ) { - String accname(SVX_RES(RID_SVXFLOAT3D_COLOR_LIGHT_PRE)); + OUString accname(SVX_RESSTR(RID_SVXFLOAT3D_COLOR_LIGHT_PRE)); aCtlLightPreview.SetAccessibleName(accname); aCtlPreview.SetAccessibleName(accname); aLbAmbientlight.SetAccessibleName(aFTAmbientlight.GetDisplayText()); @@ -3053,14 +3053,14 @@ sal_Bool Svx3DWin::LBSelectColor( ColorLB* pLb, const Color& rColor ) pLb->SelectEntry( rColor ); if( pLb->GetSelectEntryCount() == 0 ) { - String aStr(SVX_RES(RID_SVXFLOAT3D_FIX_R)); + String aStr(SVX_RESSTR(RID_SVXFLOAT3D_FIX_R)); aStr += OUString::number((sal_Int32)rColor.GetRed()); aStr += sal_Unicode(' '); - aStr += String(SVX_RES(RID_SVXFLOAT3D_FIX_G)); + aStr += SVX_RESSTR(RID_SVXFLOAT3D_FIX_G); aStr += OUString::number((sal_Int32)rColor.GetGreen()); aStr += sal_Unicode(' '); - aStr += String(SVX_RES(RID_SVXFLOAT3D_FIX_B)); + aStr += SVX_RESSTR(RID_SVXFLOAT3D_FIX_B); aStr += OUString::number((sal_Int32)rColor.GetBlue()); sal_uInt16 nPos = pLb->InsertEntry( rColor, aStr ); diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx index 9cc3518ea5d1..87aed036208f 100644 --- a/svx/source/fmcomp/fmgridcl.cxx +++ b/svx/source/fmcomp/fmgridcl.cxx @@ -536,10 +536,10 @@ IMPL_LINK( FmGridHeader, OnAsyncExecuteDrop, void*, /*NOTINTERESTEDIN*/ ) if (bDateNTimeCol) { - String sTimePostfix( SVX_RES( RID_STR_POSTFIX_TIME ) ); + OUString sTimePostfix(SVX_RESSTR(RID_STR_POSTFIX_TIME)); xCol->setPropertyValue(FM_PROP_LABEL, makeAny( OUString( sFieldName + sTimePostfix ) ) ); - String sDatePostfix( SVX_RES( RID_STR_POSTFIX_DATE ) ); + OUString sDatePostfix(SVX_RESSTR( RID_STR_POSTFIX_DATE)); xSecondCol->setPropertyValue(FM_PROP_LABEL, makeAny( OUString( sFieldName + sDatePostfix ) ) ); } else @@ -557,9 +557,9 @@ IMPL_LINK( FmGridHeader, OnAsyncExecuteDrop, void*, /*NOTINTERESTEDIN*/ ) { String sRealName,sPurePostfix; - String aPostfix[] = { - String( SVX_RES( RID_STR_POSTFIX_DATE ) ), - String( SVX_RES( RID_STR_POSTFIX_TIME ) ) + OUString aPostfix[] = { + SVX_RESSTR(RID_STR_POSTFIX_DATE), + SVX_RESSTR(RID_STR_POSTFIX_TIME) }; for ( size_t i=0; i<2; ++i ) diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx index 1e623b075f84..f713df60eded 100644 --- a/svx/source/fmcomp/gridctrl.cxx +++ b/svx/source/fmcomp/gridctrl.cxx @@ -395,8 +395,8 @@ DbGridControl::NavigationBar::NavigationBar(Window* pParent, WinBits nStyle) m_aLastBtn.SetClickHdl(LINK(this,NavigationBar,OnClick)); m_aNewBtn.SetClickHdl(LINK(this,NavigationBar,OnClick)); - m_aRecordText.SetText(XubString(SVX_RES(RID_STR_REC_TEXT))); - m_aRecordOf.SetText(XubString(SVX_RES(RID_STR_REC_FROM_TEXT))); + m_aRecordText.SetText(SVX_RESSTR(RID_STR_REC_TEXT)); + m_aRecordOf.SetText(SVX_RESSTR(RID_STR_REC_FROM_TEXT)); m_aRecordCount.SetText(OUString('?')); m_nDefaultWidth = ArrangeControls(); @@ -944,7 +944,7 @@ DbGridControl::DbGridControl( { DBG_CTOR(DbGridControl,NULL); - String sName(SVX_RES(RID_STR_NAVIGATIONBAR)); + OUString sName(SVX_RESSTR(RID_STR_NAVIGATIONBAR)); m_aBar.SetAccessibleName(sName); m_aBar.Show(); ImplInitWindow( InitAll ); diff --git a/svx/source/form/databaselocationinput.cxx b/svx/source/form/databaselocationinput.cxx index 351084169a8b..cf72741fc8e1 100644 --- a/svx/source/form/databaselocationinput.cxx +++ b/svx/source/form/databaselocationinput.cxx @@ -131,7 +131,7 @@ namespace svx { if ( ::utl::UCBContentHelper::Exists( sURL ) ) { - QueryBox aBox( m_rLocationInput.GetSystemWindow(), WB_YES_NO, SVX_RES( RID_STR_ALREADYEXISTOVERWRITE ) ); + QueryBox aBox( m_rLocationInput.GetSystemWindow(), WB_YES_NO, SVX_RESSTR(RID_STR_ALREADYEXISTOVERWRITE) ); if ( aBox.Execute() != RET_YES ) return false; } diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx index eb3d7d0636fb..ecbece7a3cf3 100644 --- a/svx/source/form/datanavi.cxx +++ b/svx/source/form/datanavi.cxx @@ -841,9 +841,9 @@ namespace svxform { // now, we can access the local resources from the dialog's // resource context - m_sDoc_UI = String( ResId( STR_REPLACE_DOC, *pMgr ) ); - m_sInstance_UI = String( ResId( STR_REPLACE_INST, *pMgr ) ); - m_sNone_UI = String( ResId( STR_REPLACE_NONE, *pMgr ) ); + m_sDoc_UI = ResId( STR_REPLACE_DOC, *pMgr ).toString(); + m_sInstance_UI = ResId( STR_REPLACE_INST, *pMgr ).toString(); + m_sNone_UI = ResId( STR_REPLACE_NONE, *pMgr ).toString(); } public: @@ -912,9 +912,9 @@ namespace svxform // load UI resources from resource file virtual void _initResources(ResMgr* pMgr) { - m_sPost_UI = String( ResId( STR_METHOD_POST, *pMgr ) ); - m_sPut_UI = String( ResId( STR_METHOD_PUT, *pMgr ) ); - m_sGet_UI = String( ResId( STR_METHOD_GET, *pMgr ) ); + m_sPost_UI = ResId( STR_METHOD_POST, *pMgr ).toString(); + m_sPut_UI = ResId( STR_METHOD_PUT, *pMgr ).toString(); + m_sGet_UI = ResId( STR_METHOD_GET, *pMgr ).toString(); } public: @@ -2500,10 +2500,10 @@ namespace svxform m_xUIHelper ( _rUIHelper ), m_pItemNode ( _pNode ), m_eItemType ( DITNone ), - m_sFL_Element ( SVX_RES( STR_FIXEDLINE_ELEMENT ) ), - m_sFL_Attribute ( SVX_RES( STR_FIXEDLINE_ATTRIBUTE ) ), - m_sFL_Binding ( SVX_RES( STR_FIXEDLINE_BINDING ) ), - m_sFT_BindingExp( SVX_RES( STR_FIXEDTEXT_BINDING ) ) + m_sFL_Element ( SVX_RESSTR( STR_FIXEDLINE_ELEMENT ) ), + m_sFL_Attribute ( SVX_RESSTR( STR_FIXEDLINE_ATTRIBUTE ) ), + m_sFL_Binding ( SVX_RESSTR( STR_FIXEDLINE_BINDING ) ), + m_sFT_BindingExp( SVX_RESSTR( STR_FIXEDTEXT_BINDING ) ) { FreeResource(); @@ -3148,9 +3148,9 @@ namespace svxform { static long aStaticTabs[]= { 3, 0, 35, 200 }; m_aNamespacesList.SvSimpleTable::SetTabs( aStaticTabs ); - String sHeader = String( SVX_RES( STR_HEADER_PREFIX ) ); + String sHeader = SVX_RESSTR( STR_HEADER_PREFIX ); sHeader += '\t'; - sHeader += String( SVX_RES( STR_HEADER_URL ) ); + sHeader += SVX_RESSTR(STR_HEADER_URL); m_aNamespacesList.InsertHeaderEntry( sHeader, HEADERBAR_APPEND, HIB_LEFT /*| HIB_FIXEDPOS | HIB_FIXED*/ ); @@ -3318,7 +3318,7 @@ namespace svxform { if ( _bIsEdit ) - SetText( String( SVX_RES( STR_EDIT_TEXT ) ) ); + SetText(SVX_RESSTR(STR_EDIT_TEXT)); FreeResource(); @@ -3484,9 +3484,9 @@ namespace svxform void AddSubmissionDialog::FillAllBoxes() { // method box - m_aMethodLB.InsertEntry( String( SVX_RES( STR_METHOD_POST ) ) ); - m_aMethodLB.InsertEntry( String( SVX_RES( STR_METHOD_PUT ) ) ); - m_aMethodLB.InsertEntry( String( SVX_RES( STR_METHOD_GET ) ) ); + m_aMethodLB.InsertEntry( SVX_RESSTR( STR_METHOD_POST ) ); + m_aMethodLB.InsertEntry( SVX_RESSTR( STR_METHOD_PUT ) ); + m_aMethodLB.InsertEntry( SVX_RESSTR( STR_METHOD_GET ) ); m_aMethodLB.SelectEntryPos(0); // binding box @@ -3543,9 +3543,9 @@ namespace svxform } // replace box - m_aReplaceLB.InsertEntry( String( SVX_RES( STR_REPLACE_NONE ) ) ); - m_aReplaceLB.InsertEntry( String( SVX_RES( STR_REPLACE_INST ) ) ); - m_aReplaceLB.InsertEntry( String( SVX_RES( STR_REPLACE_DOC ) ) ); + m_aReplaceLB.InsertEntry( SVX_RESSTR( STR_REPLACE_NONE ) ); + m_aReplaceLB.InsertEntry( SVX_RESSTR( STR_REPLACE_INST ) ); + m_aReplaceLB.InsertEntry( SVX_RESSTR( STR_REPLACE_DOC ) ); // init the controls with the values of the submission @@ -3612,7 +3612,7 @@ namespace svxform { if ( _bEdit ) - SetText( String( SVX_RES( STR_EDIT_TEXT ) ) ); + SetText(SVX_RESSTR(STR_EDIT_TEXT)); FreeResource(); } @@ -3643,7 +3643,7 @@ namespace svxform { if ( _bEdit ) - SetText( String( SVX_RES( STR_EDIT_TEXT ) ) ); + SetText(SVX_RESSTR(STR_EDIT_TEXT)); FreeResource(); @@ -3651,7 +3651,7 @@ namespace svxform m_aFilePickerBtn.SetClickHdl( LINK( this, AddInstanceDialog, FilePickerHdl ) ); // load the filter name from fps_office resource - m_sAllFilterName = String( ResId( STR_FILTERNAME_ALL, *ResMgr::CreateResMgr("fps_office") ) ); + m_sAllFilterName = ResId(STR_FILTERNAME_ALL, *ResMgr::CreateResMgr("fps_office")).toString(); } AddInstanceDialog::~AddInstanceDialog() diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx index 75766609ca25..7e9218dfb818 100644 --- a/svx/source/form/filtnav.cxx +++ b/svx/source/form/filtnav.cxx @@ -491,7 +491,7 @@ void SAL_CALL FmFilterAdapter::disjunctiveTermRemoved( const FilterEvent& _Event // if the first term was removed, then the to-be first term needs its text updated if ( _Event.DisjunctiveTerm == 0 ) { - rTermItems[1]->SetText( String( SVX_RES( RID_STR_FILTER_FILTER_FOR ) ) ); + rTermItems[1]->SetText( SVX_RESSTR(RID_STR_FILTER_FILTER_FOR)); FmFilterTextChangedHint aChangeHint( rTermItems[1] ); m_pModel->Broadcast( aChangeHint ); } @@ -527,7 +527,7 @@ void SAL_CALL FmFilterAdapter::disjunctiveTermAdded( const FilterEvent& _Event ) const ::std::vector< FmFilterData* >::iterator insertPos = pFormItem->GetChildren().begin() + nInsertPos; - FmFilterItems* pFilterItems = new FmFilterItems( pFormItem, String( SVX_RES( RID_STR_FILTER_FILTER_OR ) ) ); + FmFilterItems* pFilterItems = new FmFilterItems(pFormItem, SVX_RESSTR(RID_STR_FILTER_FILTER_OR)); m_pModel->Insert( insertPos, pFilterItems ); } @@ -630,7 +630,7 @@ void FmFilterModel::Update(const Reference< XIndexAccess > & xControllers, FmPar Reference< XFilterController > xFilterController( pFormItem->GetFilterController(), UNO_SET_THROW ); // insert the existing filters for the form - String aTitle( SVX_RES( RID_STR_FILTER_FILTER_FOR ) ); + OUString aTitle(SVX_RESSTR(RID_STR_FILTER_FILTER_FOR)); Sequence< Sequence< OUString > > aExpressions = xFilterController->getPredicateExpressions(); for ( const Sequence< OUString >* pConjunctionTerm = aExpressions.getConstArray(); @@ -1246,7 +1246,7 @@ sal_Bool FmFilterNavigator::EditedEntry( SvTreeListEntry* pEntry, const OUString { // display the error and return sal_False SQLContext aError; - aError.Message = String(SVX_RES(RID_STR_SYNTAXERROR)); + aError.Message = SVX_RESSTR(RID_STR_SYNTAXERROR); aError.Details = aErrorMsg; displayException(aError, this); diff --git a/svx/source/form/fmPropBrw.cxx b/svx/source/form/fmPropBrw.cxx index 5b7c5a72521c..72bdf74816da 100644 --- a/svx/source/form/fmPropBrw.cxx +++ b/svx/source/form/fmPropBrw.cxx @@ -183,7 +183,7 @@ OUString GetUIHeadlineName(sal_Int16 nClassId, const Any& aUnoObj) nClassNameResourceId = RID_STR_CONTROL; break; } - return OUString( String( SVX_RES( nClassNameResourceId ) ) ); + return SVX_RESSTR(nClassNameResourceId); } //======================================================================== @@ -421,13 +421,13 @@ void FmPropBrw::implSetNewSelection( const InterfaceBag& _rSelection ) if ( _rSelection.empty() ) { - sTitle = String( SVX_RES( RID_STR_NO_PROPERTIES ) ); + sTitle = SVX_RESSTR(RID_STR_NO_PROPERTIES); } else if ( _rSelection.size() > 1 ) { // no form component and (no form or no name) -> Multiselection - sTitle = String( SVX_RES( RID_STR_PROPERTIES_CONTROL ) ); - sTitle += String( SVX_RES( RID_STR_PROPTITLE_MULTISELECT ) ); + sTitle = SVX_RESSTR(RID_STR_PROPERTIES_CONTROL); + sTitle += SVX_RESSTR(RID_STR_PROPTITLE_MULTISELECT); } else { @@ -437,15 +437,15 @@ void FmPropBrw::implSetNewSelection( const InterfaceBag& _rSelection ) sal_Int16 nClassID = FormComponentType::CONTROL; xSingleSelection->getPropertyValue( FM_PROP_CLASSID ) >>= nClassID; - sTitle = String( SVX_RES( RID_STR_PROPERTIES_CONTROL ) ); - sTitle += String( GetUIHeadlineName( nClassID, makeAny( xSingleSelection ) ) ); + sTitle = SVX_RESSTR(RID_STR_PROPERTIES_CONTROL); + sTitle += GetUIHeadlineName(nClassID, makeAny(xSingleSelection)); } else if ( Reference< XForm >( xSingleSelection, UNO_QUERY ).is() ) - sTitle = String( SVX_RES( RID_STR_PROPERTIES_FORM ) ); + sTitle = SVX_RESSTR(RID_STR_PROPERTIES_FORM); } if ( implIsReadOnlyModel() ) - sTitle += String( SVX_RES( RID_STR_READONLY_VIEW ) ); + sTitle += SVX_RESSTR(RID_STR_READONLY_VIEW); SetText( sTitle ); diff --git a/svx/source/form/fmpgeimp.cxx b/svx/source/form/fmpgeimp.cxx index f938a1a039c8..42a01e6ea6d2 100644 --- a/svx/source/form/fmpgeimp.cxx +++ b/svx/source/form/fmpgeimp.cxx @@ -387,7 +387,7 @@ Reference< XForm > FmFormPageImpl::getDefaultForm() if ( Reference<XNameAccess>(xForms,UNO_QUERY_THROW)->hasElements() ) { // suche die Standardform - OUString sStandardFormname = String( SVX_RES( RID_STR_STDFORMNAME ) ); + OUString sStandardFormname = SVX_RESSTR(RID_STR_STDFORMNAME); try { @@ -416,8 +416,8 @@ Reference< XForm > FmFormPageImpl::getDefaultForm() if( pModel->IsUndoEnabled() ) { - XubString aStr(SVX_RES(RID_STR_FORM)); - XubString aUndoStr(SVX_RES(RID_STR_UNDO_CONTAINER_INSERT)); + OUString aStr(SVX_RESSTR(RID_STR_FORM)); + XubString aUndoStr(SVX_RESSTR(RID_STR_UNDO_CONTAINER_INSERT)); aUndoStr.SearchAndReplace(OUString('#'), aStr); pModel->BegUndo(aUndoStr); } @@ -431,7 +431,7 @@ Reference< XForm > FmFormPageImpl::getDefaultForm() xFormProps->setPropertyValue( FM_PROP_COMMANDTYPE, makeAny( sal_Int32( CommandType::TABLE ) ) ); // and the "Standard" name - OUString sName = String( SVX_RES( RID_STR_STDFORMNAME ) ); + OUString sName = SVX_RESSTR(RID_STR_STDFORMNAME); xFormProps->setPropertyValue( FM_PROP_NAME, makeAny( sName ) ); if( pModel->IsUndoEnabled() ) @@ -498,8 +498,8 @@ Reference< ::com::sun::star::form::XForm > FmFormPageImpl::findPlaceInFormCompo if( bUndo ) { - XubString aStr(SVX_RES(RID_STR_FORM)); - XubString aUndoStr(SVX_RES(RID_STR_UNDO_CONTAINER_INSERT)); + OUString aStr(SVX_RESSTR(RID_STR_FORM)); + XubString aUndoStr(SVX_RESSTR(RID_STR_UNDO_CONTAINER_INSERT)); aUndoStr.SearchAndReplace(OUString('#'), aStr); pModel->BegUndo(aUndoStr); } @@ -526,7 +526,7 @@ Reference< ::com::sun::star::form::XForm > FmFormPageImpl::findPlaceInFormCompo const bool bTableOrQuery = ( CommandType::TABLE == nCommandType ) || ( CommandType::QUERY == nCommandType ); OUString sName = FormControlFactory::getUniqueName( xNamedSet, - bTableOrQuery ? rCursorSource : OUString( String( SVX_RES( RID_STR_STDFORMNAME ) ) ) ); + bTableOrQuery ? rCursorSource : SVX_RESSTR(RID_STR_STDFORMNAME) ); xFormProps->setPropertyValue( FM_PROP_NAME, makeAny( sName ) ); diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx index 27b08a7d89d1..4d6ee1a54752 100644 --- a/svx/source/form/fmvwimp.cxx +++ b/svx/source/form/fmvwimp.cxx @@ -1290,7 +1290,7 @@ SdrObject* FmXFormView::implCreateFieldControl( const ::svx::ODataAccessDescript break; case DataType::TIMESTAMP: bDateNTimeField = sal_True; - sLabelPostfix = String( SVX_RES( RID_STR_POSTFIX_DATE ) ); + sLabelPostfix = SVX_RESSTR(RID_STR_POSTFIX_DATE); // DON'T break ! case DataType::DATE: nOBJID = OBJ_FM_DATEFIELD; @@ -1332,7 +1332,7 @@ SdrObject* FmXFormView::implCreateFieldControl( const ::svx::ODataAccessDescript { // so far we created a date field only, but we also need a time field pLabel = pControl = NULL; if ( createControlLabelPair( *pOutDev, 0, 1000, xField, xNumberFormats, OBJ_FM_TIMEFIELD, - String( SVX_RES( RID_STR_POSTFIX_TIME ) ), pLabel, pControl, + SVX_RESSTR(RID_STR_POSTFIX_TIME), pLabel, pControl, xDataSource, sDataSource, sCommand, nCommandType ) ) { diff --git a/svx/source/form/formcontrolfactory.cxx b/svx/source/form/formcontrolfactory.cxx index 033c72545f3c..8364115fa320 100644 --- a/svx/source/form/formcontrolfactory.cxx +++ b/svx/source/form/formcontrolfactory.cxx @@ -487,7 +487,7 @@ namespace svxform } if ( nTitleResId ) - sInitialLabel = String( SVX_RES( nTitleResId ) ); + sInitialLabel = SVX_RESSTR(nTitleResId); _rxControlModel->setPropertyValue( FM_PROP_LABEL, @@ -691,7 +691,7 @@ namespace svxform nResId = RID_STR_CONTROL; break; } - return String( SVX_RES( nResId ) ); + return SVX_RESSTR(nResId); } //------------------------------------------------------------------------------ diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx index 3a7bcee3ab1a..4760d300409c 100644 --- a/svx/source/form/formcontroller.cxx +++ b/svx/source/form/formcontroller.cxx @@ -490,7 +490,7 @@ void FmXAutoControl::createPeer( const Reference< XToolkit > & rxToolkit, const Reference< XTextComponent > xText(getPeer() , UNO_QUERY); if (xText.is()) { - xText->setText(OUString(String(SVX_RES(RID_STR_AUTOFIELD)))); + xText->setText(SVX_RESSTR(RID_STR_AUTOFIELD)); xText->setEditable(sal_False); } } @@ -3654,7 +3654,7 @@ namespace void displayErrorSetFocus( const String& _rMessage, const Reference< XControl >& _rxFocusControl, Window* _pDialogParent ) { SQLContext aError; - aError.Message = String( SVX_RES( RID_STR_WRITEERROR ) ); + aError.Message = SVX_RESSTR(RID_STR_WRITEERROR); aError.Details = _rMessage; displayException( aError, _pDialogParent ); @@ -3777,7 +3777,7 @@ sal_Bool SAL_CALL FormController::approveRowChange(const RowChangeEvent& _rEvent if ( !rColInfo.xColumn->getString().isEmpty() || !rColInfo.xColumn->wasNull() ) continue; - String sMessage( SVX_RES( RID_ERR_FIELDREQUIRED ) ); + String sMessage( SVX_RESSTR( RID_ERR_FIELDREQUIRED ) ); sMessage.SearchAndReplace( OUString('#'), rColInfo.sName ); // the control to focus @@ -4059,7 +4059,7 @@ sal_Bool SAL_CALL FormController::confirmDelete(const RowChangeEvent& aEvent) th SQLWarning aWarning; aWarning.Message = sTitle; SQLWarning aDetails; - aDetails.Message = String( SVX_RES( RID_STR_DELETECONFIRM ) ); + aDetails.Message = SVX_RESSTR(RID_STR_DELETECONFIRM); aWarning.NextException <<= aDetails; OInteractionRequest* pRequest = new OInteractionRequest( makeAny( aWarning ) ); diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx index 7eb6fb203d28..57056505f16c 100644 --- a/svx/source/form/navigatortree.cxx +++ b/svx/source/form/navigatortree.cxx @@ -595,7 +595,7 @@ namespace svxform ////////////////////////////////////////////////////////////////////// // Default-Eintrag "Formulare" Image aRootImage( m_aNavigatorImages.GetImage( RID_SVXIMG_FORMS ) ); - m_pRootEntry = InsertEntry( SVX_RES(RID_STR_FORMS), aRootImage, aRootImage, + m_pRootEntry = InsertEntry( SVX_RESSTR(RID_STR_FORMS), aRootImage, aRootImage, NULL, sal_False, 0, NULL ); } else if (!m_bMarkingObjects && rHint.ISA(FmNavRequestSelectHint)) diff --git a/svx/source/form/navigatortreemodel.cxx b/svx/source/form/navigatortreemodel.cxx index 867b9c6d1498..263826e84f19 100644 --- a/svx/source/form/navigatortreemodel.cxx +++ b/svx/source/form/navigatortreemodel.cxx @@ -291,7 +291,7 @@ namespace svxform if( bUndo ) { - XubString aUndoStr(SVX_RES(RID_STR_UNDO_CONTAINER_INSERT)); + XubString aUndoStr(SVX_RESSTR(RID_STR_UNDO_CONTAINER_INSERT)); aUndoStr.SearchAndReplace(OUString('#'), aStr); m_pFormModel->BegUndo(aUndoStr); } diff --git a/svx/source/form/stringlistresource.cxx b/svx/source/form/stringlistresource.cxx index 9cf871f46d4b..876b9424df7c 100644 --- a/svx/source/form/stringlistresource.cxx +++ b/svx/source/form/stringlistresource.cxx @@ -35,8 +35,7 @@ namespace svx ResId aLocalID( nLocalID, *_rResId.GetResMgr() ); while ( IsAvailableRes( aLocalID.SetRT( RSC_STRING ) ) ) { - String sLocalString( aLocalID ); - m_aStrings.push_back( sLocalString ); + m_aStrings.push_back( aLocalID.toString() ); aLocalID = ResId( ++nLocalID, *_rResId.GetResMgr() ); } } diff --git a/svx/source/form/tabwin.cxx b/svx/source/form/tabwin.cxx index a7af1eca6015..78ebec695ac2 100644 --- a/svx/source/form/tabwin.cxx +++ b/svx/source/form/tabwin.cxx @@ -318,7 +318,7 @@ void FmFieldWin::StateChanged(sal_uInt16 nSID, SfxItemState eState, const SfxPoo void FmFieldWin::UpdateContent(FmFormShell* pShell) { pListBox->Clear(); - String aTitle( SVX_RES( RID_STR_FIELDSELECTION ) ); + OUString aTitle(SVX_RESSTR(RID_STR_FIELDSELECTION)); SetText( aTitle ); if (!pShell || !pShell->GetImpl()) diff --git a/svx/source/form/tbxform.cxx b/svx/source/form/tbxform.cxx index 8819e8067781..a2628f497955 100644 --- a/svx/source/form/tbxform.cxx +++ b/svx/source/form/tbxform.cxx @@ -321,7 +321,7 @@ SvxFmTbxCtlRecText::~SvxFmTbxCtlRecText() //----------------------------------------------------------------------- Window* SvxFmTbxCtlRecText::CreateItemWindow( Window* pParent ) { - XubString aText( SVX_RES(RID_STR_REC_TEXT) ); + OUString aText(SVX_RESSTR(RID_STR_REC_TEXT)); FixedText* pFixedText = new FixedText( pParent ); Size aSize( pFixedText->GetTextWidth( aText ), pFixedText->GetTextHeight( ) ); pFixedText->SetText( aText ); @@ -355,7 +355,7 @@ SvxFmTbxCtlRecFromText::~SvxFmTbxCtlRecFromText() //----------------------------------------------------------------------- Window* SvxFmTbxCtlRecFromText::CreateItemWindow( Window* pParent ) { - XubString aText( SVX_RES(RID_STR_REC_FROM_TEXT) ); + OUString aText(SVX_RESSTR(RID_STR_REC_FROM_TEXT)); FixedText* pFixedText = new FixedText( pParent, WB_CENTER ); Size aSize( pFixedText->GetTextWidth( aText ), pFixedText->GetTextHeight( ) ); aSize.Width() += 12; diff --git a/svx/source/inc/stringlistresource.hxx b/svx/source/inc/stringlistresource.hxx index f0b0bb286511..35b2e56c2ea5 100644 --- a/svx/source/inc/stringlistresource.hxx +++ b/svx/source/inc/stringlistresource.hxx @@ -59,7 +59,7 @@ namespace svx */ String getString( sal_uInt16 _nResId ) { - return String( ResId( _nResId, *m_pResMgr ) ); + return ResId(_nResId, *m_pResMgr).toString(); } size_t size() const { return m_aStrings.size(); } diff --git a/svx/source/sidebar/area/AreaTransparencyGradientControl.cxx b/svx/source/sidebar/area/AreaTransparencyGradientControl.cxx index 8f1dd828056c..d0f8bd8f1414 100644 --- a/svx/source/sidebar/area/AreaTransparencyGradientControl.cxx +++ b/svx/source/sidebar/area/AreaTransparencyGradientControl.cxx @@ -88,12 +88,12 @@ AreaTransparencyGradientControl::AreaTransparencyGradientControl ( maBtnLeft45.SetItemImage(1,maRotLeft); Size aTbxSize = maBtnLeft45.CalcWindowSizePixel(); maBtnLeft45.SetOutputSizePixel( aTbxSize ); - maBtnLeft45.SetQuickHelpText(1, String(SVX_RES(STR_HELP_LEFT))); //acc wj + maBtnLeft45.SetQuickHelpText(1, SVX_RESSTR(STR_HELP_LEFT)); //acc wj maBtnRight45.SetItemImage(1,maRotRight); aTbxSize = maBtnRight45.CalcWindowSizePixel(); maBtnRight45.SetOutputSizePixel( aTbxSize ); - maBtnRight45.SetQuickHelpText(1, String(SVX_RES(STR_HELP_RIGHT))); //acc wj + maBtnRight45.SetQuickHelpText(1, SVX_RESSTR(STR_HELP_RIGHT)); //acc wj maBtnLeft45.SetBackground(Wallpaper()); maBtnLeft45.SetPaintTransparent(true); diff --git a/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx b/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx index 663fa30c1140..b3b725dcbc4f 100644 --- a/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx +++ b/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx @@ -85,10 +85,10 @@ void GraphicPropertyPanel::Initialize() mpMtrTrans->SetModifyHdl( LINK( this, GraphicPropertyPanel, ModifyTransHdl ) ); mpMtrTrans->SetAccessibleName(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Transparency"))); - mpLBColorMode->InsertEntry(String(SVX_RES(RID_SVXSTR_GRAFMODE_STANDARD))); - mpLBColorMode->InsertEntry(String(SVX_RES(RID_SVXSTR_GRAFMODE_GREYS))); - mpLBColorMode->InsertEntry(String(SVX_RES(RID_SVXSTR_GRAFMODE_MONO))); - mpLBColorMode->InsertEntry(String(SVX_RES(RID_SVXSTR_GRAFMODE_WATERMARK))); + mpLBColorMode->InsertEntry(SVX_RESSTR(RID_SVXSTR_GRAFMODE_STANDARD)); + mpLBColorMode->InsertEntry(SVX_RESSTR(RID_SVXSTR_GRAFMODE_GREYS)); + mpLBColorMode->InsertEntry(SVX_RESSTR(RID_SVXSTR_GRAFMODE_MONO)); + mpLBColorMode->InsertEntry(SVX_RESSTR(RID_SVXSTR_GRAFMODE_WATERMARK)); mpLBColorMode->SetSelectHdl( LINK( this, GraphicPropertyPanel, ClickColorModeHdl )); mpLBColorMode->SetAccessibleName(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Color mode"))); diff --git a/svx/source/sidebar/line/LinePropertyPanel.cxx b/svx/source/sidebar/line/LinePropertyPanel.cxx index dbacf2520fad..1d149bf516ed 100644 --- a/svx/source/sidebar/line/LinePropertyPanel.cxx +++ b/svx/source/sidebar/line/LinePropertyPanel.cxx @@ -60,13 +60,11 @@ using ::sfx2::sidebar::Theme; const char UNO_SELECTWIDTH[] = ".uno:SelectWidth"; const char UNO_SELECTCOLOR[] = ".uno:SelectColor"; -#define A2S(pString) (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(pString))) - namespace { void FillLineEndListBox(ListBox& rListBoxStart, ListBox& rListBoxEnd, const XLineEndList& rList) { const sal_uInt32 nCount(rList.Count()); - const String sNone(SVX_RES(RID_SVXSTR_NONE)); + const OUString sNone(SVX_RESSTR(RID_SVXSTR_NONE)); rListBoxStart.SetUpdateMode(false); rListBoxEnd.SetUpdateMode(false); @@ -304,11 +302,11 @@ LinePropertyPanel* LinePropertyPanel::Create ( SfxBindings* pBindings) { if (pParent == NULL) - throw lang::IllegalArgumentException(A2S("no parent Window given to LinePropertyPanel::Create"), NULL, 0); + throw lang::IllegalArgumentException(OUString("no parent Window given to LinePropertyPanel::Create"), NULL, 0); if ( ! rxFrame.is()) - throw lang::IllegalArgumentException(A2S("no XFrame given to LinePropertyPanel::Create"), NULL, 1); + throw lang::IllegalArgumentException(OUString("no XFrame given to LinePropertyPanel::Create"), NULL, 1); if (pBindings == NULL) - throw lang::IllegalArgumentException(A2S("no SfxBindings given to LinePropertyPanel::Create"), NULL, 2); + throw lang::IllegalArgumentException(OUString("no SfxBindings given to LinePropertyPanel::Create"), NULL, 2); return new LinePropertyPanel( pParent, diff --git a/svx/source/sidebar/line/LineWidthControl.cxx b/svx/source/sidebar/line/LineWidthControl.cxx index bd804eeee787..3e8cc4a12cc3 100644 --- a/svx/source/sidebar/line/LineWidthControl.cxx +++ b/svx/source/sidebar/line/LineWidthControl.cxx @@ -45,7 +45,7 @@ LineWidthControl::LineWidthControl ( maMFWidth( this, SVX_RES(MF_WIDTH)), meMapUnit(SFX_MAPUNIT_TWIP), rStr(NULL), - mstrPT(SVX_RES(STR_PT)), + mstrPT(SVX_RESSTR(STR_PT)), mnCustomWidth(0), mbCustom(false), mbColseByEdit(false), @@ -132,15 +132,15 @@ void LineWidthControl::Initialize() rStr = new XubString[9]; //modify, - rStr[0] = String("05", 2, RTL_TEXTENCODING_ASCII_US); - rStr[1] = String("08", 2, RTL_TEXTENCODING_ASCII_US); - rStr[2] = String("10", 2, RTL_TEXTENCODING_ASCII_US); - rStr[3] = String("15", 2, RTL_TEXTENCODING_ASCII_US); - rStr[4] = String("23", 2, RTL_TEXTENCODING_ASCII_US); - rStr[5] = String("30", 2, RTL_TEXTENCODING_ASCII_US); - rStr[6] = String("45", 2, RTL_TEXTENCODING_ASCII_US); - rStr[7] = String("60", 2, RTL_TEXTENCODING_ASCII_US); - rStr[8] = String( SVX_RES(STR_WIDTH_LAST_CUSTOM) ); + rStr[0] = OUString("05"); + rStr[1] = OUString("08"); + rStr[2] = OUString("10"); + rStr[3] = OUString("15"); + rStr[4] = OUString("23"); + rStr[5] = OUString("30"); + rStr[6] = OUString("45"); + rStr[7] = OUString("60"); + rStr[8] = SVX_RESSTR(STR_WIDTH_LAST_CUSTOM); const LocaleDataWrapper& rLocaleWrapper( Application::GetSettings().GetLocaleDataWrapper() ); const sal_Unicode cSep = rLocaleWrapper.getNumDecimalSep()[0]; diff --git a/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx b/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx index 4e429213fa3b..fabb2086ea27 100644 --- a/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx +++ b/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx @@ -73,13 +73,13 @@ ParaLineSpacingControl::ParaLineSpacingControl(Window* pParent, svx::sidebar::Pa , maSelSpacing2 (SVX_RES(IMG_SEL_SPACING2)) , maImgCus (SVX_RES(IMG_CUSTOM)) , maImgCusGrey (SVX_RES(IMG_CUSTOM_GRAY)) - , maStrCus (SVX_RES(STR_LCVALUE)) + , maStrCus (SVX_RESSTR(STR_LCVALUE)) , mpImg(NULL) , mpImgSel(NULL) , mpStr(NULL) , mpStrTip(NULL) - , maLine(SVX_RES(STR_LSPACING)) - , maOf(SVX_RES(STR_LS_OF)) + , maLine(SVX_RESSTR(STR_LSPACING)) + , maOf(SVX_RESSTR(STR_LS_OF)) , maValue( 0 ) , maPos( 0 ) { @@ -127,16 +127,16 @@ void ParaLineSpacingControl::initial() mpImgSel[3] = maSelSpacing2; mpStr = new XubString[4]; - mpStr[0] = XubString(SVX_RES(STR_SPACING1)); - mpStr[1] = XubString(SVX_RES(STR_SPACING115)); - mpStr[2] = XubString(SVX_RES(STR_SPACING15)); - mpStr[3] = XubString(SVX_RES(STR_SPACING2)); + mpStr[0] = SVX_RESSTR(STR_SPACING1); + mpStr[1] = SVX_RESSTR(STR_SPACING115); + mpStr[2] = SVX_RESSTR(STR_SPACING15); + mpStr[3] = SVX_RESSTR(STR_SPACING2); mpStrTip = new XubString[4]; - mpStrTip[0] = XubString(SVX_RES(STR_LS_SINGLE)); - mpStrTip[1] = XubString(SVX_RES(STR_LS_115)); - mpStrTip[2] = XubString(SVX_RES(STR_LS_15)); - mpStrTip[3] = XubString(SVX_RES(STR_LS_DOUBLE)); + mpStrTip[0] = SVX_RESSTR(STR_LS_SINGLE); + mpStrTip[1] = SVX_RESSTR(STR_LS_115); + mpStrTip[2] = SVX_RESSTR(STR_LS_15); + mpStrTip[3] = SVX_RESSTR(STR_LS_DOUBLE); for (int i=0;i<4;i++) maLineSpacing.AddItem(mpImg[i], &mpImgSel[i],mpStr[i],&mpStrTip[i]); diff --git a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx index c7b3e224e10f..1f8b7222371f 100644 --- a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx +++ b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx @@ -50,11 +50,11 @@ TextCharacterSpacingControl::TextCharacterSpacingControl ( , maImgCus (SVX_RES(IMG_CUSTOM)) , maImgCusGrey (SVX_RES(IMG_CUSTOM_GRAY)) -, maStrCus (SVX_RES(STR_CUSTOM)) -, maStrCusE (SVX_RES(STR_CUSTOM_E_TIP)) //add -, maStrCusC (SVX_RES(STR_CUSTOM_C_TIP)) //add -, maStrCusN (SVX_RES(STR_NORMAL_TIP)) //add -, maStrUnit (SVX_RES(STR_PT)) //add +, maStrCus (SVX_RESSTR(STR_CUSTOM)) +, maStrCusE (SVX_RESSTR(STR_CUSTOM_E_TIP)) //add +, maStrCusC (SVX_RESSTR(STR_CUSTOM_C_TIP)) //add +, maStrCusN (SVX_RESSTR(STR_NORMAL_TIP)) //add +, maStrUnit (SVX_RESSTR(STR_PT)) //add , mnCustomKern(0) , mnLastCus ( SPACING_NOCUSTOM ) @@ -112,19 +112,19 @@ void TextCharacterSpacingControl::initial() mpImgSel[4] = Image(SVX_RES(IMG_VERY_LOOSE_S)); mpStr = new XubString[5]; - mpStr[0] = XubString(SVX_RES(STR_VERY_TIGHT)); - mpStr[1] = XubString(SVX_RES(STR_TIGHT)); - mpStr[2] = XubString(SVX_RES(STR_NORMAL)); - mpStr[3] = XubString(SVX_RES(STR_LOOSE)); - mpStr[4] = XubString(SVX_RES(STR_VERY_LOOSE)); + mpStr[0] = SVX_RESSTR(STR_VERY_TIGHT); + mpStr[1] = SVX_RESSTR(STR_TIGHT); + mpStr[2] = SVX_RESSTR(STR_NORMAL); + mpStr[3] = SVX_RESSTR(STR_LOOSE); + mpStr[4] = SVX_RESSTR(STR_VERY_LOOSE); mpStrTip = new XubString[5]; - mpStrTip[0] = XubString(SVX_RES(STR_VERY_TIGHT_TIP)); - mpStrTip[1] = XubString(SVX_RES(STR_TIGHT_TIP)); - mpStrTip[2] = XubString(SVX_RES(STR_NORMAL_TIP)); - mpStrTip[3] = XubString(SVX_RES(STR_LOOSE_TIP)); - mpStrTip[4] = XubString(SVX_RES(STR_VERY_LOOSE_TIP)); + mpStrTip[0] = SVX_RESSTR(STR_VERY_TIGHT_TIP); + mpStrTip[1] = SVX_RESSTR(STR_TIGHT_TIP); + mpStrTip[2] = SVX_RESSTR(STR_NORMAL_TIP); + mpStrTip[3] = SVX_RESSTR(STR_LOOSE_TIP); + mpStrTip[4] = SVX_RESSTR(STR_VERY_LOOSE_TIP); for (int i=0;i<5;i++) maVSSpacing.AddItem(mpImg[i], &mpImgSel[i],mpStr[i],&mpStrTip[i]); diff --git a/svx/source/sidebar/text/TextUnderlineControl.cxx b/svx/source/sidebar/text/TextUnderlineControl.cxx index 8c2227bf7e42..975cc1324175 100644 --- a/svx/source/sidebar/text/TextUnderlineControl.cxx +++ b/svx/source/sidebar/text/TextUnderlineControl.cxx @@ -82,36 +82,36 @@ void TextUnderlineControl::initial() // 'none' item maVSUnderline.SetStyle( maVSUnderline.GetStyle()| WB_NONEFIELD | WB_MENUSTYLEVALUESET ); - maVSUnderline.SetText( String(SVX_RES(STR_WITHOUT) ) ); + maVSUnderline.SetText( SVX_RESSTR(STR_WITHOUT) ); - maVSUnderline.InsertItem(1, maIMGSingle ,String(SVX_RES(STR_SINGLE))); + maVSUnderline.InsertItem(1, maIMGSingle, SVX_RESSTR(STR_SINGLE)); maVSUnderline.SetItemData(1, (void*)(sal_uInt64)UNDERLINE_SINGLE); - maVSUnderline.InsertItem(2, maIMGDouble ,String(SVX_RES(STR_DOUBLE))); + maVSUnderline.InsertItem(2, maIMGDouble, SVX_RESSTR(STR_DOUBLE)); maVSUnderline.SetItemData(2, (void*)(sal_uInt64)UNDERLINE_DOUBLE); - maVSUnderline.InsertItem(3, maIMGBold, String(SVX_RES(STR_BOLD))); + maVSUnderline.InsertItem(3, maIMGBold, SVX_RESSTR(STR_BOLD)); maVSUnderline.SetItemData(3,(void*)(sal_uInt64)UNDERLINE_BOLD); - maVSUnderline.InsertItem(4, maIMGDot, String(SVX_RES(STR_DOT))); + maVSUnderline.InsertItem(4, maIMGDot, SVX_RESSTR(STR_DOT)); maVSUnderline.SetItemData(4,(void*)(sal_uInt64)UNDERLINE_DOTTED); - maVSUnderline.InsertItem(5, maIMGDotBold, String(SVX_RES(STR_DOT_BOLD))); + maVSUnderline.InsertItem(5, maIMGDotBold, SVX_RESSTR(STR_DOT_BOLD)); maVSUnderline.SetItemData(5,(void*)(sal_uInt64)UNDERLINE_BOLDDOTTED); - maVSUnderline.InsertItem(6, maIMGDash, String(SVX_RES(STR_DASH))); + maVSUnderline.InsertItem(6, maIMGDash, SVX_RESSTR(STR_DASH)); maVSUnderline.SetItemData(6,(void*)(sal_uInt64)UNDERLINE_DASH); - maVSUnderline.InsertItem(7, maIMGDashLong,String(SVX_RES(STR_DASH_LONG))); + maVSUnderline.InsertItem(7, maIMGDashLong, SVX_RESSTR(STR_DASH_LONG)); maVSUnderline.SetItemData(7,(void*)(sal_uInt64)UNDERLINE_LONGDASH); - maVSUnderline.InsertItem(8, maIMGDashDot, String(SVX_RES(STR_DASH_DOT))); + maVSUnderline.InsertItem(8, maIMGDashDot, SVX_RESSTR(STR_DASH_DOT)); maVSUnderline.SetItemData(8,(void*)(sal_uInt64)UNDERLINE_DASHDOT); - maVSUnderline.InsertItem(9, maIMGDashDotDot, String(SVX_RES(STR_DASH_DOT_DOT))); + maVSUnderline.InsertItem(9, maIMGDashDotDot, SVX_RESSTR(STR_DASH_DOT_DOT)); maVSUnderline.SetItemData(9,(void*)(sal_uInt64)UNDERLINE_DASHDOTDOT); - maVSUnderline.InsertItem(10, maIMGWave, String(SVX_RES(STR_WAVE))); + maVSUnderline.InsertItem(10, maIMGWave, SVX_RESSTR(STR_WAVE)); maVSUnderline.SetItemData(10,(void*)(sal_uInt64)UNDERLINE_WAVE); maVSUnderline.SetColCount( 1 ); diff --git a/svx/source/sidebar/tools/ColorControl.cxx b/svx/source/sidebar/tools/ColorControl.cxx index ba43c0fc367d..48bc023b3f6e 100644 --- a/svx/source/sidebar/tools/ColorControl.cxx +++ b/svx/source/sidebar/tools/ColorControl.cxx @@ -97,8 +97,8 @@ ColorControl::ColorControl ( mpFloatingWindow(pFloatingWindow), msNoColorString( pNoColorStringResId - ? String(*pNoColorStringResId) - : String()), + ? pNoColorStringResId->toString() + : OUString()), maNoColorGetter(rNoColorGetter), maColorSetter(rColorSetter) { diff --git a/svx/source/tbxctrls/colrctrl.cxx b/svx/source/tbxctrls/colrctrl.cxx index 9f9e89deda82..17e040d84891 100644 --- a/svx/source/tbxctrls/colrctrl.cxx +++ b/svx/source/tbxctrls/colrctrl.cxx @@ -99,7 +99,7 @@ SvxColorValueSet_docking::SvxColorValueSet_docking( Window* _pParent, const ResI DragSourceHelper( this ), mbLeftButton(true) { - SetAccessibleName(String( SVX_RES( STR_COLORTABLE ) )); + SetAccessibleName(SVX_RESSTR(STR_COLORTABLE)); } /************************************************************************* diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx index 2d70333e0759..26b8a4f5c01e 100644 --- a/svx/source/tbxctrls/extrusioncontrols.cxx +++ b/svx/source/tbxctrls/extrusioncontrols.cxx @@ -96,7 +96,7 @@ ExtrusionDirectionWindow::ExtrusionDirectionWindow( for( i = DIRECTION_NW; i <= DIRECTION_SE; i++ ) { - String aText( SVX_RES( STR_DIRECTION + i ) ); + OUString aText( SVX_RESSTR( STR_DIRECTION + i ) ); mpDirectionSet->InsertItem( i+1, maImgDirection[ i ], aText ); } @@ -104,8 +104,8 @@ ExtrusionDirectionWindow::ExtrusionDirectionWindow( appendEntry( 2, mpDirectionSet ); appendSeparator(); - appendEntry( 0, String( SVX_RES( STR_PERSPECTIVE ) ), maImgPerspective ); - appendEntry( 1, String( SVX_RES( STR_PARALLEL ) ), maImgParallel ); + appendEntry( 0, SVX_RESSTR( STR_PERSPECTIVE ), maImgPerspective ); + appendEntry( 1, SVX_RESSTR( STR_PARALLEL ), maImgParallel ); SetOutputSizePixel( getMenuSize() ); @@ -351,8 +351,8 @@ ExtrusionDepthWindow::ExtrusionDepthWindow( appendEntry( 2, aEmpty, maImgDepth2 ); appendEntry( 3, aEmpty, maImgDepth3 ); appendEntry( 4, aEmpty, maImgDepth4 ); - appendEntry( 5, String( SVX_RES( STR_INFINITY ) ), maImgDepthInfinity ); - appendEntry( 6, String( SVX_RES( STR_CUSTOM ) ) ); + appendEntry( 5, SVX_RESSTR( STR_INFINITY ), maImgDepthInfinity ); + appendEntry( 6, SVX_RESSTR( STR_CUSTOM ) ); SetOutputSizePixel( getMenuSize() ); @@ -390,7 +390,7 @@ void ExtrusionDepthWindow::implFillStrings( FieldUnit eUnit ) for( int i = 0; i < 5; i++ ) { - String aStr( SVX_RES( nResource + i ) ); + OUString aStr( SVX_RESSTR( nResource + i ) ); setEntryText( i, aStr ); }; } @@ -612,9 +612,9 @@ ExtrusionLightingWindow::ExtrusionLightingWindow( svt::ToolboxController& rContr appendEntry( 3, mpLightingSet ); appendSeparator(); - appendEntry( 0, String( SVX_RES( STR_BRIGHT ) ), maImgBright ); - appendEntry( 1, String( SVX_RES( STR_NORMAL ) ), maImgNormal ); - appendEntry( 2, String( SVX_RES( STR_DIM ) ), maImgDim ); + appendEntry( 0, SVX_RESSTR( STR_BRIGHT ), maImgBright ); + appendEntry( 1, SVX_RESSTR( STR_NORMAL ), maImgNormal ); + appendEntry( 2, SVX_RESSTR( STR_DIM ), maImgDim ); SetOutputSizePixel( getMenuSize() ); @@ -838,10 +838,10 @@ ExtrusionSurfaceWindow::ExtrusionSurfaceWindow( SetHelpId( HID_MENU_EXTRUSION_SURFACE ); SetSelectHdl( LINK( this, ExtrusionSurfaceWindow, SelectHdl ) ); - appendEntry( 0, String( SVX_RES( STR_WIREFRAME ) ), maImgSurface1 ); - appendEntry( 1, String( SVX_RES( STR_MATTE ) ), maImgSurface2 ); - appendEntry( 2, String( SVX_RES( STR_PLASTIC ) ), maImgSurface3 ); - appendEntry( 3, String( SVX_RES( STR_METAL ) ), maImgSurface4 ); + appendEntry( 0, SVX_RESSTR( STR_WIREFRAME ), maImgSurface1 ); + appendEntry( 1, SVX_RESSTR( STR_MATTE ), maImgSurface2 ); + appendEntry( 2, SVX_RESSTR( STR_PLASTIC ), maImgSurface3 ); + appendEntry( 3, SVX_RESSTR( STR_METAL ), maImgSurface4 ); SetOutputSizePixel( getMenuSize() ); diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx index d1f410404ccc..ed8d50061d92 100644 --- a/svx/source/tbxctrls/fontworkgallery.cxx +++ b/svx/source/tbxctrls/fontworkgallery.cxx @@ -80,7 +80,7 @@ FontWorkGalleryDialog::FontWorkGalleryDialog( SdrView* pSdrView, Window* pParent mnThemeId ( 0xffff ), mpSdrView ( pSdrView ), mpModel ( (FmFormModel*)pSdrView->GetModel() ), - maStrClickToAddText ( SVX_RES( STR_CLICK_TO_ADD_TEXT ) ), + maStrClickToAddText ( SVX_RESSTR( STR_CLICK_TO_ADD_TEXT ) ), mppSdrObject ( NULL ), mpDestModel ( NULL ) { @@ -178,7 +178,7 @@ void FontWorkGalleryDialog::fillFavorites(sal_uInt16 nThemeId) sal_uInt32 nFavorite; for( nFavorite = 1; nFavorite <= nFavCount; nFavorite++ ) { - String aStr(SVX_RES(RID_SVXFLOAT3D_FAVORITE)); + String aStr(SVX_RESSTR(RID_SVXFLOAT3D_FAVORITE)); aStr += sal_Unicode(' '); aStr += OUString::number((sal_Int32)nFavorite); Image aThumbImage( maFavoritesHorizontal[nFavorite-1] ); @@ -336,11 +336,11 @@ FontworkAlignmentWindow::FontworkAlignmentWindow( svt::ToolboxController& rContr SetHelpId( HID_POPUP_FONTWORK_ALIGN ); SetSelectHdl( LINK( this, FontworkAlignmentWindow, SelectHdl ) ); - appendEntry( 0, String( SVX_RES( STR_ALIGN_LEFT ) ), maImgAlgin1 ); - appendEntry( 1, String( SVX_RES( STR_ALIGN_CENTER ) ), maImgAlgin2 ); - appendEntry( 2, String( SVX_RES( STR_ALIGN_RIGHT ) ), maImgAlgin3 ); - appendEntry( 3, String( SVX_RES( STR_ALIGN_WORD ) ), maImgAlgin4 ); - appendEntry( 4, String( SVX_RES( STR_ALIGN_STRETCH ) ), maImgAlgin5 ); + appendEntry( 0, SVX_RESSTR( STR_ALIGN_LEFT ), maImgAlgin1 ); + appendEntry( 1, SVX_RESSTR( STR_ALIGN_CENTER ), maImgAlgin2 ); + appendEntry( 2, SVX_RESSTR( STR_ALIGN_RIGHT ), maImgAlgin3 ); + appendEntry( 3, SVX_RESSTR( STR_ALIGN_WORD ), maImgAlgin4 ); + appendEntry( 4, SVX_RESSTR( STR_ALIGN_STRETCH ), maImgAlgin5 ); SetOutputSizePixel( getMenuSize() ); @@ -388,11 +388,11 @@ void FontworkAlignmentWindow::DataChanged( const DataChangedEvent& rDCEvt ) if( ( rDCEvt.GetType() == DATACHANGED_SETTINGS ) && ( rDCEvt.GetFlags() & SETTINGS_STYLE ) ) { - appendEntry( 0, String( SVX_RES( STR_ALIGN_LEFT ) ), maImgAlgin1 ); - appendEntry( 1, String( SVX_RES( STR_ALIGN_CENTER ) ), maImgAlgin2 ); - appendEntry( 2, String( SVX_RES( STR_ALIGN_RIGHT ) ), maImgAlgin3 ); - appendEntry( 3, String( SVX_RES( STR_ALIGN_WORD ) ), maImgAlgin4 ); - appendEntry( 4, String( SVX_RES( STR_ALIGN_STRETCH ) ), maImgAlgin5 ); + appendEntry( 0, SVX_RESSTR( STR_ALIGN_LEFT ), maImgAlgin1 ); + appendEntry( 1, SVX_RESSTR( STR_ALIGN_CENTER ), maImgAlgin2 ); + appendEntry( 2, SVX_RESSTR( STR_ALIGN_RIGHT ), maImgAlgin3 ); + appendEntry( 3, SVX_RESSTR( STR_ALIGN_WORD ), maImgAlgin4 ); + appendEntry( 4, SVX_RESSTR( STR_ALIGN_STRETCH ), maImgAlgin5 ); } } @@ -523,14 +523,14 @@ FontworkCharacterSpacingWindow::FontworkCharacterSpacingWindow( svt::ToolboxCont SetHelpId( HID_POPUP_FONTWORK_CHARSPACE ); SetSelectHdl( LINK( this, FontworkCharacterSpacingWindow, SelectHdl ) ); - appendEntry( 0, String( SVX_RES( STR_CHARS_SPACING_VERY_TIGHT ) ), MIB_RADIOCHECK ); - appendEntry( 1, String( SVX_RES( STR_CHARS_SPACING_TIGHT ) ), MIB_RADIOCHECK ); - appendEntry( 2, String( SVX_RES( STR_CHARS_SPACING_NORMAL ) ), MIB_RADIOCHECK ); - appendEntry( 3, String( SVX_RES( STR_CHARS_SPACING_LOOSE ) ), MIB_RADIOCHECK ); - appendEntry( 4, String( SVX_RES( STR_CHARS_SPACING_VERY_LOOSE ) ), MIB_RADIOCHECK ); - appendEntry( 5, String( SVX_RES( STR_CHARS_SPACING_CUSTOM ) ), MIB_RADIOCHECK ); + appendEntry( 0, SVX_RESSTR( STR_CHARS_SPACING_VERY_TIGHT ), MIB_RADIOCHECK ); + appendEntry( 1, SVX_RESSTR( STR_CHARS_SPACING_TIGHT ), MIB_RADIOCHECK ); + appendEntry( 2, SVX_RESSTR( STR_CHARS_SPACING_NORMAL ), MIB_RADIOCHECK ); + appendEntry( 3, SVX_RESSTR( STR_CHARS_SPACING_LOOSE ), MIB_RADIOCHECK ); + appendEntry( 4, SVX_RESSTR( STR_CHARS_SPACING_VERY_LOOSE ), MIB_RADIOCHECK ); + appendEntry( 5, SVX_RESSTR( STR_CHARS_SPACING_CUSTOM ), MIB_RADIOCHECK ); appendSeparator(); - appendEntry( 6, String( SVX_RES( STR_CHARS_SPACING_KERN_PAIRS ) ), MIB_CHECKABLE ); + appendEntry( 6, SVX_RESSTR( STR_CHARS_SPACING_KERN_PAIRS ), MIB_CHECKABLE ); SetOutputSizePixel( getMenuSize() ); diff --git a/svx/source/toolbars/extrusionbar.cxx b/svx/source/toolbars/extrusionbar.cxx index ef8fe93b1f18..d34026c9e9ff 100644 --- a/svx/source/toolbars/extrusionbar.cxx +++ b/svx/source/toolbars/extrusionbar.cxx @@ -83,7 +83,7 @@ ExtrusionBar::ExtrusionBar(SfxViewShell* pViewShell ) SetPool(&pViewShell->GetPool()); SetHelpId( SVX_INTERFACE_EXTRUSION_BAR ); - SetName( String( SVX_RES( RID_SVX_EXTRUSION_BAR ))); + SetName(SVX_RESSTR(RID_SVX_EXTRUSION_BAR)); } @@ -571,7 +571,7 @@ void ExtrusionBar::execute( SdrView* pSdrView, SfxRequest& rReq, SfxBindings& rB { if( bUndo ) { - String aStr( SVX_RES( nStrResId ) ); + OUString aStr( SVX_RESSTR( nStrResId ) ); pSdrView->BegUndo( aStr ); pSdrView->AddUndo( pSdrView->GetModel()->GetSdrUndoFactory().CreateUndoAttrObject( *pObj ) ); } diff --git a/svx/source/toolbars/fontworkbar.cxx b/svx/source/toolbars/fontworkbar.cxx index d77bb338d169..5f28ed2c0b22 100644 --- a/svx/source/toolbars/fontworkbar.cxx +++ b/svx/source/toolbars/fontworkbar.cxx @@ -199,7 +199,7 @@ FontworkBar::FontworkBar(SfxViewShell* pViewShell ) SetPool(&pViewShell->GetPool()); SetHelpId( SVX_INTERFACE_FONTWORK_BAR ); - SetName( String( SVX_RES( RID_SVX_FONTWORK_BAR) )); + SetName( SVX_RESSTR( RID_SVX_FONTWORK_BAR )); } @@ -477,7 +477,7 @@ void FontworkBar::execute( SdrView* pSdrView, SfxRequest& rReq, SfxBindings& rBi if( bUndo ) { - String aStr( SVX_RES( RID_SVXSTR_UNDO_APPLY_FONTWORK_SHAPE ) ); + OUString aStr( SVX_RESSTR( RID_SVXSTR_UNDO_APPLY_FONTWORK_SHAPE ) ); pSdrView->BegUndo( aStr ); pSdrView->AddUndo( pSdrView->GetModel()->GetSdrUndoFactory().CreateUndoAttrObject( *pObj ) ); } @@ -552,7 +552,7 @@ void FontworkBar::execute( SdrView* pSdrView, SfxRequest& rReq, SfxBindings& rBi const bool bUndo = pSdrView->IsUndoEnabled(); if( bUndo ) { - String aStr( SVX_RES( nStrResId ) ); + OUString aStr( SVX_RESSTR( nStrResId ) ); pSdrView->BegUndo( aStr ); pSdrView->AddUndo( pSdrView->GetModel()->GetSdrUndoFactory().CreateUndoAttrObject( *pObj ) ); } diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx index 5e6d3ca1f90c..ac17d01d1597 100644 --- a/svx/source/unodraw/unoprov.cxx +++ b/svx/source/unodraw/unoprov.cxx @@ -1182,19 +1182,19 @@ bool SvxUnoConvertResourceString( int nSourceResIds, int nDestResIds, int nCount { sal_uInt16 nResId = (sal_uInt16)(nSourceResIds + i); const ResId aRes( SVX_RES(nResId)); - const String aCompare( aRes ); + const String aCompare( aRes.toString() ); if( aShortString == aCompare ) { sal_uInt16 nNewResId = (sal_uInt16)(nDestResIds + i); ResId aNewRes( SVX_RES( nNewResId )); - rString.Replace( 0, aShortString.Len(), String( aNewRes ) ); + rString.Replace( 0, aShortString.Len(), aNewRes.toString() ); return true; } else if( rString == aCompare ) { sal_uInt16 nNewResId = (sal_uInt16)(nDestResIds + i); ResId aNewRes( SVX_RES( nNewResId )); - rString = String( aNewRes ); + rString = aNewRes.toString(); return true; } } diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx index f24d81282ce7..e3b50dd6ccf4 100644 --- a/svx/source/xoutdev/xattr.cxx +++ b/svx/source/xoutdev/xattr.cxx @@ -224,7 +224,7 @@ String NameOrIndex::CheckNamedItem( const NameOrIndex* pCheckItem, const sal_uIn { sal_Int32 nUserIndex = 1; const ResId aRes(SVX_RES(nPrefixResId)); - String aUser( aRes ); + String aUser( aRes.toString() ); aUser += sal_Unicode( ' ' ); if( pDefaults.get() ) @@ -1889,7 +1889,7 @@ XLineStartItem* XLineStartItem::checkForUniqueItem( SdrModel* pModel ) const sal_Int32 nUserIndex = 1; const ResId aRes(SVX_RES(RID_SVXSTR_LINEEND)); - const String aUser( aRes ); + const String aUser( aRes.toString() ); if( pPool1 ) { @@ -2241,7 +2241,7 @@ XLineEndItem* XLineEndItem::checkForUniqueItem( SdrModel* pModel ) const sal_Int32 nUserIndex = 1; const ResId aRes(SVX_RES(RID_SVXSTR_LINEEND)); - const String aUser( aRes ); + const String aUser( aRes.toString() ); if( pPool1 ) { diff --git a/svx/source/xoutdev/xtabbtmp.cxx b/svx/source/xoutdev/xtabbtmp.cxx index 4cf5fd40e588..961c501b3356 100644 --- a/svx/source/xoutdev/xtabbtmp.cxx +++ b/svx/source/xoutdev/xtabbtmp.cxx @@ -49,7 +49,7 @@ uno::Reference< container::XNameContainer > XBitmapList::createInstance() bool XBitmapList::Create() { - String aStr(SVX_RES(RID_SVXSTR_BITMAP)); + String aStr(SVX_RESSTR(RID_SVXSTR_BITMAP)); sal_uInt16 aArray[64]; Bitmap aBitmap; const xub_StrLen nLen(aStr.Len() - 1); diff --git a/svx/source/xoutdev/xtabdash.cxx b/svx/source/xoutdev/xtabdash.cxx index ea9fb0100e5d..0da58d45486b 100644 --- a/svx/source/xoutdev/xtabdash.cxx +++ b/svx/source/xoutdev/xtabdash.cxx @@ -68,7 +68,7 @@ uno::Reference< container::XNameContainer > XDashList::createInstance() bool XDashList::Create() { - XubString aStr( SVX_RES( RID_SVXSTR_LINESTYLE ) ); + XubString aStr(SVX_RESSTR(RID_SVXSTR_LINESTYLE)); xub_StrLen nLen; aStr.AppendAscii(" 1"); @@ -206,7 +206,7 @@ String XDashList::GetStringForUiSolidLine() const { if(!maStringSolidLine.Len()) { - const_cast< XDashList* >(this)->maStringSolidLine = String(ResId(RID_SVXSTR_SOLID, DIALOG_MGR())); + const_cast< XDashList* >(this)->maStringSolidLine = ResId(RID_SVXSTR_SOLID, DIALOG_MGR()).toString(); } return maStringSolidLine; @@ -218,7 +218,7 @@ String XDashList::GetStringForUiNoLine() const { // formally was RID_SVXSTR_INVISIBLE, but tomake equal // everywhere, use RID_SVXSTR_NONE - const_cast< XDashList* >(this)->maStringNoLine = String(ResId(RID_SVXSTR_NONE, DIALOG_MGR())); + const_cast< XDashList* >(this)->maStringNoLine = ResId(RID_SVXSTR_NONE, DIALOG_MGR()).toString(); } return maStringNoLine; diff --git a/svx/source/xoutdev/xtabgrdt.cxx b/svx/source/xoutdev/xtabgrdt.cxx index bf1a7bc68606..9853a0ecb410 100644 --- a/svx/source/xoutdev/xtabgrdt.cxx +++ b/svx/source/xoutdev/xtabgrdt.cxx @@ -67,7 +67,7 @@ uno::Reference< container::XNameContainer > XGradientList::createInstance() bool XGradientList::Create() { - XubString aStr( SVX_RES( RID_SVXSTR_GRADIENT ) ); + XubString aStr( SVX_RESSTR( RID_SVXSTR_GRADIENT ) ); xub_StrLen nLen; aStr.AppendAscii(" 1"); diff --git a/svx/source/xoutdev/xtabhtch.cxx b/svx/source/xoutdev/xtabhtch.cxx index 2a1edd15dc1f..111907284342 100644 --- a/svx/source/xoutdev/xtabhtch.cxx +++ b/svx/source/xoutdev/xtabhtch.cxx @@ -66,7 +66,7 @@ uno::Reference< container::XNameContainer > XHatchList::createInstance() bool XHatchList::Create() { - XubString aStr( SVX_RES( RID_SVXSTR_HATCH ) ); + XubString aStr( SVX_RESSTR( RID_SVXSTR_HATCH ) ); xub_StrLen nLen; aStr.AppendAscii(" 1"); |