make ResId::toString a non-static member

Change-Id: I756c0a19bea7b1cc0e290d9f382a04d655819bfb

14 files changed, 54 insertions, 54 deletions

diff --git a/sc/inc/scresid.hxx b/sc/inc/scresid.hxx
index 7cb8136f2081..ecd059e5a156 100644
--- a/sc/inc/scresid.hxx
+++ b/sc/inc/scresid.hxx
@@ -40,7 +40,7 @@ class SC_DLLPUBLIC ScResId : public ResId
     ScResId( sal_uInt16 nId );      // in scdll.cxx
 };
 
-
+#define SC_RESSTR(x) ScResId(x).toString()
 
 #endif // SC_SCRESMGR_HXX
 
diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx
index a3ae9abdaa06..b6abe7d512ab 100644
--- a/sc/source/core/data/dpobject.cxx
+++ b/sc/source/core/data/dpobject.cxx
@@ -1081,7 +1081,7 @@ void ScDPObject::FillPageList( std::vector<rtl::OUString>& rStrings, long nField
     }
 
     //  add "-all-" entry to the top (unsorted)
-    rStrings.insert(rStrings.begin(), ScResId::toString(ScResId(SCSTR_ALL)));
+    rStrings.insert(rStrings.begin(), SC_RESSTR(SCSTR_ALL));
 }
 
 void ScDPObject::GetHeaderPositionData(const ScAddress& rPos, DataPilotTableHeaderData& rData)
diff --git a/sc/source/core/data/dpoutput.cxx b/sc/source/core/data/dpoutput.cxx
index 875371f94c9b..544fb9ddef56 100644
--- a/sc/source/core/data/dpoutput.cxx
+++ b/sc/source/core/data/dpoutput.cxx
@@ -1005,7 +1005,7 @@ void ScDPOutput::Output()
         if ( pPageFields[nField].aResult.getLength() == 1 )
             aPageValue = pPageFields[nField].aResult[0].Caption;
         else
-            aPageValue = ScResId::toString(ScResId(SCSTR_ALL));        //! separate string?
+            aPageValue = SC_RESSTR(SCSTR_ALL);        //! separate string?
 
         pDoc->SetString( nFldCol, nHdrRow, nTab, aPageValue );
 
diff --git a/sc/source/core/data/funcdesc.cxx b/sc/source/core/data/funcdesc.cxx
index 4175effc7d25..8a0217200be8 100644
--- a/sc/source/core/data/funcdesc.cxx
+++ b/sc/source/core/data/funcdesc.cxx
@@ -787,7 +787,7 @@ void ScFunctionMgr::fillLastRecentlyUsedFunctions(::std::vector< const formula::
     SAL_WNODEPRECATED_DECLARATIONS_PUSH
     ::std::auto_ptr<ScResourcePublisher> pCategories( new ScResourcePublisher( ScResId( RID_FUNCTION_CATEGORIES ) ) );
     SAL_WNODEPRECATED_DECLARATIONS_POP
-    return ResId::toString(ScResId(static_cast<sal_uInt16>(_nCategoryNumber)));
+    return SC_RESSTR(static_cast<sal_uInt16>(_nCategoryNumber));
 }
 
 sal_Unicode ScFunctionMgr::getSingleToken(const formula::IFunctionManager::EToken _eToken) const
@@ -866,7 +866,7 @@ ScFuncRes::ScFuncRes( ResId &aRes, ScFuncDesc* pDesc, bool & rbSuppressed )
     }
 
     pDesc->pFuncName = new ::rtl::OUString( ScCompiler::GetNativeSymbol( static_cast<OpCode>( aRes.GetId())));
