reduce use of UniString from ResID ctor

Change-Id: I8d7619e7807ff2d400ec5c7fd181375130245728

48 files changed, 209 insertions, 212 deletions

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