make string translation loading more uniform

change various ResId classes that use conversion operator to OUString to functions that return a OUString drop various defines drop unnecessary toString calls Change-Id: Ibeccdf2b91a46a2ed5b4b74e6024e301a023bc92 Reviewed-on: https://gerrit.libreoffice.org/37817 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
author: Caolán McNamara <caolanm@redhat.com> 2017-05-18 21:14:00 +0100
committer: Caolán McNamara <caolanm@redhat.com> 2017-05-19 15:40:40 +0200
commit: 2155e04d6343638ca9815d394cbc4f78c2b17c3a (patch)
tree: 0378142f6ce9edb63074291aed45527568e7b254 /sd
parent: cee02e81cd3b55fb46eacf5db5713e8bf4363bcd (diff)
121 files changed, 588 insertions, 626 deletions
diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index 36ac7d7b5808..62a4c3775e47 100644
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -191,7 +191,6 @@ $(eval $(call gb_Library_add_exception_objects,sd,\
 	sd/source/ui/app/sdmod1 \
 	sd/source/ui/app/sdmod2 \
 	sd/source/ui/app/sdpopup \
-	sd/source/ui/app/sdresid \
 	sd/source/ui/app/sdxfer \
 	sd/source/ui/app/tmplctrl \
 	sd/source/ui/controller/slidelayoutcontroller \
diff --git a/sd/inc/sdabstdlg.hxx b/sd/inc/sdabstdlg.hxx
index 5372a83252d5..f39b7d369332 100644
--- a/sd/inc/sdabstdlg.hxx
+++ b/sd/inc/sdabstdlg.hxx
@@ -54,7 +54,6 @@ class SdrModel;
 class SdrView;
 class Bitmap;
 class List;
-class SdResId;
 namespace vcl { class Window; }
 class SdPage;
 class TabPage;
diff --git a/sd/inc/sdresid.hxx b/sd/inc/sdresid.hxx
index 95397b38b06b..2fdb9e30d236 100644
--- a/sd/inc/sdresid.hxx
+++ b/sd/inc/sdresid.hxx
@@ -22,14 +22,12 @@
 
 #include <tools/resid.hxx>
 #include "sddllapi.h"
+#include "sdmod.hxx"
 
-class SD_DLLPUBLIC SdResId : public ResId
+inline OUString SdResId(sal_uInt16 nId)
 {
-public:
-    SdResId(sal_uInt16 nId);
-};
-
-#define SD_RESSTR(x) SdResId(x).toString()
+    return ResId(nId, *SD_MOD()->GetResMgr());
+}
 
 #endif /* _SD_SDRESID_HXX */
 
diff --git a/sd/qa/unit/dialogs-test.cxx b/sd/qa/unit/dialogs-test.cxx
index 3637c27831de..aa0837ecf3ce 100644
--- a/sd/qa/unit/dialogs-test.cxx
+++ b/sd/qa/unit/dialogs-test.cxx
@@ -367,7 +367,7 @@ VclPtr<VclAbstractDialog> SdDialogsTest::createDialogByID(sal_uInt32 nID)
             SdDrawDocument* pDrawDoc = getSdXImpressDocument()->GetDoc();
             CPPUNIT_ASSERT(pDrawDoc);
             SfxItemSet aNewAttr(pDrawDoc->GetItemPool(), ATTR_LAYER_START, ATTR_LAYER_END);
-            const OUString aLayerName = SD_RESSTR(STR_LAYER); // + OUString::number(2);
+            const OUString aLayerName = SdResId(STR_LAYER); // + OUString::number(2);
             aNewAttr.Put(makeSdAttrLayerName(aLayerName));
             aNewAttr.Put(makeSdAttrLayerTitle());
             aNewAttr.Put(makeSdAttrLayerDesc());
@@ -379,7 +379,7 @@ VclPtr<VclAbstractDialog> SdDialogsTest::createDialogByID(sal_uInt32 nID)
                 getViewShell()->GetActiveWindow(),
                 aNewAttr,
                 true, // alternative: false
-                SD_RESSTR(STR_INSERTLAYER) /* alternative: STR_MODIFYLAYER */);
+                SdResId(STR_INSERTLAYER) /* alternative: STR_MODIFYLAYER */);
             break;
         }
         case 9:
diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx
index a30fdb097d6e..fba824d42a94 100644
--- a/sd/source/core/drawdoc.cxx
+++ b/sd/source/core/drawdoc.cxx
@@ -348,14 +348,14 @@ SdDrawDocument::SdDrawDocument(DocumentType eType, SfxObjectShell* pDrDocSh)
       */
 
     {
-        OUString aControlLayerName( SD_RESSTR(STR_LAYER_CONTROLS) );
+        OUString aControlLayerName( SdResId(STR_LAYER_CONTROLS) );
 
         SdrLayerAdmin& rLayerAdmin = GetLayerAdmin();
-        rLayerAdmin.NewLayer( SD_RESSTR(STR_LAYER_LAYOUT) );
-        rLayerAdmin.NewLayer( SD_RESSTR(STR_LAYER_BCKGRND) );
-        rLayerAdmin.NewLayer( SD_RESSTR(STR_LAYER_BCKGRNDOBJ) );
+        rLayerAdmin.NewLayer( SdResId(STR_LAYER_LAYOUT) );
+        rLayerAdmin.NewLayer( SdResId(STR_LAYER_BCKGRND) );
+        rLayerAdmin.NewLayer( SdResId(STR_LAYER_BCKGRNDOBJ) );
         rLayerAdmin.NewLayer( aControlLayerName );
-        rLayerAdmin.NewLayer( SD_RESSTR(STR_LAYER_MEASURELINES) );
+        rLayerAdmin.NewLayer( SdResId(STR_LAYER_MEASURELINES) );
 
         rLayerAdmin.SetControlLayerName(aControlLayerName);
     }
@@ -627,11 +627,11 @@ void SdDrawDocument::NewOrLoadCompleted(DocCreationMode eMode)
     }
 
     // Set default style of Drawing Engine
-    OUString aName( SD_RESSTR(STR_STANDARD_STYLESHEET_NAME));
+    OUString aName( SdResId(STR_STANDARD_STYLESHEET_NAME));
     SetDefaultStyleSheet(static_cast<SfxStyleSheet*>(mxStyleSheetPool->Find(aName, SD_STYLE_FAMILY_GRAPHICS)));
 
     // #i119287# Set default StyleSheet for SdrGrafObj and SdrOle2Obj
-    SetDefaultStyleSheetForSdrGrafObjAndSdrOle2Obj(static_cast<SfxStyleSheet*>(mxStyleSheetPool->Find(SD_RESSTR(STR_POOLSHEET_OBJNOLINENOFILL), SD_STYLE_FAMILY_GRAPHICS)));
+    SetDefaultStyleSheetForSdrGrafObjAndSdrOle2Obj(static_cast<SfxStyleSheet*>(mxStyleSheetPool->Find(SdResId(STR_POOLSHEET_OBJNOLINENOFILL), SD_STYLE_FAMILY_GRAPHICS)));
 
     // Initialize DrawOutliner and DocumentOutliner, but don't initialize the
     // global outliner, as it is not document specific like StyleSheetPool and
diff --git a/sd/source/core/drawdoc2.cxx b/sd/source/core/drawdoc2.cxx
index baa71139cce2..917c486c7408 100644
--- a/sd/source/core/drawdoc2.cxx
+++ b/sd/source/core/drawdoc2.cxx
@@ -309,7 +309,7 @@ void SdDrawDocument::UpdatePageRelativeURLs(const OUString& rOldName, const OUSt
                     }
                     else
                     {
-                        const OUString sNotes(SD_RESSTR(STR_NOTES));
+                        const OUString sNotes(SdResId(STR_NOTES));
                         if (aURL.getLength() == rOldName.getLength() + 2 + sNotes.getLength()
                             && aURL.indexOf(sNotes, rOldName.getLength() + 2) == rOldName.getLength() + 2)
                         {
@@ -346,12 +346,12 @@ void SdDrawDocument::UpdatePageRelativeURLs(SdPage* pPage, sal_uInt16 nPos, sal_
                 if (!aURL.isEmpty() && (aURL[0] == 35))
                 {
                     OUString aHashSlide("#");
-                    aHashSlide += SD_RESSTR(STR_PAGE);
+                    aHashSlide += SdResId(STR_PAGE);
 
                     if (aURL.startsWith(aHashSlide))
                     {
                         OUString aURLCopy = aURL;
-                        const OUString sNotes(SD_RESSTR(STR_NOTES));
+                        const OUString sNotes(SdResId(STR_NOTES));
 
                         aURLCopy = aURLCopy.replaceAt(0, aHashSlide.getLength(), "");
 
@@ -547,7 +547,7 @@ void SdDrawDocument::CreateFirstPages( SdDrawDocument* pRefDocument /* = 0 */ )
         }
 
         pHandoutPage->SetPageKind(PageKind::Handout);
-        pHandoutPage->SetName( SD_RESSTR(STR_HANDOUT) );
+        pHandoutPage->SetName( SdResId(STR_HANDOUT) );
         InsertPage(pHandoutPage, 0);
 
         // Insert master page and register this with the handout page
@@ -760,7 +760,7 @@ bool SdDrawDocument::MovePages(sal_uInt16 nTargetPage)
     const bool bUndo = IsUndoEnabled();
 
     if( bUndo )
-        BegUndo(SD_RESSTR(STR_UNDO_MOVEPAGES));
+        BegUndo(SdResId(STR_UNDO_MOVEPAGES));
 
     // List of selected pages
     std::vector<SdPage*> aPageList;
@@ -1346,8 +1346,8 @@ sal_uInt16 SdDrawDocument::DuplicatePage (sal_uInt16 nPageNum)
 
     // Get background flags
     SdrLayerAdmin& rLayerAdmin = GetLayerAdmin();
-    SdrLayerID aBckgrnd = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND));
-    SdrLayerID aBckgrndObj = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ));
+    SdrLayerID aBckgrnd = rLayerAdmin.GetLayerID(SdResId(STR_LAYER_BCKGRND));
+    SdrLayerID aBckgrndObj = rLayerAdmin.GetLayerID(SdResId(STR_LAYER_BCKGRNDOBJ));
     SdrLayerIDSet aVisibleLayers = pActualPage->TRG_GetMasterPageVisibleLayers();
 
     return DuplicatePage (
@@ -1490,8 +1490,8 @@ void SdDrawDocument::SetupNewPage (
     if (pPreviousPage != nullptr)
     {
         SdrLayerAdmin& rLayerAdmin = GetLayerAdmin();
-        SdrLayerID aBckgrnd = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND));
-        SdrLayerID aBckgrndObj = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ));
+        SdrLayerID aBckgrnd = rLayerAdmin.GetLayerID(SdResId(STR_LAYER_BCKGRND));
+        SdrLayerID aBckgrndObj = rLayerAdmin.GetLayerID(SdResId(STR_LAYER_BCKGRNDOBJ));
         SdrLayerIDSet aVisibleLayers = pPreviousPage->TRG_GetMasterPageVisibleLayers();
         aVisibleLayers.Set(aBckgrnd, bIsPageBack);
         aVisibleLayers.Set(aBckgrndObj, bIsPageObj);
diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx
index f4030c714cfa..dada8f687e41 100644
--- a/sd/source/core/drawdoc3.cxx
+++ b/sd/source/core/drawdoc3.cxx
@@ -246,7 +246,7 @@ SdDrawDocument* SdDrawDocument::OpenBookmarkDoc(SfxMedium* pMedium)
 
     if (!bOK)
     {
-        ScopedVclPtrInstance< MessageDialog > aErrorBox(nullptr, SD_RESSTR(STR_READ_DATA_ERROR));
+        ScopedVclPtrInstance< MessageDialog > aErrorBox(nullptr, SdResId(STR_READ_DATA_ERROR));
         aErrorBox->Execute();
 
         CloseBookmarkDoc();
@@ -467,7 +467,7 @@ bool SdDrawDocument::InsertBookmarkAsPage(
             pBMPage->GetUppBorder()   != pRefPage->GetUppBorder()    ||
             pBMPage->GetLwrBorder()   != pRefPage->GetLwrBorder())
         {
-            OUString aStr(SD_RESSTR(STR_SCALE_OBJECTS));
+            OUString aStr(SdResId(STR_SCALE_OBJECTS));
             sal_uInt16 nBut = ScopedVclPtrInstance<QueryBox>(nullptr, WB_YES_NO_CANCEL, aStr)->Execute();
 
             bScaleObjects = nBut == RET_YES;
@@ -489,7 +489,7 @@ bool SdDrawDocument::InsertBookmarkAsPage(
         ViewShellId nViewShellId(-1);
         if (sd::ViewShell* pViewShell = mpDocSh->GetViewShell())
             nViewShellId = pViewShell->GetViewShellBase().GetViewShellId();
-        pUndoMgr->EnterListAction(SD_RESSTR(STR_UNDO_INSERTPAGES), "", 0, nViewShellId);
+        pUndoMgr->EnterListAction(SdResId(STR_UNDO_INSERTPAGES), "", 0, nViewShellId);
     }
 
     // Refactored copy'n'pasted layout name collection into IterateBookmarkPages
@@ -544,7 +544,7 @@ bool SdDrawDocument::InsertBookmarkAsPage(
     const bool bUndo = IsUndoEnabled();
 
     if( bUndo )
-        BegUndo(SD_RESSTR(STR_UNDO_INSERTPAGES));
+        BegUndo(SdResId(STR_UNDO_INSERTPAGES));
 
     if (rBookmarkList.empty())
     {
@@ -1418,7 +1418,7 @@ void SdDrawDocument::SetMasterPage(sal_uInt16 nSdPageNum,
         ViewShellId nViewShellId(-1);
         if (sd::ViewShell* pViewShell = mpDocSh->GetViewShell())
             nViewShellId = pViewShell->GetViewShellBase().GetViewShellId();
-        pUndoMgr->EnterListAction(SD_RESSTR(STR_UNDO_SET_PRESLAYOUT), OUString(), 0, nViewShellId);
+        pUndoMgr->EnterListAction(SdResId(STR_UNDO_SET_PRESLAYOUT), OUString(), 0, nViewShellId);
     }
 
     SdPage* pSelectedPage   = GetSdPage(nSdPageNum, PageKind::Standard);
diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx
index 79c882a5e6d3..d4290d037a27 100644
--- a/sd/source/core/drawdoc4.cxx
+++ b/sd/source/core/drawdoc4.cxx
@@ -127,7 +127,7 @@ void SdDrawDocument::CreateLayoutTemplates()
     SdStyleSheetPool*       pSSPool = static_cast<SdStyleSheetPool*>(GetStyleSheetPool());
     SfxStyleSheetBase*      pSheet = nullptr;
     OUString                aHelpFile;
-    OUString                aStdName(SD_RESSTR(STR_STANDARD_STYLESHEET_NAME));
+    OUString                aStdName(SdResId(STR_STANDARD_STYLESHEET_NAME));
 
     // Default style
 
@@ -253,7 +253,7 @@ void SdDrawDocument::CreateLayoutTemplates()
     SfxItemSet* pISet = nullptr;
 
     // Object with arrowhead
-    aName = SD_RESSTR(STR_POOLSHEET_OBJWITHARROW);
+    aName = SdResId(STR_POOLSHEET_OBJWITHARROW);
     pSheet = &(pSSPool->Make(aName, SD_STYLE_FAMILY_GRAPHICS, nMask));
     pSheet->SetParent(aStdName);
     pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_OBJWITHARROW );
@@ -268,14 +268,14 @@ void SdDrawDocument::CreateLayoutTemplates()
     aArrow.append(::basegfx::B2DPoint(0.0, 30.0));
     aArrow.append(::basegfx::B2DPoint(20.0, 30.0));
     aArrow.setClosed(true);
-    pISet->Put(XLineStartItem(SVX_RESSTR(RID_SVXSTR_ARROW),::basegfx::B2DPolyPolygon(aArrow)));
+    pISet->Put(XLineStartItem(SvxResId(RID_SVXSTR_ARROW),::basegfx::B2DPolyPolygon(aArrow)));
 
     pISet->Put(XLineStartWidthItem(700));
     pISet->Put(XLineEndWidthItem(300));
     pISet->Put(XLineStartCenterItem(true));
 
     // Object with Shadow
-    aName = SD_RESSTR(STR_POOLSHEET_OBJWITHSHADOW);
+    aName = SdResId(STR_POOLSHEET_OBJWITHSHADOW);
     pSheet = &(pSSPool->Make(aName, SD_STYLE_FAMILY_GRAPHICS, nMask));
     pSheet->SetParent(aStdName);
     pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_OBJWITHSHADOW );
@@ -287,7 +287,7 @@ void SdDrawDocument::CreateLayoutTemplates()
     pISet->Put(makeSdrShadowYDistItem(200));
 
     // Object without filling
-    aName = SD_RESSTR(STR_POOLSHEET_OBJWITHOUTFILL);
+    aName = SdResId(STR_POOLSHEET_OBJWITHOUTFILL);
     pSheet = &(pSSPool->Make(aName, SD_STYLE_FAMILY_GRAPHICS, nMask));
     pSheet->SetParent(aStdName);
     pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_OBJWITHOUTFILL );
@@ -298,7 +298,7 @@ void SdDrawDocument::CreateLayoutTemplates()
 
     // Object no fill no line
 
-    aName = SD_RESSTR(STR_POOLSHEET_OBJNOLINENOFILL);
+    aName = SdResId(STR_POOLSHEET_OBJNOLINENOFILL);
     pSheet = &(pSSPool->Make(aName, SD_STYLE_FAMILY_GRAPHICS, nMask));
     pSheet->SetParent(aStdName);
     pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_OBJNOLINENOFILL );
@@ -309,7 +309,7 @@ void SdDrawDocument::CreateLayoutTemplates()
 
     // Text
 
-    aName = SD_RESSTR(STR_POOLSHEET_TEXT);
+    aName = SdResId(STR_POOLSHEET_TEXT);
     pSheet = &(pSSPool->Make(aName, SD_STYLE_FAMILY_GRAPHICS, nMask));
     pSheet->SetParent(aStdName);
     pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_TEXT );
@@ -319,7 +319,7 @@ void SdDrawDocument::CreateLayoutTemplates()
     pISet->Put(XFillStyleItem(drawing::FillStyle_NONE));
 
     // Text body
-    aName = SD_RESSTR(STR_POOLSHEET_TEXTBODY);
+    aName = SdResId(STR_POOLSHEET_TEXTBODY);
     pSheet = &(pSSPool->Make(aName, SD_STYLE_FAMILY_GRAPHICS, nMask));
     pSheet->SetParent(aStdName);
     pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_TEXTBODY );
@@ -331,7 +331,7 @@ void SdDrawDocument::CreateLayoutTemplates()
     pISet->Put(SvxFontHeightItem(564, 100, EE_CHAR_FONTHEIGHT));        // 16 pt
 
     // Text body, justified
-    aName = SD_RESSTR(STR_POOLSHEET_TEXTBODY_JUSTIFY);
+    aName = SdResId(STR_POOLSHEET_TEXTBODY_JUSTIFY);
     pSheet = &(pSSPool->Make(aName, SD_STYLE_FAMILY_GRAPHICS, nMask));
     pSheet->SetParent(aStdName);
     pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_TEXTBODY_JUSTIFY );
@@ -343,7 +343,7 @@ void SdDrawDocument::CreateLayoutTemplates()
     pISet->Put(SvxAdjustItem(SvxAdjust::Block, EE_PARA_JUST ));
 
     // Text body, indented
-    aName = SD_RESSTR(STR_POOLSHEET_TEXTBODY_INDENT);
+    aName = SdResId(STR_POOLSHEET_TEXTBODY_INDENT);
     pSheet = &(pSSPool->Make(aName, SD_STYLE_FAMILY_GRAPHICS, nMask));
     pSheet->SetParent(aStdName);
     pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_TEXTBODY_INDENT );
@@ -358,7 +358,7 @@ void SdDrawDocument::CreateLayoutTemplates()
 
     // Title
 
-    aName = SD_RESSTR(STR_POOLSHEET_TITLE);
+    aName = SdResId(STR_POOLSHEET_TITLE);
     pSheet = &(pSSPool->Make(aName, SD_STYLE_FAMILY_GRAPHICS, nMask));
     pSheet->SetParent(aStdName);
     pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_TITLE );
@@ -370,7 +370,7 @@ void SdDrawDocument::CreateLayoutTemplates()
     pISet->Put(SvxFontHeightItem(1551, 100, EE_CHAR_FONTHEIGHT ));      // 44 pt
 
     // Title1
-    aName = SD_RESSTR(STR_POOLSHEET_TITLE1);
+    aName = SdResId(STR_POOLSHEET_TITLE1);
     pSheet = &(pSSPool->Make(aName, SD_STYLE_FAMILY_GRAPHICS, nMask));
     pSheet->SetParent(aStdName);
     pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_TITLE1 );
@@ -391,7 +391,7 @@ void SdDrawDocument::CreateLayoutTemplates()
 
     // Title2
 
-    aName = SD_RESSTR(STR_POOLSHEET_TITLE2);
+    aName = SdResId(STR_POOLSHEET_TITLE2);
     pSheet = &(pSSPool->Make(aName, SD_STYLE_FAMILY_GRAPHICS, nMask));
     pSheet->SetParent(aStdName);
     pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_TITLE2 );
@@ -420,7 +420,7 @@ void SdDrawDocument::CreateLayoutTemplates()
 
     // Headline
 
-    aName = SD_RESSTR(STR_POOLSHEET_HEADLINE);
+    aName = SdResId(STR_POOLSHEET_HEADLINE);
     pSheet = &(pSSPool->Make(aName, SD_STYLE_FAMILY_GRAPHICS, nMask));
     pSheet->SetParent(aStdName);
     pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_HEADLINE );
@@ -435,7 +435,7 @@ void SdDrawDocument::CreateLayoutTemplates()
                                                 // Paragraph margin below: 2,1 mm
 
     // Headline1
-    aName = SD_RESSTR(STR_POOLSHEET_HEADLINE1);
+    aName = SdResId(STR_POOLSHEET_HEADLINE1);
     pSheet = &(pSSPool->Make(aName, SD_STYLE_FAMILY_GRAPHICS, nMask));
     pSheet->SetParent(aStdName);
     pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_HEADLINE1 );
@@ -452,7 +452,7 @@ void SdDrawDocument::CreateLayoutTemplates()
                                                 // Paragraph margin below: 2,1 mm
 
     // Headline2
-    aName = SD_RESSTR(STR_POOLSHEET_HEADLINE2);
+    aName = SdResId(STR_POOLSHEET_HEADLINE2);
     pSheet = &(pSSPool->Make(aName, SD_STYLE_FAMILY_GRAPHICS, nMask));
     pSheet->SetParent(aStdName);
     pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_HEADLINE2 );
@@ -470,7 +470,7 @@ void SdDrawDocument::CreateLayoutTemplates()
                                                 // Paragraph margin below: 2,1 mm
 
     // Measurements
-    aName = SD_RESSTR(STR_POOLSHEET_MEASURE);
+    aName = SdResId(STR_POOLSHEET_MEASURE);
     pSheet = &(pSSPool->Make(aName, SD_STYLE_FAMILY_GRAPHICS, nMask));
     pSheet->SetParent(aStdName);
     pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_MEASURE );
@@ -481,15 +481,15 @@ void SdDrawDocument::CreateLayoutTemplates()
 
     pISet->Put(SvxFontHeightItem(423, 100, EE_CHAR_FONTHEIGHT ));         // 12 pt
 
-    pISet->Put(XLineStartItem(SVX_RESSTR(RID_SVXSTR_ARROW),::basegfx::B2DPolyPolygon(aArrow)));
+    pISet->Put(XLineStartItem(SvxResId(RID_SVXSTR_ARROW),::basegfx::B2DPolyPolygon(aArrow)));
     pISet->Put(XLineStartWidthItem(200));
-    pISet->Put(XLineEndItem(SVX_RESSTR(RID_SVXSTR_ARROW),::basegfx::B2DPolyPolygon(aArrow)));
+    pISet->Put(XLineEndItem(SvxResId(RID_SVXSTR_ARROW),::basegfx::B2DPolyPolygon(aArrow)));
     pISet->Put(XLineEndWidthItem(200));
     pISet->Put(XLineStyleItem(drawing::LineStyle_SOLID));
     pISet->Put(SdrYesNoItem(SDRATTR_MEASURESHOWUNIT, true));
 
     // Generate presentation templates for default layout.
-    OUString aPrefix = SD_RESSTR(STR_LAYOUT_DEFAULT_NAME);
+    OUString aPrefix = SdResId(STR_LAYOUT_DEFAULT_NAME);
     pSSPool->CreateLayoutStyleSheets(aPrefix);
 }
 
@@ -1006,23 +1006,23 @@ void SdDrawDocument::RestoreLayerNames()
 
             if (aLayerName == "LAYER_LAYOUT")
             {
-                pLayer->SetName(SD_RESSTR(STR_LAYER_LAYOUT));
+                pLayer->SetName(SdResId(STR_LAYER_LAYOUT));
             }
             else if (aLayerName == "LAYER_BCKGRND")
             {
-                pLayer->SetName(SD_RESSTR(STR_LAYER_BCKGRND));
+                pLayer->SetName(SdResId(STR_LAYER_BCKGRND));
             }
             else if (aLayerName == "LAYER_BACKGRNDOBJ")
             {
-                pLayer->SetName(SD_RESSTR(STR_LAYER_BCKGRNDOBJ));
+                pLayer->SetName(SdResId(STR_LAYER_BCKGRNDOBJ));
             }
             else if (aLayerName == "LAYER_CONTROLS")
             {
-                pLayer->SetName(SD_RESSTR(STR_LAYER_CONTROLS));
+                pLayer->SetName(SdResId(STR_LAYER_CONTROLS));
             }
             else if (aLayerName == "LAYER_MEASURELINES")
             {
-                pLayer->SetName(SD_RESSTR(STR_LAYER_MEASURELINES));
+                pLayer->SetName(SdResId(STR_LAYER_MEASURELINES));
             }
         }
     }
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index f334f155d2e3..6cb7963bcacd 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -542,7 +542,7 @@ SdrObject* SdPage::CreatePresObj(PresObjKind eObjKind, bool bVertical, const ::t
 
             // background objects of the master page
             pSdrObj->SetLayer( rLayerAdmin.
-                GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ)) );
+                GetLayerID(SdResId(STR_LAYER_BCKGRNDOBJ)) );
         }
 
         // Subscribe object at the style sheet
@@ -2459,22 +2459,22 @@ void SdPage::SetObjText(SdrTextObj* pObj, SdrOutliner* pOutliner, PresObjKind eO
                 {
                     pOutl->SetStyleSheet( 0, GetStyleSheetForPresObj(eObjKind) );
                     aString += "\n\t\t";
-                    aString += SD_RESSTR(STR_PRESOBJ_MPOUTLLAYER2);
+                    aString += SdResId(STR_PRESOBJ_MPOUTLLAYER2);
 
                     aString += "\n\t\t\t";
-                    aString += SD_RESSTR(STR_PRESOBJ_MPOUTLLAYER3);
+                    aString += SdResId(STR_PRESOBJ_MPOUTLLAYER3);
 
                     aString += "\n\t\t\t\t";
-                    aString += SD_RESSTR(STR_PRESOBJ_MPOUTLLAYER4);
+                    aString += SdResId(STR_PRESOBJ_MPOUTLLAYER4);
 
                     aString += "\n\t\t\t\t\t";
-                    aString += SD_RESSTR(STR_PRESOBJ_MPOUTLLAYER5);
+                    aString += SdResId(STR_PRESOBJ_MPOUTLLAYER5);
 
                     aString += "\n\t\t\t\t\t\t";
-                    aString += SD_RESSTR(STR_PRESOBJ_MPOUTLLAYER6);
+                    aString += SdResId(STR_PRESOBJ_MPOUTLLAYER6);
 
                     aString += "\n\t\t\t\t\t\t\t";
-                    aString += SD_RESSTR(STR_PRESOBJ_MPOUTLLAYER7);
+                    aString += SdResId(STR_PRESOBJ_MPOUTLLAYER7);
 
                 }
             }
@@ -2581,7 +2581,7 @@ const OUString& SdPage::GetName() const
             // default name for handout pages
             sal_uInt16  nNum = (GetPageNum() + 1) / 2;
 
-            aCreatedPageName = SD_RESSTR(STR_PAGE);
+            aCreatedPageName = SdResId(STR_PAGE);
             aCreatedPageName += " ";
             if( GetModel()->GetPageNumType() == css::style::NumberingType::NUMBER_NONE )
             {
@@ -2600,7 +2600,7 @@ const OUString& SdPage::GetName() const
             /******************************************************************
             * default name for note pages
             ******************************************************************/
-            aCreatedPageName = SD_RESSTR(STR_LAYOUT_DEFAULT_NAME);
+            aCreatedPageName = SdResId(STR_LAYOUT_DEFAULT_NAME);
         }
     }
     else
@@ -2611,12 +2611,12 @@ const OUString& SdPage::GetName() const
     if (mePageKind == PageKind::Notes)
     {
         aCreatedPageName += " ";
-        aCreatedPageName += SD_RESSTR(STR_NOTES);
+        aCreatedPageName += SdResId(STR_NOTES);
     }
     else if (mePageKind == PageKind::Handout && mbMaster)
     {
         aCreatedPageName += " (";
-        aCreatedPageName += SD_RESSTR(STR_HANDOUT);
+        aCreatedPageName += SdResId(STR_HANDOUT);
         aCreatedPageName += ")";
     }
 
@@ -2650,63 +2650,63 @@ OUString SdPage::GetPresObjText(PresObjKind eObjKind) const
         {
             if (mePageKind != PageKind::Notes)
             {
-                aString = SD_RESSTR( STR_PRESOBJ_MPTITLE );
+                aString = SdResId( STR_PRESOBJ_MPTITLE );
             }
             else
             {
-                aString = SD_RESSTR( STR_PRESOBJ_MPNOTESTITLE );
+                aString = SdResId( STR_PRESOBJ_MPNOTESTITLE );
             }
         }
         else
         {
-            aString = SD_RESSTR( STR_PRESOBJ_TITLE );
+            aString = SdResId( STR_PRESOBJ_TITLE );
         }
     }
     else if (eObjKind == PRESOBJ_OUTLINE)
     {
         if (mbMaster)
         {
-            aString = SD_RESSTR( STR_PRESOBJ_MPOUTLINE );
+            aString = SdResId( STR_PRESOBJ_MPOUTLINE );
         }
         else
         {
-            aString = SD_RESSTR( STR_PRESOBJ_OUTLINE );
+            aString = SdResId( STR_PRESOBJ_OUTLINE );
         }
     }
     else if (eObjKind == PRESOBJ_NOTES)
     {
         if (mbMaster)
         {
-            aString = SD_RESSTR( STR_PRESOBJ_MPNOTESTEXT );
+            aString = SdResId( STR_PRESOBJ_MPNOTESTEXT );
         }
         else
         {
-            aString = SD_RESSTR( STR_PRESOBJ_NOTESTEXT );
+            aString = SdResId( STR_PRESOBJ_NOTESTEXT );
         }
     }
     else if (eObjKind == PRESOBJ_TEXT)
     {
-        aString = SD_RESSTR( STR_PRESOBJ_TEXT );
+        aString = SdResId( STR_PRESOBJ_TEXT );
     }
     else if (eObjKind == PRESOBJ_GRAPHIC)
     {
-        aString = SD_RESSTR( STR_PRESOBJ_GRAPHIC );
+        aString = SdResId( STR_PRESOBJ_GRAPHIC );
     }
     else if (eObjKind == PRESOBJ_OBJECT)
     {
-        aString = SD_RESSTR( STR_PRESOBJ_OBJECT );
+        aString = SdResId( STR_PRESOBJ_OBJECT );
     }
     else if (eObjKind == PRESOBJ_CHART)
     {
-        aString = SD_RESSTR( STR_PRESOBJ_CHART );
+        aString = SdResId( STR_PRESOBJ_CHART );
     }
     else if (eObjKind == PRESOBJ_ORGCHART)
     {
-        aString = SD_RESSTR( STR_PRESOBJ_ORGCHART );
+        aString = SdResId( STR_PRESOBJ_ORGCHART );
     }
     else if (eObjKind == PRESOBJ_CALC)
     {
-        aString = SD_RESSTR( STR_PRESOBJ_TABLE );
+        aString = SdResId( STR_PRESOBJ_TABLE );
     }
 
     return aString;
diff --git a/sd/source/core/stlfamily.cxx b/sd/source/core/stlfamily.cxx
index ee8db41641a6..04bec070c509 100644
--- a/sd/source/core/stlfamily.cxx
+++ b/sd/source/core/stlfamily.cxx
@@ -493,8 +493,8 @@ Any SdStyleFamily::getPropertyValue( const OUString& PropertyName )
         switch( mnFamily )
         {
             case SD_STYLE_FAMILY_MASTERPAGE:    sDisplayName = getName(); break;
-            case SD_STYLE_FAMILY_CELL:          sDisplayName = SD_RESSTR(STR_CELL_STYLE_FAMILY); break;
-            default:                            sDisplayName = SD_RESSTR(STR_GRAPHICS_STYLE_FAMILY); break;
+            case SD_STYLE_FAMILY_CELL:          sDisplayName = SdResId(STR_CELL_STYLE_FAMILY); break;
+            default:                            sDisplayName = SdResId(STR_GRAPHICS_STYLE_FAMILY); break;
         }
         return Any( sDisplayName );
     }
diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx
index 624f329ca45d..396f58a9000b 100644
--- a/sd/source/core/stlpool.cxx
+++ b/sd/source/core/stlpool.cxx
@@ -845,7 +845,7 @@ void SdStyleSheetPool::CreatePseudosIfNecessary()
 
     sal_uInt16 nUsedMask = SFXSTYLEBIT_USED;
 
-    aName = SD_RESSTR(STR_PSEUDOSHEET_TITLE);
+    aName = SdResId(STR_PSEUDOSHEET_TITLE);
     if( (pSheet = Find(aName, SD_STYLE_FAMILY_PSEUDO)) == nullptr )
     {
         pSheet = &Make(aName, SD_STYLE_FAMILY_PSEUDO, nUsedMask);
@@ -854,7 +854,7 @@ void SdStyleSheetPool::CreatePseudosIfNecessary()
     }
     pSheet->SetHelpId( aHelpFile, HID_PSEUDOSHEET_TITLE );
 
-    aName = SD_RESSTR(STR_PSEUDOSHEET_SUBTITLE);
+    aName = SdResId(STR_PSEUDOSHEET_SUBTITLE);
     if( (pSheet = Find(aName, SD_STYLE_FAMILY_PSEUDO)) == nullptr )
     {
         pSheet = &Make(aName, SD_STYLE_FAMILY_PSEUDO, nUsedMask);
@@ -863,7 +863,7 @@ void SdStyleSheetPool::CreatePseudosIfNecessary()
     }
     pSheet->SetHelpId( aHelpFile, HID_PSEUDOSHEET_SUBTITLE );
 