-    pDesc->pFuncDesc = new ::rtl::OUString( ResId::toString(ScResId(1)));
+    pDesc->pFuncDesc = new ::rtl::OUString( SC_RESSTR(1) );
 
     if (nArgs)
     {
@@ -874,8 +874,8 @@ ScFuncRes::ScFuncRes( ResId &aRes, ScFuncDesc* pDesc, bool & rbSuppressed )
         pDesc->ppDefArgDescs = new ::rtl::OUString*[nArgs];
         for (sal_uInt16 i = 0; i < nArgs; ++i)
         {
-            pDesc->ppDefArgNames[i] = new ::rtl::OUString(ResId::toString(ScResId(2*(i+1)  )));
-            pDesc->ppDefArgDescs[i] = new ::rtl::OUString(ResId::toString(ScResId(2*(i+1)+1)));
+            pDesc->ppDefArgNames[i] = new ::rtl::OUString(SC_RESSTR(2*(i+1)  ));
+            pDesc->ppDefArgDescs[i] = new ::rtl::OUString(SC_RESSTR(2*(i+1)+1));
         }
     }
 
diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx
index 94776cee444d..cb236c6059c4 100644
--- a/sc/source/ui/dbgui/filtdlg.cxx
+++ b/sc/source/ui/dbgui/filtdlg.cxx
@@ -113,12 +113,12 @@ ScFilterDlg::ScFilterDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent,
         aBtnDestPers    ( this, ScResId( BTN_DEST_PERS ) ),
         aFtDbAreaLabel  ( this, ScResId( FT_DBAREA_LABEL ) ),
         aFtDbArea       ( this, ScResId( FT_DBAREA ) ),
-        aStrUndefined   ( ResId::toString(ScResId(SCSTR_UNDEFINED)) ),
-        aStrNone        ( ResId::toString(ScResId(SCSTR_NONE)) ),
-        aStrEmpty       ( ResId::toString(ScResId(SCSTR_EMPTY)) ),
-        aStrNotEmpty    ( ResId::toString(ScResId(SCSTR_NOTEMPTY)) ),
-        aStrRow         ( ResId::toString(ScResId(SCSTR_ROW)) ),
-        aStrColumn      ( ResId::toString(ScResId(SCSTR_COLUMN)) ),
+        aStrUndefined   ( SC_RESSTR(SCSTR_UNDEFINED) ),
+        aStrNone        ( SC_RESSTR(SCSTR_NONE) ),
+        aStrEmpty       ( SC_RESSTR(SCSTR_EMPTY) ),
+        aStrNotEmpty    ( SC_RESSTR(SCSTR_NOTEMPTY) ),
+        aStrRow         ( SC_RESSTR(SCSTR_ROW) ),
+        aStrColumn      ( SC_RESSTR(SCSTR_COLUMN) ),
         //
         pOptionsMgr     ( NULL ),
         nWhichQuery     ( rArgSet.GetPool()->GetWhich( SID_QUERY ) ),
@@ -143,7 +143,7 @@ ScFilterDlg::ScFilterDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent,
 
     OUStringBuffer aBuf;
 
-    OUString sAccName = ResId::toString(ScResId(RID_FILTER_OPERATOR));
+    OUString sAccName = SC_RESSTR(RID_FILTER_OPERATOR);
     aBuf.append(sAccName);
     aBuf.appendAscii(RTL_CONSTASCII_STRINGPARAM (" 1"));
     aLbConnect1.SetAccessibleName(aBuf.makeStringAndClear());
@@ -151,7 +151,7 @@ ScFilterDlg::ScFilterDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent,
     aBuf.appendAscii(RTL_CONSTASCII_STRINGPARAM (" 2"));
     aLbConnect2.SetAccessibleName(aBuf.makeStringAndClear());
 
-    sAccName = ResId::toString(ScResId(RID_FILTER_FIELDNAME));
+    sAccName = SC_RESSTR(RID_FILTER_FIELDNAME);
     aBuf.append(sAccName);
     aBuf.appendAscii(RTL_CONSTASCII_STRINGPARAM (" 1"));
     aLbField1.SetAccessibleName(aBuf.makeStringAndClear());
@@ -162,7 +162,7 @@ ScFilterDlg::ScFilterDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent,
     aBuf.appendAscii(RTL_CONSTASCII_STRINGPARAM (" 3"));
     aLbField3.SetAccessibleName(aBuf.makeStringAndClear());
 
