make ResId::toString a non-static member

Change-Id: I756c0a19bea7b1cc0e290d9f382a04d655819bfb

8 files changed, 22 insertions, 20 deletions

diff --git a/sd/inc/sdresid.hxx b/sd/inc/sdresid.hxx
index b764fc289c71..a4cc1a7eb875 100644
--- a/sd/inc/sdresid.hxx
+++ b/sd/inc/sdresid.hxx
@@ -38,6 +38,8 @@ public:
     SdResId(sal_uInt16 nId);
 };
 
+#define SD_RESSTR(x) SdResId(x).toString()
+
 #endif /* _SD_SDRESID_HXX */
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/core/drawdoc2.cxx b/sd/source/core/drawdoc2.cxx
index 9db2394be043..5870e83255dd 100644
--- a/sd/source/core/drawdoc2.cxx
+++ b/sd/source/core/drawdoc2.cxx
@@ -337,7 +337,7 @@ void SdDrawDocument::UpdatePageRelativeURLs(SdPage* pPage, sal_uInt16 nPos, sal_
                 if (aURL.Len() && (aURL.GetChar(0) == 35))
                 {
                     XubString aHashSlide('#');
-                    aHashSlide += SdResId(STR_PAGE);
+                    aHashSlide += SD_RESSTR(STR_PAGE);
 
                     if (aURL.CompareTo(aHashSlide, aHashSlide.Len()) == COMPARE_EQUAL)
                     {
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index aa1a8b6c2cd6..8511f002fc1f 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -2391,22 +2391,22 @@ void SdPage::SetObjText(SdrTextObj* pObj, SdrOutliner* pOutliner, PresObjKind eO
                 {
                     pOutl->SetStyleSheet( 0, GetStyleSheetForPresObj(eObjKind) );
                     aString += "\n\t\t";
-                    aString += ResId::toString( SdResId( STR_PRESOBJ_MPOUTLLAYER2 ) );
+                    aString += SD_RESSTR(STR_PRESOBJ_MPOUTLLAYER2);
 
                     aString += "\n\t\t\t";
-                    aString += ResId::toString( SdResId( STR_PRESOBJ_MPOUTLLAYER3 ) );
+                    aString += SD_RESSTR(STR_PRESOBJ_MPOUTLLAYER3);
 
                     aString += "\n\t\t\t\t";
-                    aString += ResId::toString( SdResId( STR_PRESOBJ_MPOUTLLAYER4 ) );
+                    aString += SD_RESSTR(STR_PRESOBJ_MPOUTLLAYER4);
 
                     aString += "\n\t\t\t\t\t";
-                    aString += ResId::toString( SdResId( STR_PRESOBJ_MPOUTLLAYER5 ) );
+                    aString += SD_RESSTR(STR_PRESOBJ_MPOUTLLAYER5);
 
                     aString += "\n\t\t\t\t\t\t";
-                    aString += ResId::toString( SdResId( STR_PRESOBJ_MPOUTLLAYER6 ) );
+                    aString += SD_RESSTR(STR_PRESOBJ_MPOUTLLAYER6);
 
                     aString += "\n\t\t\t\t\t\t\t";
-                    aString += ResId::toString( SdResId( STR_PRESOBJ_MPOUTLLAYER7 ) );
+                    aString += SD_RESSTR(STR_PRESOBJ_MPOUTLLAYER7);
 
                 }
             }
diff --git a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
index 8def7218c550..b5e9f5d261e9 100644
--- a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
+++ b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
@@ -393,26 +393,26 @@ void SAL_CALL
             {
                 SolarMutexGuard aGuard;
 
-                sName = ResId::toString(SdResId(SID_SD_A11Y_I_DRAWVIEW_N) );
+                sName = SD_RESSTR(SID_SD_A11Y_I_DRAWVIEW_N);
             }
             else
             {
                 SolarMutexGuard aGuard;
 
-                sName = ResId::toString( SdResId(SID_SD_A11Y_D_DRAWVIEW_N) );
+                sName = SD_RESSTR(SID_SD_A11Y_D_DRAWVIEW_N);
             }
         }
         else if ( sFirstService == "com.sun.star.presentation.NotesView" )
         {
             SolarMutexGuard aGuard;
 
-            sName = ResId::toString( SdResId(SID_SD_A11Y_I_NOTESVIEW_N) );
+            sName = SD_RESSTR(SID_SD_A11Y_I_NOTESVIEW_N);
         }
         else if ( sFirstService == "com.sun.star.presentation.HandoutView" )
         {
             SolarMutexGuard aGuard;
 
-            sName = ResId::toString( SdResId(SID_SD_A11Y_I_HANDOUTVIEW_N) );
+            sName = SD_RESSTR(SID_SD_A11Y_I_HANDOUTVIEW_N);
         }
         else
         {
@@ -449,26 +449,26 @@ void SAL_CALL
             {
                 SolarMutexGuard aGuard;
 
-                sDescription = ResId::toString( SdResId(SID_SD_A11Y_I_DRAWVIEW_D) );
+                sDescription = SD_RESSTR(SID_SD_A11Y_I_DRAWVIEW_D);
             }
             else
             {
                 SolarMutexGuard aGuard;
 
-                sDescription = ResId::toString( SdResId(SID_SD_A11Y_D_DRAWVIEW_D) );
+                sDescription = SD_RESSTR(SID_SD_A11Y_D_DRAWVIEW_D);
             }
         }
         else if ( sFirstService == "com.sun.star.presentation.NotesView" )
         {
             SolarMutexGuard aGuard;
 
-            sDescription = ResId::toString( SdResId(SID_SD_A11Y_I_NOTESVIEW_D) );
+            sDescription = SD_RESSTR(SID_SD_A11Y_I_NOTESVIEW_D);
         }
         else if ( sFirstService == "com.sun.star.presentation.HandoutView" )
         {
             SolarMutexGuard aGuard;
 
-            sDescription = ResId::toString( SdResId(SID_SD_A11Y_I_HANDOUTVIEW_D) );
+            sDescription = SD_RESSTR(SID_SD_A11Y_I_HANDOUTVIEW_D);
         }
         else
         {
diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx
index 49623690f928..0aea780a367d 100644
--- a/sd/source/ui/dlg/sdtreelb.cxx
+++ b/sd/source/ui/dlg/sdtreelb.cxx
@@ -289,7 +289,7 @@ String SdPageObjsTLB::GetObjectName(
         && aRet.Len() == 0
         && pObject!=NULL)
     {
-        aRet = SdResId(STR_NAVIGATOR_SHAPE_BASE_NAME);
+        aRet = SD_RESSTR(STR_NAVIGATOR_SHAPE_BASE_NAME);
         aRet.SearchAndReplaceAscii("%1", String::CreateFromInt32(pObject->GetOrdNum() + 1));
     }
 
diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
index 9d37e453e1d2..f2d4f0e8f24d 100644
--- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
@@ -832,7 +832,7 @@ void SlotManager::GetStatusBarState (SfxItemSet& rSet)
     String aLayoutStr;
 
     if (nSelectedPages > 0)
-        aPageStr = rtl::OUString(ResId::toString(SdResId(STR_SD_PAGE)));
+        aPageStr = SD_RESSTR(STR_SD_PAGE);
 
     if (nSelectedPages == 1)
     {
diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx
index 672043a7cd0a..0d1b5acf6e1d 100644
--- a/sd/source/ui/view/drviewsa.cxx
+++ b/sd/source/ui/view/drviewsa.cxx
@@ -751,7 +751,7 @@ void DrawViewShell::GetStatusBarState(SfxItemSet& rSet)
     if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_STATUS_PAGE ) )
     {
         // Allways show the slide/page number.
-        OUString aOUString = ResId::toString(SdResId( STR_SD_PAGE ));
+        OUString aOUString = SD_RESSTR(STR_SD_PAGE);
         aOUString += " ";
         aOUString += OUString::valueOf( maTabControl.GetCurPageId() );
         aOUString += " / " ;
diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx
index 2e153409b91d..b29867047b97 100644
--- a/sd/source/ui/view/sdview2.cxx
+++ b/sd/source/ui/view/sdview2.cxx
@@ -929,8 +929,8 @@ bool View::GetExchangeList (std::vector<rtl::OUString> &rExchangeList,
         {
             if( mrDoc.GetObj( aNewName ) )
             {
-                rtl::OUString aTitle( ResId::toString(SdResId( STR_TITLE_NAMEGROUP ) ) ) ;
-                rtl::OUString aDesc( ResId::toString(SdResId( STR_DESC_NAMEGROUP ) ) );
+                rtl::OUString aTitle(SD_RESSTR(STR_TITLE_NAMEGROUP));
+                rtl::OUString aDesc(SD_RESSTR(STR_DESC_NAMEGROUP));
 
                 SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
                 AbstractSvxNameDialog* pDlg = 0;