-    aName = SD_RESSTR(STR_PSEUDOSHEET_BACKGROUNDOBJECTS);
+    aName = SdResId(STR_PSEUDOSHEET_BACKGROUNDOBJECTS);
     if( (pSheet = Find(aName, SD_STYLE_FAMILY_PSEUDO)) == nullptr )
     {
         pSheet = &Make(aName, SD_STYLE_FAMILY_PSEUDO, nUsedMask);
@@ -872,7 +872,7 @@ void SdStyleSheetPool::CreatePseudosIfNecessary()
     }
     pSheet->SetHelpId( aHelpFile, HID_PSEUDOSHEET_BACKGROUNDOBJECTS );
 
-    aName = SD_RESSTR(STR_PSEUDOSHEET_BACKGROUND);
+    aName = SdResId(STR_PSEUDOSHEET_BACKGROUND);
     if( (pSheet = Find(aName, SD_STYLE_FAMILY_PSEUDO)) == nullptr )
     {
         pSheet = &Make(aName, SD_STYLE_FAMILY_PSEUDO, nUsedMask);
@@ -881,7 +881,7 @@ void SdStyleSheetPool::CreatePseudosIfNecessary()
     }
     pSheet->SetHelpId( aHelpFile, HID_PSEUDOSHEET_BACKGROUND );
 
