make ResId::toString a non-static member

Change-Id: I756c0a19bea7b1cc0e290d9f382a04d655819bfb

7 files changed, 18 insertions, 18 deletions

diff --git a/editeng/inc/editeng/eerdll.hxx b/editeng/inc/editeng/eerdll.hxx
index de50d7b923f9..d4a0eb659e6d 100644
--- a/editeng/inc/editeng/eerdll.hxx
+++ b/editeng/inc/editeng/eerdll.hxx
@@ -57,7 +57,7 @@ public:
 
 #define EE_DLL() EditDLL::Get()
 
-#define EE_RESSTR(x) ResId::toString(EditResId(x))
+#define EE_RESSTR(x) EditResId(x).toString()
 
 #endif //_EERDLL_HXX
 
diff --git a/editeng/inc/editeng/itemtype.hxx b/editeng/inc/editeng/itemtype.hxx
index a54be72cde4f..a5e3c66dde0c 100644
--- a/editeng/inc/editeng/itemtype.hxx
+++ b/editeng/inc/editeng/itemtype.hxx
@@ -57,7 +57,7 @@ EDITENG_DLLPUBLIC sal_uInt16 GetMetricId( SfxMapUnit eUnit );
 
 inline String GetBoolString( sal_Bool bVal )
 {
-    return String( EditResId( bVal ? RID_SVXITEMS_TRUE : RID_SVXITEMS_FALSE ) );
+    return EE_RESSTR(bVal ? RID_SVXITEMS_TRUE : RID_SVXITEMS_FALSE);
 }
 
 // -----------------------------------------------------------------------
diff --git a/editeng/source/accessibility/AccessibleImageBullet.cxx b/editeng/source/accessibility/AccessibleImageBullet.cxx
index d6ae16f342d6..08072a628d9a 100644
--- a/editeng/source/accessibility/AccessibleImageBullet.cxx
+++ b/editeng/source/accessibility/AccessibleImageBullet.cxx
@@ -169,7 +169,7 @@ namespace accessibility
         SolarMutexGuard aGuard;
 
         // Get the string from the resource for the specified id.
-        return ::rtl::OUString( String( EditResId (RID_SVXSTR_A11Y_IMAGEBULLET_DESCRIPTION) ) );
+        return EE_RESSTR(RID_SVXSTR_A11Y_IMAGEBULLET_DESCRIPTION);
     }
 
     ::rtl::OUString SAL_CALL  AccessibleImageBullet::getAccessibleName() throw (uno::RuntimeException)
@@ -179,7 +179,7 @@ namespace accessibility
         SolarMutexGuard aGuard;
 
         // Get the string from the resource for the specified id.
-        return ::rtl::OUString( String ( EditResId (RID_SVXSTR_A11Y_IMAGEBULLET_NAME) ) );
+        return EE_RESSTR(RID_SVXSTR_A11Y_IMAGEBULLET_NAME);
     }
 
     uno::Reference< XAccessibleRelationSet > SAL_CALL AccessibleImageBullet::getAccessibleRelationSet() throw (uno::RuntimeException)
diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx
index 6772ec9d6224..05bc89956f21 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -2677,12 +2677,12 @@ XubString EditEngine::GetUndoComment( sal_uInt16 nId ) const
         case EDITUNDO_DELCONTENT:
         case EDITUNDO_DELETE:
         case EDITUNDO_CUT:
-            aComment = XubString( EditResId( RID_EDITUNDO_DEL ) );
+            aComment = EE_RESSTR(RID_EDITUNDO_DEL);
         break;
         case EDITUNDO_MOVEPARAGRAPHS:
         case EDITUNDO_MOVEPARAS:
         case EDITUNDO_DRAGANDDROP:
-            aComment = XubString( EditResId( RID_EDITUNDO_MOVE ) );
+            aComment = EE_RESSTR(RID_EDITUNDO_MOVE);
         break;
         case EDITUNDO_INSERTFEATURE:
         case EDITUNDO_SPLITPARA:
@@ -2690,29 +2690,29 @@ XubString EditEngine::GetUndoComment( sal_uInt16 nId ) const
         case EDITUNDO_PASTE:
         case EDITUNDO_INSERT:
         case EDITUNDO_READ:
-            aComment = XubString( EditResId( RID_EDITUNDO_INSERT ) );
+            aComment = EE_RESSTR(RID_EDITUNDO_INSERT);
         break;
         case EDITUNDO_SRCHANDREPL:
         case EDITUNDO_REPLACEALL:
