21 files changed, 32 insertions, 32 deletions
diff --git a/sd/source/ui/func/fucon3d.cxx b/sd/source/ui/func/fucon3d.cxx
index 07a946765bab..7db884efeefe 100644
--- a/sd/source/ui/func/fucon3d.cxx
+++ b/sd/source/ui/func/fucon3d.cxx
@@ -36,7 +36,7 @@
 #include <svx/camera3d.hxx>
 
 #include "app.hrc"
-#include "res_bmp.hrc"
+
 #include "View.hxx"
 #include "Window.hxx"
 #include "ViewShell.hxx"
diff --git a/sd/source/ui/func/fuconarc.cxx b/sd/source/ui/func/fuconarc.cxx
index 8860c006b2b7..1cb513f6ae60 100644
--- a/sd/source/ui/func/fuconarc.cxx
+++ b/sd/source/ui/func/fuconarc.cxx
@@ -33,7 +33,7 @@
 #include "app.hrc"
 #include "Window.hxx"
 #include "drawdoc.hxx"
-#include "res_bmp.hrc"
+
 #include "View.hxx"
 #include "ViewShell.hxx"
 #include "ViewShellBase.hxx"
diff --git a/sd/source/ui/func/fuconbez.cxx b/sd/source/ui/func/fuconbez.cxx
index 1de24b2bf9c9..ce8fbdde05c5 100644
--- a/sd/source/ui/func/fuconbez.cxx
+++ b/sd/source/ui/func/fuconbez.cxx
@@ -39,7 +39,7 @@
 #include "Window.hxx"
 #include "ToolBarManager.hxx"
 #include "drawdoc.hxx"
-#include "res_bmp.hrc"
+
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
 
diff --git a/sd/source/ui/func/fuconcs.cxx b/sd/source/ui/func/fuconcs.cxx
index 086163373eee..b91dccd0360d 100644
--- a/sd/source/ui/func/fuconcs.cxx
+++ b/sd/source/ui/func/fuconcs.cxx
@@ -62,8 +62,8 @@
 #include "Window.hxx"
 #include "stlpool.hxx"
 #include "drawdoc.hxx"
-#include "res_bmp.hrc"
-#include "glob.hrc"
+
+#include "strings.hrc"
 
 namespace sd {
 
diff --git a/sd/source/ui/func/fuconrec.cxx b/sd/source/ui/func/fuconrec.cxx
index 9add8904b85c..3871611bde24 100644
--- a/sd/source/ui/func/fuconrec.cxx
+++ b/sd/source/ui/func/fuconrec.cxx
@@ -21,7 +21,7 @@
 #include <svx/svdpagv.hxx>
 
 #include <svx/svxids.hrc>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 #include <svx/dialmgr.hxx>
 
 #include "app.hrc"
@@ -59,8 +59,8 @@
 #include "Window.hxx"
 #include "stlpool.hxx"
 #include "drawdoc.hxx"
-#include "res_bmp.hrc"
-#include "glob.hrc"
+
+#include "strings.hrc"
 
 namespace sd {
 
@@ -499,14 +499,14 @@ void FuConstructRectangle::SetAttributes(SfxItemSet& rAttr, SdrObject* pObj)
 /**
  * set line starts and ends for the object to be created
  */
-::basegfx::B2DPolyPolygon getPolygon( sal_uInt16 nResId, SdrModel* pDoc )
+::basegfx::B2DPolyPolygon getPolygon(const char* pResId, SdrModel* pDoc)
 {
     ::basegfx::B2DPolyPolygon aRetval;
     XLineEndListRef pLineEndList = pDoc->GetLineEndList();
 
     if( pLineEndList.is() )
     {
-        OUString aArrowName( SvxResId(nResId) );
+        OUString aArrowName(SvxResId(pResId));
         long nCount = pLineEndList->Count();
         long nIndex;
         for( nIndex = 0L; nIndex < nCount; nIndex++ )
diff --git a/sd/source/ui/func/fuconstr.cxx b/sd/source/ui/func/fuconstr.cxx
index d2edf1bbca02..b915f74e1233 100644
--- a/sd/source/ui/func/fuconstr.cxx
+++ b/sd/source/ui/func/fuconstr.cxx
@@ -28,7 +28,7 @@
 #include <sfx2/viewfrm.hxx>
 
 #include "app.hrc"
-#include "glob.hrc"
+#include "strings.hrc"
 #include "strings.hxx"
 #include "fudraw.hxx"
 #include "View.hxx"
diff --git a/sd/source/ui/func/fuconuno.cxx b/sd/source/ui/func/fuconuno.cxx
index 45a3f0f1f5cf..214814626665 100644
--- a/sd/source/ui/func/fuconuno.cxx
+++ b/sd/source/ui/func/fuconuno.cxx
@@ -29,7 +29,7 @@
 #include <svx/dialogs.hrc>
 
 #include "app.hrc"
-#include "glob.hrc"
+#include "strings.hrc"
 #include "ViewShell.hxx"
 #include "View.hxx"
 #include "Window.hxx"
@@ -37,7 +37,7 @@
 #include "ToolBarManager.hxx"
 #include "drawdoc.hxx"
 #include "sdresid.hxx"
-#include "res_bmp.hrc"
+
 
 namespace sd {
 
diff --git a/sd/source/ui/func/fudraw.cxx b/sd/source/ui/func/fudraw.cxx
index d1e023eed8c6..bb8db8ff8af5 100644
--- a/sd/source/ui/func/fudraw.cxx
+++ b/sd/source/ui/func/fudraw.cxx
@@ -41,9 +41,9 @@
 #include "anminfo.hxx"
 #include "imapinfo.hxx"
 #include "app.hrc"
-#include "glob.hrc"
 #include "strings.hrc"
-#include "res_bmp.hrc"
+#include "strings.hrc"
+
 
 #include "sdmod.hxx"
 #include "GraphicDocShell.hxx"
diff --git a/sd/source/ui/func/fuediglu.cxx b/sd/source/ui/func/fuediglu.cxx
index 53c6a8450b66..1142e77ae1f9 100644
--- a/sd/source/ui/func/fuediglu.cxx
+++ b/sd/source/ui/func/fuediglu.cxx
@@ -25,7 +25,7 @@
 
 #include "app.hrc"
 #include "strings.hrc"
-#include "res_bmp.hrc"
+
 #include "Window.hxx"
 #include "drawdoc.hxx"
 #include "FrameView.hxx"
diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx
index 14487d300c3f..413e76224514 100644
--- a/sd/source/ui/func/fuinsert.cxx
+++ b/sd/source/ui/func/fuinsert.cxx
@@ -37,7 +37,7 @@
 #include <sfx2/docfile.hxx>
 #include <sfx2/msgpool.hxx>
 #include <sfx2/filedlghelper.hxx>
-#include <svtools/sores.hxx>
+#include <svtools/strings.hrc>
 #include <svtools/insdlg.hxx>
 #include <sfx2/request.hxx>
 #include <svl/globalnameitem.hxx>
@@ -85,7 +85,7 @@
 #include <vcl/svapp.hxx>
 #include "undo/undoobjects.hxx"
 #include <memory>
-#include "glob.hrc"
+#include "strings.hrc"
 
 #include <config_features.h>
 
diff --git a/sd/source/ui/func/fuinsfil.cxx b/sd/source/ui/func/fuinsfil.cxx
index 9b15e53d8245..daf8b0a00c72 100644
--- a/sd/source/ui/func/fuinsfil.cxx
+++ b/sd/source/ui/func/fuinsfil.cxx
@@ -51,7 +51,7 @@
 #include "View.hxx"
 #include "strings.hrc"
 #include "stlpool.hxx"
-#include "glob.hrc"
+#include "strings.hrc"
 #include "sdpage.hxx"
 #include "strmname.h"
 #include "ViewShellBase.hxx"
diff --git a/sd/source/ui/func/fuoaprms.cxx b/sd/source/ui/func/fuoaprms.cxx
index 95a94b859c6b..0fbecf437dfa 100644
--- a/sd/source/ui/func/fuoaprms.cxx
+++ b/sd/source/ui/func/fuoaprms.cxx
@@ -33,7 +33,7 @@
 #include "svx/xtable.hxx"
 
 #include "strings.hrc"
-#include "glob.hrc"
+#include "strings.hrc"
 #include "drawdoc.hxx"
 #include "ViewShell.hxx"
 #include "ViewShellBase.hxx"
diff --git a/sd/source/ui/func/fuolbull.cxx b/sd/source/ui/func/fuolbull.cxx
index f171a22cc1ec..24803eb84020 100644
--- a/sd/source/ui/func/fuolbull.cxx
+++ b/sd/source/ui/func/fuolbull.cxx
@@ -25,7 +25,7 @@
 #include <sfx2/request.hxx>
 #include <editeng/numitem.hxx>
 #include "sdresid.hxx"
-#include "glob.hrc"
+#include "strings.hrc"
 #include "strings.hxx"
 
 #include <editeng/editdata.hxx>
diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx
index 2cd427f0b19b..f93561f116ad 100644
--- a/sd/source/ui/func/fupage.cxx
+++ b/sd/source/ui/func/fupage.cxx
@@ -43,7 +43,7 @@
 #include <editeng/lrspitem.hxx>
 #include <svx/sdr/properties/properties.hxx>
 #include <sfx2/bindings.hxx>
-#include "glob.hrc"
+#include "strings.hrc"
 #include <editeng/shaditem.hxx>
 #include <editeng/boxitem.hxx>
 #include <editeng/sizeitem.hxx>
diff --git a/sd/source/ui/func/fuprlout.cxx b/sd/source/ui/func/fuprlout.cxx
index b2b09be755e5..d2e10546c104 100644
--- a/sd/source/ui/func/fuprlout.cxx
+++ b/sd/source/ui/func/fuprlout.cxx
@@ -35,7 +35,7 @@
 #include "FrameView.hxx"
 #include "stlpool.hxx"
 #include "View.hxx"
-#include "glob.hrc"
+#include "strings.hrc"
 #include "glob.hxx"
 #include "strings.hrc"
 #include "strmname.h"
diff --git a/sd/source/ui/func/fuprobjs.cxx b/sd/source/ui/func/fuprobjs.cxx
index 169dd4f237f3..86b104f84c54 100644
--- a/sd/source/ui/func/fuprobjs.cxx
+++ b/sd/source/ui/func/fuprobjs.cxx
@@ -25,9 +25,9 @@
 #include <svl/hint.hxx>
 
 #include "app.hrc"
-#include "res_bmp.hrc"
+
+#include "strings.hrc"
 #include "strings.hrc"
-#include "glob.hrc"
 #include "prltempl.hrc"
 #include "strings.hxx"
 
diff --git a/sd/source/ui/func/fusel.cxx b/sd/source/ui/func/fusel.cxx
index f3df9d260562..8907eb159326 100644
--- a/sd/source/ui/func/fusel.cxx
+++ b/sd/source/ui/func/fusel.cxx
@@ -44,7 +44,7 @@
 
 #include "app.hrc"
 #include "strings.hrc"
-#include "res_bmp.hrc"
+
 #include "GraphicDocShell.hxx"
 #include "sdmod.hxx"
 #include "DrawDocShell.hxx"
diff --git a/sd/source/ui/func/fusldlg.cxx b/sd/source/ui/func/fusldlg.cxx
index c0ab1580bf6c..329ddbaf849c 100644
--- a/sd/source/ui/func/fusldlg.cxx
+++ b/sd/source/ui/func/fusldlg.cxx
@@ -26,7 +26,7 @@
 #include "sdresid.hxx"
 #include "strings.hrc"
 #include "sdattr.hxx"
-#include "glob.hrc"
+#include "strings.hrc"
 #include "sdmod.hxx"
 #include "ViewShell.hxx"
 #include "Window.hxx"
diff --git a/sd/source/ui/func/futempl.cxx b/sd/source/ui/func/futempl.cxx
index 3a5ce9adb82e..1ec074ebfd7d 100644
--- a/sd/source/ui/func/futempl.cxx
+++ b/sd/source/ui/func/futempl.cxx
@@ -57,8 +57,8 @@
 #include "DrawDocShell.hxx"
 #include "DrawViewShell.hxx"
 #include "ViewShell.hxx"
-#include "res_bmp.hrc"
-#include "glob.hrc"
+
+#include "strings.hrc"
 #include "prlayout.hxx"
 #include "prltempl.hrc"
 #include <svx/xfillit.hxx>
diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx
index f4ccb45eb6c2..1690404032ef 100644
--- a/sd/source/ui/func/futext.cxx
+++ b/sd/source/ui/func/futext.cxx
@@ -54,7 +54,7 @@
 
 #include "sdresid.hxx"
 #include "app.hrc"
-#include "res_bmp.hrc"
+
 #include "ViewShell.hxx"
 #include "ViewShellBase.hxx"
 #include "View.hxx"
@@ -66,7 +66,7 @@
 #include "FrameView.hxx"
 #include "ToolBarManager.hxx"
 #include "DrawDocShell.hxx"
-#include "glob.hrc"
+#include "strings.hrc"
 #include "pres.hxx"
 #include "optsitem.hxx"
 
diff --git a/sd/source/ui/func/futhes.cxx b/sd/source/ui/func/futhes.cxx
index 1f361c0f4868..7675f474b3e3 100644
--- a/sd/source/ui/func/futhes.cxx
+++ b/sd/source/ui/func/futhes.cxx
@@ -67,7 +67,7 @@ rtl::Reference<FuPoor> FuThesaurus::Create( ViewShell* pViewSh, ::sd::Window* pW
 void FuThesaurus::DoExecute( SfxRequest& )
 {
     SfxErrorContext aContext(ERRCTX_SVX_LINGU_THESAURUS, OUString(),
-                             mpWindow, RID_SVXERRCTX, &DIALOG_MGR() );
+                             mpWindow, getRID_SVXERRCTX(), &SvxResLocale());
 
     if (mpViewShell && dynamic_cast< DrawViewShell *>( mpViewShell ) !=  nullptr)
     {