-    aName = SD_RESSTR(STR_PSEUDOSHEET_NOTES);
+    aName = SdResId(STR_PSEUDOSHEET_NOTES);
     if( (pSheet = Find(aName, SD_STYLE_FAMILY_PSEUDO)) == nullptr )
     {
         pSheet = &Make(aName, SD_STYLE_FAMILY_PSEUDO, nUsedMask);
@@ -892,7 +892,7 @@ void SdStyleSheetPool::CreatePseudosIfNecessary()
 
     pParent = nullptr;
     SetSearchMask(SD_STYLE_FAMILY_PSEUDO);
-    aName = SD_RESSTR(STR_PSEUDOSHEET_OUTLINE);
+    aName = SdResId(STR_PSEUDOSHEET_OUTLINE);
     for (sal_Int32 nLevel = 1; nLevel < 10; nLevel++)
     {
         OUString aLevelName( aName + " " + OUString::number( nLevel ) );
@@ -1002,7 +1002,7 @@ void SdStyleSheetPool::UpdateStdNames()
             {
                 if( nNameId )
                 {
-                    aNewName = SD_RESSTR( nNameId );
+                    aNewName = SdResId( nNameId );
                     if( nNameId == STR_PSEUDOSHEET_OUTLINE )
                     {
                         aNewName += " " + OUString::number( sal_Int32( nHelpId - HID_PSEUDOSHEET_OUTLINE ) );
diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx
index 9d984d001d02..ea125d3a8aad 100644
--- a/sd/source/core/stlsheet.cxx
+++ b/sd/source/core/stlsheet.cxx
@@ -417,23 +417,23 @@ SdStyleSheet* SdStyleSheet::GetRealStyleSheet() const
     OUString aInternalName;
     OUString aStyleName(aName);
 
-    if (aStyleName == OUString(SdResId(STR_PSEUDOSHEET_TITLE)))
+    if (aStyleName == SdResId(STR_PSEUDOSHEET_TITLE))
     {
         aInternalName = STR_LAYOUT_TITLE;
     }
-    else if (aStyleName == OUString(SdResId(STR_PSEUDOSHEET_SUBTITLE)))
+    else if (aStyleName == SdResId(STR_PSEUDOSHEET_SUBTITLE))
     {
         aInternalName = STR_LAYOUT_SUBTITLE;
     }
-    else if (aStyleName == OUString(SdResId(STR_PSEUDOSHEET_BACKGROUND)))
+    else if (aStyleName == SdResId(STR_PSEUDOSHEET_BACKGROUND))
     {
         aInternalName = STR_LAYOUT_BACKGROUND;
     }
-    else if (aStyleName == OUString(SdResId(STR_PSEUDOSHEET_BACKGROUNDOBJECTS)))
+    else if (aStyleName == SdResId(STR_PSEUDOSHEET_BACKGROUNDOBJECTS))
     {
         aInternalName = STR_LAYOUT_BACKGROUNDOBJECTS;
     }
-    else if (aStyleName == OUString(SdResId(STR_PSEUDOSHEET_NOTES)))
+    else if (aStyleName == SdResId(STR_PSEUDOSHEET_NOTES))
     {
         aInternalName = STR_LAYOUT_NOTES;
     }
@@ -482,23 +482,23 @@ SdStyleSheet* SdStyleSheet::GetPseudoStyleSheet() const
 
     if (aStyleName == STR_LAYOUT_TITLE)
     {
-        aStyleName = OUString(SdResId(STR_PSEUDOSHEET_TITLE));
+        aStyleName = SdResId(STR_PSEUDOSHEET_TITLE);
     }
     else if (aStyleName == STR_LAYOUT_SUBTITLE)
     {
-        aStyleName = OUString(SdResId(STR_PSEUDOSHEET_SUBTITLE));
+        aStyleName = SdResId(STR_PSEUDOSHEET_SUBTITLE);
     }
     else if (aStyleName == STR_LAYOUT_BACKGROUND)
     {
-        aStyleName = OUString(SdResId(STR_PSEUDOSHEET_BACKGROUND));
+        aStyleName = SdResId(STR_PSEUDOSHEET_BACKGROUND);
     }
     else if (aStyleName == STR_LAYOUT_BACKGROUNDOBJECTS)
     {
-        aStyleName = OUString(SdResId(STR_PSEUDOSHEET_BACKGROUNDOBJECTS));
+        aStyleName = SdResId(STR_PSEUDOSHEET_BACKGROUNDOBJECTS);
     }
     else if (aStyleName == STR_LAYOUT_NOTES)
     {
-        aStyleName = OUString(SdResId(STR_PSEUDOSHEET_NOTES));
+        aStyleName = SdResId(STR_PSEUDOSHEET_NOTES);
     }
     else
     {
@@ -507,7 +507,7 @@ SdStyleSheet* SdStyleSheet::GetPseudoStyleSheet() const
         if (nPos != -1)
         {
             OUString aNumStr(aStyleName.copy(aOutlineStr.getLength()));
-            aStyleName = OUString(SdResId(STR_PSEUDOSHEET_OUTLINE));
+            aStyleName = SdResId(STR_PSEUDOSHEET_OUTLINE);
             aStyleName += aNumStr;
         }
     }
@@ -1331,7 +1331,7 @@ void SdStyleSheet::BroadcastSdStyleSheetChange(SfxStyleSheetBase* pStyleSheet,
 
     if( (ePO >= PO_OUTLINE_1) && (ePO <= PO_OUTLINE_8) )
     {
-        OUString sStyleName(SD_RESSTR(STR_PSEUDOSHEET_OUTLINE) + " ");
+        OUString sStyleName(SdResId(STR_PSEUDOSHEET_OUTLINE) + " ");
 
         for( sal_uInt16 n = (sal_uInt16)(ePO - PO_OUTLINE_1 + 2); n < 10; n++ )
         {
diff --git a/sd/source/core/undoanim.cxx b/sd/source/core/undoanim.cxx
index dd9b68b00dee..bc7215554e21 100644
--- a/sd/source/core/undoanim.cxx
+++ b/sd/source/core/undoanim.cxx
@@ -105,7 +105,7 @@ void UndoAnimation::Redo()
 
 OUString UndoAnimation::GetComment() const
 {
-    return SdResId(STR_UNDO_ANIMATION).toString();
+    return SdResId(STR_UNDO_ANIMATION);
 }
 
 struct UndoAnimationPathImpl
@@ -180,7 +180,7 @@ void UndoAnimationPath::Redo()
 
 OUString UndoAnimationPath::GetComment() const
 {
-    return SdResId(STR_UNDO_ANIMATION).toString();
+    return SdResId(STR_UNDO_ANIMATION);
 }
 
 struct UndoTransitionImpl
@@ -270,7 +270,7 @@ void UndoTransition::Redo()
 
 OUString UndoTransition::GetComment() const
 {
-    return SdResId(STR_UNDO_SLIDE_PARAMS).toString();
+    return SdResId(STR_UNDO_SLIDE_PARAMS);
 }
 
 }
diff --git a/sd/source/filter/grf/sdgrffilter.cxx b/sd/source/filter/grf/sdgrffilter.cxx
index 8a22c88e46bb..7e668a0ab53f 100644
--- a/sd/source/filter/grf/sdgrffilter.cxx
+++ b/sd/source/filter/grf/sdgrffilter.cxx
@@ -159,7 +159,7 @@ void SdGRFFilter::HandleGraphicFilterError( sal_uInt16 nFilterError, sal_uLong n
         ErrorHandler::HandleError( ERRCODE_IO_GENERAL );
     else
     {
-        ScopedVclPtrInstance< MessageDialog > aErrorBox(nullptr, SD_RESSTR(nId));
+        ScopedVclPtrInstance< MessageDialog > aErrorBox(nullptr, SdResId(nId));
         aErrorBox->Execute();
     }
 }
diff --git a/sd/source/filter/html/htmlattr.cxx b/sd/source/filter/html/htmlattr.cxx
index 782e599861c6..d845494d1801 100644
--- a/sd/source/filter/html/htmlattr.cxx
+++ b/sd/source/filter/html/htmlattr.cxx
@@ -49,19 +49,19 @@ void SdHtmlAttrPreview::Paint(vcl::RenderContext& rRenderContext, const ::tools:
     aTextRect.Bottom() =  nHeight + aTextRect.Top();
 
     rRenderContext.SetTextColor(m_aTextColor);
-    rRenderContext.DrawText(aTextRect, SD_RESSTR(STR_HTMLATTR_TEXT), DrawTextFlags::Center | DrawTextFlags::VCenter);
+    rRenderContext.DrawText(aTextRect, SdResId(STR_HTMLATTR_TEXT), DrawTextFlags::Center | DrawTextFlags::VCenter);
 
     aTextRect.Move(0,nHeight);
     rRenderContext.SetTextColor(m_aLinkColor);
-    rRenderContext.DrawText(aTextRect, SD_RESSTR(STR_HTMLATTR_LINK), DrawTextFlags::Center | DrawTextFlags::VCenter);
+    rRenderContext.DrawText(aTextRect, SdResId(STR_HTMLATTR_LINK), DrawTextFlags::Center | DrawTextFlags::VCenter);
 
     aTextRect.Move(0,nHeight);
     rRenderContext.SetTextColor(m_aALinkColor);
-    rRenderContext.DrawText(aTextRect, SD_RESSTR(STR_HTMLATTR_ALINK), DrawTextFlags::Center | DrawTextFlags::VCenter);
+    rRenderContext.DrawText(aTextRect, SdResId(STR_HTMLATTR_ALINK), DrawTextFlags::Center | DrawTextFlags::VCenter);
 
     aTextRect.Move(0,nHeight);
     rRenderContext.SetTextColor(m_aVLinkColor);
-    rRenderContext.DrawText(aTextRect, SD_RESSTR(STR_HTMLATTR_VLINK), DrawTextFlags::Center | DrawTextFlags::VCenter);
+    rRenderContext.DrawText(aTextRect, SdResId(STR_HTMLATTR_VLINK), DrawTextFlags::Center | DrawTextFlags::VCenter);
 }
 
 void SdHtmlAttrPreview::SetColors(Color& aBack, Color& aText, Color& aLink,
diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx
index 275b50fe5da0..06babc1c576b 100644
--- a/sd/source/filter/html/htmlex.cxx
+++ b/sd/source/filter/html/htmlex.cxx
@@ -95,7 +95,7 @@ using namespace ::com::sun::star::document;
 using namespace sdr::table;
 
 // get parameter from Itemset
-#define RESTOHTML( res ) StringToHTMLString(SD_RESSTR(res))
+#define RESTOHTML( res ) StringToHTMLString(SdResId(res))
 
 const char * const pButtonNames[] =
 {
@@ -846,7 +846,7 @@ void HtmlExport::SetDocColors( SdPage* pPage )
 
 void HtmlExport::InitProgress( sal_uInt16 nProgrCount )
 {
-    mpProgress = new SfxProgress( mpDocSh, SD_RESSTR(STR_CREATE_PAGES), nProgrCount );
+    mpProgress = new SfxProgress( mpDocSh, SdResId(STR_CREATE_PAGES), nProgrCount );
 }
 
 void HtmlExport::ResetProgress()
@@ -2417,7 +2417,7 @@ bool HtmlExport::CreateNavBarFrames()
         aStr.append("<center>\r\n");
 
         // first page
-        aButton = SD_RESSTR(STR_HTMLEXP_FIRSTPAGE);
+        aButton = SdResId(STR_HTMLEXP_FIRSTPAGE);
         if(mnButtonThema != -1)
             aButton = CreateImage(GetButtonName((nFile == 0 || mnSdPageCount == 1?
                                   BTN_FIRST_0:BTN_FIRST_1)), aButton);
@@ -2429,7 +2429,7 @@ bool HtmlExport::CreateNavBarFrames()
         aStr.append("\r\n");
 
         // to the previous page
-        aButton = SD_RESSTR(STR_PUBLISH_BACK);
+        aButton = SdResId(STR_PUBLISH_BACK);
         if(mnButtonThema != -1)
             aButton = CreateImage(GetButtonName((nFile == 0 || mnSdPageCount == 1?
                                     BTN_PREV_0:BTN_PREV_1)), aButton);
@@ -2441,7 +2441,7 @@ bool HtmlExport::CreateNavBarFrames()
         aStr.append("\r\n");
 
         // to the next page
-        aButton = SD_RESSTR(STR_PUBLISH_NEXT);
+        aButton = SdResId(STR_PUBLISH_NEXT);
         if(mnButtonThema != -1)
             aButton = CreateImage(GetButtonName((nFile ==2 || mnSdPageCount == 1?
                                     BTN_NEXT_0:BTN_NEXT_1)), aButton);
@@ -2453,7 +2453,7 @@ bool HtmlExport::CreateNavBarFrames()
         aStr.append("\r\n");
 
         // to the last page
-        aButton = SD_RESSTR(STR_HTMLEXP_LASTPAGE);
+        aButton = SdResId(STR_HTMLEXP_LASTPAGE);
         if(mnButtonThema != -1)
             aButton = CreateImage(GetButtonName((nFile ==2 || mnSdPageCount == 1?
                                   BTN_LAST_0:BTN_LAST_1)), aButton);
@@ -2472,7 +2472,7 @@ bool HtmlExport::CreateNavBarFrames()
         // content
         if (mbContentsPage)
         {
-            aButton = SD_RESSTR(STR_PUBLISH_OUTLINE);
+            aButton = SdResId(STR_PUBLISH_OUTLINE);
             if(mnButtonThema != -1)
                 aButton = CreateImage(GetButtonName(BTN_INDEX), aButton);
 
@@ -2484,7 +2484,7 @@ bool HtmlExport::CreateNavBarFrames()
         // text mode
         if(mbImpress)
         {
-            aButton = SD_RESSTR(STR_HTMLEXP_SETTEXT);
+            aButton = SdResId(STR_HTMLEXP_SETTEXT);
             if(mnButtonThema != -1)
                 aButton = CreateImage(GetButtonName(BTN_TEXT), aButton);
 
@@ -2515,7 +2515,7 @@ bool HtmlExport::CreateNavBarFrames()
         aStr.append("</title>\r\n</head>\r\n");
         aStr.append(CreateBodyTag());
 
-        aButton = SD_RESSTR(STR_HTMLEXP_OUTLINE);
+        aButton = SdResId(STR_HTMLEXP_OUTLINE);
         if(mnButtonThema != -1)
             aButton = CreateImage(GetButtonName(BTN_MORE), aButton);
 
@@ -2538,7 +2538,7 @@ bool HtmlExport::CreateNavBarFrames()
         aStr.append("</title>\r\n</head>\r\n");
         aStr.append(CreateBodyTag());
 
-        aButton = SD_RESSTR(STR_HTMLEXP_NOOUTLINE);
+        aButton = SdResId(STR_HTMLEXP_NOOUTLINE);
         if(mnButtonThema != -1)
             aButton = CreateImage(GetButtonName(BTN_LESS), aButton);
 
@@ -2559,19 +2559,19 @@ bool HtmlExport::CreateNavBarFrames()
 OUString HtmlExport::CreateNavBar( sal_uInt16 nSdPage, bool bIsText ) const
 {
     // prepare button bar
-    OUString aStrNavFirst(SD_RESSTR(STR_HTMLEXP_FIRSTPAGE));
-    OUString aStrNavPrev(SD_RESSTR(STR_PUBLISH_BACK));
-    OUString aStrNavNext(SD_RESSTR(STR_PUBLISH_NEXT));
-    OUString aStrNavLast(SD_RESSTR(STR_HTMLEXP_LASTPAGE));
-    OUString aStrNavContent(SD_RESSTR(STR_PUBLISH_OUTLINE));
+    OUString aStrNavFirst(SdResId(STR_HTMLEXP_FIRSTPAGE));
+    OUString aStrNavPrev(SdResId(STR_PUBLISH_BACK));
+    OUString aStrNavNext(SdResId(STR_PUBLISH_NEXT));
+    OUString aStrNavLast(SdResId(STR_HTMLEXP_LASTPAGE));
+    OUString aStrNavContent(SdResId(STR_PUBLISH_OUTLINE));
     OUString aStrNavText;
     if( bIsText )
     {
-        aStrNavText = SD_RESSTR(STR_HTMLEXP_SETGRAPHIC);
+        aStrNavText = SdResId(STR_HTMLEXP_SETGRAPHIC);
     }
     else
     {
-        aStrNavText = SD_RESSTR(STR_HTMLEXP_SETTEXT);
+        aStrNavText = SdResId(STR_HTMLEXP_SETTEXT);
     }
 
     if(!bIsText && mnButtonThema != -1)
@@ -3101,7 +3101,7 @@ bool HtmlExport::checkForExistingFiles()
             if( pResMgr )
             {
                 ResId aResId( 4077, *pResMgr );
-                OUString aMsg( aResId.toString() );
+                OUString aMsg( aResId );
 
                 OUString aSystemPath;
                 osl::FileBase::getSystemPathFromFileURL( maExportPath, aSystemPath );
@@ -3232,7 +3232,7 @@ bool HtmlErrorContext::GetString( sal_uInt32, OUString& rCtxStr )
     if( mnResId == 0 )
         return false;
 
-    rCtxStr = SdResId( mnResId ).toString();
+    rCtxStr = SdResId(mnResId);
 
     rCtxStr = rCtxStr.replaceAll( "$(URL1)", maURL1 );
     rCtxStr = rCtxStr.replaceAll( "$(URL2)", maURL2 );
diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx
index 9526ab2bdf4c..7b269d760061 100644
--- a/sd/source/filter/html/pubdlg.cxx
+++ b/sd/source/filter/html/pubdlg.cxx
@@ -1153,7 +1153,7 @@ IMPL_LINK_NOARG(SdPublishingDlg, FinishHdl, Button*, void)
 
                 if (iter != m_aDesignList.end())
                 {
-                    ScopedVclPtrInstance<MessageDialog> aErrorBox(this, SD_RESSTR(STR_PUBDLG_SAMENAME),
+                    ScopedVclPtrInstance<MessageDialog> aErrorBox(this, SdResId(STR_PUBDLG_SAMENAME),
                         VclMessageType::Error, VclButtonsType::YesNo);
                     bRetry = aErrorBox->Execute() == RET_NO;
 
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index 0101a5243034..be701d617712 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -246,8 +246,8 @@ bool ImplSdPPTImport::Import()
     ((EditEngine&)rOutl.GetEditEngine()).SetControlWord( nControlWord );
 
     SdrLayerAdmin& rAdmin = mpDoc->GetLayerAdmin();
-    mnBackgroundLayerID = rAdmin.GetLayerID( SD_RESSTR( STR_LAYER_BCKGRND ) );
-    mnBackgroundObjectsLayerID = rAdmin.GetLayerID( SD_RESSTR( STR_LAYER_BCKGRNDOBJ ) );
+    mnBackgroundLayerID = rAdmin.GetLayerID( SdResId( STR_LAYER_BCKGRND ) );
+    mnBackgroundObjectsLayerID = rAdmin.GetLayerID( SdResId( STR_LAYER_BCKGRNDOBJ ) );
 
     ::sd::DrawDocShell* pDocShell = mpDoc->GetDocSh();
     if ( pDocShell )
@@ -564,7 +564,7 @@ bool ImplSdPPTImport::Import()
     if (!utl::ConfigManager::IsAvoidConfig())
     {
         xStbMgr.reset(new SfxProgress(pDocShell,
-                        SD_RESSTR( STR_POWERPOINT_IMPORT),
+                        SdResId( STR_POWERPOINT_IMPORT),
                         m_pMasterPages->size() +
                         m_pSlidePages->size() + m_pNotePages->size()));
     }
@@ -598,7 +598,7 @@ bool ImplSdPPTImport::Import()
                     if ( nMasterNum == 1 )
                     {
                         // standardsheet
-                        pSheet = static_cast<SfxStyleSheet*>(mpDoc->GetStyleSheetPool()->Find(SD_RESSTR(STR_STANDARD_STYLESHEET_NAME), SD_STYLE_FAMILY_GRAPHICS ));
+                        pSheet = static_cast<SfxStyleSheet*>(mpDoc->GetStyleSheetPool()->Find(SdResId(STR_STANDARD_STYLESHEET_NAME), SD_STYLE_FAMILY_GRAPHICS ));
                         if ( pSheet )
                         {
                             SfxItemSet& rItemSet = pSheet->GetItemSet();
@@ -611,7 +611,7 @@ bool ImplSdPPTImport::Import()
                     }
 
                     // PSEUDO
-                    pSheet = static_cast<SfxStyleSheet*>(mpDoc->GetStyleSheetPool()->Find(SD_RESSTR(STR_PSEUDOSHEET_BACKGROUNDOBJECTS), SD_STYLE_FAMILY_PSEUDO ));
+                    pSheet = static_cast<SfxStyleSheet*>(mpDoc->GetStyleSheetPool()->Find(SdResId(STR_PSEUDOSHEET_BACKGROUNDOBJECTS), SD_STYLE_FAMILY_PSEUDO ));
                     if ( pSheet )
                     {
                         SfxItemSet& rItemSet = pSheet->GetItemSet();
@@ -625,12 +625,12 @@ bool ImplSdPPTImport::Import()
                     // create layoutstylesheets, set layoutname and stylesheet
                     // (only on standard and not pages)
 
-                    OUString aLayoutName( SD_RESSTR( STR_LAYOUT_DEFAULT_NAME ) );
+                    OUString aLayoutName( SdResId( STR_LAYOUT_DEFAULT_NAME ) );
                     if ( nMasterNum > 2 )
                     {
                         if ( ePgKind == PageKind::Standard )
                         {   // standard page: create new presentation layout
-                            aLayoutName = SD_RESSTR( STR_LAYOUT_DEFAULT_TITLE_NAME );
+                            aLayoutName = SdResId( STR_LAYOUT_DEFAULT_TITLE_NAME );
                             aLayoutName += OUString::number( (sal_Int32)( ( nMasterNum + 1 ) / 2 - 1 ) );
                             static_cast<SdStyleSheetPool*>( mpDoc->GetStyleSheetPool() )->CreateLayoutStyleSheets( aLayoutName );
                         }
@@ -2279,10 +2279,10 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj
                 case PRESOBJ_SLIDENUMBER :
                 case PRESOBJ_FOOTER :
                 case PRESOBJ_HEADER :
-                    pSheet = static_cast<SfxStyleSheet*>(mpDoc->GetStyleSheetPool()->Find(SD_RESSTR(STR_PSEUDOSHEET_BACKGROUNDOBJECTS), SD_STYLE_FAMILY_PSEUDO ));
+                    pSheet = static_cast<SfxStyleSheet*>(mpDoc->GetStyleSheetPool()->Find(SdResId(STR_PSEUDOSHEET_BACKGROUNDOBJECTS), SD_STYLE_FAMILY_PSEUDO ));
                 break;
                 default :
-                    pSheet = static_cast<SfxStyleSheet*>(mpDoc->GetStyleSheetPool()->Find(SD_RESSTR(STR_STANDARD_STYLESHEET_NAME), SD_STYLE_FAMILY_GRAPHICS ));
+                    pSheet = static_cast<SfxStyleSheet*>(mpDoc->GetStyleSheetPool()->Find(SdResId(STR_STANDARD_STYLESHEET_NAME), SD_STYLE_FAMILY_GRAPHICS ));
             }
         }
         break;
diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx
index c4df696242b2..b84854e68b94 100644
--- a/sd/source/filter/xml/sdxmlwrp.cxx
+++ b/sd/source/filter/xml/sdxmlwrp.cxx
@@ -523,7 +523,7 @@ bool SdXMLFilter::Import( ErrCode& nError )
         {
             sal_Int32 nProgressRange(1000000);
             sal_Int32 nProgressCurrent(0);
-            OUString aMsg(SD_RESSTR(STR_LOAD_DOC));
+            OUString aMsg(SdResId(STR_LOAD_DOC));
             mxStatusIndicator->start(aMsg, nProgressRange);
 
             // set ProgressRange
@@ -892,7 +892,7 @@ bool SdXMLFilter::Export()
             {
                 sal_Int32 nProgressRange(1000000);
                 sal_Int32 nProgressCurrent(0);
-                OUString aMsg(SD_RESSTR(STR_SAVE_DOC));
+                OUString aMsg(SdResId(STR_SAVE_DOC));
                 mxStatusIndicator->start(aMsg, nProgressRange);
 
                 // set ProgressRange
diff --git a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
index 6a597c6d95ce..d23f72b82d94 100644
--- a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
+++ b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
@@ -545,26 +545,26 @@ OUString AccessibleDrawDocumentView::CreateAccessibleName()
             {
                 SolarMutexGuard aGuard;
 
-                sName = SD_RESSTR(SID_SD_A11Y_I_DRAWVIEW_N);
+                sName = SdResId(SID_SD_A11Y_I_DRAWVIEW_N);
             }
             else
             {
                 SolarMutexGuard aGuard;
 
-                sName = SD_RESSTR(SID_SD_A11Y_D_DRAWVIEW_N);
+                sName = SdResId(SID_SD_A11Y_D_DRAWVIEW_N);
             }
         }
         else if ( sFirstService == "com.sun.star.presentation.NotesView" )
         {
             SolarMutexGuard aGuard;
 
-            sName = SD_RESSTR(SID_SD_A11Y_I_NOTESVIEW_N);
+            sName = SdResId(SID_SD_A11Y_I_NOTESVIEW_N);
         }
         else if ( sFirstService == "com.sun.star.presentation.HandoutView" )
         {
             SolarMutexGuard aGuard;
 
-            sName = SD_RESSTR(SID_SD_A11Y_I_HANDOUTVIEW_N);
+            sName = SdResId(SID_SD_A11Y_I_HANDOUTVIEW_N);
         }
         else
         {
@@ -597,26 +597,26 @@ OUString
             {
                 SolarMutexGuard aGuard;
 
-                sDescription = SD_RESSTR(SID_SD_A11Y_I_DRAWVIEW_D);
+                sDescription = SdResId(SID_SD_A11Y_I_DRAWVIEW_D);
             }
             else
             {
                 SolarMutexGuard aGuard;
 
-                sDescription = SD_RESSTR(SID_SD_A11Y_D_DRAWVIEW_D);
+                sDescription = SdResId(SID_SD_A11Y_D_DRAWVIEW_D);
             }
         }
         else if ( sFirstService == "com.sun.star.presentation.NotesView" )
         {
             SolarMutexGuard aGuard;
 
-            sDescription = SD_RESSTR(SID_SD_A11Y_I_NOTESVIEW_D);
+            sDescription = SdResId(SID_SD_A11Y_I_NOTESVIEW_D);
         }
         else if ( sFirstService == "com.sun.star.presentation.HandoutView" )
         {
             SolarMutexGuard aGuard;
 
-            sDescription = SD_RESSTR(SID_SD_A11Y_I_HANDOUTVIEW_D);
+            sDescription = SdResId(SID_SD_A11Y_I_HANDOUTVIEW_D);
         }
         else
         {
diff --git a/sd/source/ui/accessibility/AccessibleOutlineView.cxx b/sd/source/ui/accessibility/AccessibleOutlineView.cxx
index 0d627e3b99fd..4b77cce1ef73 100644
--- a/sd/source/ui/accessibility/AccessibleOutlineView.cxx
+++ b/sd/source/ui/accessibility/AccessibleOutlineView.cxx
@@ -243,7 +243,7 @@ OUString
 {
     SolarMutexGuard aGuard;
 
-    return SD_RESSTR(SID_SD_A11Y_I_OUTLINEVIEW_N);
+    return SdResId(SID_SD_A11Y_I_OUTLINEVIEW_N);
 }
 
 /** Create a description for this view.  Use the model's description or URL
@@ -254,7 +254,7 @@ OUString
 {
     SolarMutexGuard aGuard;
 
-    return SD_RESSTR(SID_SD_A11Y_I_OUTLINEVIEW_D);
+    return SdResId(SID_SD_A11Y_I_OUTLINEVIEW_D);
 }
 
 void AccessibleOutlineView::UpdateChildren()
diff --git a/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx b/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx
index 0cfc2e52f120..c06f1e4de365 100644
--- a/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx
+++ b/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx
@@ -88,17 +88,17 @@ OUString
     {
         case PRESENTATION_OLE:
             aDG.Initialize ("PresentationOLEShape");
-            //SVX_RESSTR(RID_SVXSTR_A11Y_ST_RECTANGLE));
+            //SvxResId(RID_SVXSTR_A11Y_ST_RECTANGLE));
             aDG.AddProperty ("CLSID" ,DescriptionGenerator::PropertyType::String);
             break;
         case PRESENTATION_CHART:
             aDG.Initialize ("PresentationChartShape");
-            //SVX_RESSTR(RID_SVXSTR_A11Y_ST_RECTANGLE));
+            //SvxResId(RID_SVXSTR_A11Y_ST_RECTANGLE));
             aDG.AddProperty ( "CLSID" , DescriptionGenerator::PropertyType::String);
             break;
         case PRESENTATION_TABLE:
             aDG.Initialize ("PresentationTableShape");
-            //SVX_RESSTR(RID_SVXSTR_A11Y_ST_RECTANGLE));
+            //SvxResId(RID_SVXSTR_A11Y_ST_RECTANGLE));
             aDG.AddProperty ("CLSID" , DescriptionGenerator::PropertyType::String);
             break;
         default:
diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx
index 6f2c5853b352..de850ce3564d 100644
--- a/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx
+++ b/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx
@@ -163,7 +163,7 @@ sal_Int16 SAL_CALL AccessibleSlideSorterObject::getAccessibleRole()
 OUString SAL_CALL AccessibleSlideSorterObject::getAccessibleDescription()
 {
     ThrowIfDisposed();
-    return SD_RESSTR(STR_PAGE);
+    return SdResId(STR_PAGE);
 }
 
 OUString SAL_CALL AccessibleSlideSorterObject::getAccessibleName()
diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
index c3ac9d6aa3cf..87341404435d 100644
--- a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
+++ b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
@@ -261,7 +261,7 @@ OUString SAL_CALL AccessibleSlideSorterView::getAccessibleDescription()
     ThrowIfDisposed();
     SolarMutexGuard aGuard;
 
-    return SD_RESSTR(SID_SD_A11Y_I_SLIDEVIEW_D);
+    return SdResId(SID_SD_A11Y_I_SLIDEVIEW_D);
 }
 
 OUString SAL_CALL AccessibleSlideSorterView::getAccessibleName()
@@ -269,7 +269,7 @@ OUString SAL_CALL AccessibleSlideSorterView::getAccessibleName()
     ThrowIfDisposed();
     SolarMutexGuard aGuard;
 
-    return SD_RESSTR(SID_SD_A11Y_I_SLIDEVIEW_N);
+    return SdResId(SID_SD_A11Y_I_SLIDEVIEW_N);
 }
 
 Reference<XAccessibleRelationSet> SAL_CALL
diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx
index 564963f923af..115abbb07053 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.cxx
@@ -900,7 +900,7 @@ FontStylePropertyBox::FontStylePropertyBox( sal_Int32 nControlType, vcl::Window*
     , maModifyHdl( rModifyHdl )
 {
     mpEdit.set( VclPtr<Edit>::Create( pParent, WB_TABSTOP|WB_IGNORETAB|WB_NOBORDER|WB_READONLY) );
-    mpEdit->SetText( SD_RESSTR(STR_CUSTOMANIMATION_SAMPLE) );
+    mpEdit->SetText( SdResId(STR_CUSTOMANIMATION_SAMPLE) );
 
     mpMenu = maBuilder.get_menu("menu");
     mpControl = VclPtr<DropdownMenuBox>::Create( pParent, mpEdit, mpMenu );
@@ -1455,14 +1455,14 @@ void CustomAnimationEffectTabPage::fillSoundListBox()
     GalleryExplorer::FillObjList( GALLERY_THEME_SOUNDS, maSoundList );
     GalleryExplorer::FillObjList( GALLERY_THEME_USERSOUNDS, maSoundList );
 
-    mpLBSound->InsertEntry( SD_RESSTR(STR_CUSTOMANIMATION_NO_SOUND) );
-    mpLBSound->InsertEntry( SD_RESSTR(STR_CUSTOMANIMATION_STOP_PREVIOUS_SOUND) );
+    mpLBSound->InsertEntry( SdResId(STR_CUSTOMANIMATION_NO_SOUND) );
+    mpLBSound->InsertEntry( SdResId(STR_CUSTOMANIMATION_STOP_PREVIOUS_SOUND) );
     for(const OUString & rString : maSoundList)
     {
         INetURLObject aURL( rString );
         mpLBSound->InsertEntry( aURL.GetBase() );
     }
-    mpLBSound->InsertEntry( SD_RESSTR(STR_CUSTOMANIMATION_BROWSE_SOUND) );
+    mpLBSound->InsertEntry( SdResId(STR_CUSTOMANIMATION_BROWSE_SOUND) );
 }
 
 void CustomAnimationEffectTabPage::clearSoundListBox()
@@ -1516,7 +1516,7 @@ void CustomAnimationEffectTabPage::openSoundFileDialog()
             }
             else
             {
-                OUString aStrWarning(SD_RESSTR(STR_WARNING_NOSOUNDFILE));
+                OUString aStrWarning(SdResId(STR_WARNING_NOSOUNDFILE));
                 aStrWarning = aStrWarning.replaceFirst("%", aFile);
                 ScopedVclPtrInstance< WarningBox > aWarningBox( nullptr, WB_3DLOOK | WB_RETRY_CANCEL, aStrWarning );
                 aWarningBox->SetModalInputMode (true);
diff --git a/sd/source/ui/animations/CustomAnimationList.cxx b/sd/source/ui/animations/CustomAnimationList.cxx
index 96bf05f32ccd..fa7aa1281bbd 100644
--- a/sd/source/ui/animations/CustomAnimationList.cxx
+++ b/sd/source/ui/animations/CustomAnimationList.cxx
@@ -231,13 +231,13 @@ CustomAnimationListEntryItem::CustomAnimationListEntryItem( const OUString& aDes
     switch(mpEffect->getPresetClass())
     {
     case EffectPresetClass::ENTRANCE:
-        msEffectName = SD_RESSTR(STR_CUSTOMANIMATION_ENTRANCE); break;
+        msEffectName = SdResId(STR_CUSTOMANIMATION_ENTRANCE); break;
     case EffectPresetClass::EXIT:
-        msEffectName = SD_RESSTR(STR_CUSTOMANIMATION_EXIT); break;
+        msEffectName = SdResId(STR_CUSTOMANIMATION_EXIT); break;
     case EffectPresetClass::EMPHASIS:
-        msEffectName = SD_RESSTR(STR_CUSTOMANIMATION_EMPHASIS); break;
+        msEffectName = SdResId(STR_CUSTOMANIMATION_EMPHASIS); break;
     case EffectPresetClass::MOTIONPATH:
-        msEffectName = SD_RESSTR(STR_CUSTOMANIMATION_MOTION_PATHS); break;
+        msEffectName = SdResId(STR_CUSTOMANIMATION_MOTION_PATHS); break;
     }
     msEffectName = msEffectName.replaceFirst( "%1" , mpCustomAnimationPresets->getUINameForPresetId(mpEffect->getPresetId()));
 }
@@ -635,7 +635,7 @@ void CustomAnimationList::update()
             {
                 SvTreeListEntry* pLBoxEntry = new CustomAnimationListEntry;
                 pLBoxEntry->AddItem(o3tl::make_unique<SvLBoxContextBmp>(Image(), Image(), false));
-                OUString aDescription = SD_RESSTR(STR_CUSTOMANIMATION_TRIGGER);
+                OUString aDescription = SdResId(STR_CUSTOMANIMATION_TRIGGER);
                 aDescription += ": ";
                 aDescription += getShapeDescription( xShape, false );
                 pLBoxEntry->AddItem(o3tl::make_unique<CustomAnimationTriggerEntryItem>(aDescription));
@@ -960,7 +960,7 @@ void CustomAnimationList::Paint(vcl::RenderContext& rRenderContext, const ::tool
         aRect.Right() -= aOffset.X();
         aRect.Bottom() -= aOffset.Y();
 
-        rRenderContext.DrawText(aRect, SD_RESSTR(STR_CUSTOMANIMATION_LIST_HELPTEXT),
+        rRenderContext.DrawText(aRect, SdResId(STR_CUSTOMANIMATION_LIST_HELPTEXT),
                                 DrawTextFlags::MultiLine | DrawTextFlags::WordBreak | DrawTextFlags::Center | DrawTextFlags::VCenter );
 
         rRenderContext.SetTextColor(aOldColor);
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx
index e089514c0133..715bdc97b327 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -109,7 +109,7 @@ namespace sd {
 
 void fillRepeatComboBox( ListBox* pBox )
 {
-    OUString aNone( SD_RESSTR( STR_CUSTOMANIMATION_REPEAT_NONE ) );
+    OUString aNone( SdResId( STR_CUSTOMANIMATION_REPEAT_NONE ) );
     pBox->InsertEntry(aNone);
     pBox->InsertEntry(OUString::number(2));
     pBox->InsertEntry(OUString::number(3));
@@ -117,10 +117,10 @@ void fillRepeatComboBox( ListBox* pBox )
     pBox->InsertEntry(OUString::number(5));
     pBox->InsertEntry(OUString::number(10));
 
-    OUString aUntilClick( SD_RESSTR( STR_CUSTOMANIMATION_REPEAT_UNTIL_NEXT_CLICK ) );
+    OUString aUntilClick( SdResId( STR_CUSTOMANIMATION_REPEAT_UNTIL_NEXT_CLICK ) );
     pBox->InsertEntry(aUntilClick);
 
-    OUString aEndOfSlide( SD_RESSTR( STR_CUSTOMANIMATION_REPEAT_UNTIL_END_OF_SLIDE ) );
+    OUString aEndOfSlide( SdResId( STR_CUSTOMANIMATION_REPEAT_UNTIL_END_OF_SLIDE ) );
     pBox->InsertEntry(aEndOfSlide);
 }
 
@@ -441,55 +441,55 @@ OUString getPropertyName( sal_Int32 nPropertyType )
     switch( nPropertyType )
     {
     case nPropertyTypeDirection:
-        return SD_RESSTR(STR_CUSTOMANIMATION_DIRECTION_PROPERTY);
+        return SdResId(STR_CUSTOMANIMATION_DIRECTION_PROPERTY);
 
     case nPropertyTypeSpokes:
-        return SD_RESSTR(STR_CUSTOMANIMATION_SPOKES_PROPERTY);
+        return SdResId(STR_CUSTOMANIMATION_SPOKES_PROPERTY);
 
     case nPropertyTypeFirstColor:
-        return SD_RESSTR(STR_CUSTOMANIMATION_FIRST_COLOR_PROPERTY);
+        return SdResId(STR_CUSTOMANIMATION_FIRST_COLOR_PROPERTY);
 
     case nPropertyTypeSecondColor:
-        return SD_RESSTR(STR_CUSTOMANIMATION_SECOND_COLOR_PROPERTY);
+        return SdResId(STR_CUSTOMANIMATION_SECOND_COLOR_PROPERTY);
 
     case nPropertyTypeZoom:
-        return SD_RESSTR(STR_CUSTOMANIMATION_ZOOM_PROPERTY);
+        return SdResId(STR_CUSTOMANIMATION_ZOOM_PROPERTY);
 
     case nPropertyTypeFillColor:
-        return SD_RESSTR(STR_CUSTOMANIMATION_FILL_COLOR_PROPERTY);
+        return SdResId(STR_CUSTOMANIMATION_FILL_COLOR_PROPERTY);
 
     case nPropertyTypeColorStyle:
-        return SD_RESSTR(STR_CUSTOMANIMATION_STYLE_PROPERTY);
+        return SdResId(STR_CUSTOMANIMATION_STYLE_PROPERTY);
 
     case nPropertyTypeFont:
-        return SD_RESSTR(STR_CUSTOMANIMATION_FONT_PROPERTY);
+        return SdResId(STR_CUSTOMANIMATION_FONT_PROPERTY);
 
     case nPropertyTypeCharHeight:
-        return SD_RESSTR(STR_CUSTOMANIMATION_SIZE_PROPERTY);
+        return SdResId(STR_CUSTOMANIMATION_SIZE_PROPERTY);
 
     case nPropertyTypeCharColor:
-        return SD_RESSTR(STR_CUSTOMANIMATION_FONT_COLOR_PROPERTY);
+        return SdResId(STR_CUSTOMANIMATION_FONT_COLOR_PROPERTY);
 
     case nPropertyTypeCharHeightStyle:
-        return SD_RESSTR(STR_CUSTOMANIMATION_FONT_SIZE_STYLE_PROPERTY);
+        return SdResId(STR_CUSTOMANIMATION_FONT_SIZE_STYLE_PROPERTY);
 
     case nPropertyTypeCharDecoration:
-        return SD_RESSTR(STR_CUSTOMANIMATION_FONT_STYLE_PROPERTY);
+        return SdResId(STR_CUSTOMANIMATION_FONT_STYLE_PROPERTY);
 
     case nPropertyTypeLineColor:
-        return SD_RESSTR(STR_CUSTOMANIMATION_LINE_COLOR_PROPERTY);
+        return SdResId(STR_CUSTOMANIMATION_LINE_COLOR_PROPERTY);
 
     case nPropertyTypeRotate:
-        return SD_RESSTR(STR_CUSTOMANIMATION_AMOUNT_PROPERTY);
+        return SdResId(STR_CUSTOMANIMATION_AMOUNT_PROPERTY);
 
     case nPropertyTypeColor:
-        return SD_RESSTR(STR_CUSTOMANIMATION_COLOR_PROPERTY);
+        return SdResId(STR_CUSTOMANIMATION_COLOR_PROPERTY);
 
     case nPropertyTypeTransparency:
-        return SD_RESSTR(STR_CUSTOMANIMATION_AMOUNT_PROPERTY);
+        return SdResId(STR_CUSTOMANIMATION_AMOUNT_PROPERTY);
 
     case nPropertyTypeScale:
-        return SD_RESSTR(STR_CUSTOMANIMATION_SCALE_PROPERTY);
+        return SdResId(STR_CUSTOMANIMATION_SCALE_PROPERTY);
     }
 
     return OUString();
@@ -2210,7 +2210,7 @@ sal_uInt32 CustomAnimationPane::fillAnimationLB( bool bHasText )
 
     if(nPosition == mnMotionPathPos)
     {
-        OUString sMotionPathLabel( SD_RESSTR( STR_CUSTOMANIMATION_USERPATH ) );
+        OUString sMotionPathLabel( SdResId( STR_CUSTOMANIMATION_USERPATH ) );
         mpLBAnimation->InsertCategory( sMotionPathLabel );
         mnCurvePathPos = mpLBAnimation->InsertEntry( sdr::GetResourceString(STR_ObjNameSingulCOMBLINE) );
         mnPolygonPathPos = mpLBAnimation->InsertEntry( sdr::GetResourceString(STR_ObjNameSingulPOLY) );
diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx
index 387b8172db66..c6aef5197813 100644
--- a/sd/source/ui/animations/SlideTransitionPane.cxx
+++ b/sd/source/ui/animations/SlideTransitionPane.cxx
@@ -462,7 +462,7 @@ void SlideTransitionPane::Initialize(SdDrawDocument* pDoc)
     // dummy list box of slide transitions for startup.
     mpVS_TRANSITION_ICONS->InsertItem(
         0, Image( BitmapEx( "sd/cmd/transition-none.png" ) ),
-        SD_RESSTR( STR_SLIDETRANSITION_NONE ),
+        SdResId( STR_SLIDETRANSITION_NONE ),
         VALUESET_APPEND, /* show legend */ true );
     mpVS_TRANSITION_ICONS->RecalculateItemSizes();
 
@@ -763,7 +763,7 @@ void SlideTransitionPane::openSoundFileDialog()
             }
             else
             {
-                OUString aStrWarning(SD_RESSTR(STR_WARNING_NOSOUNDFILE));
+                OUString aStrWarning(SdResId(STR_WARNING_NOSOUNDFILE));
                 aStrWarning = aStrWarning.replaceFirst("%", aFile);
                 ScopedVclPtrInstance< WarningBox > aWarningBox( nullptr, WB_3DLOOK | WB_RETRY_CANCEL, aStrWarning );
                 aWarningBox->SetModalInputMode (true);
diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx
index 3701957bc67a..9a0e7f0420f5 100644
--- a/sd/source/ui/annotations/annotationmanager.cxx
+++ b/sd/source/ui/annotations/annotationmanager.cxx
@@ -478,7 +478,7 @@ void AnnotationManagerImpl::InsertAnnotation(const OUString& rText)
     if( pPage )
     {
         if( mpDoc->IsUndoEnabled() )
-            mpDoc->BegUndo( SD_RESSTR( STR_ANNOTATION_UNDO_INSERT ) );
+            mpDoc->BegUndo( SdResId( STR_ANNOTATION_UNDO_INSERT ) );
 
         // find free space for new annotation
         int y = 0, x = 0;
@@ -600,10 +600,10 @@ void AnnotationManagerImpl::ExecuteReplyToAnnotation( SfxRequest& rReq )
         SdDrawDocument::SetCalcFieldValueHdl( pOutliner.get() );
         pOutliner->SetUpdateMode( true );
 
-        OUString aStr(SD_RESSTR(STR_ANNOTATION_REPLY));
+        OUString aStr(SdResId(STR_ANNOTATION_REPLY));
         OUString sAuthor( xAnnotation->getAuthor() );
         if( sAuthor.isEmpty() )
-            sAuthor = SD_RESSTR( STR_ANNOTATION_NOAUTHOR );
+            sAuthor = SdResId( STR_ANNOTATION_NOAUTHOR );
 
         aStr = aStr.replaceFirst("%1", sAuthor);
 
@@ -671,7 +671,7 @@ void AnnotationManagerImpl::DeleteAnnotation( const Reference< XAnnotation >& xA
     if( xAnnotation.is() && pPage )
     {
         if( mpDoc->IsUndoEnabled() )
-            mpDoc->BegUndo( SD_RESSTR( STR_ANNOTATION_UNDO_DELETE ) );
+            mpDoc->BegUndo( SdResId( STR_ANNOTATION_UNDO_DELETE ) );
 
         pPage->removeAnnotation( xAnnotation );
 
@@ -685,7 +685,7 @@ void AnnotationManagerImpl::DeleteAnnotation( const Reference< XAnnotation >& xA
 void AnnotationManagerImpl::DeleteAnnotationsByAuthor( const OUString& sAuthor )
 {
     if( mpDoc->IsUndoEnabled() )
-        mpDoc->BegUndo( SD_RESSTR( STR_ANNOTATION_UNDO_DELETE ) );
+        mpDoc->BegUndo( SdResId( STR_ANNOTATION_UNDO_DELETE ) );
 
     SdPage* pPage = nullptr;
     do
@@ -715,7 +715,7 @@ void AnnotationManagerImpl::DeleteAnnotationsByAuthor( const OUString& sAuthor )
 void AnnotationManagerImpl::DeleteAllAnnotations()
 {
     if( mpDoc->IsUndoEnabled() )
-        mpDoc->BegUndo( SD_RESSTR( STR_ANNOTATION_UNDO_DELETE ) );
+        mpDoc->BegUndo( SdResId( STR_ANNOTATION_UNDO_DELETE ) );
 
     SdPage* pPage = nullptr;
     do
@@ -887,7 +887,7 @@ void AnnotationManagerImpl::SelectNextAnnotation(bool bForeward)
 
         // Pop up question box that asks the user whether to wrap around.
         // The dialog is made modal with respect to the whole application.
-        ScopedVclPtrInstance< QueryBox > aQuestionBox( nullptr, (WB_YES_NO | WB_DEF_YES), SD_RESSTR(nStringId));
+        ScopedVclPtrInstance< QueryBox > aQuestionBox( nullptr, (WB_YES_NO | WB_DEF_YES), SdResId(nStringId));
         aQuestionBox->SetImage( QueryBox::GetStandardImage() );
         if (aQuestionBox->Execute() != RET_YES)
             break;
@@ -1145,7 +1145,7 @@ void AnnotationManagerImpl::ExecuteAnnotationContextMenu( const Reference< XAnno
     OUString aStr(pMenu->GetItemText(pMenu->GetItemId("deleteby")));
     OUString aReplace( sAuthor );
     if( aReplace.isEmpty() )
-        aReplace = SD_RESSTR( STR_ANNOTATION_NOAUTHOR );
+        aReplace = SdResId( STR_ANNOTATION_NOAUTHOR );
     aStr = aStr.replaceFirst("%1", aReplace);
     pMenu->SetItemText(pMenu->GetItemId("deleteby"), aStr);
     pMenu->EnableItem(pMenu->GetItemId("reply"), (sAuthor != sCurrentAuthor) && !bReadOnly);
diff --git a/sd/source/ui/annotations/annotationtag.cxx b/sd/source/ui/annotations/annotationtag.cxx
index 78e53f9eff68..9006600efde4 100644
--- a/sd/source/ui/annotations/annotationtag.cxx
+++ b/sd/source/ui/annotations/annotationtag.cxx
@@ -365,7 +365,7 @@ void AnnotationTag::Move( int nDX, int nDY )
     if( mxAnnotation.is() )
     {
         if( mrManager.GetDoc()->IsUndoEnabled() )
-            mrManager.GetDoc()->BegUndo( SD_RESSTR( STR_ANNOTATION_UNDO_MOVE ) );
+            mrManager.GetDoc()->BegUndo( SdResId( STR_ANNOTATION_UNDO_MOVE ) );
 
         RealPoint2D aPosition( mxAnnotation->getPosition() );
         aPosition.X += (double)nDX / 100.0;
diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx
index 18bca50855a1..e3c30d990109 100644
--- a/sd/source/ui/annotations/annotationwindow.cxx
+++ b/sd/source/ui/annotations/annotationwindow.cxx
@@ -611,7 +611,7 @@ void AnnotationWindow::Deactivate()
             if( pOPO )
             {
                 if( mpDoc->IsUndoEnabled() )
-                    mpDoc->BegUndo( SD_RESSTR( STR_ANNOTATION_UNDO_EDIT ) );
+                    mpDoc->BegUndo( SdResId( STR_ANNOTATION_UNDO_EDIT ) );
 
                 pTextApi->SetText( *pOPO );
                 delete pOPO;
diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx
index 53d0750ede7b..094becb271fc 100644
--- a/sd/source/ui/app/sdmod1.cxx
+++ b/sd/source/ui/app/sdmod1.cxx
@@ -232,7 +232,7 @@ void SdModule::Execute(SfxRequest& rReq)
             }
             else
             {
-                ScopedVclPtrInstance<MessageDialog>(nullptr, SD_RESSTR(STR_CANT_PERFORM_IN_LIVEMODE))->Execute();
+                ScopedVclPtrInstance<MessageDialog>(nullptr, SdResId(STR_CANT_PERFORM_IN_LIVEMODE))->Execute();
 
                 const SfxLinkItem* pLinkItem = rReq.GetArg<SfxLinkItem>(SID_DONELINK);
                 if( pLinkItem )
diff --git a/sd/source/ui/app/sdmod2.cxx b/sd/source/ui/app/sdmod2.cxx
index c19ae34d1919..4ddeb6ff5eec 100644
--- a/sd/source/ui/app/sdmod2.cxx
+++ b/sd/source/ui/app/sdmod2.cxx
@@ -245,7 +245,7 @@ IMPL_LINK(SdModule, CalcFieldValueHdl, EditFieldInfo*, pInfo, void)
             aRepresentation = pDoc->CreatePageNumValue((sal_uInt16)nPgNum);
         }
         else
-            aRepresentation = SdResId(STR_FIELD_PLACEHOLDER_NUMBER).toString();
+            aRepresentation = SdResId(STR_FIELD_PLACEHOLDER_NUMBER);
 
         pInfo->SetRepresentation( aRepresentation );
     }
@@ -275,8 +275,8 @@ IMPL_LINK(SdModule, CalcFieldValueHdl, EditFieldInfo*, pInfo, void)
         {
             DocumentType eDocType = pDoc ? pDoc->GetDocumentType() : DocumentType::Impress;
             aRepresentation = ( ( eDocType == DocumentType::Impress )
-                                ? SdResId(STR_FIELD_PLACEHOLDER_SLIDENAME).toString()
-                                : SdResId(STR_FIELD_PLACEHOLDER_PAGENAME).toString() );
+                                ? SdResId(STR_FIELD_PLACEHOLDER_SLIDENAME)
+                                : SdResId(STR_FIELD_PLACEHOLDER_PAGENAME) );
         }
 
         pInfo->SetRepresentation( aRepresentation );
@@ -315,7 +315,7 @@ IMPL_LINK(SdModule, CalcFieldValueHdl, EditFieldInfo*, pInfo, void)
         if( nPageCount > 0 )
             aRepresentation = pDoc->CreatePageNumValue(nPageCount);
         else
-            aRepresentation = SdResId(STR_FIELD_PLACEHOLDER_COUNT).toString();
+            aRepresentation = SdResId(STR_FIELD_PLACEHOLDER_COUNT);
 
         pInfo->SetRepresentation( aRepresentation );
     }
@@ -361,11 +361,11 @@ IMPL_LINK(SdModule, CalcFieldValueHdl, EditFieldInfo*, pInfo, void)
             if( (pPage == nullptr) || bMasterView )
             {
                 if( bHeaderField )
-                    aRepresentation = SdResId(STR_FIELD_PLACEHOLDER_HEADER).toString();
+                    aRepresentation = SdResId(STR_FIELD_PLACEHOLDER_HEADER);
                 else if (bFooterField )
-                    aRepresentation = SdResId(STR_FIELD_PLACEHOLDER_FOOTER).toString();
+                    aRepresentation = SdResId(STR_FIELD_PLACEHOLDER_FOOTER);
                 else if (bDateTimeField )
-                    aRepresentation = SdResId(STR_FIELD_PLACEHOLDER_DATETIME).toString();
+                    aRepresentation = SdResId(STR_FIELD_PLACEHOLDER_DATETIME);
             }
             else
             {
@@ -806,14 +806,14 @@ SfxStyleFamilies* SdModule::CreateStyleFamilies()
     SfxStyleFamilies *pStyleFamilies = new SfxStyleFamilies;
 
     pStyleFamilies->emplace_back(SfxStyleFamilyItem(SfxStyleFamily::Para,
-                                                    SD_RESSTR(STR_GRAPHICS_STYLE_FAMILY),
+                                                    SdResId(STR_GRAPHICS_STYLE_FAMILY),
                                                     Image(BitmapEx(BMP_STYLES_FAMILY_GRAPHICS)),
-                                                    SdResId(RID_GRAPHICSTYLEFAMILY)));
+                                                    ResId(RID_GRAPHICSTYLEFAMILY, *SD_MOD()->GetResMgr())));
 
     pStyleFamilies->emplace_back(SfxStyleFamilyItem(SfxStyleFamily::Pseudo,
-                                                    SD_RESSTR(STR_PRESENTATIONS_STYLE_FAMILY),
+                                                    SdResId(STR_PRESENTATIONS_STYLE_FAMILY),
                                                     Image(BitmapEx(BMP_STYLES_FAMILY_PRESENTATIONS)),
-                                                    SdResId(RID_PRESENTATIONSTYLEFAMILY)));
+                                                    ResId(RID_PRESENTATIONSTYLEFAMILY, *SD_MOD()->GetResMgr())));
 
     return pStyleFamilies;
 }
diff --git a/sd/source/ui/app/sdpopup.cxx b/sd/source/ui/app/sdpopup.cxx
index 02c7ff23c0c6..0f0efa786622 100644
--- a/sd/source/ui/app/sdpopup.cxx
+++ b/sd/source/ui/app/sdpopup.cxx
@@ -51,8 +51,8 @@ void SdFieldPopup::Fill( LanguageType eLanguage )
 {
     sal_uInt16 nID = 1;
     MenuItemBits nStyle = MenuItemBits::RADIOCHECK | MenuItemBits::AUTOCHECK;
-    InsertItem( nID++, SD_RESSTR( STR_FIX ), nStyle );
-    InsertItem( nID++, SD_RESSTR( STR_VAR ), nStyle );
+    InsertItem( nID++, SdResId( STR_FIX ), nStyle );
+    InsertItem( nID++, SdResId( STR_VAR ), nStyle );
     InsertSeparator();
 
     if( dynamic_cast< const SvxDateField *>( pField ) !=  nullptr )
@@ -67,8 +67,8 @@ void SdFieldPopup::Fill( LanguageType eLanguage )
 
         //SVXDATEFORMAT_APPDEFAULT,     // is not used
         //SVXDATEFORMAT_SYSTEM,         // is not used
-        InsertItem( nID++, SD_RESSTR( STR_STANDARD_SMALL ), nStyle );
-        InsertItem( nID++, SD_RESSTR( STR_STANDARD_BIG ), nStyle );
+        InsertItem( nID++, SdResId( STR_STANDARD_SMALL ), nStyle );
+        InsertItem( nID++, SdResId( STR_STANDARD_BIG ), nStyle );
 
         SvNumberFormatter* pNumberFormatter = SD_MOD()->GetNumberFormatter();
         aDateField.SetFormat( SVXDATEFORMAT_A );    // 13.02.96
@@ -99,7 +99,7 @@ void SdFieldPopup::Fill( LanguageType eLanguage )
 
         //SVXTIMEFORMAT_APPDEFAULT,     // is not used
         //SVXTIMEFORMAT_SYSTEM,         // is not used
-        InsertItem( nID++, SD_RESSTR( STR_STANDARD_NORMAL ), nStyle );
+        InsertItem( nID++, SdResId( STR_STANDARD_NORMAL ), nStyle );
 
         SvNumberFormatter* pNumberFormatter = SD_MOD()->GetNumberFormatter();
         aTimeField.SetFormat( SVXTIMEFORMAT_24_HM );    // 13:49
@@ -131,10 +131,10 @@ void SdFieldPopup::Fill( LanguageType eLanguage )
         else
             CheckItem( 2 );
 
-        InsertItem( nID++, SD_RESSTR( STR_FILEFORMAT_NAME_EXT ), nStyle );
-        InsertItem( nID++, SD_RESSTR( STR_FILEFORMAT_FULLPATH ), nStyle );
-        InsertItem( nID++, SD_RESSTR( STR_FILEFORMAT_PATH ), nStyle );
-        InsertItem( nID++, SD_RESSTR( STR_FILEFORMAT_NAME ), nStyle );
+        InsertItem( nID++, SdResId( STR_FILEFORMAT_NAME_EXT ), nStyle );
+        InsertItem( nID++, SdResId( STR_FILEFORMAT_FULLPATH ), nStyle );
+        InsertItem( nID++, SdResId( STR_FILEFORMAT_PATH ), nStyle );
+        InsertItem( nID++, SdResId( STR_FILEFORMAT_NAME ), nStyle );
 
         CheckItem( (sal_uInt16) ( pFileField->GetFormat() ) + 3 );
     }
diff --git a/sd/source/ui/app/sdresid.cxx b/sd/source/ui/app/sdresid.cxx
deleted file mode 100644
index c91e982a0b7c..000000000000
--- a/sd/source/ui/app/sdresid.cxx
+++ /dev/null
@@ -1,30 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "sdmod.hxx"
-#include "sdresid.hxx"
-#include <sal/types.h>
-
-// Ctor
-SdResId::SdResId(sal_uInt16 nId) :
-    ResId(nId, *SD_MOD()->GetResMgr())
-{
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/app/tmplctrl.cxx b/sd/source/ui/app/tmplctrl.cxx
index ea5db97a6d64..685d39d6d889 100644
--- a/sd/source/ui/app/tmplctrl.cxx
+++ b/sd/source/ui/app/tmplctrl.cxx
@@ -66,7 +66,7 @@ SdTemplateControl::SdTemplateControl( sal_uInt16 _nSlotId,
                                       StatusBar& rStb ) :
     SfxStatusBarControl( _nSlotId, _nId, rStb )
 {
-    GetStatusBar().SetQuickHelpText(GetId(), SD_RESSTR(STR_STATUSBAR_MASTERPAGE));
+    GetStatusBar().SetQuickHelpText(GetId(), SdResId(STR_STATUSBAR_MASTERPAGE));
 }
 
 SdTemplateControl::~SdTemplateControl()
diff --git a/sd/source/ui/controller/displaymodecontroller.cxx b/sd/source/ui/controller/displaymodecontroller.cxx
index 725e2332a2b0..29748337eca4 100644
--- a/sd/source/ui/controller/displaymodecontroller.cxx
+++ b/sd/source/ui/controller/displaymodecontroller.cxx
@@ -119,7 +119,7 @@ static void fillLayoutValueSet( ValueSet* pValue, const snewfoil_value_info* pIn
     Size aLayoutItemSize;
     for( ; pInfo->mnId; pInfo++ )
     {
-        OUString aText( SD_RESSTR( pInfo->mnStrResId ) );
+        OUString aText( SdResId( pInfo->mnStrResId ) );
         BitmapEx aBmp(OUString::createFromAscii(pInfo->msBmpResId));
 
         pValue->InsertItem(pInfo->mnId, Image(aBmp), aText);
@@ -140,8 +140,8 @@ DisplayModeToolbarMenu::DisplayModeToolbarMenu( DisplayModeController& rControll
 {
     const sal_Int32 LAYOUT_BORDER_PIX = 7;
 
-    OUString aTitle1( SD_RESSTR( STR_DISPLAYMODE_EDITMODES ) );
-    OUString aTitle2( SD_RESSTR( STR_DISPLAYMODE_MASTERMODES ) );
+    OUString aTitle1( SdResId( STR_DISPLAYMODE_EDITMODES ) );
+    OUString aTitle2( SdResId( STR_DISPLAYMODE_MASTERMODES ) );
 
     SetSelectHdl( LINK( this, DisplayModeToolbarMenu, SelectToolbarMenuHdl ) );
 
diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx b/sd/source/ui/controller/slidelayoutcontroller.cxx
index 759c9eacd8da..1f61a4c1f07d 100644
--- a/sd/source/ui/controller/slidelayoutcontroller.cxx
+++ b/sd/source/ui/controller/slidelayoutcontroller.cxx
@@ -138,7 +138,7 @@ static void fillLayoutValueSet( ValueSet* pValue, const snewfoil_value_info_layo
     Size aLayoutItemSize;
     for( ; pInfo->mnStrResId; pInfo++ )
     {
-        OUString aText( SD_RESSTR( pInfo->mnStrResId ) );
+        OUString aText( SdResId( pInfo->mnStrResId ) );
         BitmapEx aBmp(OUString::createFromAscii(pInfo->msBmpResId));
 
         pValue->InsertItem(static_cast<sal_uInt16>(pInfo->maAutoLayout)+1,
@@ -176,8 +176,8 @@ LayoutToolbarMenu::LayoutToolbarMenu( SlideLayoutController& rController, vcl::W
 
     const sal_Int32 LAYOUT_BORDER_PIX = 7;
 
-    OUString aTitle1( SD_RESSTR( STR_GLUE_ESCDIR_HORZ ) );
-    OUString aTitle2( SD_RESSTR( STR_GLUE_ESCDIR_VERT ) );
+    OUString aTitle1( SdResId( STR_GLUE_ESCDIR_HORZ ) );
+    OUString aTitle2( SdResId( STR_GLUE_ESCDIR_VERT ) );
 
     SvtLanguageOptions aLanguageOptions;
     const bool bVerticalEnabled = aLanguageOptions.IsVerticalTextEnabled();
@@ -248,7 +248,7 @@ LayoutToolbarMenu::LayoutToolbarMenu( SlideLayoutController& rController, vcl::W
             if( bInsertPage )
                 sSlotTitle = vcl::CommandInfoProvider::GetLabelForCommand( sSlotStr, rController.getModuleName() );
             else
-                sSlotTitle = SD_RESSTR( STR_RESET_LAYOUT );
+                sSlotTitle = SdResId( STR_RESET_LAYOUT );
             appendEntry( 2, sSlotTitle, aSlotImage);
         }
     }
diff --git a/sd/source/ui/dlg/LayerTabBar.cxx b/sd/source/ui/dlg/LayerTabBar.cxx
index a62a59603403..edc4be63b315 100644
--- a/sd/source/ui/dlg/LayerTabBar.cxx
+++ b/sd/source/ui/dlg/LayerTabBar.cxx
@@ -170,11 +170,11 @@ bool LayerTabBar::StartRenaming()
 {
     bool bOK = true;
     OUString aLayerName = GetPageText( GetEditPageId() );
-    OUString aLayoutLayer = SD_RESSTR(STR_LAYER_LAYOUT);
-    OUString aControlsLayer = SD_RESSTR(STR_LAYER_CONTROLS);
-    OUString aMeasureLinesLayer = SD_RESSTR(STR_LAYER_MEASURELINES);
-    OUString aBackgroundLayer = SD_RESSTR(STR_LAYER_BCKGRND);
-    OUString aBackgroundObjLayer = SD_RESSTR(STR_LAYER_BCKGRNDOBJ);
+    OUString aLayoutLayer = SdResId(STR_LAYER_LAYOUT);
+    OUString aControlsLayer = SdResId(STR_LAYER_CONTROLS);
+    OUString aMeasureLinesLayer = SdResId(STR_LAYER_MEASURELINES);
+    OUString aBackgroundLayer = SdResId(STR_LAYER_BCKGRND);
+    OUString aBackgroundObjLayer = SdResId(STR_LAYER_BCKGRNDOBJ);
 
     if ( aLayerName == aLayoutLayer       || aLayerName == aControlsLayer  ||
          aLayerName == aMeasureLinesLayer ||
@@ -212,18 +212,18 @@ TabBarAllowRenamingReturnCode LayerTabBar::AllowRenaming()
     {
         // Name already exists
         ScopedVclPtrInstance<WarningBox> aWarningBox( &pDrViewSh->GetViewFrame()->GetWindow(), WinBits( WB_OK ),
-                                SD_RESSTR( STR_WARN_NAME_DUPLICATE ) );
+                                SdResId( STR_WARN_NAME_DUPLICATE ) );
         aWarningBox->Execute();
         bOK = false;
     }
 
     if (bOK)
     {
-        OUString aLayoutLayer = SD_RESSTR(STR_LAYER_LAYOUT);
-        OUString aControlsLayer = SD_RESSTR(STR_LAYER_CONTROLS);
-        OUString aMeasureLinesLayer = SD_RESSTR(STR_LAYER_MEASURELINES);
-        OUString aBackgroundLayer = SD_RESSTR(STR_LAYER_BCKGRND);
-        OUString aBackgroundObjLayer = SD_RESSTR(STR_LAYER_BCKGRNDOBJ);
+        OUString aLayoutLayer = SdResId(STR_LAYER_LAYOUT);
+        OUString aControlsLayer = SdResId(STR_LAYER_CONTROLS);
+        OUString aMeasureLinesLayer = SdResId(STR_LAYER_MEASURELINES);
+        OUString aBackgroundLayer = SdResId(STR_LAYER_BCKGRND);
+        OUString aBackgroundObjLayer = SdResId(STR_LAYER_BCKGRNDOBJ);
 
         if ( aNewName == aLayoutLayer       || aNewName == aControlsLayer  ||
              aNewName == aMeasureLinesLayer ||
diff --git a/sd/source/ui/dlg/PaneChildWindows.cxx b/sd/source/ui/dlg/PaneChildWindows.cxx
index a441b1a0a548..cd83474c0af4 100644
--- a/sd/source/ui/dlg/PaneChildWindows.cxx
+++ b/sd/source/ui/dlg/PaneChildWindows.cxx
@@ -50,7 +50,7 @@ PaneChildWindow::PaneChildWindow (
         pBindings,
         this,
         pParentWindow,
-        SD_RESSTR(nTitleBarResId)));
+        SdResId(nTitleBarResId)));
     SetAlignment(SfxChildAlignment::LEFT);
     static_cast<SfxDockingWindow*>(GetWindow())->Initialize(pInfo);
     SetHideNotDelete(true);
diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.cxx b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
index c2f03a7cf7cc..ffc73486e2c3 100644
--- a/sd/source/ui/dlg/PhotoAlbumDialog.cxx
+++ b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
@@ -109,7 +109,7 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, CreateHdl, Button*, void)
 {
     if (pImagesLst->GetEntryCount() == 0)
     {
-        ScopedVclPtrInstance< WarningBox > aWarning(this, WB_OK, SD_RESSTR(STR_PHOTO_ALBUM_EMPTY_WARNING));
+        ScopedVclPtrInstance< WarningBox > aWarning(this, WB_OK, SdResId(STR_PHOTO_ALBUM_EMPTY_WARNING));
         aWarning->Execute();
     }
     else
@@ -610,7 +610,7 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, SelectHdl, ListBox&, void)
     OUString* pData = static_cast<OUString*>(pImagesLst->GetSelectEntryData());
     OUString sImgUrl = pData ? OUString(*pData) : "";
 
-    if (sImgUrl != SD_RESSTR(STR_PHOTO_ALBUM_TEXTBOX))
+    if (sImgUrl != SdResId(STR_PHOTO_ALBUM_TEXTBOX))
     {
         GraphicFilter aCurFilter;
         Graphic aGraphic;
diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.cxx b/sd/source/ui/dlg/RemoteDialogClientBox.cxx
index f0933ba5e7e9..d0583395923f 100644
--- a/sd/source/ui/dlg/RemoteDialogClientBox.cxx
+++ b/sd/source/ui/dlg/RemoteDialogClientBox.cxx
@@ -80,7 +80,7 @@ ClientBox::ClientBox( vcl::Window* pParent, WinBits nStyle ) :
     m_aScrollBar->EnableDrag();
 
     m_aPinBox->SetUseThousandSep(false);
-    m_aDeauthoriseButton->SetText( SD_RESSTR(STR_DEAUTHORISE_CLIENT) );
+    m_aDeauthoriseButton->SetText( SdResId(STR_DEAUTHORISE_CLIENT) );
     m_aDeauthoriseButton->SetClickHdl( LINK( this, ClientBox, DeauthoriseHdl ) );
 
     SetPosPixel( Point( RSC_SP_DLG_INNERBORDER_LEFT, RSC_SP_DLG_INNERBORDER_TOP ) );
@@ -331,7 +331,7 @@ void ClientBox::DrawRow(vcl::RenderContext& rRenderContext, const ::tools::Recta
     aPos.Y() += aTextHeight;
     if (rEntry->m_bActive)
     {
-      OUString sPinText(SD_RESSTR(STR_ENTER_PIN));
+      OUString sPinText(SdResId(STR_ENTER_PIN));
       DrawText(m_sPinTextRect, sPinText);
     }
 
@@ -373,7 +373,7 @@ void ClientBox::RecalcAll()
                                         aEntryRect.Right(),
                                         aEntryRect.Bottom() - TOP_OFFSET);
 
-            OUString sPinText(SD_RESSTR(STR_ENTER_PIN));
+            OUString sPinText(SdResId(STR_ENTER_PIN));
 
             aPos = Point( aEntryRect.Left() + GetTextWidth( sPinText ),
                           aEntryRect.Bottom() - TOP_OFFSET - aPinBoxSize.Height() );
diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx
index 6588b105b646..22117cb810f2 100644
--- a/sd/source/ui/dlg/animobjs.cxx
+++ b/sd/source/ui/dlg/animobjs.cxx
@@ -441,7 +441,7 @@ IMPL_LINK( AnimationWindow, ClickRemoveBitmapHdl, Button*, pBtn, void )
     }
     else // delete everything
     {
-        ScopedVclPtrInstance< WarningBox > aWarnBox( this, WB_YES_NO, SD_RESSTR( STR_ASK_DELETE_ALL_PICTURES ) );
+        ScopedVclPtrInstance< WarningBox > aWarnBox( this, WB_YES_NO, SdResId( STR_ASK_DELETE_ALL_PICTURES ) );
         short nReturn = aWarnBox->Execute();
 
         if( nReturn == RET_YES )
diff --git a/sd/source/ui/dlg/brkdlg.cxx b/sd/source/ui/dlg/brkdlg.cxx
index 6f8fee9961bf..e6da3e880f27 100644
--- a/sd/source/ui/dlg/brkdlg.cxx
+++ b/sd/source/ui/dlg/brkdlg.cxx
@@ -58,7 +58,7 @@ BreakDlg::BreakDlg(
 
     m_pBtnCancel->SetClickHdl( LINK( this, BreakDlg, CancelButtonHdl));
 
-    mpProgress = new SfxProgress( pShell, SD_RESSTR(STR_BREAK_METAFILE), nSumActionCount*3 );
+    mpProgress = new SfxProgress( pShell, SdResId(STR_BREAK_METAFILE), nSumActionCount*3 );
 
     pProgrInfo = new SvdProgressInfo( LINK(this, BreakDlg, UpDate) );
     // every action is edited 3 times in DoImport()
@@ -107,7 +107,7 @@ IMPL_LINK( BreakDlg, UpDate, void*, nInit, bool )
     // update status bar or show a error message?
     if(nInit == reinterpret_cast<void*>(1L))
     {
-        ScopedVclPtrInstance< MessageDialog > aErrBox(this, SD_RESSTR(STR_BREAK_FAIL));
+        ScopedVclPtrInstance< MessageDialog > aErrBox(this, SdResId(STR_BREAK_FAIL));
         aErrBox->Execute();
     }
     else
diff --git a/sd/source/ui/dlg/custsdlg.cxx b/sd/source/ui/dlg/custsdlg.cxx
index 8c6673011075..1666bffee6c7 100644
--- a/sd/source/ui/dlg/custsdlg.cxx
+++ b/sd/source/ui/dlg/custsdlg.cxx
@@ -532,7 +532,7 @@ IMPL_LINK_NOARG(SdDefineCustomShowDlg, OKHdl, Button*, void)
     else
     {
         ScopedVclPtrInstance<WarningBox>( this, WinBits( WB_OK ),
-                    SD_RESSTR( STR_WARN_NAME_DUPLICATE ) )->Execute();
+                    SdResId( STR_WARN_NAME_DUPLICATE ) )->Execute();
 
         m_pEdtName->GrabFocus();
     }
diff --git a/sd/source/ui/dlg/diactrl.cxx b/sd/source/ui/dlg/diactrl.cxx
index e8737c19e6e9..842462414dc9 100644
--- a/sd/source/ui/dlg/diactrl.cxx
+++ b/sd/source/ui/dlg/diactrl.cxx
@@ -43,7 +43,7 @@ SdPagesField::SdPagesField( vcl::Window* pParent,
     SvxMetricField  ( pParent, rFrame ),
     m_xFrame        ( rFrame )
 {
-    OUString aStr( SD_RESSTR( STR_SLIDE_PLURAL ) );
+    OUString aStr( SdResId( STR_SLIDE_PLURAL ) );
     SetCustomUnitText( aStr );
 
     // set size
@@ -74,9 +74,9 @@ void SdPagesField::UpdatePagesField( const SfxUInt16Item* pItem )
         long nValue = (long) pItem->GetValue();
         SetValue( nValue );
         if( nValue == 1 )
-            SetCustomUnitText( SD_RESSTR( STR_SLIDE_SINGULAR ) );
+            SetCustomUnitText( SdResId( STR_SLIDE_SINGULAR ) );
         else
-            SetCustomUnitText( SD_RESSTR( STR_SLIDE_PLURAL ) );
+            SetCustomUnitText( SdResId( STR_SLIDE_PLURAL ) );
     }
     else
         SetText( OUString() );
diff --git a/sd/source/ui/dlg/dlgfield.cxx b/sd/source/ui/dlg/dlgfield.cxx
index 0ff1eddb3c82..6270815d8ff0 100644
--- a/sd/source/ui/dlg/dlgfield.cxx
+++ b/sd/source/ui/dlg/dlgfield.cxx
@@ -179,8 +179,8 @@ void SdModifyFieldDlg::FillFormatList()
 
         //SVXDATEFORMAT_APPDEFAULT,     // not used
         //SVXDATEFORMAT_SYSTEM,         // not used
-        m_pLbFormat->InsertEntry( SD_RESSTR( STR_STANDARD_SMALL ) );
-        m_pLbFormat->InsertEntry( SD_RESSTR( STR_STANDARD_BIG ) );
+        m_pLbFormat->InsertEntry( SdResId( STR_STANDARD_SMALL ) );
+        m_pLbFormat->InsertEntry( SdResId( STR_STANDARD_BIG ) );
 
         SvNumberFormatter* pNumberFormatter = SD_MOD()->GetNumberFormatter();
         aDateField.SetFormat( SVXDATEFORMAT_A );    // 13.02.96
@@ -205,7 +205,7 @@ void SdModifyFieldDlg::FillFormatList()
 
         //SVXTIMEFORMAT_APPDEFAULT,     // not used
         //SVXTIMEFORMAT_SYSTEM,         // not used
-        m_pLbFormat->InsertEntry( SD_RESSTR( STR_STANDARD_NORMAL ) );
+        m_pLbFormat->InsertEntry( SdResId( STR_STANDARD_NORMAL ) );
 
         SvNumberFormatter* pNumberFormatter = SD_MOD()->GetNumberFormatter();
         aTimeField.SetFormat( SVXTIMEFORMAT_24_HM );    // 13:49
@@ -231,10 +231,10 @@ void SdModifyFieldDlg::FillFormatList()
         const SvxExtFileField* pFileField = static_cast<const SvxExtFileField*>( pField );
         SvxExtFileField aFileField( *pFileField );
 
-        m_pLbFormat->InsertEntry( SD_RESSTR( STR_FILEFORMAT_NAME_EXT ) );
-        m_pLbFormat->InsertEntry( SD_RESSTR( STR_FILEFORMAT_FULLPATH ) );
-        m_pLbFormat->InsertEntry( SD_RESSTR( STR_FILEFORMAT_PATH ) );
-        m_pLbFormat->InsertEntry( SD_RESSTR( STR_FILEFORMAT_NAME ) );
+        m_pLbFormat->InsertEntry( SdResId( STR_FILEFORMAT_NAME_EXT ) );
+        m_pLbFormat->InsertEntry( SdResId( STR_FILEFORMAT_FULLPATH ) );
+        m_pLbFormat->InsertEntry( SdResId( STR_FILEFORMAT_PATH ) );
+        m_pLbFormat->InsertEntry( SdResId( STR_FILEFORMAT_NAME ) );
 
         m_pLbFormat->SelectEntryPos( (sal_uInt16) ( pFileField->GetFormat() ) );
     }
diff --git a/sd/source/ui/dlg/filedlg.cxx b/sd/source/ui/dlg/filedlg.cxx
index 7799458da69f..c983e5f585b0 100644
--- a/sd/source/ui/dlg/filedlg.cxx
+++ b/sd/source/ui/dlg/filedlg.cxx
@@ -111,7 +111,7 @@ IMPL_LINK_NOARG(SdFileDialog_Imp, PlayMusicHdl, void*, void)
         try
         {
             mxControlAccess->setLabel( css::ui::dialogs::ExtendedFilePickerElementIds::PUSHBUTTON_PLAY,
-                                       SD_RESSTR( STR_PLAY ) );
+                                       SdResId( STR_PLAY ) );
             mbLabelPlaying = false;
         }
         catch(const css::lang::IllegalArgumentException&)
@@ -143,7 +143,7 @@ IMPL_LINK_NOARG(SdFileDialog_Imp, PlayMusicHdl, void*, void)
                 try
                 {
                     mxControlAccess->setLabel( css::ui::dialogs::ExtendedFilePickerElementIds::PUSHBUTTON_PLAY,
-                                               SD_RESSTR( STR_STOP ) );
+                                               SdResId( STR_STOP ) );
                     mbLabelPlaying = true;
                 }
                 catch (const css::lang::IllegalArgumentException&)
@@ -173,7 +173,7 @@ IMPL_LINK_NOARG(SdFileDialog_Imp, IsMusicStoppedHdl, Timer *, void)
         try
         {
             mxControlAccess->setLabel( css::ui::dialogs::ExtendedFilePickerElementIds::PUSHBUTTON_PLAY,
-                                       SD_RESSTR( STR_PLAY ) );
+                                       SdResId( STR_PLAY ) );
             mbLabelPlaying = false;
         }
         catch (const css::lang::IllegalArgumentException&)
@@ -194,7 +194,7 @@ void SdFileDialog_Imp::CheckSelectionState()
 
         try
         {
-            if( aCurrFilter.isEmpty() || ( aCurrFilter == SD_RESSTR( STR_EXPORT_HTML_NAME ) ) )
+            if( aCurrFilter.isEmpty() || ( aCurrFilter == SdResId( STR_EXPORT_HTML_NAME ) ) )
                 mxControlAccess->enableControl( css::ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_SELECTION, false );
             else
                 mxControlAccess->enableControl( css::ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_SELECTION, true );
@@ -227,7 +227,7 @@ SdFileDialog_Imp::SdFileDialog_Imp() :
         try
         {
             mxControlAccess->setLabel( css::ui::dialogs::ExtendedFilePickerElementIds::PUSHBUTTON_PLAY,
-                                       SD_RESSTR( STR_PLAY ) );
+                                       SdResId( STR_PLAY ) );
         }
         catch (const css::lang::IllegalArgumentException&)
         {
@@ -258,25 +258,25 @@ SdOpenSoundFileDialog::SdOpenSoundFileDialog() :
     mpImpl( new SdFileDialog_Imp() )
 {
     OUString aDescr;
-    aDescr = SD_RESSTR(STR_ALL_FILES);
+    aDescr = SdResId(STR_ALL_FILES);
     mpImpl->AddFilter( aDescr, "*.*");
 
     // setup filter
 #if defined UNX
-    aDescr = SD_RESSTR(STR_AU_FILE);
+    aDescr = SdResId(STR_AU_FILE);
     mpImpl->AddFilter( aDescr, "*.au;*.snd");
-    aDescr = SD_RESSTR(STR_VOC_FILE);
+    aDescr = SdResId(STR_VOC_FILE);
     mpImpl->AddFilter( aDescr, "*.voc");
-    aDescr = SD_RESSTR(STR_WAV_FILE);
+    aDescr = SdResId(STR_WAV_FILE);
     mpImpl->AddFilter( aDescr, "*.wav");
-    aDescr = SD_RESSTR(STR_AIFF_FILE);
+    aDescr = SdResId(STR_AIFF_FILE);
     mpImpl->AddFilter( aDescr, "*.aiff");
-    aDescr = SD_RESSTR(STR_SVX_FILE);
+    aDescr = SdResId(STR_SVX_FILE);
     mpImpl->AddFilter( aDescr, "*.svx");
 #else
-    aDescr = SD_RESSTR(STR_WAV_FILE);
+    aDescr = SdResId(STR_WAV_FILE);
     mpImpl->AddFilter( aDescr, "*.wav;*.mp3;*.ogg" );
-    aDescr = SD_RESSTR(STR_MIDI_FILE);
+    aDescr = SdResId(STR_MIDI_FILE);
     mpImpl->AddFilter( aDescr, "*.mid" );
 #endif
 }
diff --git a/sd/source/ui/dlg/gluectrl.cxx b/sd/source/ui/dlg/gluectrl.cxx
index 2f62a2444551..f8954dc56cd4 100644
--- a/sd/source/ui/dlg/gluectrl.cxx
+++ b/sd/source/ui/dlg/gluectrl.cxx
@@ -92,19 +92,19 @@ void GlueEscDirLB::Select()
  */
 void GlueEscDirLB::Fill()
 {
-    InsertEntry( SD_RESSTR( STR_GLUE_ESCDIR_SMART ) );
-    InsertEntry( SD_RESSTR( STR_GLUE_ESCDIR_LEFT ) );
-    InsertEntry( SD_RESSTR( STR_GLUE_ESCDIR_RIGHT ) );
-    InsertEntry( SD_RESSTR( STR_GLUE_ESCDIR_TOP ) );
-    InsertEntry( SD_RESSTR( STR_GLUE_ESCDIR_BOTTOM ) );
+    InsertEntry( SdResId( STR_GLUE_ESCDIR_SMART ) );
+    InsertEntry( SdResId( STR_GLUE_ESCDIR_LEFT ) );
+    InsertEntry( SdResId( STR_GLUE_ESCDIR_RIGHT ) );
+    InsertEntry( SdResId( STR_GLUE_ESCDIR_TOP ) );
+    InsertEntry( SdResId( STR_GLUE_ESCDIR_BOTTOM ) );
     /*
-    InsertEntry( SD_RESSTR( STR_GLUE_ESCDIR_LO ) );
-    InsertEntry( SD_RESSTR( STR_GLUE_ESCDIR_LU ) );
-    InsertEntry( SD_RESSTR( STR_GLUE_ESCDIR_RO ) );
-    InsertEntry( SD_RESSTR( STR_GLUE_ESCDIR_RU ) );
-    InsertEntry( SD_RESSTR( STR_GLUE_ESCDIR_HORZ ) );
-    InsertEntry( SD_RESSTR( STR_GLUE_ESCDIR_VERT ) );
-    InsertEntry( SD_RESSTR( STR_GLUE_ESCDIR_ALL ) );
+    InsertEntry( SdResId( STR_GLUE_ESCDIR_LO ) );
+    InsertEntry( SdResId( STR_GLUE_ESCDIR_LU ) );
+    InsertEntry( SdResId( STR_GLUE_ESCDIR_RO ) );
+    InsertEntry( SdResId( STR_GLUE_ESCDIR_RU ) );
+    InsertEntry( SdResId( STR_GLUE_ESCDIR_HORZ ) );
+    InsertEntry( SdResId( STR_GLUE_ESCDIR_VERT ) );
+    InsertEntry( SdResId( STR_GLUE_ESCDIR_ALL ) );
     */
 }
 
diff --git a/sd/source/ui/dlg/inspagob.cxx b/sd/source/ui/dlg/inspagob.cxx
index 2afd2d54bca8..296349f0d887 100644
--- a/sd/source/ui/dlg/inspagob.cxx
+++ b/sd/source/ui/dlg/inspagob.cxx
@@ -49,7 +49,7 @@ SdInsertPagesObjsDlg::SdInsertPagesObjsDlg(
 
     // insert text
     if( !pMedium )
-        SetText( SD_RESSTR( STR_INSERT_TEXT ) );
+        SetText( SdResId( STR_INSERT_TEXT ) );
 
     Reset();
 }
diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx
index 76fa5140872b..22157511eb53 100644
--- a/sd/source/ui/dlg/navigatr.cxx
+++ b/sd/source/ui/dlg/navigatr.cxx
@@ -81,7 +81,7 @@ SdNavigatorWin::SdNavigatorWin(vcl::Window* pParent, SfxBindings* pInBindings)
 
     maTlbObjects->SetViewFrame( mpBindings->GetDispatcher()->GetFrame() );
 
-    maTlbObjects->SetAccessibleName(SD_RESSTR(STR_OBJECTS_TREE));
+    maTlbObjects->SetAccessibleName(SdResId(STR_OBJECTS_TREE));
 
     maTlbObjects->SetDoubleClickHdl(LINK(this, SdNavigatorWin, ClickObjectHdl));
     maTlbObjects->SetSelectionMode(SelectionMode::Single);
@@ -271,7 +271,7 @@ IMPL_LINK( SdNavigatorWin, DropdownClickToolBoxHdl, ToolBox*, pBox, void )
             if( nRId > 0 )
             {
                 DBG_ASSERT(aHIDs[nID-NAVIGATOR_DRAGTYPE_URL],"HelpId not added!");
-                pMenu->InsertItem(nID, SD_RESSTR(nRId), MenuItemBits::RADIOCHECK);
+                pMenu->InsertItem(nID, SdResId(nRId), MenuItemBits::RADIOCHECK);
                 pMenu->SetHelpId(nID, aHIDs[nID - NAVIGATOR_DRAGTYPE_URL]);
             }
 
@@ -297,11 +297,11 @@ IMPL_LINK( SdNavigatorWin, DropdownClickToolBoxHdl, ToolBox*, pBox, void )
 
         pMenu->InsertItem(
             nShowNamedShapesFilter,
-            SD_RESSTR(STR_NAVIGATOR_SHOW_NAMED_SHAPES),
+            SdResId(STR_NAVIGATOR_SHOW_NAMED_SHAPES),
             MenuItemBits::RADIOCHECK);
         pMenu->InsertItem(
             nShowAllShapesFilter,
-            SD_RESSTR(STR_NAVIGATOR_SHOW_ALL_SHAPES),
+            SdResId(STR_NAVIGATOR_SHOW_ALL_SHAPES),
             MenuItemBits::RADIOCHECK);
 
         if (maTlbObjects->GetShowAllShapes())
diff --git a/sd/source/ui/dlg/prltempl.cxx b/sd/source/ui/dlg/prltempl.cxx
index 71ab78a7acff..3573b27bd929 100644
--- a/sd/source/ui/dlg/prltempl.cxx
+++ b/sd/source/ui/dlg/prltempl.cxx
@@ -99,7 +99,7 @@ SdPresLayoutTemplateDlg::SdPresLayoutTemplateDlg( SfxObjectShell* pDocSh,
         // from 'Outline 1' style sheet.
         if( SfxItemState::SET != aInputSet.GetItemState(EE_PARA_NUMBULLET, false, &pItem ))
         {
-            OUString aStyleName(SD_RESSTR(STR_PSEUDOSHEET_OUTLINE) + " 1");
+            OUString aStyleName(SdResId(STR_PSEUDOSHEET_OUTLINE) + " 1");
             SfxStyleSheetBase* pFirstStyleSheet = pSSPool->Find( aStyleName, SD_STYLE_FAMILY_PSEUDO);
 
             if(pFirstStyleSheet)
@@ -180,19 +180,19 @@ SdPresLayoutTemplateDlg::SdPresLayoutTemplateDlg( SfxObjectShell* pDocSh,
     switch( ePO )
     {
         case PO_TITLE:
-            aTitle = OUString(SdResId( STR_PSEUDOSHEET_TITLE ));
+            aTitle = SdResId(STR_PSEUDOSHEET_TITLE);
         break;
 
         case PO_SUBTITLE:
-            aTitle = OUString(SdResId( STR_PSEUDOSHEET_SUBTITLE ));
+            aTitle = SdResId(STR_PSEUDOSHEET_SUBTITLE);
         break;
 
         case PO_BACKGROUND:
-            aTitle = OUString(SdResId( STR_PSEUDOSHEET_BACKGROUND ));
+            aTitle = SdResId(STR_PSEUDOSHEET_BACKGROUND);
         break;
 
         case PO_BACKGROUNDOBJECTS:
-            aTitle = OUString(SdResId( STR_PSEUDOSHEET_BACKGROUNDOBJECTS ));
+            aTitle = SdResId(STR_PSEUDOSHEET_BACKGROUNDOBJECTS);
         break;
 
         case PO_OUTLINE_1:
@@ -204,12 +204,12 @@ SdPresLayoutTemplateDlg::SdPresLayoutTemplateDlg( SfxObjectShell* pDocSh,
         case PO_OUTLINE_7:
         case PO_OUTLINE_8:
         case PO_OUTLINE_9:
-            aTitle = OUString(SdResId( STR_PSEUDOSHEET_OUTLINE )) + " " +
+            aTitle = SdResId(STR_PSEUDOSHEET_OUTLINE) + " " +
                 OUString::number( ePO - PO_OUTLINE_1 + 1 );
         break;
 
         case PO_NOTES:
-            aTitle = OUString(SdResId( STR_PSEUDOSHEET_NOTES ));
+            aTitle = SdResId(STR_PSEUDOSHEET_NOTES);
         break;
     }
     SetText( aTitle );
diff --git a/sd/source/ui/dlg/sdpreslt.cxx b/sd/source/ui/dlg/sdpreslt.cxx
index 7746eb90f0d6..b7f7d3642671 100644
--- a/sd/source/ui/dlg/sdpreslt.cxx
+++ b/sd/source/ui/dlg/sdpreslt.cxx
@@ -38,7 +38,7 @@ SdPresLayoutDlg::SdPresLayoutDlg(::sd::DrawDocShell* pDocShell,
         "modules/simpress/ui/slidedesigndialog.ui")
     , mpDocSh(pDocShell)
     , mrOutAttrs(rInAttrs)
-    , maStrNone(SD_RESSTR(STR_NULL))
+    , maStrNone(SdResId(STR_NULL))
 {
     get(m_pVS, "select");
     Size aPref(LogicToPixel(Size(144 , 141), MapUnit::MapAppFont));
@@ -180,7 +180,7 @@ IMPL_LINK_NOARG(SdPresLayoutDlg, ClickLayoutHdl, ValueSet*, void)
 IMPL_LINK_NOARG(SdPresLayoutDlg, ClickLoadHdl, Button*, void)
 {
     VclPtrInstance< SfxNewFileDialog > pDlg(this, SfxNewFileDialogMode::Preview);
-    pDlg->SetText(SD_RESSTR(STR_LOAD_PRESENTATION_LAYOUT));
+    pDlg->SetText(SdResId(STR_LOAD_PRESENTATION_LAYOUT));
 
     if(!IsReallyVisible())
         return;
diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx
index 614592536d9a..3bb125de459e 100644
--- a/sd/source/ui/dlg/sdtreelb.cxx
+++ b/sd/source/ui/dlg/sdtreelb.cxx
@@ -404,7 +404,7 @@ OUString SdPageObjsTLB::GetObjectName(
         && aRet.isEmpty()
         && pObject!=nullptr)
     {
-        aRet = SD_RESSTR(STR_NAVIGATOR_SHAPE_BASE_NAME);
+        aRet = SdResId(STR_NAVIGATOR_SHAPE_BASE_NAME);
         aRet = aRet.replaceFirst("%1", OUString::number(pObject->GetOrdNum() + 1));
     }
 
@@ -988,7 +988,7 @@ SdDrawDocument* SdPageObjsTLB::GetBookmarkDoc(SfxMedium* pMed)
 
         if ( !mpBookmarkDoc )
         {
-            ScopedVclPtrInstance< MessageDialog > aErrorBox(this, SD_RESSTR(STR_READ_DATA_ERROR));
+            ScopedVclPtrInstance< MessageDialog > aErrorBox(this, SdResId(STR_READ_DATA_ERROR));
             aErrorBox->Execute();
             mpMedium = nullptr; //On failure the SfxMedium is invalid
         }
diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx
index d658d5f8b4f1..a0dec36b6c8c 100644
--- a/sd/source/ui/dlg/tpaction.cxx
+++ b/sd/source/ui/dlg/tpaction.cxx
@@ -220,7 +220,7 @@ void SdTPAction::Construct()
         bOLEAction = true;
 
         aVerbVector.push_back( 0 );
-        m_pLbOLEAction->InsertEntry( MnemonicGenerator::EraseAllMnemonicChars( SD_RESSTR( STR_EDIT_OBJ ) ) );
+        m_pLbOLEAction->InsertEntry( MnemonicGenerator::EraseAllMnemonicChars( SdResId( STR_EDIT_OBJ ) ) );
     }
     else if( pOleObj )
     {
@@ -270,7 +270,7 @@ void SdTPAction::Construct()
     for (presentation::ClickAction & rAction : maCurrentActions)
     {
         sal_uInt16 nRId = GetClickActionSdResId( rAction );
-        m_pLbAction->InsertEntry( SD_RESSTR( nRId ) );
+        m_pLbAction->InsertEntry( SdResId( nRId ) );
     }
 
 }
@@ -452,7 +452,7 @@ void SdTPAction::OpenFileDialog()
             // filter makes the (Windows system) open file dialog follow
             // links on the desktop to directories.
             aFileDialog.AddFilter (
-                SFX2_RESSTR(STR_SFX_FILTERNAME_ALL),
+                SfxResId(STR_SFX_FILTERNAME_ALL),
                 "*.*");
 
             if( aFileDialog.Execute() == ERRCODE_NONE )
@@ -583,7 +583,7 @@ IMPL_LINK_NOARG(SdTPAction, ClickActionHdl, ListBox&, void)
             m_pEdtSound->Enable();
             m_pBtnSearch->Show();
             m_pBtnSearch->Enable();
-            m_pFrame->set_label( SD_RESSTR( STR_EFFECTDLG_SOUND ) );
+            m_pFrame->set_label( SdResId( STR_EFFECTDLG_SOUND ) );
             break;
 
         case presentation::ClickAction_PROGRAM:
@@ -594,12 +594,12 @@ IMPL_LINK_NOARG(SdTPAction, ClickActionHdl, ListBox&, void)
             if( eCA == presentation::ClickAction_MACRO )
             {
                 m_pEdtMacro->Show();
-                m_pFrame->set_label( SD_RESSTR( STR_EFFECTDLG_MACRO ) );
+                m_pFrame->set_label( SdResId( STR_EFFECTDLG_MACRO ) );
             }
             else
             {
                 m_pEdtProgram->Show();
-                m_pFrame->set_label( SD_RESSTR( STR_EFFECTDLG_PROGRAM ) );
+                m_pFrame->set_label( SdResId( STR_EFFECTDLG_PROGRAM ) );
             }
             break;
 
@@ -612,8 +612,8 @@ IMPL_LINK_NOARG(SdTPAction, ClickActionHdl, ListBox&, void)
             m_pBtnSearch->Show();
             m_pBtnSearch->Enable();
 
-            m_pFtTree->SetText( SD_RESSTR( STR_EFFECTDLG_JUMP ) );
-            m_pFrame->set_label( SD_RESSTR( STR_EFFECTDLG_DOCUMENT ) );
+            m_pFtTree->SetText( SdResId( STR_EFFECTDLG_JUMP ) );
+            m_pFrame->set_label( SdResId( STR_EFFECTDLG_DOCUMENT ) );
 
             CheckFileHdl( *m_pEdtDocument );
             break;
@@ -622,7 +622,7 @@ IMPL_LINK_NOARG(SdTPAction, ClickActionHdl, ListBox&, void)
             m_pFtTree->Show();
             m_pLbOLEAction->Show();
 
-            m_pFtTree->SetText( SD_RESSTR( STR_EFFECTDLG_ACTION ) );
+            m_pFtTree->SetText( SdResId( STR_EFFECTDLG_ACTION ) );
             break;
 
         case presentation::ClickAction_BOOKMARK:
@@ -635,8 +635,8 @@ IMPL_LINK_NOARG(SdTPAction, ClickActionHdl, ListBox&, void)
             m_pEdtBookmark->Show();
             m_pBtnSeek->Show();
 
-            m_pFtTree->SetText( SD_RESSTR( STR_EFFECTDLG_JUMP ) );
-            m_pFrame->set_label( SD_RESSTR( STR_EFFECTDLG_PAGE_OBJECT ) );
+            m_pFtTree->SetText( SdResId( STR_EFFECTDLG_JUMP ) );
+            m_pFrame->set_label( SdResId( STR_EFFECTDLG_PAGE_OBJECT ) );
             break;
         default:
             break;
diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx
index cb7eafc02332..8f3510bf7839 100644
--- a/sd/source/ui/dlg/tpoption.cxx
+++ b/sd/source/ui/dlg/tpoption.cxx
@@ -369,7 +369,7 @@ DeactivateRC SdTpOptionsMisc::DeactivatePage( SfxItemSet* pActiveSet )
             FillItemSet( pActiveSet );
         return DeactivateRC::LeavePage;
     }
-    ScopedVclPtrInstance< WarningBox > aWarnBox( GetParent(), WB_YES_NO, SD_RESSTR( STR_WARN_SCALE_FAIL ) );
+    ScopedVclPtrInstance< WarningBox > aWarnBox( GetParent(), WB_YES_NO, SdResId( STR_WARN_SCALE_FAIL ) );
 
     if( aWarnBox->Execute() == RET_YES )
         return DeactivateRC::KeepPage;
diff --git a/sd/source/ui/dlg/unchss.cxx b/sd/source/ui/dlg/unchss.cxx
index 7b6842539fbe..1e0b6d99a5a1 100644
--- a/sd/source/ui/dlg/unchss.cxx
+++ b/sd/source/ui/dlg/unchss.cxx
@@ -51,7 +51,7 @@ StyleSheetUndoAction::StyleSheetUndoAction(SdDrawDocument* pTheDoc,
     mpOldSet = o3tl::make_unique<SfxItemSet>(static_cast<SfxItemPool&>(SdrObject::GetGlobalDrawObjectItemPool()), mpStyleSheet->GetItemSet().GetRanges());
     SdrModel::MigrateItemSet( &mpStyleSheet->GetItemSet(), mpOldSet.get(), pTheDoc );
 
-    OUString aComment(SD_RESSTR(STR_UNDO_CHANGE_PRES_OBJECT));
+    OUString aComment(SdResId(STR_UNDO_CHANGE_PRES_OBJECT));
     OUString aName(mpStyleSheet->GetName());
 
     // delete layout name and separator
@@ -61,27 +61,27 @@ StyleSheetUndoAction::StyleSheetUndoAction(SdDrawDocument* pTheDoc,
 
     if (aName == STR_LAYOUT_TITLE)
     {
-        aName = SD_RESSTR(STR_PSEUDOSHEET_TITLE);
+        aName = SdResId(STR_PSEUDOSHEET_TITLE);
     }
     else if (aName == STR_LAYOUT_SUBTITLE)
     {
-        aName = SD_RESSTR(STR_PSEUDOSHEET_SUBTITLE);
+        aName = SdResId(STR_PSEUDOSHEET_SUBTITLE);
     }
     else if (aName == STR_LAYOUT_BACKGROUND)
     {
-        aName = SD_RESSTR(STR_PSEUDOSHEET_BACKGROUND);
+        aName = SdResId(STR_PSEUDOSHEET_BACKGROUND);
     }
     else if (aName == STR_LAYOUT_BACKGROUNDOBJECTS)
     {
-        aName = SD_RESSTR(STR_PSEUDOSHEET_BACKGROUNDOBJECTS);
+        aName = SdResId(STR_PSEUDOSHEET_BACKGROUNDOBJECTS);
     }
     else if (aName == STR_LAYOUT_NOTES)
     {
-        aName = SD_RESSTR(STR_PSEUDOSHEET_NOTES);
+        aName = SdResId(STR_PSEUDOSHEET_NOTES);
     }
     else
     {
-        OUString aOutlineStr(SD_RESSTR(STR_PSEUDOSHEET_OUTLINE));
+        OUString aOutlineStr(SdResId(STR_PSEUDOSHEET_OUTLINE));
         nPos = aName.indexOf(aOutlineStr);
         if (nPos != -1)
         {
diff --git a/sd/source/ui/docshell/docshel2.cxx b/sd/source/ui/docshell/docshel2.cxx
index 0124b1fd8efd..1062de5e6bdb 100644
--- a/sd/source/ui/docshell/docshel2.cxx
+++ b/sd/source/ui/docshell/docshel2.cxx
@@ -282,7 +282,7 @@ bool DrawDocShell::CheckPageName (vcl::Window* pWin, OUString& rName )
 
     if( ! bIsNameValid )
     {
-        OUString aDesc( SD_RESSTR( STR_WARN_PAGE_EXISTS ) );
+        OUString aDesc( SdResId( STR_WARN_PAGE_EXISTS ) );
         SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
         VclPtr<AbstractSvxNameDialog> aNameDlg = pFact ? pFact->CreateSvxNameDialog( pWin, aStrForDlg, aDesc ) : nullptr;
         if( aNameDlg )
@@ -312,7 +312,7 @@ bool DrawDocShell::IsNewPageNameValid( OUString & rInOutPageName, bool bResetStr
     bool bCanUseNewName = false;
 
     // check if name is something like 'Slide n'
-    OUString aStrPage(SD_RESSTR(STR_SD_PAGE) + " ");
+    OUString aStrPage(SdResId(STR_SD_PAGE) + " ");
 
     bool bIsStandardName = false;
 
diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx
index d1e464fa38d6..773bfd506a7e 100644
--- a/sd/source/ui/docshell/docshel4.cxx
+++ b/sd/source/ui/docshell/docshel4.cxx
@@ -1037,13 +1037,13 @@ void DrawDocShell::FillClass(SvGlobalName* pClassName,
         {
             *pClassName = SvGlobalName(SO3_SDRAW_CLASSID_60);
             *pFormat = SotClipboardFormatId::STARDRAW_60;
-            *pFullTypeName = OUString(SdResId(STR_GRAPHIC_DOCUMENT_FULLTYPE_60));
+            *pFullTypeName = SdResId(STR_GRAPHIC_DOCUMENT_FULLTYPE_60);
         }
         else
         {
             *pClassName = SvGlobalName(SO3_SIMPRESS_CLASSID_60);
             *pFormat = SotClipboardFormatId::STARIMPRESS_60;
-            *pFullTypeName = OUString(SdResId(STR_IMPRESS_DOCUMENT_FULLTYPE_60));
+            *pFullTypeName = SdResId(STR_IMPRESS_DOCUMENT_FULLTYPE_60);
         }
     }
     else if (nFileFormat == SOFFICE_FILEFORMAT_8)
@@ -1062,8 +1062,8 @@ void DrawDocShell::FillClass(SvGlobalName* pClassName,
         }
     }
 
-    *pShortTypeName = OUString(SdResId( (meDocType == DocumentType::Draw) ?
-                                      STR_GRAPHIC_DOCUMENT : STR_IMPRESS_DOCUMENT ));
+    *pShortTypeName = SdResId((meDocType == DocumentType::Draw) ?
+                                     STR_GRAPHIC_DOCUMENT : STR_IMPRESS_DOCUMENT);
 }
 
 OutputDevice* DrawDocShell::GetDocumentRefDev()
diff --git a/sd/source/ui/framework/module/SlideSorterModule.cxx b/sd/source/ui/framework/module/SlideSorterModule.cxx
index 5185e53f8988..6315ec335a14 100644
--- a/sd/source/ui/framework/module/SlideSorterModule.cxx
+++ b/sd/source/ui/framework/module/SlideSorterModule.cxx
@@ -133,7 +133,7 @@ void SlideSorterModule::UpdateViewTabBar (const Reference<XTabBar>& rxTabBar)
         aButtonA.ResourceId = FrameworkHelper::CreateResourceId(
             FrameworkHelper::msSlideSorterURL,
             FrameworkHelper::msCenterPaneURL);
-        aButtonA.ButtonLabel = SD_RESSTR(STR_SLIDE_SORTER_MODE);
+        aButtonA.ButtonLabel = SdResId(STR_SLIDE_SORTER_MODE);
 
         TabBarButton aButtonB;
         aButtonB.ResourceId = FrameworkHelper::CreateResourceId(
diff --git a/sd/source/ui/framework/module/ViewTabBarModule.cxx b/sd/source/ui/framework/module/ViewTabBarModule.cxx
index 2752493faa9d..f3bdca4a7250 100644
--- a/sd/source/ui/framework/module/ViewTabBarModule.cxx
+++ b/sd/source/ui/framework/module/ViewTabBarModule.cxx
@@ -153,7 +153,7 @@ void ViewTabBarModule::UpdateViewTabBar (const Reference<XTabBar>& rxTabBar)
             aImpressViewButton.ResourceId = FrameworkHelper::CreateResourceId(
                 FrameworkHelper::msImpressViewURL,
                 xAnchor);
-            aImpressViewButton.ButtonLabel = SD_RESSTR(STR_NORMAL_MODE);
+            aImpressViewButton.ButtonLabel = SdResId(STR_NORMAL_MODE);
             if ( ! xBar->hasTabBarButton(aImpressViewButton))
                 xBar->addTabBarButtonAfter(aImpressViewButton, aEmptyButton);
 
@@ -161,7 +161,7 @@ void ViewTabBarModule::UpdateViewTabBar (const Reference<XTabBar>& rxTabBar)
             aOutlineViewButton.ResourceId = FrameworkHelper::CreateResourceId(
                 FrameworkHelper::msOutlineViewURL,
                 xAnchor);
-            aOutlineViewButton.ButtonLabel = SD_RESSTR(STR_OUTLINE_MODE);
+            aOutlineViewButton.ButtonLabel = SdResId(STR_OUTLINE_MODE);
             if ( ! xBar->hasTabBarButton(aOutlineViewButton))
                 xBar->addTabBarButtonAfter(aOutlineViewButton, aImpressViewButton);
 
@@ -169,7 +169,7 @@ void ViewTabBarModule::UpdateViewTabBar (const Reference<XTabBar>& rxTabBar)
             aNotesViewButton.ResourceId = FrameworkHelper::CreateResourceId(
                 FrameworkHelper::msNotesViewURL,
                 xAnchor);
-            aNotesViewButton.ButtonLabel = SD_RESSTR(STR_NOTES_MODE);
+            aNotesViewButton.ButtonLabel = SdResId(STR_NOTES_MODE);
             if ( ! xBar->hasTabBarButton(aNotesViewButton))
                 xBar->addTabBarButtonAfter(aNotesViewButton, aOutlineViewButton);
 
@@ -177,7 +177,7 @@ void ViewTabBarModule::UpdateViewTabBar (const Reference<XTabBar>& rxTabBar)
             aHandoutViewButton.ResourceId = FrameworkHelper::CreateResourceId(
                 FrameworkHelper::msHandoutViewURL,
                 xAnchor);
-            aHandoutViewButton.ButtonLabel = SD_RESSTR(STR_HANDOUT_MASTER_MODE);
+            aHandoutViewButton.ButtonLabel = SdResId(STR_HANDOUT_MASTER_MODE);
             if ( ! xBar->hasTabBarButton(aHandoutViewButton))
                 xBar->addTabBarButtonAfter(aHandoutViewButton, aNotesViewButton);
         }
diff --git a/sd/source/ui/func/fubullet.cxx b/sd/source/ui/func/fubullet.cxx
index 52a104404797..82f43477691c 100644
--- a/sd/source/ui/func/fubullet.cxx
+++ b/sd/source/ui/func/fubullet.cxx
@@ -128,7 +128,7 @@ void FuBullet::InsertFormattingMark( sal_Unicode cMark )
 
         // prepare undo
         ::svl::IUndoManager& rUndoMgr =  pOL->GetUndoManager();
-        rUndoMgr.EnterListAction(SD_RESSTR(STR_UNDO_INSERT_SPECCHAR),
+        rUndoMgr.EnterListAction(SdResId(STR_UNDO_INSERT_SPECCHAR),
                                     "", 0, mpViewShell->GetViewShellBase().GetViewShellId() );
 
         // insert given text
@@ -257,7 +257,7 @@ void FuBullet::InsertSpecialCharacter( SfxRequest& rReq )
 
             ::svl::IUndoManager& rUndoMgr =  pOL->GetUndoManager();
             ViewShellId nViewShellId = mpViewShell ? mpViewShell->GetViewShellBase().GetViewShellId() : ViewShellId(-1);
-            rUndoMgr.EnterListAction(SD_RESSTR(STR_UNDO_INSERT_SPECCHAR),
+            rUndoMgr.EnterListAction(SdResId(STR_UNDO_INSERT_SPECCHAR),
                                      "", 0, nViewShellId );
             pOV->InsertText(aChars, true);
 
diff --git a/sd/source/ui/func/fuconrec.cxx b/sd/source/ui/func/fuconrec.cxx
index 5708102dedb8..9add8904b85c 100644
--- a/sd/source/ui/func/fuconrec.cxx
+++ b/sd/source/ui/func/fuconrec.cxx
@@ -228,7 +228,7 @@ bool FuConstructRectangle::MouseButtonUp(const MouseEvent& rMEvt)
             if(SID_DRAW_MEASURELINE == nSlotId)
             {
                 SdrLayerAdmin& rAdmin = mpDoc->GetLayerAdmin();
-                OUString aStr(SD_RESSTR(STR_LAYER_MEASURELINES));
+                OUString aStr(SdResId(STR_LAYER_MEASURELINES));
                 pObj->SetLayer(rAdmin.GetLayerID(aStr));
             }
 
@@ -476,7 +476,7 @@ void FuConstructRectangle::SetAttributes(SfxItemSet& rAttr, SdrObject* pObj)
     {
         // dimension line
         SdPage* pPage = static_cast<SdPage*>( mpView->GetSdrPageView()->GetPage() );
-        OUString aName(SD_RESSTR(STR_POOLSHEET_MEASURE));
+        OUString aName(SdResId(STR_POOLSHEET_MEASURE));
         SfxStyleSheet* pSheet = static_cast<SfxStyleSheet*>( pPage->GetModel()->
                                      GetStyleSheetPool()->
                                      Find(aName, SD_STYLE_FAMILY_GRAPHICS));
@@ -488,7 +488,7 @@ void FuConstructRectangle::SetAttributes(SfxItemSet& rAttr, SdrObject* pObj)
         }
 
         SdrLayerAdmin& rAdmin = mpDoc->GetLayerAdmin();
-        OUString aStr(SD_RESSTR(STR_LAYER_MEASURELINES));
+        OUString aStr(SdResId(STR_LAYER_MEASURELINES));
         pObj->SetLayer(rAdmin.GetLayerID(aStr));
     }
     else if (nSlotId == OBJ_CUSTOMSHAPE )
@@ -506,7 +506,7 @@ void FuConstructRectangle::SetAttributes(SfxItemSet& rAttr, SdrObject* pObj)
 
     if( pLineEndList.is() )
     {
-        OUString aArrowName( SVX_RES(nResId) );
+        OUString aArrowName( SvxResId(nResId) );
         long nCount = pLineEndList->Count();
         long nIndex;
         for( nIndex = 0L; nIndex < nCount; nIndex++ )
@@ -600,9 +600,9 @@ void FuConstructRectangle::SetLineEnds(SfxItemSet& rAttr, SdrObject* pObj)
             case SID_LINE_ARROWS:
             {
                 // connector with arrow ends
-                rAttr.Put(XLineStartItem(SVX_RESSTR(RID_SVXSTR_ARROW), aArrow));
+                rAttr.Put(XLineStartItem(SvxResId(RID_SVXSTR_ARROW), aArrow));
                 rAttr.Put(XLineStartWidthItem(nWidth));
-                rAttr.Put(XLineEndItem(SVX_RESSTR(RID_SVXSTR_ARROW), aArrow));
+                rAttr.Put(XLineEndItem(SvxResId(RID_SVXSTR_ARROW), aArrow));
                 rAttr.Put(XLineEndWidthItem(nWidth));
             }
             break;
@@ -616,7 +616,7 @@ void FuConstructRectangle::SetLineEnds(SfxItemSet& rAttr, SdrObject* pObj)
             case SID_LINE_ARROW_SQUARE:
             {
                 // connector with arrow start
-                rAttr.Put(XLineStartItem(SVX_RESSTR(RID_SVXSTR_ARROW), aArrow));
+                rAttr.Put(XLineStartItem(SvxResId(RID_SVXSTR_ARROW), aArrow));
                 rAttr.Put(XLineStartWidthItem(nWidth));
             }
             break;
@@ -630,7 +630,7 @@ void FuConstructRectangle::SetLineEnds(SfxItemSet& rAttr, SdrObject* pObj)
             case SID_LINE_SQUARE_ARROW:
             {
                 // connector with arrow end
-                rAttr.Put(XLineEndItem(SVX_RESSTR(RID_SVXSTR_ARROW), aArrow));
+                rAttr.Put(XLineEndItem(SvxResId(RID_SVXSTR_ARROW), aArrow));
                 rAttr.Put(XLineEndWidthItem(nWidth));
             }
             break;
@@ -641,9 +641,9 @@ void FuConstructRectangle::SetLineEnds(SfxItemSet& rAttr, SdrObject* pObj)
             case SID_CONNECTOR_CURVE_CIRCLES:
             {
                 // connector with circle ends
-                rAttr.Put(XLineStartItem(SVX_RESSTR(RID_SVXSTR_CIRCLE), aCircle));
+                rAttr.Put(XLineStartItem(SvxResId(RID_SVXSTR_CIRCLE), aCircle));
                 rAttr.Put(XLineStartWidthItem(nWidth));
-                rAttr.Put(XLineEndItem(SVX_RESSTR(RID_SVXSTR_CIRCLE), aCircle));
+                rAttr.Put(XLineEndItem(SvxResId(RID_SVXSTR_CIRCLE), aCircle));
                 rAttr.Put(XLineEndWidthItem(nWidth));
             }
             break;
@@ -654,7 +654,7 @@ void FuConstructRectangle::SetLineEnds(SfxItemSet& rAttr, SdrObject* pObj)
             case SID_CONNECTOR_CURVE_CIRCLE_START:
             {
                 // connector with circle start
-                rAttr.Put(XLineStartItem(SVX_RESSTR(RID_SVXSTR_CIRCLE), aCircle));
+                rAttr.Put(XLineStartItem(SvxResId(RID_SVXSTR_CIRCLE), aCircle));
                 rAttr.Put(XLineStartWidthItem(nWidth));
             }
             break;
@@ -665,7 +665,7 @@ void FuConstructRectangle::SetLineEnds(SfxItemSet& rAttr, SdrObject* pObj)
             case SID_CONNECTOR_CURVE_CIRCLE_END:
             {
                 // connector with circle ends
-                rAttr.Put(XLineEndItem(SVX_RESSTR(RID_SVXSTR_CIRCLE), aCircle));
+                rAttr.Put(XLineEndItem(SvxResId(RID_SVXSTR_CIRCLE), aCircle));
                 rAttr.Put(XLineEndWidthItem(nWidth));
             }
             break;
@@ -677,7 +677,7 @@ void FuConstructRectangle::SetLineEnds(SfxItemSet& rAttr, SdrObject* pObj)
             case SID_LINE_ARROW_CIRCLE:
             {
                 // circle end
-                rAttr.Put(XLineEndItem(SVX_RESSTR(RID_SVXSTR_CIRCLE), aCircle));
+                rAttr.Put(XLineEndItem(SvxResId(RID_SVXSTR_CIRCLE), aCircle));
                 rAttr.Put(XLineEndWidthItem(nWidth));
             }
             break;
@@ -685,7 +685,7 @@ void FuConstructRectangle::SetLineEnds(SfxItemSet& rAttr, SdrObject* pObj)
             case SID_LINE_CIRCLE_ARROW:
             {
                 // circle start
-                rAttr.Put(XLineStartItem(SVX_RESSTR(RID_SVXSTR_CIRCLE), aCircle));
+                rAttr.Put(XLineStartItem(SvxResId(RID_SVXSTR_CIRCLE), aCircle));
                 rAttr.Put(XLineStartWidthItem(nWidth));
             }
             break;
@@ -693,7 +693,7 @@ void FuConstructRectangle::SetLineEnds(SfxItemSet& rAttr, SdrObject* pObj)
             case SID_LINE_ARROW_SQUARE:
             {
                 // square end
-                rAttr.Put(XLineEndItem(SVX_RESSTR(RID_SVXSTR_SQUARE), aSquare));
+                rAttr.Put(XLineEndItem(SvxResId(RID_SVXSTR_SQUARE), aSquare));
                 rAttr.Put(XLineEndWidthItem(nWidth));
             }
             break;
@@ -701,7 +701,7 @@ void FuConstructRectangle::SetLineEnds(SfxItemSet& rAttr, SdrObject* pObj)
             case SID_LINE_SQUARE_ARROW:
             {
                 // square start
-                rAttr.Put(XLineStartItem(SVX_RESSTR(RID_SVXSTR_SQUARE), aSquare));
+                rAttr.Put(XLineStartItem(SvxResId(RID_SVXSTR_SQUARE), aSquare));
                 rAttr.Put(XLineStartWidthItem(nWidth));
             }
             break;
diff --git a/sd/source/ui/func/fuconstr.cxx b/sd/source/ui/func/fuconstr.cxx
index 4366d5a5aa57..d2edf1bbca02 100644
--- a/sd/source/ui/func/fuconstr.cxx
+++ b/sd/source/ui/func/fuconstr.cxx
@@ -347,7 +347,7 @@ void FuConstruct::SetStyleSheet( SfxItemSet& rAttr, SdrObject* pObj,
         ************************************/
         if ( bForceNoFillStyle )
         {
-            OUString aName(SD_RESSTR(STR_POOLSHEET_OBJWITHOUTFILL));
+            OUString aName(SdResId(STR_POOLSHEET_OBJWITHOUTFILL));
             SfxStyleSheet* pSheet = static_cast<SfxStyleSheet*>(pPage->GetModel()->
                                          GetStyleSheetPool()->
                                          Find(aName, SD_STYLE_FAMILY_GRAPHICS));
diff --git a/sd/source/ui/func/fuconuno.cxx b/sd/source/ui/func/fuconuno.cxx
index 84024ff5c4fa..45a3f0f1f5cf 100644
--- a/sd/source/ui/func/fuconuno.cxx
+++ b/sd/source/ui/func/fuconuno.cxx
@@ -121,7 +121,7 @@ void FuConstructUnoControl::Activate()
     mpWindow->SetPointer( aNewPointer );
 
     aOldLayer = mpView->GetActiveLayer();
-    mpView->SetActiveLayer( SD_RESSTR(STR_LAYER_CONTROLS) );
+    mpView->SetActiveLayer( SdResId(STR_LAYER_CONTROLS) );
 
     FuConstruct::Activate();
 }
diff --git a/sd/source/ui/func/fucopy.cxx b/sd/source/ui/func/fucopy.cxx
index 0edd047c0fed..41ce0571c81a 100644
--- a/sd/source/ui/func/fucopy.cxx
+++ b/sd/source/ui/func/fucopy.cxx
@@ -69,7 +69,7 @@ void FuCopy::DoExecute( SfxRequest& rReq )
     {
         // Undo
         OUString aString( mpView->GetDescriptionOfMarkedObjects() );
-        aString += " " + SD_RESSTR( STR_UNDO_COPYOBJECTS );
+        aString += " " + SdResId( STR_UNDO_COPYOBJECTS );
         mpView->BegUndo( aString );
 
         const SfxItemSet* pArgs = rReq.GetArgs();
@@ -174,8 +174,8 @@ void FuCopy::DoExecute( SfxRequest& rReq )
 
         if( nNumber > 1 )
         {
-            OUString aStr( SD_RESSTR( STR_OBJECTS ) );
-            aStr += " " + SD_RESSTR( STR_UNDO_COPYOBJECTS );
+            OUString aStr( SdResId( STR_OBJECTS ) );
+            aStr += " " + SdResId( STR_UNDO_COPYOBJECTS );
 
             pProgress.reset(new SfxProgress( mpDocSh, aStr, nNumber ));
             mpDocSh->SetWaitCursor( true );
diff --git a/sd/source/ui/func/fudraw.cxx b/sd/source/ui/func/fudraw.cxx
index d82d59beca5f..2501ecb59fda 100644
--- a/sd/source/ui/func/fudraw.cxx
+++ b/sd/source/ui/func/fudraw.cxx
@@ -340,7 +340,7 @@ bool FuDraw::KeyInput(const KeyEvent& rKEvt)
             {
                 if (mpView->IsPresObjSelected(false, true, false, true))
                 {
-                    ScopedVclPtrInstance<InfoBox>(mpWindow, SD_RESSTR(STR_ACTION_NOTPOSSIBLE))->Execute();
+                    ScopedVclPtrInstance<InfoBox>(mpWindow, SdResId(STR_ACTION_NOTPOSSIBLE))->Execute();
                 }
                 else
                 {
@@ -808,35 +808,35 @@ bool FuDraw::SetHelpText(SdrObject* pObj, const Point& rPosPixel, const SdrViewE
             case presentation::ClickAction_PREVPAGE:
             {
                 // jump to the prior page
-                aHelpText = SD_RESSTR(STR_CLICK_ACTION_PREVPAGE);
+                aHelpText = SdResId(STR_CLICK_ACTION_PREVPAGE);
             }
             break;
 
             case presentation::ClickAction_NEXTPAGE:
             {
                 // jump to the next page
-                aHelpText = SD_RESSTR(STR_CLICK_ACTION_NEXTPAGE);
+                aHelpText = SdResId(STR_CLICK_ACTION_NEXTPAGE);
             }
             break;
 
             case presentation::ClickAction_FIRSTPAGE:
             {
                 // jump to the first page
-                aHelpText = SD_RESSTR(STR_CLICK_ACTION_FIRSTPAGE);
+                aHelpText = SdResId(STR_CLICK_ACTION_FIRSTPAGE);
             }
             break;
 
             case presentation::ClickAction_LASTPAGE:
             {
                 // jump to the last page
-                aHelpText = SD_RESSTR(STR_CLICK_ACTION_LASTPAGE);
+                aHelpText = SdResId(STR_CLICK_ACTION_LASTPAGE);
             }
             break;
 
             case presentation::ClickAction_BOOKMARK:
             {
                 // jump to object/page
-                aHelpText = SD_RESSTR(STR_CLICK_ACTION_BOOKMARK);
+                aHelpText = SdResId(STR_CLICK_ACTION_BOOKMARK);
                 aHelpText += ": ";
                 aHelpText += INetURLObject::decode( pInfo->GetBookmark(), INetURLObject::DecodeMechanism::WithCharset );
             }
@@ -845,7 +845,7 @@ bool FuDraw::SetHelpText(SdrObject* pObj, const Point& rPosPixel, const SdrViewE
             case presentation::ClickAction_DOCUMENT:
             {
                 // jump to document (object/page)
-                aHelpText = SD_RESSTR(STR_CLICK_ACTION_DOCUMENT);
+                aHelpText = SdResId(STR_CLICK_ACTION_DOCUMENT);
                 aHelpText += ": ";
                 aHelpText += INetURLObject::decode( pInfo->GetBookmark(), INetURLObject::DecodeMechanism::WithCharset );
             }
@@ -854,7 +854,7 @@ bool FuDraw::SetHelpText(SdrObject* pObj, const Point& rPosPixel, const SdrViewE
             case presentation::ClickAction_PROGRAM:
             {
                 // execute program
-                aHelpText = SD_RESSTR(STR_CLICK_ACTION_PROGRAM);
+                aHelpText = SdResId(STR_CLICK_ACTION_PROGRAM);
                 aHelpText += ": ";
                 aHelpText += INetURLObject::decode( pInfo->GetBookmark(), INetURLObject::DecodeMechanism::WithCharset );
             }
@@ -863,7 +863,7 @@ bool FuDraw::SetHelpText(SdrObject* pObj, const Point& rPosPixel, const SdrViewE
             case presentation::ClickAction_MACRO:
             {
                 // execute program
-                aHelpText = SD_RESSTR(STR_CLICK_ACTION_MACRO);
+                aHelpText = SdResId(STR_CLICK_ACTION_MACRO);
                 aHelpText += ": ";
 
                 if ( SfxApplication::IsXScriptURL( pInfo->GetBookmark() ) )
@@ -885,21 +885,21 @@ bool FuDraw::SetHelpText(SdrObject* pObj, const Point& rPosPixel, const SdrViewE
             case presentation::ClickAction_SOUND:
             {
                 // play-back sound
-                aHelpText = SD_RESSTR(STR_CLICK_ACTION_SOUND);
+                aHelpText = SdResId(STR_CLICK_ACTION_SOUND);
             }
             break;
 
             case presentation::ClickAction_VERB:
             {
                 // execute OLE-verb
-                aHelpText = SD_RESSTR(STR_CLICK_ACTION_VERB);
+                aHelpText = SdResId(STR_CLICK_ACTION_VERB);
             }
             break;
 
             case presentation::ClickAction_STOPPRESENTATION:
             {
                 // quit presentation
-                aHelpText = SD_RESSTR(STR_CLICK_ACTION_STOPPRESENTATION);
+                aHelpText = SdResId(STR_CLICK_ACTION_STOPPRESENTATION);
             }
             break;
             default:
diff --git a/sd/source/ui/func/fuexpand.cxx b/sd/source/ui/func/fuexpand.cxx
index c89b10289879..a7b3dbcbb419 100644
--- a/sd/source/ui/func/fuexpand.cxx
+++ b/sd/source/ui/func/fuexpand.cxx
@@ -109,7 +109,7 @@ void FuExpandPage::DoExecute( SfxRequest& )
             const bool bUndo = mpView->IsUndoEnabled();
 
             if( bUndo )
-                mpView->BegUndo(SD_RESSTR(STR_UNDO_EXPAND_PAGE));
+                mpView->BegUndo(SdResId(STR_UNDO_EXPAND_PAGE));
 
             // set current structuring-object into outliner
             OutlinerParaObject* pParaObj = pActualOutline->GetOutlinerParaObject();
diff --git a/sd/source/ui/func/fuhhconv.cxx b/sd/source/ui/func/fuhhconv.cxx
index cad5a7a59974..bb471096812a 100644
--- a/sd/source/ui/func/fuhhconv.cxx
+++ b/sd/source/ui/func/fuhhconv.cxx
@@ -99,7 +99,7 @@ void FuHangulHanjaConversion::StartConversion( LanguageType nSourceLanguage, Lan
         const vcl::Font *pTargetFont, sal_Int32 nOptions, bool bIsInteractive )
 {
 
-    mpView->BegUndo(SD_RESSTR(STR_UNDO_HANGULHANJACONVERSION));
+    mpView->BegUndo(SdResId(STR_UNDO_HANGULHANJACONVERSION));
 
     ViewShellBase* pBase = dynamic_cast<ViewShellBase*>( SfxViewShell::Current() );
     if (pBase != nullptr)
diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx
index b3d431a98b25..d8f9d04a7fb6 100644
--- a/sd/source/ui/func/fuinsert.cxx
+++ b/sd/source/ui/func/fuinsert.cxx
@@ -783,12 +783,12 @@ void FuInsert3DModel::DoExecute( SfxRequest& )
 {
     sfx2::FileDialogHelper aDlg( ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE );
 
-    aDlg.SetTitle( SD_RESSTR( STR_INSERT_3D_MODEL_TITLE ) );
+    aDlg.SetTitle( SdResId( STR_INSERT_3D_MODEL_TITLE ) );
 
 #if HAVE_FEATURE_COLLADA
-    aDlg.AddFilter( SD_RESSTR( STR_INSERT_3D_MODEL_ALL_SUPPORTED_FORMATS ), "*.json;*.dae;*.kmz"  );
+    aDlg.AddFilter( SdResId( STR_INSERT_3D_MODEL_ALL_SUPPORTED_FORMATS ), "*.json;*.dae;*.kmz"  );
 #else
-    aDlg.AddFilter( SD_RESSTR( STR_INSERT_3D_MODEL_ALL_SUPPORTED_FORMATS ), "*.json"  );
+    aDlg.AddFilter( SdResId( STR_INSERT_3D_MODEL_ALL_SUPPORTED_FORMATS ), "*.json"  );
 #endif
 
     aDlg.AddFilter( "JSON - GL Transmission Format", "*.json" );
diff --git a/sd/source/ui/func/fuinsfil.cxx b/sd/source/ui/func/fuinsfil.cxx
index d4ace7dc8e36..0ba07d137a37 100644
--- a/sd/source/ui/func/fuinsfil.cxx
+++ b/sd/source/ui/func/fuinsfil.cxx
@@ -145,7 +145,7 @@ void FuInsertFile::DoExecute( SfxRequest& rReq )
         OUString aOwnCont;
         OUString aOtherCont;
 
-        aFileDialog.SetTitle( SD_RESSTR(STR_DLG_INSERT_PAGES_FROM_FILE) );
+        aFileDialog.SetTitle( SdResId(STR_DLG_INSERT_PAGES_FROM_FILE) );
 
         if( mpDoc->GetDocumentType() == DocumentType::Impress )
         {
@@ -216,7 +216,7 @@ void FuInsertFile::DoExecute( SfxRequest& rReq )
                 }
 
                 // set default-filter (<All>)
-                OUString aAllSpec( SD_RESSTR( STR_ALL_FILES ) );
+                OUString aAllSpec( SdResId( STR_ALL_FILES ) );
                 OUString aExtensions = lcl_GetExtensionsList( aFilterVector );
                 OUString aGUIName = aAllSpec + " (" + aExtensions + ")";
 
@@ -317,7 +317,7 @@ void FuInsertFile::DoExecute( SfxRequest& rReq )
 
     if( !bInserted )
     {
-        ScopedVclPtrInstance< MessageDialog > aErrorBox(mpWindow, SD_RESSTR( STR_READ_DATA_ERROR));
+        ScopedVclPtrInstance< MessageDialog > aErrorBox(mpWindow, SdResId( STR_READ_DATA_ERROR));
         aErrorBox->Execute();
     }
 }
@@ -460,7 +460,7 @@ void FuInsertFile::InsTextOrRTFinDrMode(SfxMedium* pMedium)
 
         if (nErr || pOutliner->GetEditEngine().GetText().isEmpty())
         {
-            ScopedVclPtrInstance< MessageDialog > aErrorBox(mpWindow, SD_RESSTR(STR_READ_DATA_ERROR));
+            ScopedVclPtrInstance< MessageDialog > aErrorBox(mpWindow, SdResId(STR_READ_DATA_ERROR));
             aErrorBox->Execute();
         }
         else
@@ -509,7 +509,7 @@ void FuInsertFile::InsTextOrRTFinDrMode(SfxMedium* pMedium)
 
                 const bool bUndo = mpView->IsUndoEnabled();
                 if( bUndo )
-                    mpView->BegUndo(SD_RESSTR(STR_UNDO_INSERT_TEXTFRAME));
+                    mpView->BegUndo(SdResId(STR_UNDO_INSERT_TEXTFRAME));
                 pPage->InsertObject(pTO);
 
                 /* can be bigger as the maximal allowed size:
@@ -604,7 +604,7 @@ void FuInsertFile::InsTextOrRTFinOlMode(SfxMedium* pMedium)
 
     if (nErr || pOutliner->GetEditEngine().GetText().isEmpty())
     {
-        ScopedVclPtrInstance< MessageDialog > aErrorBox(mpWindow, SD_RESSTR(STR_READ_DATA_ERROR));
+        ScopedVclPtrInstance< MessageDialog > aErrorBox(mpWindow, SdResId(STR_READ_DATA_ERROR));
         aErrorBox->Execute();
     }
     else
@@ -624,7 +624,7 @@ void FuInsertFile::InsTextOrRTFinOlMode(SfxMedium* pMedium)
 
         mpDocSh->SetWaitCursor( false );
 
-        std::unique_ptr<SfxProgress> pProgress(new SfxProgress( mpDocSh, SD_RESSTR(STR_CREATE_PAGES), nNewPages));
+        std::unique_ptr<SfxProgress> pProgress(new SfxProgress( mpDocSh, SdResId(STR_CREATE_PAGES), nNewPages));
         if( pProgress )
             pProgress->SetState( 0, 100 );
 
@@ -632,7 +632,7 @@ void FuInsertFile::InsTextOrRTFinOlMode(SfxMedium* pMedium)
 
         ViewShellId nViewShellId = mpViewShell ? mpViewShell->GetViewShellBase().GetViewShellId() : ViewShellId(-1);
         rDocliner.GetUndoManager().EnterListAction(
-                                    SD_RESSTR(STR_UNDO_INSERT_FILE), OUString(), 0, nViewShellId );
+                                    SdResId(STR_UNDO_INSERT_FILE), OUString(), 0, nViewShellId );
 
         sal_Int32 nSourcePos = 0;
         SfxStyleSheet* pStyleSheet = pPage->GetStyleSheetForPresObj( PRESOBJ_OUTLINE );
diff --git a/sd/source/ui/func/fulinend.cxx b/sd/source/ui/func/fulinend.cxx
index a3ff6e656b92..426c8f26a9bf 100644
--- a/sd/source/ui/func/fulinend.cxx
+++ b/sd/source/ui/func/fulinend.cxx
@@ -92,8 +92,8 @@ void FuLineEnd::DoExecute( SfxRequest& )
 
         XLineEndListRef pLineEndList = mpDoc->GetLineEndList();
 
-        OUString aNewName( SD_RESSTR( STR_LINEEND ) );
-        OUString aDesc( SD_RESSTR( STR_DESC_LINEEND ) );
+        OUString aNewName( SdResId( STR_LINEEND ) );
+        OUString aDesc( SdResId( STR_DESC_LINEEND ) );
         OUString aName;
 
         long nCount = pLineEndList->Count();
@@ -138,7 +138,7 @@ void FuLineEnd::DoExecute( SfxRequest& )
                 else
                 {
                     ScopedVclPtrInstance<WarningBox> aWarningBox( mpWindow, WinBits( WB_OK ),
-                            SD_RESSTR( STR_WARN_NAME_DUPLICATE ) );
+                            SdResId( STR_WARN_NAME_DUPLICATE ) );
                     aWarningBox->Execute();
                 }
             }
diff --git a/sd/source/ui/func/fumorph.cxx b/sd/source/ui/func/fumorph.cxx
index 009a2f39426c..84484652aab6 100644
--- a/sd/source/ui/func/fumorph.cxx
+++ b/sd/source/ui/func/fumorph.cxx
@@ -166,7 +166,7 @@ void FuMorph::DoExecute( SfxRequest& )
                 if(ImpMorphPolygons(aPolyPoly1, aPolyPoly2, pDlg->GetFadeSteps(), aPolyPolyList))
                 {
                     OUString aString(mpView->GetDescriptionOfMarkedObjects());
-                    aString += " " + SD_RESSTR(STR_UNDO_MORPHING);
+                    aString += " " + SdResId(STR_UNDO_MORPHING);
 
                     mpView->BegUndo(aString);
                     ImpInsertPolygons(aPolyPolyList, pDlg->IsAttributeFade(), pObj1, pObj2);
diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx
index 5a9acafd6f11..40095175025e 100644
--- a/sd/source/ui/func/fupage.cxx
+++ b/sd/source/ui/func/fupage.cxx
@@ -377,9 +377,9 @@ const SfxItemSet* FuPage::ExecuteDialog( vcl::Window* pParent )
                 if( ePageKind != PageKind::Notes )
                 {
                     ScopedVclPtrInstance<MessageDialog> aQuestionBox(
-                        pParent, SD_RESSTR(STR_PAGE_BACKGROUND_TXT),
+                        pParent, SdResId(STR_PAGE_BACKGROUND_TXT),
                         VclMessageType::Question, VclButtonsType::YesNo);
-                    aQuestionBox->SetText(SD_RESSTR(STR_PAGE_BACKGROUND_TITLE));
+                    aQuestionBox->SetText(SdResId(STR_PAGE_BACKGROUND_TITLE));
                     bSetToAllPages = ( RET_YES == aQuestionBox->Execute() );
                 }
 
diff --git a/sd/source/ui/func/fusldlg.cxx b/sd/source/ui/func/fusldlg.cxx
index 8d3a4218839f..2ef0a548a184 100644
--- a/sd/source/ui/func/fusldlg.cxx
+++ b/sd/source/ui/func/fusldlg.cxx
@@ -74,7 +74,7 @@ void FuSlideShowDlg::DoExecute( SfxRequest& )
 
         if ( aStr.isEmpty() )
         {
-            aStr = SD_RESSTR( STR_PAGE ) + OUString::number( nPage + 1 );
+            aStr = SdResId( STR_PAGE ) + OUString::number( nPage + 1 );
         }
 
         aPageNameList[ nPage ] = aStr;
diff --git a/sd/source/ui/func/fusnapln.cxx b/sd/source/ui/func/fusnapln.cxx
index 958f7f906a1e..25fe9b64a559 100644
--- a/sd/source/ui/func/fusnapln.cxx
+++ b/sd/source/ui/func/fusnapln.cxx
@@ -123,12 +123,12 @@ void FuSnapLine::DoExecute( SfxRequest& rReq )
 
             if ( rHelpLine.GetKind() == SdrHelpLineKind::Point )
             {
-                pDlg->SetText(SD_RESSTR(STR_SNAPDLG_SETPOINT));
+                pDlg->SetText(SdResId(STR_SNAPDLG_SETPOINT));
                 pDlg->SetInputFields(true, true);
             }
             else
             {
-                pDlg->SetText(SD_RESSTR(STR_SNAPDLG_SETLINE));
+                pDlg->SetText(SdResId(STR_SNAPDLG_SETLINE));
 
                 if ( rHelpLine.GetKind() == SdrHelpLineKind::Vertical )
                     pDlg->SetInputFields(true, false);
diff --git a/sd/source/ui/func/fusumry.cxx b/sd/source/ui/func/fusumry.cxx
index e6377d7d1b1d..661e5ae13359 100644
--- a/sd/source/ui/func/fusumry.cxx
+++ b/sd/source/ui/func/fusumry.cxx
@@ -112,7 +112,7 @@ void FuSummaryPage::DoExecute( SfxRequest& )
 
                     if( bUndo )
                     {
-                        mpView->BegUndo(SD_RESSTR(STR_UNDO_SUMMARY_PAGE));
+                        mpView->BegUndo(SdResId(STR_UNDO_SUMMARY_PAGE));
                         bBegUndo = true;
                     }
 
diff --git a/sd/source/ui/func/futempl.cxx b/sd/source/ui/func/futempl.cxx
index cdead7212cee..51a074342c25 100644
--- a/sd/source/ui/func/futempl.cxx
+++ b/sd/source/ui/func/futempl.cxx
@@ -183,7 +183,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq )
             }
             else
             {
-                pStyleSheet->SetParent(SD_RESSTR(STR_STANDARD_STYLESHEET_NAME));
+                pStyleSheet->SetParent(SdResId(STR_STANDARD_STYLESHEET_NAME));
             }
         }
         break;
@@ -198,7 +198,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq )
                 p = nullptr;
             }
             pStyleSheet = &pSSPool->Make( aStyleName, nFamily, SFXSTYLEBIT_USERDEF );
-            pStyleSheet->SetParent(SD_RESSTR(STR_STANDARD_STYLESHEET_NAME));
+            pStyleSheet->SetParent(SdResId(STR_STANDARD_STYLESHEET_NAME));
         }
         break;
 
@@ -326,39 +326,39 @@ void FuTemplate::DoExecute( SfxRequest& rReq )
                     OUString aName(pStyleSheet->GetName());
                     sal_uInt16 nDlgId = 0;
 
-                    if (aName == SD_RESSTR(STR_PSEUDOSHEET_TITLE))
+                    if (aName == SdResId(STR_PSEUDOSHEET_TITLE))
                     {
                         nDlgId = TAB_PRES_LAYOUT_TEMPLATE;
                         ePO    = PO_TITLE;
                     }
-                    else if (aName == SD_RESSTR(STR_PSEUDOSHEET_SUBTITLE))
+                    else if (aName == SdResId(STR_PSEUDOSHEET_SUBTITLE))
                     {
                         nDlgId = TAB_PRES_LAYOUT_TEMPLATE;
                         ePO    = PO_SUBTITLE;
                     }
                     else if (aName ==
-                             SD_RESSTR(STR_PSEUDOSHEET_BACKGROUND))
+                             SdResId(STR_PSEUDOSHEET_BACKGROUND))
                     {
                         nDlgId = TAB_PRES_LAYOUT_TEMPLATE_BACKGROUND;
                         ePO    = PO_BACKGROUND;
                     }
                     else if (aName ==
-                             SD_RESSTR(STR_PSEUDOSHEET_BACKGROUNDOBJECTS))
+                             SdResId(STR_PSEUDOSHEET_BACKGROUNDOBJECTS))
                     {
                         nDlgId = TAB_PRES_LAYOUT_TEMPLATE;
                         ePO    = PO_BACKGROUNDOBJECTS;
                     }
                     else if (aName ==
-                             SD_RESSTR(STR_PSEUDOSHEET_NOTES))
+                             SdResId(STR_PSEUDOSHEET_NOTES))
                     {
                         nDlgId = TAB_PRES_LAYOUT_TEMPLATE;
                         ePO    = PO_NOTES;
                     }
-                    else if(aName.indexOf(SD_RESSTR(STR_PSEUDOSHEET_OUTLINE)) != -1)
+                    else if(aName.indexOf(SdResId(STR_PSEUDOSHEET_OUTLINE)) != -1)
                     {
                         nDlgId = TAB_PRES_LAYOUT_TEMPLATE;
 
-                        OUString aOutlineStr(SD_RESSTR(STR_PSEUDOSHEET_OUTLINE));
+                        OUString aOutlineStr(SdResId(STR_PSEUDOSHEET_OUTLINE));
                         // determine number, mind the blank between name and number
                         OUString aNumStr(aName.copy(aOutlineStr.getLength() + 1));
                         sal_uInt16 nLevel = (sal_uInt16)aNumStr.toInt32();
@@ -434,7 +434,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq )
                                 {
                                     SvxNumRule aRule(*aTempSet.GetItem<SvxNumBulletItem>(EE_PARA_NUMBULLET)->GetNumRule());
 
-                                    OUString sStyleName(SD_RESSTR(STR_PSEUDOSHEET_OUTLINE) + " 1");
+                                    OUString sStyleName(SdResId(STR_PSEUDOSHEET_OUTLINE) + " 1");
                                     SfxStyleSheetBase* pFirstStyleSheet = pSSPool->Find( sStyleName, SD_STYLE_FAMILY_PSEUDO);
 
                                     if(pFirstStyleSheet)
diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx
index e22615cb5728..e794d2602479 100644
--- a/sd/source/ui/func/futext.cxx
+++ b/sd/source/ui/func/futext.cxx
@@ -1391,7 +1391,7 @@ void FuText::ChangeFontSize( bool bGrow, OutlinerView* pOLV, const FontList* pFo
     else
     {
 
-        pView->BegUndo(SD_RESSTR(bGrow ? STR_GROW_FONT_SIZE : STR_SHRINK_FONT_SIZE));
+        pView->BegUndo(SdResId(bGrow ? STR_GROW_FONT_SIZE : STR_SHRINK_FONT_SIZE));
         const SdrMarkList& rMarkList = pView->GetMarkedObjectList();
         for( size_t nMark = 0; nMark < rMarkList.GetMarkCount(); ++nMark )
         {
diff --git a/sd/source/ui/func/futransf.cxx b/sd/source/ui/func/futransf.cxx
index 45aeff70c7b5..ccee671a24f7 100644
--- a/sd/source/ui/func/futransf.cxx
+++ b/sd/source/ui/func/futransf.cxx
@@ -106,7 +106,7 @@ void FuTransform::DoExecute( SfxRequest& rReq )
         {
             // Undo
             OUString aString( mpView->GetDescriptionOfMarkedObjects() );
-            aString += " " + SD_RESSTR( STR_TRANSFORM );
+            aString += " " + SdResId( STR_TRANSFORM );
             mpView->BegUndo( aString );
 
             mpView->SetGeoAttrToMarked( *pArgs );
diff --git a/sd/source/ui/func/fuvect.cxx b/sd/source/ui/func/fuvect.cxx
index bd23fe21b7e5..0d7be7b819eb 100644
--- a/sd/source/ui/func/fuvect.cxx
+++ b/sd/source/ui/func/fuvect.cxx
@@ -73,7 +73,7 @@ void FuVectorize::DoExecute( SfxRequest& )
                 {
                     SdrGrafObj* pVectObj = static_cast<SdrGrafObj*>( pObj->Clone() );
                     OUString aStr( mpView->GetDescriptionOfMarkedObjects() );
-                    aStr += " " + SD_RESSTR( STR_UNDO_VECTORIZE );
+                    aStr += " " + SdResId( STR_UNDO_VECTORIZE );
                     mpView->BegUndo( aStr );
                     pVectObj->SetGraphic( rMtf );
                     mpView->ReplaceObjectAtView( pObj, *pPageView, pVectObj );
diff --git a/sd/source/ui/func/unprlout.cxx b/sd/source/ui/func/unprlout.cxx
index 0e9c122d74d0..8aaed9932d89 100644
--- a/sd/source/ui/func/unprlout.cxx
+++ b/sd/source/ui/func/unprlout.cxx
@@ -43,7 +43,7 @@ SdPresentationLayoutUndoAction::SdPresentationLayoutUndoAction(
 
     DBG_ASSERT(pThePage, "No Page set!");
     pPage = pThePage;
-    aComment = SD_RESSTR(STR_UNDO_SET_PRESLAYOUT);
+    aComment = SdResId(STR_UNDO_SET_PRESLAYOUT);
 }
 
 void SdPresentationLayoutUndoAction::Undo()
diff --git a/sd/source/ui/sidebar/DocumentHelper.cxx b/sd/source/ui/sidebar/DocumentHelper.cxx
index d6d7c9fd7585..ae147d43cb00 100644
--- a/sd/source/ui/sidebar/DocumentHelper.cxx
+++ b/sd/source/ui/sidebar/DocumentHelper.cxx
@@ -322,7 +322,7 @@ void DocumentHelper::AssignMasterPageToPageList (
 
     ::svl::IUndoManager* pUndoMgr = rTargetDocument.GetDocSh()->GetUndoManager();
     if( pUndoMgr )
-        pUndoMgr->EnterListAction(SD_RESSTR(STR_UNDO_SET_PRESLAYOUT), OUString(), 0, rTargetDocument.GetDocSh()->GetViewShell()->GetViewShellBase().GetViewShellId());
+        pUndoMgr->EnterListAction(SdResId(STR_UNDO_SET_PRESLAYOUT), OUString(), 0, rTargetDocument.GetDocSh()->GetViewShell()->GetViewShellBase().GetViewShellId());
 
     SdPage* pMasterPageInDocument = ProvideMasterPage(rTargetDocument,pMasterPage,rpPageList);
     if (pMasterPageInDocument == nullptr)
diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx
index 93159a16beae..770ea132666b 100644
--- a/sd/source/ui/sidebar/LayoutMenu.cxx
+++ b/sd/source/ui/sidebar/LayoutMenu.cxx
@@ -468,9 +468,9 @@ SfxRequest LayoutMenu::CreateRequest (
     {
         SdrLayerAdmin& rLayerAdmin (mrBase.GetDocument()->GetLayerAdmin());
         SdrLayerID aBackground (rLayerAdmin.GetLayerID(
-            SD_RESSTR(STR_LAYER_BCKGRND)));
+            SdResId(STR_LAYER_BCKGRND)));
         SdrLayerID aBackgroundObject (rLayerAdmin.GetLayerID(
-            SD_RESSTR(STR_LAYER_BCKGRNDOBJ)));
+            SdResId(STR_LAYER_BCKGRNDOBJ)));
         ViewShell* pViewShell = mrBase.GetMainViewShell().get();
         if (pViewShell == nullptr)
             break;
diff --git a/sd/source/ui/sidebar/SlideBackground.cxx b/sd/source/ui/sidebar/SlideBackground.cxx
index cd71372756e7..7425518a5980 100644
--- a/sd/source/ui/sidebar/SlideBackground.cxx
+++ b/sd/source/ui/sidebar/SlideBackground.cxx
@@ -343,12 +343,12 @@ IMPL_LINK(SlideBackground, EventMultiplexerListener,
                     {
                         if( IsImpress() )
                         {
-                            SetPanelTitle(SD_RESSTR(STR_MASTERSLIDE_NAME));
+                            SetPanelTitle(SdResId(STR_MASTERSLIDE_NAME));
                             mpEditMaster->Hide();
                             mpCloseMaster->Show();
                         }
                         else
-                            SetPanelTitle(SD_RESSTR(STR_MASTERPAGE_NAME));
+                            SetPanelTitle(SdResId(STR_MASTERPAGE_NAME));
                         mpMasterSlide->Disable();
                         mpDspMasterBackground->Disable();
                         mpDspMasterObjects->Disable();
@@ -357,12 +357,12 @@ IMPL_LINK(SlideBackground, EventMultiplexerListener,
                     {
                         if( IsImpress() )
                         {
-                            SetPanelTitle(SD_RESSTR(STR_SLIDE_NAME));
+                            SetPanelTitle(SdResId(STR_SLIDE_NAME));
                             mpCloseMaster->Hide();
                             mpEditMaster->Show();
                         }
                         else
-                            SetPanelTitle(SD_RESSTR(STR_PAGE_NAME));
+                            SetPanelTitle(SdResId(STR_PAGE_NAME));
                         mpMasterSlide->Enable();
                         mpDspMasterBackground->Enable();
                         mpDspMasterObjects->Enable();
@@ -401,25 +401,25 @@ IMPL_LINK(SlideBackground, EventMultiplexerListener,
                                                        vcl::EnumContext::Context::MasterPage);
                 if(maContext == aDrawOtherContext || maContext == aDrawMasterContext)
                 {
-                    mpMasterLabel->SetText(SD_RESSTR(STR_MASTERPAGE_NAME));
+                    mpMasterLabel->SetText(SdResId(STR_MASTERPAGE_NAME));
                     maApplication = vcl::EnumContext::Application::Draw;
                     mpCloseMaster->Hide();
                     mpEditMaster->Hide();
                     if( maContext == aDrawMasterContext)
-                        SetPanelTitle(SD_RESSTR(STR_MASTERPAGE_NAME));
+                        SetPanelTitle(SdResId(STR_MASTERPAGE_NAME));
                     else
-                        SetPanelTitle(SD_RESSTR(STR_PAGE_NAME));
+                        SetPanelTitle(SdResId(STR_PAGE_NAME));
                 }
                 else if ( maContext == aImpressOtherContext || maContext == aImpressMasterContext )
                 {
-                    mpMasterLabel->SetText(SD_RESSTR(STR_MASTERSLIDE_NAME));
+                    mpMasterLabel->SetText(SdResId(STR_MASTERSLIDE_NAME));
                     maApplication = vcl::EnumContext::Application::Impress;
                     mpCloseMaster->Hide();
                     mpEditMaster->Show();
                     if( maContext == aImpressMasterContext )
-                        SetPanelTitle(SD_RESSTR(STR_MASTERSLIDE_NAME));
+                        SetPanelTitle(SdResId(STR_MASTERSLIDE_NAME));
                     else
-                        SetPanelTitle(SD_RESSTR(STR_SLIDE_NAME));
+                        SetPanelTitle(SdResId(STR_SLIDE_NAME));
                 }
                 mbTitle = true;
             }
diff --git a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
index 4f3d4d23e5c8..1043ee7a1af0 100644
--- a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
@@ -118,9 +118,9 @@ public:
         if (mpDocument!=nullptr && mpDocument->IsUndoEnabled())
         {
             if (mpMainViewShell && mpMainViewShell->GetShellType() == ViewShell::ST_DRAW)
-                mpDocument->BegUndo(SD_RESSTR(STRING_DRAG_AND_DROP_PAGES));
+                mpDocument->BegUndo(SdResId(STRING_DRAG_AND_DROP_PAGES));
             else
-                mpDocument->BegUndo(SD_RESSTR(STRING_DRAG_AND_DROP_SLIDES));
+                mpDocument->BegUndo(SdResId(STRING_DRAG_AND_DROP_SLIDES));
         }
     }
 
diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
index aef29161a600..67180808ecf2 100644
--- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
@@ -834,7 +834,7 @@ void SlotManager::GetStatusBarState (SfxItemSet& rSet)
             nPageCount = mrSlideSorter.GetModel().GetPageCount();
             nActivePageCount = static_cast<sal_Int32>(mrSlideSorter.GetModel().GetDocument()->GetActiveSdPageCount());
 
-            aPageStr = (nPageCount == nActivePageCount) ? SD_RESSTR(STR_SD_PAGE_COUNT) : SD_RESSTR(STR_SD_PAGE_COUNT_CUSTOM);
+            aPageStr = (nPageCount == nActivePageCount) ? SdResId(STR_SD_PAGE_COUNT) : SdResId(STR_SD_PAGE_COUNT_CUSTOM);
 
             aPageStr = aPageStr.replaceFirst("%1", OUString::number(nFirstPage));
             aPageStr = aPageStr.replaceFirst("%2", OUString::number(nPageCount));
@@ -946,8 +946,8 @@ bool SlotManager::RenameSlideFromDrawViewShell( sal_uInt16 nPageId, const OUStri
             // Undo
             SdPage* pUndoPage = pPageToRename;
             SdrLayerAdmin &  rLayerAdmin = pDocument->GetLayerAdmin();
-            SdrLayerID nBackground = rLayerAdmin.GetLayerID( SD_RESSTR( STR_LAYER_BCKGRND ) );
-            SdrLayerID nBgObj = rLayerAdmin.GetLayerID( SD_RESSTR( STR_LAYER_BCKGRNDOBJ ) );
+            SdrLayerID nBackground = rLayerAdmin.GetLayerID( SdResId( STR_LAYER_BCKGRND ) );
+            SdrLayerID nBgObj = rLayerAdmin.GetLayerID( SdResId( STR_LAYER_BCKGRNDOBJ ) );
             SdrLayerIDSet aVisibleLayers = pPageToRename->TRG_GetMasterPageVisibleLayers();
 
             // (#67720#)
@@ -1089,7 +1089,7 @@ void SlotManager::DuplicateSelectedSlides (SfxRequest& rRequest)
     // created pages in aPagesToSelect.
     const bool bUndo (aPagesToDuplicate.size()>1 && mrSlideSorter.GetView().IsUndoEnabled());
     if (bUndo)
-        mrSlideSorter.GetView().BegUndo(SD_RESSTR(STR_INSERTPAGE));
+        mrSlideSorter.GetView().BegUndo(SdResId(STR_INSERTPAGE));
 
     ::std::vector<SdPage*> aPagesToSelect;
     for(::std::vector<SdPage*>::const_iterator
diff --git a/sd/source/ui/slidesorter/view/SlsToolTip.cxx b/sd/source/ui/slidesorter/view/SlsToolTip.cxx
index 515520b8371a..3835ca5bd6b2 100644
--- a/sd/source/ui/slidesorter/view/SlsToolTip.cxx
+++ b/sd/source/ui/slidesorter/view/SlsToolTip.cxx
@@ -77,7 +77,7 @@ void ToolTip::SetPage (const model::SharedPageDescriptor& rpDescriptor)
             }
             if (sHelpText.isEmpty())
             {
-                sHelpText = SD_RESSTR(STR_PAGE);
+                sHelpText = SdResId(STR_PAGE);
                 sHelpText += OUString::number(mpDescriptor->GetPageIndex()+1);
             }
 
diff --git a/sd/source/ui/table/tableobjectbar.cxx b/sd/source/ui/table/tableobjectbar.cxx
index 7f69df7c14a2..139c59cfb507 100644
--- a/sd/source/ui/table/tableobjectbar.cxx
+++ b/sd/source/ui/table/tableobjectbar.cxx
@@ -91,7 +91,7 @@ TableObjectBar::TableObjectBar( ViewShell* pSdViewShell, ::sd::View* pSdView )
         SetUndoManager( pDocShell->GetUndoManager() );
     }
     SetRepeatTarget( mpView );
-    SetName( SD_RESSTR( RID_DRAW_TABLE_TOOLBOX ) );
+    SetName( SdResId( RID_DRAW_TABLE_TOOLBOX ) );
     SetContextName(vcl::EnumContext::GetContextName(vcl::EnumContext::Context::Table));
 }
 
diff --git a/sd/source/ui/unoidl/unolayer.cxx b/sd/source/ui/unoidl/unolayer.cxx
index aa2d98380918..847e101cfe21 100644
--- a/sd/source/ui/unoidl/unolayer.cxx
+++ b/sd/source/ui/unoidl/unolayer.cxx
@@ -81,23 +81,23 @@ OUString SdLayer::convertToInternalName( const OUString& rName )
 {
     if ( rName == sUNO_LayerName_background )
     {
-        return SD_RESSTR( STR_LAYER_BCKGRND );
+        return SdResId( STR_LAYER_BCKGRND );
     }
     else if ( rName == sUNO_LayerName_background_objects )
     {
-        return  SD_RESSTR( STR_LAYER_BCKGRNDOBJ );
+        return  SdResId( STR_LAYER_BCKGRNDOBJ );
     }
     else if ( rName == sUNO_LayerName_layout )
     {
-        return  SD_RESSTR( STR_LAYER_LAYOUT );
+        return  SdResId( STR_LAYER_LAYOUT );
     }
     else if ( rName == sUNO_LayerName_controls )
     {
-        return  SD_RESSTR( STR_LAYER_CONTROLS );
+        return  SdResId( STR_LAYER_CONTROLS );
     }
     else if ( rName == sUNO_LayerName_measurelines )
     {
-        return  SD_RESSTR( STR_LAYER_MEASURELINES );
+        return  SdResId( STR_LAYER_MEASURELINES );
     }
     else
     {
@@ -107,23 +107,23 @@ OUString SdLayer::convertToInternalName( const OUString& rName )
 
 OUString SdLayer::convertToExternalName( const OUString& rName )
 {
-    if( rName == SD_RESSTR( STR_LAYER_BCKGRND ) )
+    if( rName == SdResId( STR_LAYER_BCKGRND ) )
     {
         return OUString( sUNO_LayerName_background );
     }
-    else if( rName == SD_RESSTR( STR_LAYER_BCKGRNDOBJ ) )
+    else if( rName == SdResId( STR_LAYER_BCKGRNDOBJ ) )
     {
         return OUString( sUNO_LayerName_background_objects );
     }
-    else if( rName == SD_RESSTR( STR_LAYER_LAYOUT ) )
+    else if( rName == SdResId( STR_LAYER_LAYOUT ) )
     {
         return OUString( sUNO_LayerName_layout );
     }
-    else if( rName == SD_RESSTR( STR_LAYER_CONTROLS ) )
+    else if( rName == SdResId( STR_LAYER_CONTROLS ) )
     {
         return OUString( sUNO_LayerName_controls );
     }
-    else if( rName == SD_RESSTR( STR_LAYER_MEASURELINES ) )
+    else if( rName == SdResId( STR_LAYER_MEASURELINES ) )
     {
         return OUString( sUNO_LayerName_measurelines );
     }
@@ -488,7 +488,7 @@ uno::Reference< drawing::XLayer > SAL_CALL SdLayerManager::insertNewByIndex( sal
         // Test for existing names
         while( aLayerName.isEmpty() || rLayerAdmin.GetLayer( aLayerName ) )
         {
-            aLayerName = SD_RESSTR(STR_LAYER);
+            aLayerName = SdResId(STR_LAYER);
             aLayerName += OUString::number(nLayer);
             ++nLayer;
         }
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index b5c478e549f1..bf8f41b28534 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -468,8 +468,8 @@ SdPage* SdXImpressDocument::InsertSdPage( sal_uInt16 nPage, bool bDuplicate )
 {
     sal_uInt16 nPageCount = mpDoc->GetSdPageCount( PageKind::Standard );
     SdrLayerAdmin& rLayerAdmin = mpDoc->GetLayerAdmin();
-    SdrLayerID aBckgrnd = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND));
-    SdrLayerID aBckgrndObj = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ));
+    SdrLayerID aBckgrnd = rLayerAdmin.GetLayerID(SdResId(STR_LAYER_BCKGRND));
+    SdrLayerID aBckgrndObj = rLayerAdmin.GetLayerID(SdResId(STR_LAYER_BCKGRNDOBJ));
 
     SdPage* pStandardPage = nullptr;
 
@@ -530,8 +530,8 @@ SdPage* SdXImpressDocument::InsertSdPage( sal_uInt16 nPage, bool bDuplicate )
             pStandardPage->SetAutoLayout(AUTOLAYOUT_NONE, true );
         }
 
-        aBckgrnd = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND));
-        aBckgrndObj = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ));
+        aBckgrnd = rLayerAdmin.GetLayerID(SdResId(STR_LAYER_BCKGRND));
+        aBckgrndObj = rLayerAdmin.GetLayerID(SdResId(STR_LAYER_BCKGRNDOBJ));
         aVisibleLayers.Set(aBckgrnd, bIsPageBack);
         aVisibleLayers.Set(aBckgrndObj, bIsPageObj);
         pStandardPage->TRG_SetMasterPageVisibleLayers(aVisibleLayers);
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index 8b02b73abe77..5a161ce673b2 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -793,7 +793,7 @@ void SAL_CALL SdGenericDrawPage::setPropertyValue( const OUString& aPropertyName
                 {
                     SdrLayerAdmin& rLayerAdmin = pDoc->GetLayerAdmin();
                     SdrLayerIDSet aVisibleLayers = pPage->TRG_GetMasterPageVisibleLayers();
-                    aVisibleLayers.Set(rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND)), bVisible);
+                    aVisibleLayers.Set(rLayerAdmin.GetLayerID(SdResId(STR_LAYER_BCKGRND)), bVisible);
                     pPage->TRG_SetMasterPageVisibleLayers(aVisibleLayers);
                 }
             }
@@ -813,7 +813,7 @@ void SAL_CALL SdGenericDrawPage::setPropertyValue( const OUString& aPropertyName
                 {
                     SdrLayerAdmin& rLayerAdmin = pDoc->GetLayerAdmin();
                     SdrLayerIDSet aVisibleLayers = pPage->TRG_GetMasterPageVisibleLayers();
-                    aVisibleLayers.Set(rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ)), bVisible);
+                    aVisibleLayers.Set(rLayerAdmin.GetLayerID(SdResId(STR_LAYER_BCKGRNDOBJ)), bVisible);
                     pPage->TRG_SetMasterPageVisibleLayers(aVisibleLayers);
                 }
             }
@@ -1218,7 +1218,7 @@ Any SAL_CALL SdGenericDrawPage::getPropertyValue( const OUString& PropertyName )
             {
                 SdrLayerAdmin& rLayerAdmin = pDoc->GetLayerAdmin();
                 SdrLayerIDSet aVisibleLayers = pPage->TRG_GetMasterPageVisibleLayers();
-                aAny <<= aVisibleLayers.IsSet(rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND)));
+                aAny <<= aVisibleLayers.IsSet(rLayerAdmin.GetLayerID(SdResId(STR_LAYER_BCKGRND)));
             }
             else
             {
@@ -1237,7 +1237,7 @@ Any SAL_CALL SdGenericDrawPage::getPropertyValue( const OUString& PropertyName )
             {
                 SdrLayerAdmin& rLayerAdmin = pDoc->GetLayerAdmin();
                 SdrLayerIDSet aVisibleLayers = pPage->TRG_GetMasterPageVisibleLayers();
-                aAny <<= aVisibleLayers.IsSet(rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ)));
+                aAny <<= aVisibleLayers.IsSet(rLayerAdmin.GetLayerID(SdResId(STR_LAYER_BCKGRNDOBJ)));
             }
             else
             {
@@ -2164,7 +2164,7 @@ OUString getPageApiNameFromUiName( const OUString& rUIName )
 {
     OUString aApiName;
 
-    OUString aDefPageName(SD_RESSTR(STR_PAGE) + " ");
+    OUString aDefPageName(SdResId(STR_PAGE) + " ");
 
     if( rUIName.startsWith( aDefPageName ) )
     {
@@ -2212,7 +2212,7 @@ OUString getUiNameFromPageApiNameImpl( const OUString& rApiName )
         if( nPageNumber != -1)
         {
             OUStringBuffer sBuffer;
-            sBuffer.append( SD_RESSTR(STR_PAGE) );
+            sBuffer.append( SdResId(STR_PAGE) );
             sBuffer.append( ' ' );
             sBuffer.append( aNumber );
             return sBuffer.makeStringAndClear();
@@ -2295,7 +2295,7 @@ void SAL_CALL SdDrawPage::setName( const OUString& rName )
         }
         else
         {
-            OUString aDefaultPageName( SD_RESSTR(STR_PAGE) + " " );
+            OUString aDefaultPageName( SdResId(STR_PAGE) + " " );
             if( aName.startsWith( aDefaultPageName ) )
                 aName.clear();
         }
diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx
index 9d29bcac5c99..3ebc5f6c3723 100644
--- a/sd/source/ui/view/DocumentRenderer.cxx
+++ b/sd/source/ui/view/DocumentRenderer.cxx
@@ -373,7 +373,7 @@ namespace {
             maProperties.push_back(aOptionsUIFile);
 
             SvtModuleOptions aOpt;
-            OUString aAppGroupname(SD_RESSTR(STR_IMPRESS_PRINT_UI_GROUP_NAME));
+            OUString aAppGroupname(SdResId(STR_IMPRESS_PRINT_UI_GROUP_NAME));
             aAppGroupname = aAppGroupname.replaceFirst("%s", aOpt.GetModuleName(
                 mbImpress ? SvtModuleOptions::EModule::IMPRESS : SvtModuleOptions::EModule::DRAW));
             AddDialogControl(vcl::PrinterOptionsHelper::setGroupControlOpt("tabcontrol-page2", aAppGroupname, ".HelpID:vcl:PrintDialog:TabPage:AppPage"));
@@ -384,7 +384,7 @@ namespace {
                 vcl::PrinterOptionsHelper::UIControlOptions aPrintOpt;
                 aPrintOpt.maGroupHint = "JobPage" ;
                 AddDialogControl( vcl::PrinterOptionsHelper::setSubgroupControlOpt("extraimpressprintoptions",
-                                    SD_RESSTR(STR_IMPRESS_PRINT_UI_PRINT_GROUP),
+                                    SdResId(STR_IMPRESS_PRINT_UI_PRINT_GROUP),
                                     "",
                                     aPrintOpt ));
 
@@ -392,7 +392,7 @@ namespace {
                 aHelpIds[0] = ".HelpID:vcl:PrintDialog:PageContentType:ListBox" ;
                 AddDialogControl( vcl::PrinterOptionsHelper::setChoiceListControlOpt(
                                     "impressdocument",
-                                    SD_RESSTR(STR_IMPRESS_PRINT_UI_CONTENT),
+                                    SdResId(STR_IMPRESS_PRINT_UI_CONTENT),
                                     aHelpIds,
                                     "PageContentType" ,
                                     CreateChoice(STR_IMPRESS_PRINT_UI_CONTENT_CHOICES),
@@ -403,7 +403,7 @@ namespace {
                 vcl::PrinterOptionsHelper::UIControlOptions aContentOpt( "PageContentType" , 1 );
                 AddDialogControl( vcl::PrinterOptionsHelper::setChoiceListControlOpt(
                                     "slidesperpage",
-                                    SD_RESSTR(STR_IMPRESS_PRINT_UI_SLIDESPERPAGE),
+                                    SdResId(STR_IMPRESS_PRINT_UI_SLIDESPERPAGE),
                                     aHelpIds,
                                     "SlidesPerPage" ,
                                     GetSlidesPerPageSequence(),
@@ -417,7 +417,7 @@ namespace {
                 vcl::PrinterOptionsHelper::UIControlOptions aSlidesPerPageOpt( "SlidesPerPage" , -1, true );
                 AddDialogControl( vcl::PrinterOptionsHelper::setChoiceListControlOpt(
                                     "slidesperpageorder",
-                                    SD_RESSTR(STR_IMPRESS_PRINT_UI_ORDER),
+                                    SdResId(STR_IMPRESS_PRINT_UI_ORDER),
                                     aHelpIds,
                                     "SlidesPerPageOrder" ,
                                     CreateChoice(STR_IMPRESS_PRINT_UI_ORDER_CHOICES),
@@ -428,12 +428,12 @@ namespace {
             }
 
             AddDialogControl( vcl::PrinterOptionsHelper::setSubgroupControlOpt("contents",
-                               SD_RESSTR(STR_IMPRESS_PRINT_UI_INCLUDE_CONTENT), "" ) );
+                               SdResId(STR_IMPRESS_PRINT_UI_INCLUDE_CONTENT), "" ) );
 
             if( mbImpress )
             {
                 AddDialogControl( vcl::PrinterOptionsHelper::setBoolControlOpt("printname",
-                                    SD_RESSTR(STR_IMPRESS_PRINT_UI_IS_PRINT_NAME),
+                                    SdResId(STR_IMPRESS_PRINT_UI_IS_PRINT_NAME),
                                     ".HelpID:vcl:PrintDialog:IsPrintName:CheckBox" ,
                                     "IsPrintName" ,
                                     false
@@ -443,7 +443,7 @@ namespace {
             else
             {
                 AddDialogControl( vcl::PrinterOptionsHelper::setBoolControlOpt("printname",
-                                    SD_RESSTR(STR_DRAW_PRINT_UI_IS_PRINT_NAME),
+                                    SdResId(STR_DRAW_PRINT_UI_IS_PRINT_NAME),
                                     ".HelpID:vcl:PrintDialog:IsPrintName:CheckBox" ,
                                     "IsPrintName" ,
                                     false
@@ -452,7 +452,7 @@ namespace {
             }
 
             AddDialogControl( vcl::PrinterOptionsHelper::setBoolControlOpt("printdatetime",
-                                SD_RESSTR(STR_IMPRESS_PRINT_UI_IS_PRINT_DATE),
+                                SdResId(STR_IMPRESS_PRINT_UI_IS_PRINT_DATE),
                                 ".HelpID:vcl:PrintDialog:IsPrintDateTime:CheckBox" ,
                                 "IsPrintDateTime" ,
                                 false
@@ -462,7 +462,7 @@ namespace {
             if( mbImpress )
             {
                 AddDialogControl( vcl::PrinterOptionsHelper::setBoolControlOpt("printhidden",
-                                    SD_RESSTR(STR_IMPRESS_PRINT_UI_IS_PRINT_HIDDEN),
+                                    SdResId(STR_IMPRESS_PRINT_UI_IS_PRINT_HIDDEN),
                                     ".HelpID:vcl:PrintDialog:IsPrintHidden:CheckBox" ,
                                     "IsPrintHidden" ,
                                     false
@@ -471,7 +471,7 @@ namespace {
             }
 
             AddDialogControl( vcl::PrinterOptionsHelper::setSubgroupControlOpt("color",
-                               SD_RESSTR(STR_IMPRESS_PRINT_UI_QUALITY), "" ) );
+                               SdResId(STR_IMPRESS_PRINT_UI_QUALITY), "" ) );
 
             aHelpIds.realloc( 3 );
             aHelpIds[0] = ".HelpID:vcl:PrintDialog:Quality:RadioButton:0" ;
@@ -491,7 +491,7 @@ namespace {
                             );
 
             AddDialogControl( vcl::PrinterOptionsHelper::setSubgroupControlOpt("pagesizes",
-                               SD_RESSTR(STR_IMPRESS_PRINT_UI_PAGE_OPTIONS), "" ) );
+                               SdResId(STR_IMPRESS_PRINT_UI_PAGE_OPTIONS), "" ) );
 
             aHelpIds.realloc( 4 );
             aHelpIds[0] = ".HelpID:vcl:PrintDialog:PageOptions:RadioButton:0" ;
@@ -520,12 +520,12 @@ namespace {
             vcl::PrinterOptionsHelper::UIControlOptions aBrochureOpt;
             aBrochureOpt.maGroupHint = "LayoutPage" ;
             AddDialogControl( vcl::PrinterOptionsHelper::setSubgroupControlOpt("pagesides",
-                               SD_RESSTR(STR_IMPRESS_PRINT_UI_PAGE_SIDES), "",
+                               SdResId(STR_IMPRESS_PRINT_UI_PAGE_SIDES), "",
                                aBrochureOpt ) );
 
             // brochure printing
             AddDialogControl( vcl::PrinterOptionsHelper::setBoolControlOpt("brochure",
-                                SD_RESSTR(STR_IMPRESS_PRINT_UI_BROCHURE),
+                                SdResId(STR_IMPRESS_PRINT_UI_BROCHURE),
                                 ".HelpID:vcl:PrintDialog:PrintProspect:CheckBox" ,
                                 "PrintProspect" ,
                                 false,
@@ -540,7 +540,7 @@ namespace {
             aHelpIds[0] = ".HelpID:vcl:PrintDialog:PrintProspectInclude:ListBox" ;
             AddDialogControl( vcl::PrinterOptionsHelper::setChoiceListControlOpt(
                                 "brochureinclude",
-                                SD_RESSTR(STR_IMPRESS_PRINT_UI_BROCHURE_INCLUDE),
+                                SdResId(STR_IMPRESS_PRINT_UI_BROCHURE_INCLUDE),
                                 aHelpIds,
                                 "PrintProspectInclude" ,
                                 CreateChoice(STR_IMPRESS_PRINT_UI_BROCHURE_INCLUDE_LIST),
@@ -554,7 +554,7 @@ namespace {
             vcl::PrinterOptionsHelper::UIControlOptions aPaperTrayOpt;
             aPaperTrayOpt.maGroupHint = "OptionsPageOptGroup" ;
             AddDialogControl( vcl::PrinterOptionsHelper::setBoolControlOpt("printpaperfromsetup",
-                                SD_RESSTR(STR_IMPRESS_PRINT_UI_PAPER_TRAY),
+                                SdResId(STR_IMPRESS_PRINT_UI_PAPER_TRAY),
                                 ".HelpID:vcl:PrintDialog:PrintPaperFromSetup:CheckBox" ,
                                 "PrintPaperFromSetup" ,
                                 false,
@@ -566,7 +566,7 @@ namespace {
             aPrintRangeOpt.mbInternalOnly = true;
             aPrintRangeOpt.maGroupHint = "PrintRange" ;
             AddDialogControl( vcl::PrinterOptionsHelper::setSubgroupControlOpt("printrange",
-                                SD_RESSTR(STR_IMPRESS_PRINT_UI_PAGE_RANGE),
+                                SdResId(STR_IMPRESS_PRINT_UI_PAGE_RANGE),
                                 "",
                                 aPrintRangeOpt )
                              );
@@ -633,7 +633,7 @@ namespace {
 
         static Sequence<OUString> CreateChoice (const sal_uInt16 nResourceId)
         {
-            SdResId aResourceId (nResourceId);
+            ResId aResourceId(nResourceId, *SD_MOD()->GetResMgr());
             ResStringArray aChoiceStrings (aResourceId);
 
             const sal_uInt32 nCount (aChoiceStrings.Count());
@@ -1301,7 +1301,7 @@ public:
                     ScopedVclPtrInstance<WarningBox> aWarnBox(
                         pViewShell->GetActiveWindow(),
                         (WinBits)(WB_OK_CANCEL | WB_DEF_CANCEL),
-                        SD_RESSTR(STR_WARN_PRINTFORMAT_FAILURE));
+                        SdResId(STR_WARN_PRINTFORMAT_FAILURE));
                     if (aWarnBox->Execute() != RET_OK)
                         return;
                 }
diff --git a/sd/source/ui/view/GraphicObjectBar.cxx b/sd/source/ui/view/GraphicObjectBar.cxx
index c03c3363777d..eb9b6be057b6 100644
--- a/sd/source/ui/view/GraphicObjectBar.cxx
+++ b/sd/source/ui/view/GraphicObjectBar.cxx
@@ -133,7 +133,7 @@ void GraphicObjectBar::ExecuteFilter( SfxRequest& rReq )
                 {
                     SdrGrafObj* pFilteredObj = static_cast<SdrGrafObj*>( pObj->Clone() );
                     OUString    aStr = mpView->GetDescriptionOfMarkedObjects();
-                    aStr += " " + SD_RESSTR(STR_UNDO_GRAFFILTER);
+                    aStr += " " + SdResId(STR_UNDO_GRAFFILTER);
                     mpView->BegUndo( aStr );
                     pFilteredObj->SetGraphicObject( aFilterObj );
                     ::sd::View* const pView = mpView;
diff --git a/sd/source/ui/view/MediaObjectBar.cxx b/sd/source/ui/view/MediaObjectBar.cxx
index dbce5caf3d55..f2413042fd6a 100644
--- a/sd/source/ui/view/MediaObjectBar.cxx
+++ b/sd/source/ui/view/MediaObjectBar.cxx
@@ -65,7 +65,7 @@ MediaObjectBar::MediaObjectBar( ViewShell* pSdViewShell, ::sd::View* pSdView ) :
     SetPool( &pDocShell->GetPool() );
     SetUndoManager( pDocShell->GetUndoManager() );
     SetRepeatTarget( mpView );
-    SetName(SD_RESSTR(RID_DRAW_MEDIA_TOOLBOX));
+    SetName(SdResId(RID_DRAW_MEDIA_TOOLBOX));
 }
 
 MediaObjectBar::~MediaObjectBar()
diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx
index 0cd8df02d24e..002c6baf16ad 100644
--- a/sd/source/ui/view/Outliner.cxx
+++ b/sd/source/ui/view/Outliner.cxx
@@ -1196,9 +1196,9 @@ void SdOutliner::ShowEndOfSearchDialog()
 
     OUString aString;
     if (mpView->AreObjectsMarked())
-        aString = SD_RESSTR(STR_END_SPELLING_OBJ);
+        aString = SdResId(STR_END_SPELLING_OBJ);
     else
-        aString = SD_RESSTR(STR_END_SPELLING);
+        aString = SdResId(STR_END_SPELLING);
 
     // Show the message in an info box that is modal with respect to the
     // whole application.
@@ -1241,7 +1241,7 @@ bool SdOutliner::ShowWrapArroundDialog()
 
     // Pop up question box that asks the user whether to wrap around.
     // The dialog is made modal with respect to the whole application.
-    ScopedVclPtrInstance<QueryBox> aQuestionBox(nullptr, WB_YES_NO | WB_DEF_YES, SD_RESSTR(nStringId));
+    ScopedVclPtrInstance<QueryBox> aQuestionBox(nullptr, WB_YES_NO | WB_DEF_YES, SdResId(nStringId));
     aQuestionBox->SetImage(QueryBox::GetStandardImage());
     sal_uInt16 nBoxResult = ShowModalMessageBox(*aQuestionBox.get());
 
diff --git a/sd/source/ui/view/ViewShellImplementation.cxx b/sd/source/ui/view/ViewShellImplementation.cxx
index 5a9fca237af6..d8ac5cd4401f 100644
--- a/sd/source/ui/view/ViewShellImplementation.cxx
+++ b/sd/source/ui/view/ViewShellImplementation.cxx
@@ -198,8 +198,8 @@ void ViewShell::Implementation::ProcessModifyPageSlot (
 
                 pCurrentPage->SetAutoLayout(aNewAutoLayout, true);
 
-                SdrLayerID aBckgrnd = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND));
-                SdrLayerID aBckgrndObj = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ));
+                SdrLayerID aBckgrnd = rLayerAdmin.GetLayerID(SdResId(STR_LAYER_BCKGRND));
+                SdrLayerID aBckgrndObj = rLayerAdmin.GetLayerID(SdResId(STR_LAYER_BCKGRNDOBJ));
                 aVisibleLayers.Set(aBckgrnd, bBVisible);
                 aVisibleLayers.Set(aBckgrndObj, bBObjsVisible);
                 pCurrentPage->TRG_SetMasterPageVisibleLayers(aVisibleLayers);
@@ -259,8 +259,8 @@ void ViewShell::Implementation::AssignLayout ( SfxRequest& rRequest, PageKind eP
         // Transform the given request into the four argument form that is
         // understood by ProcessModifyPageSlot().
         SdrLayerAdmin& rLayerAdmin (mrViewShell.GetViewShellBase().GetDocument()->GetLayerAdmin());
-        SdrLayerID aBackground (rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND)));
-        SdrLayerID aBackgroundObject (rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ)));
+        SdrLayerID aBackground (rLayerAdmin.GetLayerID(SdResId(STR_LAYER_BCKGRND)));
+        SdrLayerID aBackgroundObject (rLayerAdmin.GetLayerID(SdResId(STR_LAYER_BCKGRNDOBJ)));
 
         SdrLayerIDSet aVisibleLayers;
 
diff --git a/sd/source/ui/view/drawview.cxx b/sd/source/ui/view/drawview.cxx
index 26ac7a9b4f22..314e110b8b16 100644
--- a/sd/source/ui/view/drawview.cxx
+++ b/sd/source/ui/view/drawview.cxx
@@ -180,8 +180,8 @@ bool DrawView::SetAttributes(const SfxItemSet& rSet,
                     mpDocSh->SetWaitCursor( true );
 
                     // replace placeholder by template name
-                    OUString aComment(SD_RESSTR(STR_UNDO_CHANGE_PRES_OBJECT));
-                    aComment = aComment.replaceFirst("$", SD_RESSTR(STR_PSEUDOSHEET_OUTLINE));
+                    OUString aComment(SdResId(STR_UNDO_CHANGE_PRES_OBJECT));
+                    aComment = aComment.replaceFirst("$", SdResId(STR_PSEUDOSHEET_OUTLINE));
                     mpDocSh->GetUndoManager()->EnterListAction( aComment, OUString(), 0, mpDrawViewShell->GetViewShellBase().GetViewShellId() );
 
                     std::vector<Paragraph*> aSelList;
@@ -435,7 +435,7 @@ bool DrawView::SetStyleSheet(SfxStyleSheet* pStyleSheet, bool bDontRemoveHardAtt
         if (IsPresObjSelected(false))
         {
             ScopedVclPtrInstance<InfoBox>(mpDrawViewShell->GetActiveWindow(),
-                    SD_RESSTR(STR_ACTION_NOTPOSSIBLE))->Execute();
+                    SdResId(STR_ACTION_NOTPOSSIBLE))->Execute();
             bResult = false;
         }
         else
@@ -518,7 +518,7 @@ void DrawView::DeleteMarked()
 
     if( pUndoManager )
     {
-        OUString aUndo(SVX_RESSTR(STR_EditDelete));
+        OUString aUndo(SvxResId(STR_EditDelete));
         aUndo = aUndo.replaceFirst("%1", GetDescriptionOfMarkedObjects());
         ViewShellId nViewShellId = mpDrawViewShell ? mpDrawViewShell->GetViewShellBase().GetViewShellId() : ViewShellId(-1);
         pUndoManager->EnterListAction(aUndo, aUndo, 0, nViewShellId);
diff --git a/sd/source/ui/view/drbezob.cxx b/sd/source/ui/view/drbezob.cxx
index 0511db501b81..bf52bffe3f0b 100644
--- a/sd/source/ui/view/drbezob.cxx
+++ b/sd/source/ui/view/drbezob.cxx
@@ -261,7 +261,7 @@ void BezierObjectBar::Execute(SfxRequest& rReq)
                         SdrPathObj* pPathObj = static_cast<SdrPathObj*>( rMarkList.GetMark(0)->GetMarkedSdrObj() );
                         const bool bUndo = mpView->IsUndoEnabled();
                         if( bUndo )
-                            mpView->BegUndo(SD_RESSTR(STR_UNDO_BEZCLOSE));
+                            mpView->BegUndo(SdResId(STR_UNDO_BEZCLOSE));
 
                         mpView->UnmarkAllPoints();
 
diff --git a/sd/source/ui/view/drtxtob1.cxx b/sd/source/ui/view/drtxtob1.cxx
index 9a084422fc29..351b5a960b31 100644
--- a/sd/source/ui/view/drtxtob1.cxx
+++ b/sd/source/ui/view/drtxtob1.cxx
@@ -363,7 +363,7 @@ void TextObjectBar::Execute( SfxRequest &rReq )
                     {
                         const SvxNumBulletItem *pItem = nullptr;
                         SfxStyleSheetBasePool* pSSPool = mpView->GetDocSh()->GetStyleSheetPool();
-                        OUString sStyleName(SD_RESSTR(STR_PSEUDOSHEET_OUTLINE) + " 1");
+                        OUString sStyleName(SdResId(STR_PSEUDOSHEET_OUTLINE) + " 1");
                         SfxStyleSheetBase* pFirstStyleSheet = pSSPool->Find(sStyleName, SD_STYLE_FAMILY_PSEUDO);
                         if( pFirstStyleSheet )
                             pFirstStyleSheet->GetItemSet().GetItemState(EE_PARA_NUMBULLET, false, reinterpret_cast<const SfxPoolItem**>(&pItem));
diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx
index 5007bfff0f52..78e5d42b9c79 100644
--- a/sd/source/ui/view/drviews1.cxx
+++ b/sd/source/ui/view/drviews1.cxx
@@ -1149,11 +1149,11 @@ void DrawViewShell::ResetActualLayer()
 
         OUString aName;
         OUString aActiveLayer = mpDrawView->GetActiveLayer();
-        OUString aBackgroundLayer = SD_RESSTR(STR_LAYER_BCKGRND);
-        OUString aBackgroundObjLayer = SD_RESSTR(STR_LAYER_BCKGRNDOBJ);
-        OUString aLayoutLayer = SD_RESSTR(STR_LAYER_LAYOUT);
-        OUString aControlsLayer = SD_RESSTR(STR_LAYER_CONTROLS);
-        OUString aMeasureLinesLayer = SD_RESSTR(STR_LAYER_MEASURELINES);
+        OUString aBackgroundLayer = SdResId(STR_LAYER_BCKGRND);
+        OUString aBackgroundObjLayer = SdResId(STR_LAYER_BCKGRNDOBJ);
+        OUString aLayoutLayer = SdResId(STR_LAYER_LAYOUT);
+        OUString aControlsLayer = SdResId(STR_LAYER_CONTROLS);
+        OUString aMeasureLinesLayer = SdResId(STR_LAYER_MEASURELINES);
         sal_uInt16 nActiveLayerPos = SDRLAYERPOS_NOTFOUND;
         SdrLayerAdmin& rLayerAdmin = GetDoc()->GetLayerAdmin();
         sal_uInt16 nLayerCnt = rLayerAdmin.GetLayerCount();
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index 1ea7eae77139..a189006ea60d 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -425,8 +425,8 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
                     ? GetDoc()->GetSdPage( nPage, GetPageKind() )
                     : GetDoc()->GetMasterSdPage( nPage, GetPageKind() );
 
-                OUString aTitle = SD_RESSTR(STR_TITLE_RENAMESLIDE);
-                OUString aDescr = SD_RESSTR(STR_DESC_RENAMESLIDE);
+                OUString aTitle = SdResId(STR_TITLE_RENAMESLIDE);
+                OUString aDescr = SdResId(STR_DESC_RENAMESLIDE);
                 OUString aPageName = pCurrentPage->GetName();
 
                 SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
@@ -604,7 +604,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
             if ( mpDrawView->IsPresObjSelected() )
             {
                 ::sd::Window* pWindow = GetActiveWindow();
-                ScopedVclPtrInstance<InfoBox>(pWindow, SD_RESSTR(STR_ACTION_NOTPOSSIBLE))->Execute();
+                ScopedVclPtrInstance<InfoBox>(pWindow, SdResId(STR_ACTION_NOTPOSSIBLE))->Execute();
             }
             else
             {
@@ -649,7 +649,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
             if ( mpDrawView->IsPresObjSelected() )
             {
                 ::sd::Window* pWindow = GetActiveWindow();
-                ScopedVclPtrInstance<InfoBox>(pWindow, SD_RESSTR(STR_ACTION_NOTPOSSIBLE))->Execute();
+                ScopedVclPtrInstance<InfoBox>(pWindow, SdResId(STR_ACTION_NOTPOSSIBLE))->Execute();
             }
             else
             {
@@ -677,7 +677,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
             if ( mpDrawView->IsPresObjSelected(true,true,true) )
             {
                 ::sd::Window* pWindow = GetActiveWindow();
-                ScopedVclPtrInstance<InfoBox>(pWindow, SD_RESSTR(STR_ACTION_NOTPOSSIBLE))->Execute();
+                ScopedVclPtrInstance<InfoBox>(pWindow, SdResId(STR_ACTION_NOTPOSSIBLE))->Execute();
             }
             else
             {
@@ -690,7 +690,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
                     case SID_CONVERT_TO_METAFILE:
                     {
                         // switch on undo for the next operations
-                        mpDrawView->BegUndo(SD_RESSTR(STR_UNDO_CONVERT_TO_METAFILE));
+                        mpDrawView->BegUndo(SdResId(STR_UNDO_CONVERT_TO_METAFILE));
                         GDIMetaFile aMetaFile(mpDrawView->GetMarkedObjMetaFile());
                         aGraphic = Graphic(aMetaFile);
                     }
@@ -698,7 +698,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
                     case SID_CONVERT_TO_BITMAP:
                     {
                         // switch on undo for the next operations
-                        mpDrawView->BegUndo(SD_RESSTR(STR_UNDO_CONVERT_TO_BITMAP));
+                        mpDrawView->BegUndo(SdResId(STR_UNDO_CONVERT_TO_BITMAP));
                         bool bDone(false);
 
                         // I have to get the image here directly since GetMarkedObjBitmapEx works
@@ -1160,7 +1160,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
             if ( mpDrawView->IsPresObjSelected(false) )
             {
                 ::sd::Window* pWindow = GetActiveWindow();
-                ScopedVclPtrInstance<InfoBox>(pWindow, SD_RESSTR(STR_ACTION_NOTPOSSIBLE))->Execute();
+                ScopedVclPtrInstance<InfoBox>(pWindow, SdResId(STR_ACTION_NOTPOSSIBLE))->Execute();
             }
             else
             {
@@ -1345,7 +1345,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
 #endif
 
                 ::sd::Window* pWindow = GetActiveWindow();
-                ScopedVclPtrInstance<InfoBox>(pWindow, SD_RESSTR(nId))->Execute();
+                ScopedVclPtrInstance<InfoBox>(pWindow, SdResId(nId))->Execute();
             }
             else
             {
@@ -1376,7 +1376,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
             SdrLayerAdmin& rLayerAdmin = GetDoc()->GetLayerAdmin();
             sal_uInt16 nLayerCnt = rLayerAdmin.GetLayerCount();
             sal_uInt16 nLayer = nLayerCnt - 2 + 1;
-            OUString aLayerName = SD_RESSTR(STR_LAYER) + OUString::number(nLayer);
+            OUString aLayerName = SdResId(STR_LAYER) + OUString::number(nLayer);
             OUString aLayerTitle, aLayerDesc;
             bool bIsVisible = false;
             bool bIsLocked = false;
@@ -1397,7 +1397,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
                 aNewAttr.Put( makeSdAttrLayerThisPage() );
 
                 SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
-                ScopedVclPtr<AbstractSdInsertLayerDlg> pDlg(pFact ? pFact->CreateSdInsertLayerDlg(GetActiveWindow(), aNewAttr, true, SD_RESSTR(STR_INSERTLAYER)) : nullptr);
+                ScopedVclPtr<AbstractSdInsertLayerDlg> pDlg(pFact ? pFact->CreateSdInsertLayerDlg(GetActiveWindow(), aNewAttr, true, SdResId(STR_INSERTLAYER)) : nullptr);
                 if( pDlg )
                 {
                     pDlg->SetHelpId( SD_MOD()->GetSlotPool()->GetSlot( SID_INSERTLAYER )->GetCommand() );
@@ -1416,7 +1416,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
                             ScopedVclPtrInstance<WarningBox> aWarningBox (
                                 GetParentWindow(),
                                 WinBits( WB_OK ),
-                                SD_RESSTR(STR_WARN_NAME_DUPLICATE));
+                                SdResId(STR_WARN_NAME_DUPLICATE));
                             aWarningBox->Execute();
                         }
                         else
@@ -1539,11 +1539,11 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
             // is it allowed to delete the layer?
             bool bDelete = true;
 
-            OUString aLayoutLayer = SD_RESSTR(STR_LAYER_LAYOUT);
-            OUString aControlsLayer = SD_RESSTR(STR_LAYER_CONTROLS);
-            OUString aMeasureLinesLayer = SD_RESSTR(STR_LAYER_MEASURELINES);
-            OUString aBackgroundLayer = SD_RESSTR(STR_LAYER_BCKGRND);
-            OUString aBackgroundObjLayer = SD_RESSTR(STR_LAYER_BCKGRNDOBJ);
+            OUString aLayoutLayer = SdResId(STR_LAYER_LAYOUT);
+            OUString aControlsLayer = SdResId(STR_LAYER_CONTROLS);
+            OUString aMeasureLinesLayer = SdResId(STR_LAYER_MEASURELINES);
+            OUString aBackgroundLayer = SdResId(STR_LAYER_BCKGRND);
+            OUString aBackgroundObjLayer = SdResId(STR_LAYER_BCKGRNDOBJ);
 
             if( aLayerName == aLayoutLayer       || aLayerName == aControlsLayer ||
                 aLayerName == aMeasureLinesLayer ||
@@ -1565,7 +1565,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
                 aNewAttr.Put( makeSdAttrLayerThisPage() );
 
                 SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
-                ScopedVclPtr<AbstractSdInsertLayerDlg> pDlg(pFact ? pFact->CreateSdInsertLayerDlg(GetActiveWindow(), aNewAttr, bDelete, SD_RESSTR(STR_MODIFYLAYER)) : nullptr);
+                ScopedVclPtr<AbstractSdInsertLayerDlg> pDlg(pFact ? pFact->CreateSdInsertLayerDlg(GetActiveWindow(), aNewAttr, bDelete, SdResId(STR_MODIFYLAYER)) : nullptr);
                 if( pDlg )
                 {
                     pDlg->SetHelpId( SD_MOD()->GetSlotPool()->GetSlot( SID_MODIFYLAYER )->GetCommand() );
@@ -1585,7 +1585,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
                             ScopedVclPtrInstance<WarningBox> aWarningBox (
                                 GetParentWindow(),
                                 WinBits( WB_OK ),
-                                SD_RESSTR(STR_WARN_NAME_DUPLICATE));
+                                SdResId(STR_WARN_NAME_DUPLICATE));
                             aWarningBox->Execute();
                         }
                         else
@@ -1815,7 +1815,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
                     if (nDepth != sal_uInt16(-1) && nDepth < 8)
                     {
                         sal_uInt16 nNewDepth = nDepth+1;
-                        pOL->Insert(SD_RESSTR(STR_PRESOBJ_MPOUTLINE+nNewDepth), EE_PARA_APPEND, nNewDepth);
+                        pOL->Insert(SdResId(STR_PRESOBJ_MPOUTLINE+nNewDepth), EE_PARA_APPEND, nNewDepth);
                     }
                 }
             }
@@ -2052,7 +2052,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
             if ( mpDrawView->IsPresObjSelected( true, true, true ) )
             {
                 ::sd::Window* pWindow = GetActiveWindow();
-                ScopedVclPtrInstance<InfoBox>(pWindow, SD_RESSTR(STR_ACTION_NOTPOSSIBLE))->Execute();
+                ScopedVclPtrInstance<InfoBox>(pWindow, SdResId(STR_ACTION_NOTPOSSIBLE))->Execute();
             }
             else
             {
@@ -2171,7 +2171,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
             if ( mpDrawView->IsPresObjSelected() )
             {
                 ::sd::Window* pWindow = GetActiveWindow();
-                ScopedVclPtrInstance<InfoBox>(pWindow, SD_RESSTR(STR_ACTION_NOTPOSSIBLE))->Execute();
+                ScopedVclPtrInstance<InfoBox>(pWindow, SdResId(STR_ACTION_NOTPOSSIBLE))->Execute();
             }
             else
             {
@@ -2188,7 +2188,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
             if ( mpDrawView->IsPresObjSelected() )
             {
                 ::sd::Window* pWindow = GetActiveWindow();
-                ScopedVclPtrInstance<InfoBox>(pWindow, SD_RESSTR(STR_ACTION_NOTPOSSIBLE))->Execute();
+                ScopedVclPtrInstance<InfoBox>(pWindow, SdResId(STR_ACTION_NOTPOSSIBLE))->Execute();
             }
             else
             {
@@ -2208,7 +2208,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
             if ( mpDrawView->IsPresObjSelected() )
             {
                 ::sd::Window* pWindow = GetActiveWindow();
-                ScopedVclPtrInstance<InfoBox>(pWindow, SD_RESSTR(STR_ACTION_NOTPOSSIBLE))->Execute();
+                ScopedVclPtrInstance<InfoBox>(pWindow, SdResId(STR_ACTION_NOTPOSSIBLE))->Execute();
             }
             else
             {
@@ -2229,7 +2229,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
             if ( mpDrawView->IsPresObjSelected() )
             {
                 ::sd::Window* pWindow = GetActiveWindow();
-                ScopedVclPtrInstance<InfoBox>(pWindow, SD_RESSTR(STR_ACTION_NOTPOSSIBLE))->Execute();
+                ScopedVclPtrInstance<InfoBox>(pWindow, SdResId(STR_ACTION_NOTPOSSIBLE))->Execute();
             }
             else
             {
@@ -2250,7 +2250,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
             if ( mpDrawView->IsPresObjSelected() )
             {
                 ::sd::Window* pWindow = GetActiveWindow();
-                ScopedVclPtrInstance<InfoBox>(pWindow, SD_RESSTR(STR_ACTION_NOTPOSSIBLE))->Execute();
+                ScopedVclPtrInstance<InfoBox>(pWindow, SdResId(STR_ACTION_NOTPOSSIBLE))->Execute();
             }
             else
             {
@@ -2292,7 +2292,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
             if ( mpDrawView->IsPresObjSelected() )
             {
                 ::sd::Window* pWindow = GetActiveWindow();
-                ScopedVclPtrInstance<InfoBox>(pWindow, SD_RESSTR(STR_ACTION_NOTPOSSIBLE))->Execute();
+                ScopedVclPtrInstance<InfoBox>(pWindow, SdResId(STR_ACTION_NOTPOSSIBLE))->Execute();
             }
             else
             {
@@ -2384,7 +2384,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
             if ( mpDrawView->IsPresObjSelected() )
             {
                 ::sd::Window* pWindow = GetActiveWindow();
-                ScopedVclPtrInstance<InfoBox>(pWindow, SD_RESSTR(STR_ACTION_NOTPOSSIBLE))->Execute();
+                ScopedVclPtrInstance<InfoBox>(pWindow, SdResId(STR_ACTION_NOTPOSSIBLE))->Execute();
             }
             else
             {
@@ -2868,9 +2868,9 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
                 SdrLayerAdmin& rLayerAdmin = GetDoc()->GetLayerAdmin();
                 SdrLayerID aLayerId;
                 if (nSId == SID_DISPLAY_MASTER_BACKGROUND)
-                    aLayerId = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND));
+                    aLayerId = rLayerAdmin.GetLayerID(SdResId(STR_LAYER_BCKGRND));
                 else
-                    aLayerId = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ));
+                    aLayerId = rLayerAdmin.GetLayerID(SdResId(STR_LAYER_BCKGRNDOBJ));
                 aVisibleLayers.Set(aLayerId, !aVisibleLayers.IsSet(aLayerId));
                 pPage->TRG_SetMasterPageVisibleLayers(aVisibleLayers);
             }
diff --git a/sd/source/ui/view/drviews3.cxx b/sd/source/ui/view/drviews3.cxx
index 2a3aedf19bba..ab4aaf5f6936 100644
--- a/sd/source/ui/view/drviews3.cxx
+++ b/sd/source/ui/view/drviews3.cxx
@@ -253,7 +253,7 @@ void  DrawViewShell::ExecCtrl(SfxRequest& rReq)
             }
 
             // turn on default layer of page
-            mpDrawView->SetActiveLayer(SD_RESSTR(STR_LAYER_LAYOUT));
+            mpDrawView->SetActiveLayer(SdResId(STR_LAYER_LAYOUT));
 
             ChangeEditMode(EditMode::Page, mbIsLayerModeActive);
 
@@ -1043,16 +1043,16 @@ void  DrawViewShell::GetSnapItemState( SfxItemSet &rSet )
         if ( rHelpLine.GetKind() == SdrHelpLineKind::Point )
         {
             rSet.Put( SfxStringItem( SID_SET_SNAPITEM,
-                                SD_RESSTR( STR_POPUP_EDIT_SNAPPOINT)) );
+                                SdResId( STR_POPUP_EDIT_SNAPPOINT)) );
             rSet.Put( SfxStringItem( SID_DELETE_SNAPITEM,
-                                SD_RESSTR( STR_POPUP_DELETE_SNAPPOINT)) );
+                                SdResId( STR_POPUP_DELETE_SNAPPOINT)) );
         }
         else
         {
             rSet.Put( SfxStringItem( SID_SET_SNAPITEM,
-                                SD_RESSTR( STR_POPUP_EDIT_SNAPLINE)) );
+                                SdResId( STR_POPUP_EDIT_SNAPLINE)) );
             rSet.Put( SfxStringItem( SID_DELETE_SNAPITEM,
-                                SD_RESSTR( STR_POPUP_DELETE_SNAPLINE)) );
+                                SdResId( STR_POPUP_DELETE_SNAPLINE)) );
         }
     }
 }
diff --git a/sd/source/ui/view/drviews4.cxx b/sd/source/ui/view/drviews4.cxx
index 6bc0613f250a..881b18306136 100644
--- a/sd/source/ui/view/drviews4.cxx
+++ b/sd/source/ui/view/drviews4.cxx
@@ -101,7 +101,7 @@ void DrawViewShell::DeleteActualLayer()
 
     SdrLayerAdmin& rAdmin = GetDoc()->GetLayerAdmin();
     const OUString& rName = GetLayerTabControl()->GetPageText(GetLayerTabControl()->GetCurPageId());
-    OUString aString(SD_RESSTR(STR_ASK_DELETE_LAYER));
+    OUString aString(SdResId(STR_ASK_DELETE_LAYER));
 
     // replace placeholder
     aString = aString.replaceFirst("$", rName);
@@ -875,21 +875,21 @@ void DrawViewShell::ShowSnapLineContextMenu (
     {
         pMenu->InsertItem(
             SID_SET_SNAPITEM,
-            SD_RESSTR(STR_POPUP_EDIT_SNAPPOINT));
+            SdResId(STR_POPUP_EDIT_SNAPPOINT));
         pMenu->InsertSeparator();
         pMenu->InsertItem(
             SID_DELETE_SNAPITEM,
-            SD_RESSTR(STR_POPUP_DELETE_SNAPPOINT));
+            SdResId(STR_POPUP_DELETE_SNAPPOINT));
     }
     else
     {
         pMenu->InsertItem(
             SID_SET_SNAPITEM,
-            SD_RESSTR(STR_POPUP_EDIT_SNAPLINE));
+            SdResId(STR_POPUP_EDIT_SNAPLINE));
         pMenu->InsertSeparator();
         pMenu->InsertItem(
             SID_DELETE_SNAPITEM,
-            SD_RESSTR(STR_POPUP_DELETE_SNAPLINE));
+            SdResId(STR_POPUP_DELETE_SNAPLINE));
     }
 
     pMenu->RemoveDisabledEntries(false);
diff --git a/sd/source/ui/view/drviews6.cxx b/sd/source/ui/view/drviews6.cxx
index 1e137982404e..d34931a65364 100644
--- a/sd/source/ui/view/drviews6.cxx
+++ b/sd/source/ui/view/drviews6.cxx
@@ -309,7 +309,7 @@ void DrawViewShell::ExecBmpMask( SfxRequest& rReq )
                         pNewObj->SetGraphic(pBmpMask->Mask(pNewObj->GetGraphic()));
 
                         OUString aStr( mpDrawView->GetDescriptionOfMarkedObjects() );
-                        aStr += " " + SD_RESSTR(STR_EYEDROPPER);
+                        aStr += " " + SdResId(STR_EYEDROPPER);
 
                         mpDrawView->BegUndo( aStr );
                         mpDrawView->ReplaceObjectAtView( pObj, *pPV, pNewObj );
diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx
index 9e9c3bbee364..cf684596dbb6 100644
--- a/sd/source/ui/view/drviews7.cxx
+++ b/sd/source/ui/view/drviews7.cxx
@@ -818,11 +818,11 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
             const OUString& rName = GetLayerTabControl()->GetPageText(nCurrentLayer);
 
             bool bDisableIt = !IsLayerModeActive();
-            bDisableIt |= (rName == SD_RESSTR(STR_LAYER_LAYOUT));
-            bDisableIt |= (rName == SD_RESSTR(STR_LAYER_BCKGRND));
-            bDisableIt |= (rName == SD_RESSTR(STR_LAYER_BCKGRNDOBJ));
-            bDisableIt |= (rName == SD_RESSTR(STR_LAYER_CONTROLS));
-            bDisableIt |= (rName == SD_RESSTR(STR_LAYER_MEASURELINES));
+            bDisableIt |= (rName == SdResId(STR_LAYER_LAYOUT));
+            bDisableIt |= (rName == SdResId(STR_LAYER_BCKGRND));
+            bDisableIt |= (rName == SdResId(STR_LAYER_BCKGRNDOBJ));
+            bDisableIt |= (rName == SdResId(STR_LAYER_CONTROLS));
+            bDisableIt |= (rName == SdResId(STR_LAYER_MEASURELINES));
 
             if (bDisableIt)
             {
@@ -1522,8 +1522,8 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
         {
             SdrLayerIDSet aVisibleLayers = pPage->TRG_GetMasterPageVisibleLayers();
             SdrLayerAdmin& rLayerAdmin = GetDoc()->GetLayerAdmin();
-            SdrLayerID aBackgroundId = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND));
-            SdrLayerID aObjectId = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ));
+            SdrLayerID aBackgroundId = rLayerAdmin.GetLayerID(SdResId(STR_LAYER_BCKGRND));
+            SdrLayerID aObjectId = rLayerAdmin.GetLayerID(SdResId(STR_LAYER_BCKGRNDOBJ));
             rSet.Put(SfxBoolItem(SID_DISPLAY_MASTER_BACKGROUND,
                     aVisibleLayers.IsSet(aBackgroundId)));
             rSet.Put(SfxBoolItem(SID_DISPLAY_MASTER_OBJECTS,
diff --git a/sd/source/ui/view/drviews9.cxx b/sd/source/ui/view/drviews9.cxx
index 0bb246b89ec5..775ce699bf4d 100644
--- a/sd/source/ui/view/drviews9.cxx
+++ b/sd/source/ui/view/drviews9.cxx
@@ -157,7 +157,7 @@ void DrawViewShell::ExecGallery(SfxRequest& rReq)
                         pNewGrafObj->SetGraphic(aGraphic);
 
                         OUString aStr(mpDrawView->GetDescriptionOfMarkedObjects());
-                        aStr += " " + SD_RESSTR(STR_UNDO_REPLACE);
+                        aStr += " " + SdResId(STR_UNDO_REPLACE);
                         mpDrawView->BegUndo(aStr);
                         SdrPageView* pPV = mpDrawView->GetSdrPageView();
                         mpDrawView->ReplaceObjectAtView(pGrafObj, *pPV, pNewGrafObj);
diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx
index 3a97a1b183ed..24d8cac6f277 100644
--- a/sd/source/ui/view/drviewsa.cxx
+++ b/sd/source/ui/view/drviewsa.cxx
@@ -655,7 +655,7 @@ void DrawViewShell::GetStatusBarState(SfxItemSet& rSet)
         sal_Int32 nPageCount = sal_Int32(GetDoc()->GetSdPageCount(mePageKind));
         sal_Int32 nActivePageCount = sal_Int32(GetDoc()->GetActiveSdPageCount());
         // Always show the slide/page number.
-        OUString aOUString = (nPageCount == nActivePageCount) ? SD_RESSTR(STR_SD_PAGE_COUNT) : SD_RESSTR(STR_SD_PAGE_COUNT_CUSTOM);
+        OUString aOUString = (nPageCount == nActivePageCount) ? SdResId(STR_SD_PAGE_COUNT) : SdResId(STR_SD_PAGE_COUNT_CUSTOM);
 
         aOUString = aOUString.replaceFirst("%1", OUString::number(maTabControl->GetCurPagePos() + 1));
         aOUString = aOUString.replaceFirst("%2", OUString::number(nPageCount));
diff --git a/sd/source/ui/view/drviewsb.cxx b/sd/source/ui/view/drviewsb.cxx
index a9a60fb35408..6381526a08f3 100644
--- a/sd/source/ui/view/drviewsb.cxx
+++ b/sd/source/ui/view/drviewsb.cxx
@@ -81,8 +81,8 @@ bool DrawViewShell::RenameSlide( sal_uInt16 nPageId, const OUString & rName  )
         // Undo
         SdPage* pUndoPage = pPageToRename;
         SdrLayerAdmin &  rLayerAdmin = GetDoc()->GetLayerAdmin();
-        SdrLayerID nBackground = rLayerAdmin.GetLayerID( SD_RESSTR(STR_LAYER_BCKGRND) );
-        SdrLayerID nBgObj = rLayerAdmin.GetLayerID( SD_RESSTR(STR_LAYER_BCKGRNDOBJ) );
+        SdrLayerID nBackground = rLayerAdmin.GetLayerID( SdResId(STR_LAYER_BCKGRND) );
+        SdrLayerID nBgObj = rLayerAdmin.GetLayerID( SdResId(STR_LAYER_BCKGRNDOBJ) );
         SdrLayerIDSet aVisibleLayers = mpActualPage->TRG_GetMasterPageVisibleLayers();
 
         ::svl::IUndoManager* pManager = GetDoc()->GetDocSh()->GetUndoManager();
diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx
index e3b59fa2ee97..54b3628826cc 100644
--- a/sd/source/ui/view/drviewse.cxx
+++ b/sd/source/ui/view/drviewse.cxx
@@ -327,10 +327,10 @@ void DrawViewShell::FuPermanent(SfxRequest& rReq)
                     if ( mpDrawView->IsPresObjSelected() )
                     {
                         ::sd::Window* pWindow = GetActiveWindow();
-                        ScopedVclPtrInstance<InfoBox>(pWindow, SD_RESSTR(STR_ACTION_NOTPOSSIBLE) )->Execute();
+                        ScopedVclPtrInstance<InfoBox>(pWindow, SdResId(STR_ACTION_NOTPOSSIBLE) )->Execute();
                     }
                     else if ( ScopedVclPtrInstance<QueryBox>(GetActiveWindow(), WB_YES_NO,
-                                      SD_RESSTR(STR_ASK_FOR_CONVERT_TO_BEZIER)
+                                      SdResId(STR_ASK_FOR_CONVERT_TO_BEZIER)
                                       )->Execute() == RET_YES )
                     {
                         // implicit transformation into bezier
@@ -364,10 +364,10 @@ void DrawViewShell::FuPermanent(SfxRequest& rReq)
                     if ( mpDrawView->IsPresObjSelected() )
                     {
                         ::sd::Window* pWindow = GetActiveWindow();
-                        ScopedVclPtrInstance<InfoBox>(pWindow, SD_RESSTR(STR_ACTION_NOTPOSSIBLE) )->Execute();
+                        ScopedVclPtrInstance<InfoBox>(pWindow, SdResId(STR_ACTION_NOTPOSSIBLE) )->Execute();
                     }
                     else if ( ScopedVclPtrInstance<QueryBox>(GetActiveWindow(), WB_YES_NO,
-                                      SD_RESSTR(STR_ASK_FOR_CONVERT_TO_BEZIER)
+                                      SdResId(STR_ASK_FOR_CONVERT_TO_BEZIER)
                                       )->Execute() == RET_YES )
                     {
                         // implicit transformation into bezier
@@ -670,7 +670,7 @@ void DrawViewShell::FuDeleteSelectedObjects()
     if (mpDrawView->IsPresObjSelected(false, true, false, true))
     {
         ::sd::Window* pWindow = GetActiveWindow();
-        ScopedVclPtrInstance<InfoBox>(pWindow, SD_RESSTR(STR_ACTION_NOTPOSSIBLE) )->Execute();
+        ScopedVclPtrInstance<InfoBox>(pWindow, SdResId(STR_ACTION_NOTPOSSIBLE) )->Execute();
         bConsumed = true;
     }
 
@@ -763,7 +763,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq)
                 SdrPathObj* pPathObj = static_cast<SdrPathObj*>( rMarkList.GetMark(0)->GetMarkedSdrObj());
                 const bool bUndo = mpDrawView->IsUndoEnabled();
                 if( bUndo )
-                    mpDrawView->BegUndo(SD_RESSTR(STR_UNDO_BEZCLOSE));
+                    mpDrawView->BegUndo(SdResId(STR_UNDO_BEZCLOSE));
 
                 mpDrawView->UnmarkAllPoints();
 
@@ -784,7 +784,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq)
             if ( mpDrawView->IsPresObjSelected(false, true, false, true) )
             {
                 ::sd::Window* pWindow = GetActiveWindow();
-                ScopedVclPtrInstance<InfoBox>(pWindow, SD_RESSTR(STR_ACTION_NOTPOSSIBLE))->Execute();
+                ScopedVclPtrInstance<InfoBox>(pWindow, SdResId(STR_ACTION_NOTPOSSIBLE))->Execute();
             }
             else
             {
@@ -806,7 +806,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq)
             if ( mpDrawView->IsPresObjSelected(false, true, false, true) )
             {
                 ::sd::Window* pWindow = GetActiveWindow();
-                ScopedVclPtrInstance<InfoBox>(pWindow, SD_RESSTR(STR_ACTION_NOTPOSSIBLE))->Execute();
+                ScopedVclPtrInstance<InfoBox>(pWindow, SdResId(STR_ACTION_NOTPOSSIBLE))->Execute();
             }
             else
             {
@@ -1002,7 +1002,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq)
                 ViewShellHint(ViewShellHint::HINT_CHANGE_EDIT_MODE_START));
 
             // turn on default layer of MasterPage
-            mpDrawView->SetActiveLayer( SD_RESSTR(STR_LAYER_BCKGRNDOBJ) );
+            mpDrawView->SetActiveLayer( SdResId(STR_LAYER_BCKGRNDOBJ) );
 
             ChangeEditMode(EditMode::MasterPage, mbIsLayerModeActive);
 
diff --git a/sd/source/ui/view/drviewsi.cxx b/sd/source/ui/view/drviewsi.cxx
index 4236050fe3b3..fe10d917541c 100644
--- a/sd/source/ui/view/drviewsi.cxx
+++ b/sd/source/ui/view/drviewsi.cxx
@@ -126,7 +126,7 @@ void DrawViewShell::AssignFrom3DWindow()
                 p3DWin->GetAttr( aSet );
 
                 // own UNDO-compounding also around transformation in 3D
-                GetView()->BegUndo(SD_RESSTR(STR_UNDO_APPLY_3D_FAVOURITE));
+                GetView()->BegUndo(SdResId(STR_UNDO_APPLY_3D_FAVOURITE));
 
                 if(GetView()->IsConvertTo3DObjPossible())
                 {
@@ -167,7 +167,7 @@ void DrawViewShell::AssignFrom3DWindow()
             {
                 ScopedVclPtrInstance<InfoBox> aInfoBox (
                     GetActiveWindow(),
-                    SD_RESSTR(STR_ACTION_NOTPOSSIBLE));
+                    SdResId(STR_ACTION_NOTPOSSIBLE));
                 aInfoBox->Execute();
             }
 
diff --git a/sd/source/ui/view/frmview.cxx b/sd/source/ui/view/frmview.cxx
index 7572c368074c..0928ead4021f 100644
--- a/sd/source/ui/view/frmview.cxx
+++ b/sd/source/ui/view/frmview.cxx
@@ -202,7 +202,7 @@ FrameView::FrameView(SdDrawDocument* pDrawDoc, FrameView* pFrameView /* = NULK *
         maPrintableLayers.SetAll();
         SetGridCoarse( Size( 1000, 1000 ) );
         SetSnapGridWidth(Fraction(1000, 1), Fraction(1000, 1));
-        SetActiveLayer( SD_RESSTR(STR_LAYER_LAYOUT) );
+        SetActiveLayer( SdResId(STR_LAYER_LAYOUT) );
         mbNoColors = true;
         mbNoAttribs = false;
         maVisArea = ::tools::Rectangle( Point(), Size(0, 0) );
diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx
index 7041995282af..7586361979a4 100644
--- a/sd/source/ui/view/outlnvsh.cxx
+++ b/sd/source/ui/view/outlnvsh.cxx
@@ -1332,7 +1332,7 @@ void OutlineViewShell::GetStatusBarState(SfxItemSet& rSet)
 
         SdrPage* pPage = GetDoc()->GetSdPage( (sal_uInt16) nPos, PageKind::Standard );
 
-        aPageStr = SD_RESSTR(STR_SD_PAGE_COUNT);
+        aPageStr = SdResId(STR_SD_PAGE_COUNT);
 
         aPageStr = aPageStr.replaceFirst("%1", OUString::number((sal_Int32)(nPos + 1)));
         aPageStr = aPageStr.replaceFirst("%2", OUString::number(nPageCount));
diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx
index 2a4ce761c013..b76b852e7100 100644
--- a/sd/source/ui/view/outlview.cxx
+++ b/sd/source/ui/view/outlview.cxx
@@ -590,7 +590,7 @@ IMPL_LINK( OutlineView, DepthChangedHdl, ::Outliner::DepthChangeHdlParam, aParam
             if (mnPagesToProcess > PROCESS_WITH_PROGRESS_THRESHOLD)
             {
                 delete mpProgress;
-                mpProgress = new SfxProgress( GetDocSh(), SD_RESSTR(STR_CREATE_PAGES), mnPagesToProcess );
+                mpProgress = new SfxProgress( GetDocSh(), SdResId(STR_CREATE_PAGES), mnPagesToProcess );
             }
             else
             {
@@ -1010,7 +1010,7 @@ bool OutlineView::PrepareClose()
 
     mrOutliner.GetUndoManager().Clear();
 
-    BegUndo(SD_RESSTR(STR_UNDO_CHANGE_TITLE_AND_LAYOUT));
+    BegUndo(SdResId(STR_UNDO_CHANGE_TITLE_AND_LAYOUT));
     UpdateDocument();
     EndUndo();
     mrDoc.SetSelected(GetActualPage(), true);
@@ -1169,7 +1169,7 @@ IMPL_LINK_NOARG(OutlineView, RemovingPagesHdl, OutlinerView*, bool)
     if (mnPagesToProcess)
     {
         delete mpProgress;
-        mpProgress = new SfxProgress( GetDocSh(), SD_RESSTR(STR_DELETE_PAGES), mnPagesToProcess );
+        mpProgress = new SfxProgress( GetDocSh(), SdResId(STR_DELETE_PAGES), mnPagesToProcess );
     }
     mrOutliner.UpdateFields();
 
@@ -1457,7 +1457,7 @@ void OutlineView::IgnoreCurrentPageChanges (bool bIgnoreChanges)
 void OutlineView::BeginModelChange()
 {
     mrOutliner.GetUndoManager().EnterListAction("", "", 0, mrOutlineViewShell.GetViewShellBase().GetViewShellId());
-    BegUndo(SD_RESSTR(STR_UNDO_CHANGE_TITLE_AND_LAYOUT));
+    BegUndo(SdResId(STR_UNDO_CHANGE_TITLE_AND_LAYOUT));
 }
 
 /** call this method after BeginModelChange(), when all possible model
diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx
index 2856afa6355c..8d6543a45744 100644
--- a/sd/source/ui/view/sdview.cxx
+++ b/sd/source/ui/view/sdview.cxx
@@ -139,7 +139,7 @@ View::View(SdDrawDocument& rDrawDoc, OutputDevice* pOutDev,
 
     SetMinMoveDistancePixel(2);
     SetHitTolerancePixel(2);
-    SetMeasureLayer(SD_RESSTR(STR_LAYER_MEASURELINES));
+    SetMeasureLayer(SdResId(STR_LAYER_MEASURELINES));
 
     // Timer for delayed drop (has to be for MAC)
     maDropErrorIdle.SetInvokeHandler( LINK(this, View, DropErrorHdl) );
@@ -305,7 +305,7 @@ drawinglayer::primitive2d::Primitive2DContainer ViewRedirector::createRedirected
                             {
                                 if(pObjectsSdPage && pObjectsSdPage->GetPageKind() == PageKind::Standard)
                                 {
-                                    static OUString aTitleAreaStr(SD_RESSTR(STR_PLACEHOLDER_DESCRIPTION_TITLE));
+                                    static OUString aTitleAreaStr(SdResId(STR_PLACEHOLDER_DESCRIPTION_TITLE));
                                     aObjectString = aTitleAreaStr;
                                 }
 
@@ -313,31 +313,31 @@ drawinglayer::primitive2d::Primitive2DContainer ViewRedirector::createRedirected
                             }
                             case PRESOBJ_OUTLINE:
                             {
-                                static OUString aOutlineAreaStr(SD_RESSTR(STR_PLACEHOLDER_DESCRIPTION_OUTLINE));
+                                static OUString aOutlineAreaStr(SdResId(STR_PLACEHOLDER_DESCRIPTION_OUTLINE));
                                 aObjectString = aOutlineAreaStr;
                                 break;
                             }
                             case PRESOBJ_FOOTER:
                             {
-                                static OUString aFooterAreaStr(SD_RESSTR(STR_PLACEHOLDER_DESCRIPTION_FOOTER));
+                                static OUString aFooterAreaStr(SdResId(STR_PLACEHOLDER_DESCRIPTION_FOOTER));
                                 aObjectString = aFooterAreaStr;
                                 break;
                             }
                             case PRESOBJ_HEADER:
                             {
-                                static OUString aHeaderAreaStr(SD_RESSTR(STR_PLACEHOLDER_DESCRIPTION_HEADER));
+                                static OUString aHeaderAreaStr(SdResId(STR_PLACEHOLDER_DESCRIPTION_HEADER));
                                 aObjectString = aHeaderAreaStr;
                                 break;
                             }
                             case PRESOBJ_DATETIME:
                             {
-                                static OUString aDateTimeStr(SD_RESSTR(STR_PLACEHOLDER_DESCRIPTION_DATETIME));
+                                static OUString aDateTimeStr(SdResId(STR_PLACEHOLDER_DESCRIPTION_DATETIME));
                                 aObjectString = aDateTimeStr;
                                 break;
                             }
                             case PRESOBJ_NOTES:
                             {
-                                static OUString aDateTimeStr(SD_RESSTR(STR_PLACEHOLDER_DESCRIPTION_NOTES));
+                                static OUString aDateTimeStr(SdResId(STR_PLACEHOLDER_DESCRIPTION_NOTES));
                                 aObjectString = aDateTimeStr;
                                 break;
                             }
@@ -345,12 +345,12 @@ drawinglayer::primitive2d::Primitive2DContainer ViewRedirector::createRedirected
                             {
                                 if(pObjectsSdPage && pObjectsSdPage->GetPageKind() == PageKind::Standard)
                                 {
-                                    static OUString aSlideAreaStr(SD_RESSTR(STR_PLACEHOLDER_DESCRIPTION_SLIDE));
+                                    static OUString aSlideAreaStr(SdResId(STR_PLACEHOLDER_DESCRIPTION_SLIDE));
                                     aObjectString = aSlideAreaStr;
                                 }
                                 else
                                 {
-                                    static OUString aNumberAreaStr(SD_RESSTR(STR_PLACEHOLDER_DESCRIPTION_NUMBER));
+                                    static OUString aNumberAreaStr(SdResId(STR_PLACEHOLDER_DESCRIPTION_NUMBER));
                                     aObjectString = aNumberAreaStr;
                                 }
                                 break;
@@ -917,7 +917,7 @@ void View::SetMarkedOriginalSize()
 
     if( bOK )
     {
-        pUndoGroup->SetComment(SD_RESSTR(STR_UNDO_ORIGINALSIZE));
+        pUndoGroup->SetComment(SdResId(STR_UNDO_ORIGINALSIZE));
         mpDocSh->GetUndoManager()->AddUndoAction(pUndoGroup);
     }
     else
diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx
index 41b935b4aa0d..1865f01cc674 100644
--- a/sd/source/ui/view/sdview2.cxx
+++ b/sd/source/ui/view/sdview2.cxx
@@ -242,7 +242,7 @@ void View::DoCut()
         const_cast<OutlinerView*>(pOLV)->Cut();
     else if( AreObjectsMarked() )
     {
-        OUString aStr(SD_RESSTR(STR_UNDO_CUT));
+        OUString aStr(SdResId(STR_UNDO_CUT));
 
         DoCopy();
         BegUndo(aStr + " " + GetDescriptionOfMarkedObjects());
@@ -367,7 +367,7 @@ void View::StartDrag( const Point& rStartPos, vcl::Window* pWindow )
 
         if( IsUndoEnabled() )
         {
-            OUString aStr(SD_RESSTR(STR_UNDO_DRAGDROP));
+            OUString aStr(SdResId(STR_UNDO_DRAGDROP));
             BegUndo(aStr + " " + mpDragSrcMarkList->GetMarkDescription());
         }
         CreateDragDataObject( this, *pWindow, rStartPos );
@@ -874,8 +874,8 @@ bool View::GetExchangeList (std::vector<OUString> &rExchangeList,
         {
             if( mrDoc.GetObj( aNewName ) )
             {
-                OUString aTitle(SD_RESSTR(STR_TITLE_NAMEGROUP));
-                OUString aDesc(SD_RESSTR(STR_DESC_NAMEGROUP));
+                OUString aTitle(SdResId(STR_TITLE_NAMEGROUP));
+                OUString aDesc(SdResId(STR_DESC_NAMEGROUP));
 
                 SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
                 ScopedVclPtr<AbstractSvxNameDialog> pDlg(pFact ? pFact->CreateSvxNameDialog(mpViewSh->GetActiveWindow(), aNewName, aDesc) : nullptr);
diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx
index 5f31aabd0293..7720442f6c7b 100644
--- a/sd/source/ui/view/sdview3.cxx
+++ b/sd/source/ui/view/sdview3.cxx
@@ -410,7 +410,7 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper,
                                 // #i11702#
                                 if( IsUndoEnabled() )
                                 {
-                                    BegUndo(SD_RESSTR(STR_MODIFYLAYER));
+                                    BegUndo(SdResId(STR_MODIFYLAYER));
                                     AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoObjectLayerChange(*pO, pO->GetLayer(), nLayer));
                                     EndUndo();
                                 }
@@ -494,7 +494,7 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper,
 
                                         if( IsUndoEnabled() )
                                         {
-                                            BegUndo(SD_RESSTR(STR_UNDO_DRAGDROP));
+                                            BegUndo(SdResId(STR_UNDO_DRAGDROP));
                                             AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewObject(*pObj));
                                             EndUndo();
                                         }
@@ -731,7 +731,7 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper,
                             const bool bUndo = IsUndoEnabled();
 
                             if( bUndo )
-                                BegUndo(SD_RESSTR(STR_UNDO_DRAGDROP));
+                                BegUndo(SdResId(STR_UNDO_DRAGDROP));
                             pNewObj->NbcSetLayer( pPickObj->GetLayer() );
                             SdrPage* pWorkPage = GetSdrPageView()->GetPage();
                             pWorkPage->InsertObject( pNewObj );
@@ -763,7 +763,7 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper,
                             const bool bUndo = IsUndoEnabled();
                             if( bUndo )
                             {
-                                BegUndo( SD_RESSTR(STR_UNDO_DRAGDROP) );
+                                BegUndo( SdResId(STR_UNDO_DRAGDROP) );
                                 AddUndo( mrDoc.GetSdrUndoFactory().CreateUndoAttrObject( *pPickObj ) );
                             }
 
@@ -1327,7 +1327,7 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper,
 
             if( IsUndoEnabled() )
             {
-                BegUndo( SD_RESSTR(STR_UNDO_DRAGDROP) );
+                BegUndo( SdResId(STR_UNDO_DRAGDROP) );
                 AddUndo( GetModel()->GetSdrUndoFactory().CreateUndoAttrObject( *pPickObj ) );
                 EndUndo();
             }
diff --git a/sd/source/ui/view/sdview4.cxx b/sd/source/ui/view/sdview4.cxx
index af1bafb11a81..051a3cc0e5e3 100644
--- a/sd/source/ui/view/sdview4.cxx
+++ b/sd/source/ui/view/sdview4.cxx
@@ -107,7 +107,7 @@ SdrGrafObj* View::InsertGraphic( const Graphic& rGraphic, sal_Int8& rAction,
     {
         // hit on SdrGrafObj with wanted new linked graphic (or PresObj placeholder hit)
         if( IsUndoEnabled() )
-            BegUndo(OUString(SdResId(STR_INSERTGRAPHIC)));
+            BegUndo(SdResId(STR_INSERTGRAPHIC));
 
         SdPage* pPage = static_cast<SdPage*>( pPickObj->GetPage() );
 
@@ -156,7 +156,7 @@ SdrGrafObj* View::InsertGraphic( const Graphic& rGraphic, sal_Int8& rAction,
         // and thus of DND_ACTION_LINK or DND_ACTION_MOVE
         if( IsUndoEnabled() )
         {
-            BegUndo(OUString(SdResId(STR_UNDO_DRAGDROP)));
+            BegUndo(SdResId(STR_UNDO_DRAGDROP));
             AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoAttrObject(*pPickObj));
             EndUndo();
         }
@@ -238,7 +238,7 @@ SdrGrafObj* View::InsertGraphic( const Graphic& rGraphic, sal_Int8& rAction,
             const bool bUndo = IsUndoEnabled();
 
             if( bUndo )
-                BegUndo(SD_RESSTR(STR_UNDO_DRAGDROP));
+                BegUndo(SdResId(STR_UNDO_DRAGDROP));
             pNewGrafObj->NbcSetLayer(pPickObj->GetLayer());
             SdrPage* pP = pPV->GetPage();
             pP->InsertObject(pNewGrafObj);
@@ -334,7 +334,7 @@ SdrMediaObj* View::InsertMediaObj( const OUString& rMediaURL, const OUString& rM
         pNewMediaObj = static_cast< SdrMediaObj* >( pPickObj->Clone() );
         pNewMediaObj->setURL( rMediaURL, ""/*TODO?*/, rMimeType );
 
-        BegUndo(SD_RESSTR(STR_UNDO_DRAGDROP));
+        BegUndo(SdResId(STR_UNDO_DRAGDROP));
         ReplaceObjectAtView(pPickObj, *pPV, pNewMediaObj);
         EndUndo();
     }
@@ -578,7 +578,7 @@ IMPL_LINK_NOARG(View, DropInsertFileHdl, Timer *, void)
  */
 IMPL_LINK_NOARG(View, DropErrorHdl, Timer *, void)
 {
-    ScopedVclPtrInstance<InfoBox>( mpViewSh ? mpViewSh->GetActiveWindow() : nullptr, SD_RESSTR(STR_ACTION_NOTPOSSIBLE) )->Execute();
+    ScopedVclPtrInstance<InfoBox>( mpViewSh ? mpViewSh->GetActiveWindow() : nullptr, SdResId(STR_ACTION_NOTPOSSIBLE) )->Execute();
 }
 
 /**
diff --git a/sd/source/ui/view/unmodpg.cxx b/sd/source/ui/view/unmodpg.cxx
index b852eb58644c..f0445646fff0 100644
--- a/sd/source/ui/view/unmodpg.cxx
+++ b/sd/source/ui/view/unmodpg.cxx
@@ -58,8 +58,8 @@ ModifyPageUndoAction::ModifyPageUndoAction(
     {
         maOldName = mpPage->GetName();
         SdrLayerAdmin& rLayerAdmin = mpDoc->GetLayerAdmin();
-        SdrLayerID aBckgrnd = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND));
-        SdrLayerID aBckgrndObj = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ));
+        SdrLayerID aBckgrnd = rLayerAdmin.GetLayerID(SdResId(STR_LAYER_BCKGRND));
+        SdrLayerID aBckgrndObj = rLayerAdmin.GetLayerID(SdResId(STR_LAYER_BCKGRNDOBJ));
         SdrLayerIDSet aVisibleLayers = mpPage->TRG_GetMasterPageVisibleLayers();
 
         mbOldBckgrndVisible = aVisibleLayers.IsSet(aBckgrnd);
@@ -71,7 +71,7 @@ ModifyPageUndoAction::ModifyPageUndoAction(
         mbOldBckgrndObjsVisible = false;
     }
 
-    SetComment( SD_RESSTR(STR_UNDO_MODIFY_PAGE) );
+    SetComment( SdResId(STR_UNDO_MODIFY_PAGE) );
 }
 
 void ModifyPageUndoAction::Undo()
@@ -104,8 +104,8 @@ void ModifyPageUndoAction::Undo()
         }
 
         SdrLayerAdmin& rLayerAdmin = mpDoc->GetLayerAdmin();
-        SdrLayerID aBckgrnd = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND));
-        SdrLayerID aBckgrndObj = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ));
+        SdrLayerID aBckgrnd = rLayerAdmin.GetLayerID(SdResId(STR_LAYER_BCKGRND));
+        SdrLayerID aBckgrndObj = rLayerAdmin.GetLayerID(SdResId(STR_LAYER_BCKGRNDOBJ));
         SdrLayerIDSet aVisibleLayers;
         aVisibleLayers.Set(aBckgrnd, mbOldBckgrndVisible);
         aVisibleLayers.Set(aBckgrndObj, mbOldBckgrndObjsVisible);
@@ -147,8 +147,8 @@ void ModifyPageUndoAction::Redo()
         }
 
         SdrLayerAdmin& rLayerAdmin = mpDoc->GetLayerAdmin();
-        SdrLayerID aBckgrnd = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND));
-        SdrLayerID aBckgrndObj = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ));
+        SdrLayerID aBckgrnd = rLayerAdmin.GetLayerID(SdResId(STR_LAYER_BCKGRND));
+        SdrLayerID aBckgrndObj = rLayerAdmin.GetLayerID(SdResId(STR_LAYER_BCKGRNDOBJ));
         SdrLayerIDSet aVisibleLayers;
         aVisibleLayers.Set(aBckgrnd, mbNewBckgrndVisible);
         aVisibleLayers.Set(aBckgrndObj, mbNewBckgrndObjsVisible);
@@ -171,7 +171,7 @@ RenameLayoutTemplateUndoAction::RenameLayoutTemplateUndoAction(
     : SdUndoAction(pDocument)
     , maOldName(rOldLayoutName)
     , maNewName(rNewLayoutName)
-    , maComment(SD_RESSTR(STR_TITLE_RENAMESLIDE))
+    , maComment(SdResId(STR_TITLE_RENAMESLIDE))
 {
     sal_Int32 nPos = maOldName.indexOf(SD_LT_SEPARATOR);
     if (nPos != -1)
diff --git a/sd/source/ui/view/viewoverlaymanager.cxx b/sd/source/ui/view/viewoverlaymanager.cxx
index 60a396e2d865..f182d0d21975 100644
--- a/sd/source/ui/view/viewoverlaymanager.cxx
+++ b/sd/source/ui/view/viewoverlaymanager.cxx
@@ -182,7 +182,6 @@ void ImageButtonHdl::HideTip()
 
 void ImageButtonHdl::onMouseEnter(const MouseEvent& rMEvt)
 {
-
     if( pHdlList && pHdlList->GetView())
     {
         int nHighlightId = 0;
@@ -204,10 +203,7 @@ void ImageButtonHdl::onMouseEnter(const MouseEvent& rMEvt)
 
             if( pHdlList )
             {
-                SdResId aResId( gButtonToolTips[mnHighlightId] );
-                aResId.SetRT( RSC_STRING );
-
-                OUString aHelpText( aResId );
+                OUString aHelpText(SdResId(gButtonToolTips[mnHighlightId]));
                 ::tools::Rectangle aScreenRect( pDev->LogicToPixel( GetPos() ), maImageSize );
                 Help::ShowQuickHelp(static_cast< vcl::Window* >( pHdlList->GetView()->GetFirstOutputDevice() ), aScreenRect, aHelpText);
             }
diff --git a/sd/source/ui/view/viewshe3.cxx b/sd/source/ui/view/viewshe3.cxx
index c24307a678de..2a59f0ecdfab 100644
--- a/sd/source/ui/view/viewshe3.cxx
+++ b/sd/source/ui/view/viewshe3.cxx
@@ -145,7 +145,7 @@ void  ViewShell::GetMenuState( SfxItemSet &rSet )
         {
             // Set the necessary string like in
             // sfx2/source/view/viewfrm.cxx ver 1.23 ln 1072 ff.
-            OUString aTmp(SVT_RESSTR(STR_UNDO));
+            OUString aTmp(SvtResId(STR_UNDO));
             aTmp += pUndoManager->GetUndoActionComment();
             rSet.Put(SfxStringItem(SID_UNDO, aTmp));
         }
@@ -177,7 +177,7 @@ void  ViewShell::GetMenuState( SfxItemSet &rSet )
         {
             // Set the necessary string like in
             // sfx2/source/view/viewfrm.cxx ver 1.23 ln 1081 ff.
-            OUString aTmp(SVT_RESSTR(STR_REDO));
+            OUString aTmp(SvtResId(STR_REDO));
             aTmp += pUndoManager->GetRedoActionComment();
             rSet.Put(SfxStringItem(SID_REDO, aTmp));
         }
@@ -202,8 +202,8 @@ SdPage* ViewShell::CreateOrDuplicatePage (
     sal_uInt16 nSId = rRequest.GetSlot();
     SdDrawDocument* pDocument = GetDoc();
     SdrLayerAdmin& rLayerAdmin = pDocument->GetLayerAdmin();
-    SdrLayerID aBckgrnd = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND));
-    SdrLayerID aBckgrndObj = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ));
+    SdrLayerID aBckgrnd = rLayerAdmin.GetLayerID(SdResId(STR_LAYER_BCKGRND));
+    SdrLayerID aBckgrndObj = rLayerAdmin.GetLayerID(SdResId(STR_LAYER_BCKGRNDOBJ));
     SdrLayerIDSet aVisibleLayers;
     // Determine the page from which to copy some values, such as layers,
     // size, master page, to the new page.  This is usually the given page.
@@ -314,7 +314,7 @@ SdPage* ViewShell::CreateOrDuplicatePage (
     View* pDrView = GetView();
     const bool bUndo = pDrView && pDrView->IsUndoEnabled();
     if( bUndo )
-        pDrView->BegUndo(SD_RESSTR(STR_INSERTPAGE));
+        pDrView->BegUndo(SdResId(STR_INSERTPAGE));
 
     sal_uInt16 nNewPageIndex = 0xffff;
     switch (nSId)
author	Caolán McNamara <caolanm@redhat.com>	2017-05-18 21:14:00 +0100
committer	Caolán McNamara <caolanm@redhat.com>	2017-05-19 15:40:40 +0200
commit	2155e04d6343638ca9815d394cbc4f78c2b17c3a (patch)
tree	0378142f6ce9edb63074291aed45527568e7b254 /sd
parent	cee02e81cd3b55fb46eacf5db5713e8bf4363bcd (diff)