tidy some resource strings

Change-Id: I611a276d048121084ec842d062129e042f3baea5

4 files changed, 13 insertions, 13 deletions

diff --git a/sfx2/source/view/orgmgr.cxx b/sfx2/source/view/orgmgr.cxx
index ab1d2248256d..71507cf36ac4 100644
--- a/sfx2/source/view/orgmgr.cxx
+++ b/sfx2/source/view/orgmgr.cxx
@@ -751,7 +751,7 @@ void SfxOrganizeMgr::SaveAll(Window *pParent)
             {
                 if(!pTemplates->DeleteObjectShell(i, j))
                 {
-                    String aText = String(SfxResId(STR_ERROR_SAVE_TEMPLATE));
+                    String aText = SfxResId(STR_ERROR_SAVE_TEMPLATE).toString();
                     aText += pTemplates->GetName(i, j);
                     ErrorBox aBox(pParent,
                                   WinBits(WB_OK_CANCEL | WB_DEF_CANCEL),
@@ -768,7 +768,7 @@ void SfxOrganizeMgr::SaveAll(Window *pParent)
         _FileListEntry *pEntry = (*pImpl->pDocList)[i];
         if(!pEntry->DeleteObjectShell())
         {
-            String aText(SfxResId(STR_ERROR_SAVE_TEMPLATE));
+            String aText(SfxResId(STR_ERROR_SAVE_TEMPLATE).toString());
             aText += pEntry->aBaseName;
             ErrorBox aBox(pParent, WinBits(WB_OK_CANCEL | WB_DEF_CANCEL), aText);
             if(RET_CANCEL == aBox.Execute())
diff --git a/sfx2/source/view/printer.cxx b/sfx2/source/view/printer.cxx
index 810b25071ae1..77eb34cd0672 100644
--- a/sfx2/source/view/printer.cxx
+++ b/sfx2/source/view/printer.cxx
@@ -222,7 +222,7 @@ SfxPrintOptionsDialog::SfxPrintOptionsDialog( Window *pParent,
     pPage       ( NULL )
 
 {
-    SetText( SfxResId( STR_PRINT_OPTIONS_TITLE ) );
+    SetText( SfxResId(STR_PRINT_OPTIONS_TITLE).toString() );
 
     // Insert TabPage
     pPage = pViewSh->CreatePrintOptionsPage( this, *pOptions );
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 3719ac1c7149..589c6608628d 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -995,7 +995,7 @@ void SfxViewFrame::StateHistory_Impl( SfxItemSet &rSet )
 
     if ( pShUndoMgr && pShUndoMgr->GetUndoActionCount() )
     {
-        String aTmp( SvtResId( STR_UNDO ) );
+        String aTmp(SvtResId(STR_UNDO).toString());
         aTmp+= pShUndoMgr->GetUndoActionComment(0);
         rSet.Put( SfxStringItem( SID_UNDO, aTmp ) );
     }
@@ -1004,7 +1004,7 @@ void SfxViewFrame::StateHistory_Impl( SfxItemSet &rSet )
 
     if ( pShUndoMgr && pShUndoMgr->GetRedoActionCount() )
     {
-        String aTmp( SvtResId(STR_REDO) );
+        String aTmp(SvtResId(STR_REDO).toString());
         aTmp += pShUndoMgr->GetRedoActionComment(0);
         rSet.Put( SfxStringItem( SID_REDO, aTmp ) );
     }
@@ -1014,7 +1014,7 @@ void SfxViewFrame::StateHistory_Impl( SfxItemSet &rSet )
     if ( pShUndoMgr && pTarget && pShUndoMgr->GetRepeatActionCount() &&
          pShUndoMgr->CanRepeat(*pTarget) )
     {
-        String aTmp( SvtResId(STR_REPEAT) );
+        String aTmp(SvtResId(STR_REPEAT).toString());
         aTmp += pShUndoMgr->GetRepeatActionComment(*pTarget);
         rSet.Put( SfxStringItem( SID_REPEAT, aTmp ) );
     }
diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx
index a8c19a2b0145..909b54eddca4 100644
--- a/sfx2/source/view/viewprn.cxx
+++ b/sfx2/source/view/viewprn.cxx
@@ -343,7 +343,7 @@ void SfxPrinterController::jobFinished( com::sun::star::view::PrintableState nSt
             case view::PrintableState_JOB_FAILED :
             {
                 // "real" problem (not simply printing cancelled by user)
-                String aMsg( SfxResId( STR_NOSTARTPRINTER ) );
+                rtl::OUString aMsg( SfxResId(STR_NOSTARTPRINTER).toString() );
                 if ( !m_bApi )
                     ErrorBox( mpViewShell->GetWindow(), WB_OK | WB_DEF_OK,  aMsg ).Execute();
                 // intentionally no break
@@ -517,21 +517,21 @@ SfxPrinter* SfxViewShell::SetPrinter_Impl( SfxPrinter *pNewPrinter )
             bSizeToDoc;
 
     // Message and Flags for page format, summaries changes
-    String aMsg;
+    rtl::OUString aMsg;
     sal_uInt16 nNewOpt=0;
     if( bOriChg && bPgSzChg )
     {
-        aMsg = String(SfxResId(STR_PRINT_NEWORISIZE));
+        aMsg = SfxResId(STR_PRINT_NEWORISIZE).toString();
         nNewOpt = SFX_PRINTER_CHG_ORIENTATION | SFX_PRINTER_CHG_SIZE;
     }
     else if (bOriChg )
     {
-        aMsg = String(SfxResId(STR_PRINT_NEWORI));
+        aMsg = SfxResId(STR_PRINT_NEWORI).toString();
         nNewOpt = SFX_PRINTER_CHG_ORIENTATION;
     }
     else if (bPgSzChg)
     {
-        aMsg = String(SfxResId(STR_PRINT_NEWSIZE));
+        aMsg = SfxResId(STR_PRINT_NEWSIZE).toString();
         nNewOpt = SFX_PRINTER_CHG_SIZE;
     }
 
@@ -797,7 +797,7 @@ void SfxViewShell::ExecPrint_Impl( SfxRequest &rReq )
                     break;
                 }
                 else
-                    ErrorBox( NULL, WB_OK | WB_DEF_OK, String( SfxResId( STR_NODEFPRINTER ) ) ).Execute();
+                    ErrorBox( NULL, WB_OK | WB_DEF_OK, SfxResId(STR_NODEFPRINTER).toString() ).Execute();
             }
 
             // FIXME: printer isn't used for printing anymore!
@@ -805,7 +805,7 @@ void SfxViewShell::ExecPrint_Impl( SfxRequest &rReq )
             {
                 // if printer is busy, abort printing
                 if ( !bSilent )
-                    InfoBox( NULL, String( SfxResId( STR_ERROR_PRINTER_BUSY ) ) ).Execute();
+                    InfoBox( NULL, SfxResId(STR_ERROR_PRINTER_BUSY).toString() ).Execute();
                 rReq.SetReturnValue(SfxBoolItem(0,sal_False));
                 break;
             }