-            aComment = XubString( EditResId( RID_EDITUNDO_REPLACE ) );
+            aComment = EE_RESSTR(RID_EDITUNDO_REPLACE);
         break;
         case EDITUNDO_ATTRIBS:
         case EDITUNDO_PARAATTRIBS:
         case EDITUNDO_STRETCH:
-            aComment = XubString( EditResId( RID_EDITUNDO_SETATTRIBS ) );
+            aComment = EE_RESSTR(RID_EDITUNDO_SETATTRIBS);
         break;
         case EDITUNDO_RESETATTRIBS:
-            aComment = XubString( EditResId( RID_EDITUNDO_RESETATTRIBS ) );
+            aComment = EE_RESSTR(RID_EDITUNDO_RESETATTRIBS);
         break;
         case EDITUNDO_STYLESHEET:
-            aComment = XubString( EditResId( RID_EDITUNDO_SETSTYLE ) );
+            aComment = EE_RESSTR(RID_EDITUNDO_SETSTYLE);
         break;
         case EDITUNDO_TRANSLITERATE:
-            aComment = XubString( EditResId( RID_EDITUNDO_TRANSLITERATE ) );
+            aComment = EE_RESSTR(RID_EDITUNDO_TRANSLITERATE);
         break;
         case EDITUNDO_INDENTBLOCK:
         case EDITUNDO_UNINDENTBLOCK:
-            aComment = XubString( EditResId( RID_EDITUNDO_INDENT ) );
+            aComment = EE_RESSTR(RID_EDITUNDO_INDENT);
         break;
     }
     return aComment;
diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx
index ffe228523bc6..9e0fd274ec14 100644
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -966,9 +966,9 @@ void EditView::ExecuteSpellPopup( const Point& rPosPixel, Link* pCallBack )
             aPopupMenu.InsertSeparator();
             String aTmpWord( SvtLanguageTable::GetLanguageString( nGuessLangWord ) );
             String aTmpPara( SvtLanguageTable::GetLanguageString( nGuessLangPara ) );
-            String aWordStr( EditResId( RID_STR_WORD ) );
+            String aWordStr( EE_RESSTR( RID_STR_WORD ) );
             aWordStr.SearchAndReplace( String( RTL_CONSTASCII_USTRINGPARAM( "%x" ) ), aTmpWord );
-            String aParaStr( EditResId( RID_STR_PARAGRAPH ) );
+            String aParaStr( EE_RESSTR( RID_STR_PARAGRAPH ) );
             aParaStr.SearchAndReplace( String( RTL_CONSTASCII_USTRINGPARAM( "%x" ) ), aTmpPara );
             aPopupMenu.InsertItem( MN_WORDLANGUAGE, aWordStr );
             aPopupMenu.SetHelpId( MN_WORDLANGUAGE, HID_EDITENG_SPELLER_WORDLANGUAGE );
diff --git a/editeng/source/items/optitems.cxx b/editeng/source/items/optitems.cxx
index fcfe3c8a8b07..4ea6a97a1583 100644
--- a/editeng/source/items/optitems.cxx
+++ b/editeng/source/items/optitems.cxx
@@ -165,10 +165,10 @@ SfxItemPresentation SfxHyphenRegionItem::GetPresentation
         case SFX_ITEM_PRESENTATION_COMPLETE:
         {
             rText += String::CreateFromInt32( nMinLead );
-            rText += String( EditResId( RID_SVXITEMS_HYPHEN_MINLEAD ) );
+            rText += EE_RESSTR( RID_SVXITEMS_HYPHEN_MINLEAD );
             rText += ',';
             rText += String::CreateFromInt32( nMinTrail );
-            rText += String( EditResId( RID_SVXITEMS_HYPHEN_MINTRAIL ) );
+            rText += EE_RESSTR( RID_SVXITEMS_HYPHEN_MINTRAIL );
             return ePres;
         }
         default:
diff --git a/editeng/source/items/writingmodeitem.cxx b/editeng/source/items/writingmodeitem.cxx
index cb8db177bb3f..a552ec990977 100644
--- a/editeng/source/items/writingmodeitem.cxx
+++ b/editeng/source/items/writingmodeitem.cxx
@@ -93,7 +93,7 @@ SfxItemPresentation SvxWritingModeItem::GetPresentation( SfxItemPresentation ePr
 
     case SFX_ITEM_PRESENTATION_NAMELESS:
     case SFX_ITEM_PRESENTATION_COMPLETE:
-        rText = String( EditResId( RID_SVXITEMS_FRMDIR_BEGIN + GetValue() ) );
+        rText = EE_RESSTR(RID_SVXITEMS_FRMDIR_BEGIN + GetValue());
         break;
 
     default: