make ResId::toString a non-static member

Change-Id: I756c0a19bea7b1cc0e290d9f382a04d655819bfb

6 files changed, 51 insertions, 54 deletions

diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx
index 09d43f90838f..e423b6a1c382 100644
--- a/svtools/source/dialogs/addresstemplate.cxx
+++ b/svtools/source/dialogs/addresstemplate.cxx
@@ -181,7 +181,7 @@ public:
         // first collect all known programmatic names
         StringBag aKnownNames;
 
-        rtl::OUString sLogicalFieldNames(ResId::toString(SvtResId(STR_LOGICAL_FIELD_NAMES)));
+        rtl::OUString sLogicalFieldNames(SVT_RESSTR(STR_LOGICAL_FIELD_NAMES));
         sal_Int32 nIndex = 0;
         do
         {
@@ -565,7 +565,7 @@ void AssignmentPersistentData::Commit()
         ,m_aOK                      (this, SvtResId(PB_OK))\
         ,m_aCancel                  (this, SvtResId(PB_CANCEL))\
         ,m_aHelp                    (this, SvtResId(PB_HELP))\
-        ,m_sNoFieldSelection(SvtResId(STR_NO_FIELD_SELECTION))\
+        ,m_sNoFieldSelection(SVT_RESSTR(STR_NO_FIELD_SELECTION))\
         ,m_xORB(_rxORB)
 
     // -------------------------------------------------------------------
@@ -622,37 +622,37 @@ void AssignmentPersistentData::Commit()
         // should be adjustable with a rather small effort.)
 
         // initialize the strings for the field labels
-        m_pImpl->aFieldLabels.push_back( String(SvtResId( STR_FIELD_FIRSTNAME )) );
-        m_pImpl->aFieldLabels.push_back( String(SvtResId( STR_FIELD_LASTNAME )) );
-        m_pImpl->aFieldLabels.push_back( String(SvtResId( STR_FIELD_COMPANY)) );
-        m_pImpl->aFieldLabels.push_back( String(SvtResId( STR_FIELD_DEPARTMENT )) );
-        m_pImpl->aFieldLabels.push_back( String(SvtResId( STR_FIELD_STREET )) );
-        m_pImpl->aFieldLabels.push_back( String(SvtResId( STR_FIELD_ZIPCODE )) );
-        m_pImpl->aFieldLabels.push_back( String(SvtResId( STR_FIELD_CITY )) );
-        m_pImpl->aFieldLabels.push_back( String(SvtResId( STR_FIELD_STATE)) );
-        m_pImpl->aFieldLabels.push_back( String(SvtResId( STR_FIELD_COUNTRY )) );
-        m_pImpl->aFieldLabels.push_back( String(SvtResId( STR_FIELD_HOMETEL )) );
-        m_pImpl->aFieldLabels.push_back( String(SvtResId( STR_FIELD_WORKTEL )) );
-        m_pImpl->aFieldLabels.push_back( String(SvtResId( STR_FIELD_OFFICETEL)) );
-        m_pImpl->aFieldLabels.push_back( String(SvtResId( STR_FIELD_MOBILE)) );
-        m_pImpl->aFieldLabels.push_back( String(SvtResId( STR_FIELD_TELOTHER)) );
-        m_pImpl->aFieldLabels.push_back( String(SvtResId( STR_FIELD_PAGER)) );
-        m_pImpl->aFieldLabels.push_back( String(SvtResId( STR_FIELD_FAX )) );
-        m_pImpl->aFieldLabels.push_back( String(SvtResId( STR_FIELD_EMAIL )) );
-        m_pImpl->aFieldLabels.push_back( String(SvtResId( STR_FIELD_URL )) );
-        m_pImpl->aFieldLabels.push_back( String(SvtResId( STR_FIELD_TITLE )) );
-        m_pImpl->aFieldLabels.push_back( String(SvtResId( STR_FIELD_POSITION )) );
-        m_pImpl->aFieldLabels.push_back( String(SvtResId( STR_FIELD_INITIALS )) );
-        m_pImpl->aFieldLabels.push_back( String(SvtResId( STR_FIELD_ADDRFORM )) );
-        m_pImpl->aFieldLabels.push_back( String(SvtResId( STR_FIELD_SALUTATION )) );
-        m_pImpl->aFieldLabels.push_back( String(SvtResId( STR_FIELD_ID)) );
-        m_pImpl->aFieldLabels.push_back( String(SvtResId( STR_FIELD_CALENDAR)) );
-        m_pImpl->aFieldLabels.push_back( String(SvtResId( STR_FIELD_INVITE)) );
-        m_pImpl->aFieldLabels.push_back( String(SvtResId( STR_FIELD_NOTE)) );
-        m_pImpl->aFieldLabels.push_back( String(SvtResId( STR_FIELD_USER1)) );
-        m_pImpl->aFieldLabels.push_back( String(SvtResId( STR_FIELD_USER2)) );
-        m_pImpl->aFieldLabels.push_back( String(SvtResId( STR_FIELD_USER3)) );
-        m_pImpl->aFieldLabels.push_back( String(SvtResId( STR_FIELD_USER4)) );
+        m_pImpl->aFieldLabels.push_back( SVT_RESSTR( STR_FIELD_FIRSTNAME ));
+        m_pImpl->aFieldLabels.push_back( SVT_RESSTR( STR_FIELD_LASTNAME ));
+        m_pImpl->aFieldLabels.push_back( SVT_RESSTR( STR_FIELD_COMPANY));
+        m_pImpl->aFieldLabels.push_back( SVT_RESSTR( STR_FIELD_DEPARTMENT ));
+        m_pImpl->aFieldLabels.push_back( SVT_RESSTR( STR_FIELD_STREET ));
+        m_pImpl->aFieldLabels.push_back( SVT_RESSTR( STR_FIELD_ZIPCODE ));
+        m_pImpl->aFieldLabels.push_back( SVT_RESSTR( STR_FIELD_CITY ));
+        m_pImpl->aFieldLabels.push_back( SVT_RESSTR( STR_FIELD_STATE));
+        m_pImpl->aFieldLabels.push_back( SVT_RESSTR( STR_FIELD_COUNTRY ));
+        m_pImpl->aFieldLabels.push_back( SVT_RESSTR( STR_FIELD_HOMETEL ));
+        m_pImpl->aFieldLabels.push_back( SVT_RESSTR( STR_FIELD_WORKTEL ));
+        m_pImpl->aFieldLabels.push_back( SVT_RESSTR( STR_FIELD_OFFICETEL));
+        m_pImpl->aFieldLabels.push_back( SVT_RESSTR( STR_FIELD_MOBILE));
+        m_pImpl->aFieldLabels.push_back( SVT_RESSTR( STR_FIELD_TELOTHER));
+        m_pImpl->aFieldLabels.push_back( SVT_RESSTR( STR_FIELD_PAGER));
+        m_pImpl->aFieldLabels.push_back( SVT_RESSTR( STR_FIELD_FAX ));
+        m_pImpl->aFieldLabels.push_back( SVT_RESSTR( STR_FIELD_EMAIL ));
+        m_pImpl->aFieldLabels.push_back( SVT_RESSTR( STR_FIELD_URL ));
+        m_pImpl->aFieldLabels.push_back( SVT_RESSTR( STR_FIELD_TITLE ));
+        m_pImpl->aFieldLabels.push_back( SVT_RESSTR( STR_FIELD_POSITION ));
+        m_pImpl->aFieldLabels.push_back( SVT_RESSTR( STR_FIELD_INITIALS ));
+        m_pImpl->aFieldLabels.push_back( SVT_RESSTR( STR_FIELD_ADDRFORM ));
+        m_pImpl->aFieldLabels.push_back( SVT_RESSTR( STR_FIELD_SALUTATION ));
+        m_pImpl->aFieldLabels.push_back( SVT_RESSTR( STR_FIELD_ID));
+        m_pImpl->aFieldLabels.push_back( SVT_RESSTR( STR_FIELD_CALENDAR));
+        m_pImpl->aFieldLabels.push_back( SVT_RESSTR( STR_FIELD_INVITE));
+        m_pImpl->aFieldLabels.push_back( SVT_RESSTR( STR_FIELD_NOTE));
+        m_pImpl->aFieldLabels.push_back( SVT_RESSTR( STR_FIELD_USER1));
+        m_pImpl->aFieldLabels.push_back( SVT_RESSTR( STR_FIELD_USER2));
+        m_pImpl->aFieldLabels.push_back( SVT_RESSTR( STR_FIELD_USER3));
+        m_pImpl->aFieldLabels.push_back( SVT_RESSTR( STR_FIELD_USER4));
 
         // force a even number of known fields
         m_pImpl->bOddFieldNumber = (m_pImpl->aFieldLabels.size() % 2) != 0;
@@ -691,7 +691,7 @@ void AssignmentPersistentData::Commit()
         implScrollFields(0, sal_False, sal_False);
 
         // the logical names
-        rtl::OUString sLogicalFieldNames(ResId::toString(SvtResId(STR_LOGICAL_FIELD_NAMES)));
+        rtl::OUString sLogicalFieldNames(SVT_RESSTR(STR_LOGICAL_FIELD_NAMES));
         sal_Int32 nAdjustedTokenCount = comphelper::string::getTokenCount(sLogicalFieldNames, ';') + (m_pImpl->bOddFieldNumber ? 1 : 0);
         DBG_ASSERT(nAdjustedTokenCount == (sal_Int32)m_pImpl->aFieldLabels.size(),
             "AddressBookSourceDialog::AddressBookSourceDialog: inconsistence between logical and UI field names!");
diff --git a/svtools/source/dialogs/filedlg2.cxx b/svtools/source/dialogs/filedlg2.cxx
index 1d84fa441d6c..d16f65aebfc9 100644
--- a/svtools/source/dialogs/filedlg2.cxx
+++ b/svtools/source/dialogs/filedlg2.cxx
@@ -150,7 +150,7 @@ ImpPathDialog::~ImpPathDialog()
 void ImpPathDialog::InitControls()
 {
     PathDialog* pDlg = GetPathDialog();
-    pDlg->SetText( UniString( SvtResId( STR_FILEDLG_SELECT ) ) );
+    pDlg->SetText( SVT_RESSTR(STR_FILEDLG_SELECT) );
 
     Size a3Siz = pDlg->LogicToPixel( Size( 3, 3 ), MAP_APPFONT );
     Size a6Siz = pDlg->LogicToPixel( Size( 6, 6 ), MAP_APPFONT );
@@ -163,7 +163,7 @@ void ImpPathDialog::InitControls()
     UniString aEmptyStr;
 
     INITCONTROL( pDirTitel, FixedText, 0,
-                 aPnt, aFTSiz, UniString( SvtResId( STR_FILEDLG_DIR ) ), HID_FILEDLG_DIR );
+                 aPnt, aFTSiz, SVT_RESSTR( STR_FILEDLG_DIR ), HID_FILEDLG_DIR );
     aPnt.Y() += aFTSiz.Height() + a3Siz.Height();
 
     INITCONTROL( pEdit, Edit, WB_BORDER, aPnt, aEDSiz, aPath.GetFull(), HID_FILEDLG_EDIT );
@@ -175,7 +175,7 @@ void ImpPathDialog::InitControls()
         aPnt, Size( aEDSiz.Width(), nLbH1 ), aEmptyStr, HID_FILEDLG_DIRS );
     aPnt.Y() += nLbH1 + a6Siz.Height();
     INITCONTROL( pDriveTitle, FixedText, 0,
-                 aPnt, aFTSiz, UniString( SvtResId( STR_FILEDLG_DRIVES ) ), HID_FILEDLG_DRIVE );
+                 aPnt, aFTSiz, SVT_RESSTR( STR_FILEDLG_DRIVES ), HID_FILEDLG_DRIVE );
     aPnt.Y() += aFTSiz.Height() + a3Siz.Height();
     INITCONTROL( pDriveList, ListBox, WB_DROPDOWN,
                  aPnt, Size( aEDSiz.Width(), nLbH2 ), aEmptyStr, HID_FILEDLG_DRIVES );
@@ -201,12 +201,12 @@ void ImpPathDialog::InitControls()
     if( nTextWidth > aBtnSiz.Width() )
         aBtnSiz.Width() = nTextWidth;
 
-    String aNewDirStr( SvtResId( STR_FILEDLG_NEWDIR ) );
+    String aNewDirStr( SVT_RESSTR( STR_FILEDLG_NEWDIR ) );
     nTextWidth = pDlg->GetTextWidth( aNewDirStr )+nExtraWidth;
     if( nTextWidth > aBtnSiz.Width() )
         aBtnSiz.Width() = nTextWidth;
 #if defined(UNX)
-    String aHomeDirStr( SvtResId( STR_FILEDLG_HOME ) );
+    String aHomeDirStr( SVT_RESSTR( STR_FILEDLG_HOME ) );
     nTextWidth = pDlg->GetTextWidth( aHomeDirStr )+nExtraWidth;
     if( nTextWidth > aBtnSiz.Width() )
         aBtnSiz.Width() = nTextWidth;
@@ -405,7 +405,7 @@ IMPL_LINK( ImpPathDialog, DblClickHdl, ListBox*, pBox )
         {
             ErrorBox aBox( GetPathDialog(),
                            WB_OK_CANCEL | WB_DEF_OK,
-                           UniString( SvtResId( STR_FILEDLG_CANTCHDIR ) ) );
+                           SVT_RESSTR( STR_FILEDLG_CANTCHDIR ) );
             if( aBox.Execute() == RET_CANCEL )
                 GetPathDialog()->EndDialog( sal_False );
         }