-    sAccName = ResId::toString(ScResId(RID_FILTER_CONDITION));
+    sAccName = SC_RESSTR(RID_FILTER_CONDITION);
     aBuf.append(sAccName);
     aBuf.appendAscii(RTL_CONSTASCII_STRINGPARAM (" 1"));
     aLbCond1.SetAccessibleName(aBuf.makeStringAndClear());
@@ -173,7 +173,7 @@ ScFilterDlg::ScFilterDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent,
     aBuf.appendAscii(RTL_CONSTASCII_STRINGPARAM (" 3"));
     aLbCond3.SetAccessibleName(aBuf.makeStringAndClear());
 
-    sAccName = ResId::toString(ScResId(RID_FILTER_VALUE));
+    sAccName = SC_RESSTR(RID_FILTER_VALUE);
     aBuf.append(sAccName);
     aBuf.appendAscii(RTL_CONSTASCII_STRINGPARAM (" 1"));
     aEdVal1.SetAccessibleName(aBuf.makeStringAndClear());
diff --git a/sc/source/ui/dbgui/pfiltdlg.cxx b/sc/source/ui/dbgui/pfiltdlg.cxx
index 4b2198e77198..ef4157f1f803 100644
--- a/sc/source/ui/dbgui/pfiltdlg.cxx
+++ b/sc/source/ui/dbgui/pfiltdlg.cxx
@@ -88,12 +88,12 @@ ScPivotFilterDlg::ScPivotFilterDlg( Window*             pParent,
         aBtnCancel      ( this, ScResId( BTN_CANCEL ) ),
         aBtnHelp        ( this, ScResId( BTN_HELP ) ),
         aBtnMore        ( this, ScResId( BTN_MORE ) ),
-        aStrUndefined   ( ResId::toString(ScResId(SCSTR_UNDEFINED)) ),
-        aStrNone        ( ResId::toString(ScResId(SCSTR_NONE)) ),
-        aStrEmpty       ( ResId::toString(ScResId(SCSTR_EMPTY)) ),
-        aStrNotEmpty    ( ResId::toString(ScResId(SCSTR_NOTEMPTY)) ),
-        aStrRow         ( ResId::toString(ScResId(SCSTR_ROW)) ),
-        aStrColumn      ( ResId::toString(ScResId(SCSTR_COLUMN)) ),
+        aStrUndefined   ( SC_RESSTR(SCSTR_UNDEFINED) ),
+        aStrNone        ( SC_RESSTR(SCSTR_NONE) ),
+        aStrEmpty       ( SC_RESSTR(SCSTR_EMPTY) ),
+        aStrNotEmpty    ( SC_RESSTR(SCSTR_NOTEMPTY) ),
+        aStrRow         ( SC_RESSTR(SCSTR_ROW) ),
+        aStrColumn      ( SC_RESSTR(SCSTR_COLUMN) ),
         //
         nWhichQuery     ( rArgSet.GetPool()->GetWhich( SID_QUERY ) ),
         theQueryData    ( ((const ScQueryItem&)
diff --git a/sc/source/ui/dbgui/pvlaydlg.cxx b/sc/source/ui/dbgui/pvlaydlg.cxx
index d4217659da86..3ff9b9ccef02 100644
--- a/sc/source/ui/dbgui/pvlaydlg.cxx
+++ b/sc/source/ui/dbgui/pvlaydlg.cxx
@@ -129,8 +129,8 @@ ScDPLayoutDlg::ScDPLayoutDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pPar
         aBtnOptions     ( this, ScResId( BTN_OPTIONS ) ),
         aBtnMore        ( this, ScResId( BTN_MORE ) ),
 
-        aStrUndefined   (ScResId::toString(ScResId(SCSTR_UNDEFINED))),
-        aStrNewTable    (ScResId::toString(ScResId(SCSTR_NEWTABLE))),
+        aStrUndefined   (SC_RESSTR(SCSTR_UNDEFINED)),
+        aStrNewTable    (SC_RESSTR(SCSTR_NEWTABLE)),
 
         bIsDrag         ( false ),
 
@@ -177,7 +177,7 @@ void ScDPLayoutDlg::Init(bool bNewOutput)
 
     aFuncNameArr.reserve( PIVOT_MAXFUNC );
     for ( sal_uInt16 i = 0; i < PIVOT_MAXFUNC; ++i )
-        aFuncNameArr.push_back(ScResId::toString(ScResId(i+1)));
+        aFuncNameArr.push_back(SC_RESSTR(i+1));
 
     aBtnMore.AddWindow( &aFlAreas );
     aBtnMore.AddWindow( &aFtInArea );
diff --git a/sc/source/ui/dbgui/sfiltdlg.cxx b/sc/source/ui/dbgui/sfiltdlg.cxx
index ce4808b7313a..8d4e9aa36bf1 100644
--- a/sc/source/ui/dbgui/sfiltdlg.cxx
+++ b/sc/source/ui/dbgui/sfiltdlg.cxx
@@ -86,7 +86,7 @@ ScSpecialFilterDlg::ScSpecialFilterDlg( SfxBindings* pB, SfxChildWindow* pCW, Wi
         aBtnDestPers    ( this, ScResId( BTN_DEST_PERS ) ),
         aFtDbAreaLabel  ( this, ScResId( FT_DBAREA_LABEL ) ),
         aFtDbArea       ( this, ScResId( FT_DBAREA ) ),
-        aStrUndefined   ( ResId::toString(ScResId(SCSTR_UNDEFINED)) ),
+        aStrUndefined   ( SC_RESSTR(SCSTR_UNDEFINED) ),
         aBtnOk          ( this, ScResId( BTN_OK ) ),
         aBtnCancel      ( this, ScResId( BTN_CANCEL ) ),
         aBtnHelp        ( this, ScResId( BTN_HELP ) ),
diff --git a/sc/source/ui/miscdlgs/acredlin.cxx b/sc/source/ui/miscdlgs/acredlin.cxx
index 488d1a20bb34..99645044b23c 100644
--- a/sc/source/ui/miscdlgs/acredlin.cxx
+++ b/sc/source/ui/miscdlgs/acredlin.cxx
@@ -110,22 +110,22 @@ ScAcceptChgDlg::ScAcceptChgDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pP
         pViewData       ( ptrViewData ),
         pDoc            ( ptrViewData->GetDocument() ),
         aLocalRangeName ( *(pDoc->GetRangeName()) ),
-        aStrInsertCols       (ResId::toString(ScResId(STR_INSERT_COLS))),
-        aStrInsertRows       (ResId::toString(ScResId(STR_INSERT_ROWS))),
-        aStrInsertTabs       (ResId::toString(ScResId(STR_INSERT_TABS))),
-        aStrDeleteCols       (ResId::toString(ScResId(STR_DELETE_COLS))),
-        aStrDeleteRows       (ResId::toString(ScResId(STR_DELETE_ROWS))),
-        aStrDeleteTabs       (ResId::toString(ScResId(STR_DELETE_TABS))),
-        aStrMove             (ResId::toString(ScResId(STR_MOVE))),
-        aStrContent          (ResId::toString(ScResId(STR_CONTENT))),
-        aStrReject           (ResId::toString(ScResId(STR_REJECT))),
-        aStrAllAccepted      (ResId::toString(ScResId(STR_ACCEPTED))),
-        aStrAllRejected      (ResId::toString(ScResId(STR_REJECTED))),
-        aStrNoEntry          (ResId::toString(ScResId(STR_NO_ENTRY))),
-        aStrContentWithChild (ResId::toString(ScResId(STR_CONTENT_WITH_CHILD))),
-        aStrChildContent     (ResId::toString(ScResId(STR_CHILD_CONTENT))),
-        aStrChildOrgContent  (ResId::toString(ScResId(STR_CHILD_ORGCONTENT))),
-        aStrEmpty            (ResId::toString(ScResId(STR_EMPTY))),
+        aStrInsertCols       (SC_RESSTR(STR_INSERT_COLS)),
+        aStrInsertRows       (SC_RESSTR(STR_INSERT_ROWS)),
+        aStrInsertTabs       (SC_RESSTR(STR_INSERT_TABS)),
+        aStrDeleteCols       (SC_RESSTR(STR_DELETE_COLS)),
+        aStrDeleteRows       (SC_RESSTR(STR_DELETE_ROWS)),
+        aStrDeleteTabs       (SC_RESSTR(STR_DELETE_TABS)),
+        aStrMove             (SC_RESSTR(STR_MOVE)),
+        aStrContent          (SC_RESSTR(STR_CONTENT)),
+        aStrReject           (SC_RESSTR(STR_REJECT)),
+        aStrAllAccepted      (SC_RESSTR(STR_ACCEPTED)),
+        aStrAllRejected      (SC_RESSTR(STR_REJECTED)),
+        aStrNoEntry          (SC_RESSTR(STR_NO_ENTRY)),
+        aStrContentWithChild (SC_RESSTR(STR_CONTENT_WITH_CHILD)),
+        aStrChildContent     (SC_RESSTR(STR_CHILD_CONTENT)),
+        aStrChildOrgContent  (SC_RESSTR(STR_CHILD_ORGCONTENT)),
+        aStrEmpty            (SC_RESSTR(STR_EMPTY)),
         aUnknown(RTL_CONSTASCII_USTRINGPARAM("Unknown")),
         bAcceptEnableFlag(true),
         bRejectEnableFlag(true),
diff --git a/sc/source/ui/miscdlgs/filldlg.cxx b/sc/source/ui/miscdlgs/filldlg.cxx
index c045587dcce5..4106f6952fc0 100644
--- a/sc/source/ui/miscdlgs/filldlg.cxx
+++ b/sc/source/ui/miscdlgs/filldlg.cxx
@@ -95,7 +95,7 @@ ScFillSeriesDlg::ScFillSeriesDlg( Window*       pParent,
         aBtnOk          ( this, ScResId( BTN_OK ) ),
         aBtnCancel      ( this, ScResId( BTN_CANCEL ) ),
         aBtnHelp        ( this, ScResId( BTN_HELP ) ),
-        aErrMsgInvalidVal( ResId::toString(ScResId(STR_VALERR)) ),
+        aErrMsgInvalidVal( SC_RESSTR(STR_VALERR) ),
         rDoc            ( rDocument ),
         theFillDir      ( eFillDir ),
         theFillCmd      ( eFillCmd ),
diff --git a/sc/source/ui/miscdlgs/mvtabdlg.cxx b/sc/source/ui/miscdlgs/mvtabdlg.cxx
index b3f30c43fe65..7c91282acfe9 100644
--- a/sc/source/ui/miscdlgs/mvtabdlg.cxx
+++ b/sc/source/ui/miscdlgs/mvtabdlg.cxx
@@ -65,9 +65,9 @@ ScMoveTableDlg::ScMoveTableDlg(Window* pParent, const rtl::OUString& rDefault)
         aBtnCancel  ( this, ScResId( BTN_CANCEL ) ),
         aBtnHelp    ( this, ScResId( BTN_HELP ) ),
 
-        maStrTabNameUsed( ResId::toString(ScResId(STR_TABNAME_WARN_USED)) ),
-        maStrTabNameEmpty( ResId::toString(ScResId(STR_TABNAME_WARN_EMPTY)) ),
-        maStrTabNameInvalid( ResId::toString(ScResId(STR_TABNAME_WARN_INVALID)) ),
+        maStrTabNameUsed( SC_RESSTR(STR_TABNAME_WARN_USED) ),
+        maStrTabNameEmpty( SC_RESSTR(STR_TABNAME_WARN_EMPTY) ),
+        maStrTabNameInvalid( SC_RESSTR(STR_TABNAME_WARN_INVALID) ),
         //
         maDefaultName( rDefault ),
         mnCurrentDocPos( 0 ),
diff --git a/sc/source/ui/namedlg/namedefdlg.cxx b/sc/source/ui/namedlg/namedefdlg.cxx
index fe383d7cba2a..3500d02898a7 100644
--- a/sc/source/ui/namedlg/namedefdlg.cxx
+++ b/sc/source/ui/namedlg/namedefdlg.cxx
@@ -76,7 +76,7 @@ ScNameDefDlg::ScNameDefDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParen
     maGlobalNameStr  ( ScGlobal::GetRscString(STR_GLOBAL_SCOPE) ),
     maErrInvalidNameStr( ScGlobal::GetRscString(STR_ERR_NAME_INVALID)),
     maErrNameInUse   ( ScGlobal::GetRscString(STR_ERR_NAME_EXISTS)),
-    maStrInfoDefault ( ResId::toString(ScResId(STR_DEFAULT_INFO))),
+    maStrInfoDefault ( SC_RESSTR(STR_DEFAULT_INFO)),
     maRangeMap( aRangeMap )
 {
     // Initialize scope list.
diff --git a/sc/source/ui/namedlg/namedlg.cxx b/sc/source/ui/namedlg/namedlg.cxx
index 40cf4fd9fe5d..b00f54600222 100644
--- a/sc/source/ui/namedlg/namedlg.cxx
+++ b/sc/source/ui/namedlg/namedlg.cxx
@@ -97,8 +97,8 @@ ScNameDlg::ScNameDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent,
     maGlobalNameStr  ( ScGlobal::GetRscString(STR_GLOBAL_SCOPE) ),
     maErrInvalidNameStr( ScGlobal::GetRscString(STR_ERR_NAME_INVALID)),
     maErrNameInUse   ( ScGlobal::GetRscString(STR_ERR_NAME_EXISTS)),
-    maStrInfoDefault ( ResId::toString(ScResId(STR_DEFAULT_INFO))),
-    maStrMultiSelect ( ResId::toString(ScResId(STR_MULTI_SELECT))),
+    maStrInfoDefault ( SC_RESSTR(STR_DEFAULT_INFO)),
+    maStrMultiSelect ( SC_RESSTR(STR_MULTI_SELECT)),
     //
     mpViewData       ( ptrViewData ),
     mpDoc            ( ptrViewData->GetDocument() ),
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 847483fb36f3..8b243dfc1319 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -705,13 +705,13 @@ void ScGridWindow::LaunchAutoFilterMenu(SCCOL nCol, SCROW nRow)
 
     // Populate the menu.
     mpAutoFilterPopup->addMenuItem(
-        ScResId::toString(ScResId(SCSTR_TOP10FILTER)), true, new AutoFilterAction(this, Top10));
+        SC_RESSTR(SCSTR_TOP10FILTER), true, new AutoFilterAction(this, Top10));
     mpAutoFilterPopup->addMenuItem(
-        ScResId::toString(ScResId(SCSTR_STDFILTER)), true, new AutoFilterAction(this, Custom));
+        SC_RESSTR(SCSTR_STDFILTER), true, new AutoFilterAction(this, Custom));
     mpAutoFilterPopup->addMenuItem(
-        ScResId::toString(ScResId(SCSTR_EMPTY)), true, new AutoFilterAction(this, Empty));
+        SC_RESSTR(SCSTR_EMPTY), true, new AutoFilterAction(this, Empty));
     mpAutoFilterPopup->addMenuItem(
-        ScResId::toString(ScResId(SCSTR_NOTEMPTY)), true, new AutoFilterAction(this, NonEmpty));
+        SC_RESSTR(SCSTR_NOTEMPTY), true, new AutoFilterAction(this, NonEmpty));
 
     ScCheckListMenuWindow::Config aConfig;
     aConfig.mbAllowEmptySet = false;