22 files changed, 74 insertions, 74 deletions
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/fuprobjs.cxx b/sd/source/ui/func/fuprobjs.cxx
index 7a87b97976e8..7f8fed69b2a9 100644
--- a/sd/source/ui/func/fuprobjs.cxx
+++ b/sd/source/ui/func/fuprobjs.cxx
@@ -140,7 +140,7 @@ void FuPresentationObjects::DoExecute( SfxRequest& )
             SfxStyleSheetBase& rStyleSheet = *pStyleSheet;
 
             SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
-            ScopedVclPtr<SfxAbstractTabDialog> pDlg(pFact ? pFact->CreateSdPresLayoutTemplateDlg( mpDocSh, mpViewShell->GetActiveWindow(), SdResId( nDlgId ), rStyleSheet, ePO, pStyleSheetPool ) : nullptr);
+            ScopedVclPtr<SfxAbstractTabDialog> pDlg(pFact ? pFact->CreateSdPresLayoutTemplateDlg( mpDocSh, mpViewShell->GetActiveWindow(), nDlgId, rStyleSheet, ePO, pStyleSheetPool ) : nullptr);
             if( pDlg && (pDlg->Execute() == RET_OK) )
             {
                 const SfxItemSet* pOutSet = pDlg->GetOutputItemSet();
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 77a53c1d7d23..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();
@@ -383,7 +383,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq )
 
                     if( !bOldDocInOtherLanguage )
                     {
-                        pPresDlg.disposeAndReset(pFact ? pFact->CreateSdPresLayoutTemplateDlg( mpDocSh,  mpViewShell->GetActiveWindow(), SdResId(nDlgId), *pStyleSheet, ePO, pSSPool ) : nullptr);
+                        pPresDlg.disposeAndReset(pFact ? pFact->CreateSdPresLayoutTemplateDlg( mpDocSh,  mpViewShell->GetActiveWindow(), nDlgId, *pStyleSheet, ePO, pSSPool ) : nullptr);
                     }
                 }
                 else if (eFamily == SD_STYLE_FAMILY_CELL)
@@ -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()