@@ -508,7 +508,7 @@ sal_Bool ImpPathDialog::IsFileOk( const DirEntry& rDirEntry )
         // Datei vorhanden ?
         if( ! rDirEntry.Exists() )
         {
-            UniString aQueryTxt( SvtResId( STR_FILEDLG_ASKNEWDIR ) );
+            UniString aQueryTxt( SVT_RESSTR( STR_FILEDLG_ASKNEWDIR ) );
             aQueryTxt.SearchAndReplaceAscii( "%s", rDirEntry.GetFull() );
             QueryBox aQuery( GetPathDialog(),
                              WB_YES_NO | WB_DEF_YES,
@@ -520,7 +520,7 @@ sal_Bool ImpPathDialog::IsFileOk( const DirEntry& rDirEntry )
         }
         if( !FileStat( rDirEntry ).IsKind( FSYS_KIND_DIR ) )
         {
-            UniString aBoxText( SvtResId( STR_FILEDLG_CANTOPENDIR ) );
+            UniString aBoxText( SVT_RESSTR( STR_FILEDLG_CANTOPENDIR ) );
             aBoxText.AppendAscii( "\n[" );
             aBoxText += rDirEntry.GetFull();
             aBoxText.AppendAscii( "]" );
diff --git a/svtools/source/dialogs/insdlg.cxx b/svtools/source/dialogs/insdlg.cxx
index a7de833ff9a6..9f3f70b020ae 100644
--- a/svtools/source/dialogs/insdlg.cxx
+++ b/svtools/source/dialogs/insdlg.cxx
@@ -204,7 +204,7 @@ void SvObjectServerList::FillInsertObjects()
 
 #ifdef WNT
     SvGlobalName aOleFact( SO3_OUT_CLASSID );
-    String aOleObj( SvtResId( STR_FURTHER_OBJECT ) );
+    String aOleObj( SVT_RESSTR( STR_FURTHER_OBJECT ) );
     aObjectServerList.push_back( SvObjectServer( aOleFact, aOleObj ) );
 #endif
 
@@ -306,7 +306,7 @@ String SvPasteObjectHelper::GetSotFormatUIName( SotFormatStringId nId )
     }
 
     if( nResId )
-        aUIName = String( SvtResId( nResId ) );
+        aUIName = SVT_RESSTR( nResId );
     else
         aUIName = SotExchange::GetFormatName( nId );
 
@@ -363,8 +363,7 @@ sal_Bool SvPasteObjectHelper::GetEmbeddedName(const TransferableDataHelper& rDat
                 _rSource.Append( pSrcOfCopy );
             }
             else
-                _rSource =
-                    String( SvtResId( STR_UNKNOWN_SOURCE ) );
+                _rSource = SVT_RESSTR(STR_UNKNOWN_SOURCE);
         }
         bRet = sal_True;
     }
diff --git a/svtools/source/dialogs/prnsetup.cxx b/svtools/source/dialogs/prnsetup.cxx
index 3eb70f1705f4..add15bc37444 100644
--- a/svtools/source/dialogs/prnsetup.cxx
+++ b/svtools/source/dialogs/prnsetup.cxx
@@ -144,9 +144,7 @@ static void ImplPrnDlgAddString( XubString& rStr, const XubString& rAddStr )
 
 static void ImplPrnDlgAddResString( XubString& rStr, sal_uInt16 nResId )
 {
-    SvtResId aResId( nResId );
-    XubString aAddStr( aResId );
-    ImplPrnDlgAddString( rStr, aAddStr );
+    ImplPrnDlgAddString( rStr, SVT_RESSTR(nResId) );
 }
 
 // -----------------------------------------------------------------------
@@ -217,7 +215,7 @@ XubString ImplPrnDlgGetStatusText( const QueueInfo& rInfo )
     sal_uLong nJobs = rInfo.GetJobs();
     if ( nJobs && (nJobs != QUEUE_JOBS_DONTKNOW) )
     {
-        XubString aJobStr( SvtResId( STR_SVT_PRNDLG_JOBCOUNT ) );
+        XubString aJobStr( SVT_RESSTR( STR_SVT_PRNDLG_JOBCOUNT ) );
         XubString aJobs( XubString::CreateFromInt32( nJobs ) );
         aJobStr.SearchAndReplaceAscii( "%d", aJobs );
         ImplPrnDlgAddString( aStr, aJobStr );
diff --git a/svtools/source/dialogs/roadmapwizard.cxx b/svtools/source/dialogs/roadmapwizard.cxx
index a6d591941b7d..6a7490e26038 100644
--- a/svtools/source/dialogs/roadmapwizard.cxx
+++ b/svtools/source/dialogs/roadmapwizard.cxx
@@ -200,7 +200,7 @@ namespace svt
         SetEmptyViewMargin();
 
         m_pImpl->pRoadmap = new ORoadmap( this, WB_TABSTOP );
-        m_pImpl->pRoadmap->SetText( SvtResId( STR_WIZDLG_ROADMAP_TITLE ) );
+        m_pImpl->pRoadmap->SetText( SVT_RESSTR( STR_WIZDLG_ROADMAP_TITLE ) );
         m_pImpl->pRoadmap->SetPosPixel( Point( 0, 0 ) );
         m_pImpl->pRoadmap->SetItemSelectHdl( LINK( this, RoadmapWizard, OnRoadmapItemSelected ) );
 
diff --git a/svtools/source/dialogs/wizardmachine.cxx b/svtools/source/dialogs/wizardmachine.cxx
index 56d66a1c0fc5..b024364c4861 100644
--- a/svtools/source/dialogs/wizardmachine.cxx
+++ b/svtools/source/dialogs/wizardmachine.cxx
@@ -170,7 +170,7 @@ namespace svt
             m_pPrevPage = new PushButton(this, WB_TABSTOP);
             m_pPrevPage->SetHelpId( HID_WIZARD_PREVIOUS );
             m_pPrevPage->SetSizePixel( LogicToPixel( Size( 50, 14 ), MAP_APPFONT ) );
-            m_pPrevPage->SetText(String(SvtResId(STR_WIZDLG_PREVIOUS)));
+            m_pPrevPage->SetText(SVT_RESSTR(STR_WIZDLG_PREVIOUS));
             m_pPrevPage->Show();
 
             if (_nButtonFlags & WZB_NEXT)
@@ -187,7 +187,7 @@ namespace svt
             m_pNextPage = new PushButton(this, WB_TABSTOP);
             m_pNextPage->SetHelpId( HID_WIZARD_NEXT );
             m_pNextPage->SetSizePixel( LogicToPixel( Size( 50, 14 ), MAP_APPFONT ) );
-            m_pNextPage->SetText(String(SvtResId(STR_WIZDLG_NEXT)));
+            m_pNextPage->SetText(String(SVT_RESSTR(STR_WIZDLG_NEXT)));
             m_pNextPage->Show();
 
             AddButton( m_pNextPage, WIZARDDIALOG_BUTTON_STDOFFSET_X );
@@ -200,7 +200,7 @@ namespace svt
         {
             m_pFinish = new OKButton(this, WB_TABSTOP);
             m_pFinish->SetSizePixel( LogicToPixel( Size( 50, 14 ), MAP_APPFONT ) );
-            m_pFinish->SetText(String(SvtResId(STR_WIZDLG_FINISH)));
+            m_pFinish->SetText(SVT_RESSTR(STR_WIZDLG_FINISH));
             m_pFinish->Show();
 
             AddButton( m_pFinish, WIZARDDIALOG_BUTTON_STDOFFSET_X );