reduce use of UniString from ResID ctor

Change-Id: I8d7619e7807ff2d400ec5c7fd181375130245728

3 files changed, 33 insertions, 33 deletions

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() );