tidy some resource strings

Change-Id: I611a276d048121084ec842d062129e042f3baea5

5 files changed, 25 insertions, 32 deletions

diff --git a/svtools/source/filter/exportdialog.cxx b/svtools/source/filter/exportdialog.cxx
index 9fc8ecd0eb71..ef226f9516ea 100644
--- a/svtools/source/filter/exportdialog.cxx
+++ b/svtools/source/filter/exportdialog.cxx
@@ -617,9 +617,9 @@ ExportDialog::ExportDialog( FltCallDialogParameter& rPara,
                 maRbEPSCompressionNone  ( this, ResId( RB_EPS_COMPRESSION_NONE, *rPara.pResMgr ) ),
                 maFlEstimatedSize       ( this, ResId( FL_ESTIMATED_SIZE, *rPara.pResMgr ) ),
                 maFtEstimatedSize       ( this, ResId( FT_ESTIMATED_SIZE, *rPara.pResMgr ) ),
-                msEstimatedSizePix1     ( ResId( STR_ESTIMATED_SIZE_PIX_1, *rPara.pResMgr ) ),
-                msEstimatedSizePix2     ( ResId( STR_ESTIMATED_SIZE_PIX_2, *rPara.pResMgr ) ),
-                msEstimatedSizeVec      ( ResId( STR_ESTIMATED_SIZE_VEC, *rPara.pResMgr ) ),
+                msEstimatedSizePix1     ( ResId( STR_ESTIMATED_SIZE_PIX_1, *rPara.pResMgr ).toString() ),
+                msEstimatedSizePix2     ( ResId( STR_ESTIMATED_SIZE_PIX_2, *rPara.pResMgr ).toString() ),
+                msEstimatedSizeVec      ( ResId( STR_ESTIMATED_SIZE_VEC, *rPara.pResMgr ).toString() ),
                 maFlButtons             ( this, ResId( FL_BUTTONS, *rPara.pResMgr ) ),
                 maFbJPGPreview          ( this, ResId( FB_JPG_PREVIEW, *rPara.pResMgr ) ),
                 maSbZoom                ( this, ResId( SB_ZOOM, *rPara.pResMgr ) ),
@@ -629,13 +629,13 @@ ExportDialog::ExportDialog( FltCallDialogParameter& rPara,
                 maBtnOK                 ( this, ResId( BTN_OK, *rPara.pResMgr ) ),
                 maBtnCancel             ( this, ResId( BTN_CANCEL, *rPara.pResMgr ) ),
                 maBtnHelp               ( this, ResId( BTN_HELP, *rPara.pResMgr ) ),
-                ms1BitTreshold          ( ResId( STR_1BIT_THRESHOLD, *rPara.pResMgr ) ),
-                ms1BitDithered          ( ResId( STR_1BIT_DITHERED, *rPara.pResMgr ) ),
-                ms4BitGrayscale         ( ResId( STR_4BIT_GRAYSCALE, *rPara.pResMgr ) ),
-                ms4BitColorPalette      ( ResId( STR_4BIT_COLOR_PALETTE, *rPara.pResMgr ) ),
-                ms8BitGrayscale         ( ResId( STR_8BIT_GRAYSCALE, *rPara.pResMgr ) ),
-                ms8BitColorPalette      ( ResId( STR_8BIT_COLOR_PALETTE, *rPara.pResMgr ) ),
-                ms24BitColor            ( ResId( STR_24BIT_TRUE_COLOR, *rPara.pResMgr ) ),
+                ms1BitTreshold          ( ResId( STR_1BIT_THRESHOLD, *rPara.pResMgr ).toString() ),
+                ms1BitDithered          ( ResId( STR_1BIT_DITHERED, *rPara.pResMgr ).toString() ),
+                ms4BitGrayscale         ( ResId( STR_4BIT_GRAYSCALE, *rPara.pResMgr ).toString() ),
+                ms4BitColorPalette      ( ResId( STR_4BIT_COLOR_PALETTE, *rPara.pResMgr ).toString() ),
+                ms8BitGrayscale         ( ResId( STR_8BIT_GRAYSCALE, *rPara.pResMgr ).toString() ),
+                ms8BitColorPalette      ( ResId( STR_8BIT_COLOR_PALETTE, *rPara.pResMgr ).toString() ),
+                ms24BitColor            ( ResId( STR_24BIT_TRUE_COLOR, *rPara.pResMgr ).toString() ),
                 maExt                   ( rPara.aFilterExt ),
                 mnFormat                ( FORMAT_UNKNOWN ),
                 mnMaxFilesizeForRealtimePreview( 0 ),
@@ -663,7 +663,7 @@ ExportDialog::ExportDialog( FltCallDialogParameter& rPara,
     maFtEstimatedSize.SetText( String( RTL_CONSTASCII_USTRINGPARAM( " \n " ) ) );
 
     String  aTitle( maExt );
-    aTitle += String( ResId( DLG_EXPORT_TITLE, *mpMgr ) );
+    aTitle += ResId(DLG_EXPORT_TITLE, *mpMgr).toString();
     SetText( aTitle );
 
     mnFormat = GetFilterFormat( maExt );
diff --git a/svtools/source/java/javainteractionhandler.cxx b/svtools/source/java/javainteractionhandler.cxx
index 6b54a5dfe5b1..16146ba34e56 100644
--- a/svtools/source/java/javainteractionhandler.cxx
+++ b/svtools/source/java/javainteractionhandler.cxx
@@ -131,8 +131,7 @@ void SAL_CALL JavaInteractionHandler::handle( const Reference< XInteractionReque
             SolarMutexGuard aSolarGuard;
             m_bJavaNotFound_Handled = true;
             WarningBox aWarningBox( NULL, SvtResId( WARNINGBOX_JAVANOTFOUND ) );
-            String aTitle( SvtResId( STR_WARNING_JAVANOTFOUND ) );
-            aWarningBox.SetText( aTitle );
+            aWarningBox.SetText(SvtResId(STR_WARNING_JAVANOTFOUND).toString());
             nResult = aWarningBox.Execute();
         }
         else
@@ -152,8 +151,7 @@ void SAL_CALL JavaInteractionHandler::handle( const Reference< XInteractionReque
 #else
             WarningBox aWarningBox( NULL, SvtResId( WARNINGBOX_INVALIDJAVASETTINGS ) );
 #endif
-            String aTitle( SvtResId(STR_WARNING_INVALIDJAVASETTINGS));
-            aWarningBox.SetText( aTitle );
+            aWarningBox.SetText(SvtResId(STR_WARNING_INVALIDJAVASETTINGS).toString());
             nResult = aWarningBox.Execute();
         }
         else
@@ -169,8 +167,7 @@ void SAL_CALL JavaInteractionHandler::handle( const Reference< XInteractionReque
             m_bJavaDisabled_Handled = true;
             // Java disabled. Give user a chance to enable Java inside Office.
             QueryBox aQueryBox( NULL, SvtResId( QBX_JAVADISABLED ) );
-            String aTitle( SvtResId( STR_QUESTION_JAVADISABLED ) );
-            aQueryBox.SetText( aTitle );
+            aQueryBox.SetText(SvtResId( STR_QUESTION_JAVADISABLED ).toString());
             nResult = aQueryBox.Execute();
             if ( nResult == RET_YES )
             {
@@ -197,8 +194,7 @@ void SAL_CALL JavaInteractionHandler::handle( const Reference< XInteractionReque
 #else
             ErrorBox aErrorBox( NULL, SvtResId( ERRORBOX_JVMCREATIONFAILED ) );
 #endif
-            String aTitle( SvtResId( STR_ERROR_JVMCREATIONFAILED ) );
-            aErrorBox.SetText( aTitle );
+            aErrorBox.SetText(SvtResId( STR_ERROR_JVMCREATIONFAILED ).toString());
             nResult = aErrorBox.Execute();
         }
         else
@@ -215,8 +211,7 @@ void SAL_CALL JavaInteractionHandler::handle( const Reference< XInteractionReque
             SolarMutexGuard aSolarGuard;
             m_bRestartRequired_Handled = true;
             ErrorBox aErrorBox(NULL, SvtResId( ERRORBOX_RESTARTREQUIRED ) );
-            String aTitle( SvtResId( STR_ERROR_RESTARTREQUIRED ) );
-            aErrorBox.SetText( aTitle );
+            aErrorBox.SetText(SvtResId( STR_ERROR_RESTARTREQUIRED ).toString());
             nResult = aErrorBox.Execute();
         }
         else
diff --git a/svtools/source/misc/ehdl.cxx b/svtools/source/misc/ehdl.cxx
index d78745c642a7..c56cb894abc5 100644
--- a/svtools/source/misc/ehdl.cxx
+++ b/svtools/source/misc/ehdl.cxx
@@ -90,7 +90,7 @@ static sal_uInt16 aWndFunc(
             break;
     }
 
-    String aErr(SvtResId(STR_ERR_HDLMESS));
+    String aErr(SvtResId(STR_ERR_HDLMESS).toString());
     String aAction(rAction);
     if ( aAction.Len() )
         aAction += String::CreateFromAscii( ":\n" );
@@ -264,7 +264,7 @@ class ResString: public String
 //-------------------------------------------------------------------------
 
 ResString::ResString(ResId & rId):
-    String(rId.SetAutoRelease(sal_False)),
+    String(rId.SetAutoRelease(sal_False).toString()),
     nFlags(0)
 {
     ResMgr * pResMgr = rId.GetResMgr();
@@ -371,7 +371,7 @@ sal_Bool SfxErrorHandler::GetErrorString(
     SolarMutexGuard aGuard;
 
     sal_Bool bRet = sal_False;
-    rStr=String(SvtResId(RID_ERRHDL_CLASS));
+    rStr=SvtResId(RID_ERRHDL_CLASS).toString();
     ResId aResId(nId, *pMgr);
 
     {
diff --git a/svtools/source/misc/imagemgr.cxx b/svtools/source/misc/imagemgr.cxx
index e5256bd10ead..1e65ecdd40ea 100644
--- a/svtools/source/misc/imagemgr.cxx
+++ b/svtools/source/misc/imagemgr.cxx
@@ -457,13 +457,12 @@ static String GetDescriptionByFactory_Impl( const String& rFactory )
     else if ( rFactory.EqualsIgnoreCaseAscii( "sdatabase", 0, 9 ) )
         nResId = STR_DESCRIPTION_FACTORY_DATABASE;
 
-    String aRet;
     if ( nResId )
     {
         SolarMutexGuard aGuard;
-        aRet = String( SvtResId( nResId ) );
+        return SvtResId(nResId).toString();
     }
-    return aRet;
+    return rtl::OUString();
 }
 
 static sal_uInt16 GetFolderDescriptionId_Impl( const String& rURL )
@@ -588,7 +587,7 @@ String SvFileInformationManager::GetDescription_Impl( const INetURLObject& rObje
             sDescription += '-';
         }
         SolarMutexGuard aGuard;
-        sDescription += String( SvtResId( nResId ) );
+        sDescription += SvtResId(nResId).toString();
     }
 
     DBG_ASSERT( sDescription.Len() > 0, "file without description" );
@@ -667,8 +666,7 @@ String SvFileInformationManager::GetFolderDescription( const svtools::VolumeInfo
     else if ( rInfo.m_bIsRemoveable || rInfo.m_bIsVolume )
         nResId = STR_DESCRIPTION_LOCALE_VOLUME;
 
-    String sDescription = String( SvtResId( nResId ) );
-    return sDescription;
+    return SvtResId(nResId).toString();
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/toolpanel/paneltabbar.cxx b/svtools/source/toolpanel/paneltabbar.cxx
index 3db96b0ed762..a322c965c2e3 100644
--- a/svtools/source/toolpanel/paneltabbar.cxx
+++ b/svtools/source/toolpanel/paneltabbar.cxx
@@ -533,13 +533,13 @@ namespace svt
         m_aScrollBack.SetSymbol( IsVertical() ? SYMBOL_ARROW_UP : SYMBOL_ARROW_LEFT );
         m_aScrollBack.Show();
         m_aScrollBack.SetClickHdl( LINK( this, PanelTabBar_Impl, OnScroll ) );
-        m_aScrollBack.SetAccessibleDescription( String( SvtResId( STR_SVT_TOOL_PANEL_BUTTON_FWD ) ) );
+        m_aScrollBack.SetAccessibleDescription( SvtResId( STR_SVT_TOOL_PANEL_BUTTON_FWD ).toString() );
         m_aScrollBack.SetAccessibleName( m_aScrollBack.GetAccessibleDescription() );
 
         m_aScrollForward.SetSymbol( IsVertical() ? SYMBOL_ARROW_DOWN : SYMBOL_ARROW_RIGHT );
         m_aScrollForward.Show();
         m_aScrollForward.SetClickHdl( LINK( this, PanelTabBar_Impl, OnScroll ) );
-        m_aScrollForward.SetAccessibleDescription( String( SvtResId( STR_SVT_TOOL_PANEL_BUTTON_BACK ) ) );
+        m_aScrollForward.SetAccessibleDescription( SvtResId( STR_SVT_TOOL_PANEL_BUTTON_BACK ).toString() );
         m_aScrollForward.SetAccessibleName( m_aScrollForward.GetAccessibleDescription() );
     }