move resmgr to unotools

and the vast majority of translations is to the ui language so default
ctor with that arg

and now drop OModuleResourceClient

Change-Id: I3b85a560ffdfe5f019c2271ac56a5fe4a361522b

5 files changed, 9 insertions, 10 deletions

diff --git a/sfx2/inc/pch/precompiled_sfx.hxx b/sfx2/inc/pch/precompiled_sfx.hxx
index e381e7370484..cea43ef5b833 100644
--- a/sfx2/inc/pch/precompiled_sfx.hxx
+++ b/sfx2/inc/pch/precompiled_sfx.hxx
@@ -403,7 +403,6 @@
 #include <tools/link.hxx>
 #include <tools/poly.hxx>
 #include <tools/ref.hxx>
-#include <tools/resmgr.hxx>
 #include <tools/solar.h>
 #include <tools/stream.hxx>
 #include <tools/svborder.hxx>
@@ -428,6 +427,7 @@
 #include <unotools/options.hxx>
 #include <unotools/pathoptions.hxx>
 #include <unotools/printwarningoptions.hxx>
+#include <unotools/resmgr.hxx>
 #include <unotools/saveopt.hxx>
 #include <unotools/securityoptions.hxx>
 #include <unotools/streamwrap.hxx>
diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx
index 2bc435a1da16..d163e80226dc 100644
--- a/sfx2/source/appl/appinit.cxx
+++ b/sfx2/source/appl/appinit.cxx
@@ -29,7 +29,7 @@
 #include <basic/sbdef.hxx>
 #include <svtools/soerr.hxx>
 #include <svtools/strings.hrc>
-#include <tools/resmgr.hxx>
+#include <unotools/resmgr.hxx>
 #include <unotools/configmgr.hxx>
 #include <unotools/saveopt.hxx>
 #include <svl/intitem.hxx>
@@ -215,9 +215,9 @@ void SfxApplication::Initialize_Impl()
         getRID_ERRHDL(), ErrCode(ERRCODE_AREA_IO), ErrCode(ERRCODE_AREA_SVX));
 
 #if HAVE_FEATURE_SCRIPTING
-    pImpl->aBasicResLocale = Translate::Create("sb", Application::GetSettings().GetUILanguageTag());
+    pImpl->aBasicResLocale = Translate::Create("sb");
 #endif
-    pImpl->aSvtResLocale = Translate::Create("svt", Application::GetSettings().GetUILanguageTag());
+    pImpl->aSvtResLocale = Translate::Create("svt");
 
     pImpl->m_pSoErrorHdl = new SfxErrorHandler(
         getRID_SO_ERROR_HANDLER(), ErrCode(ERRCODE_AREA_SO), ErrCode(ERRCODE_AREA_SO_END), &(pImpl->aSvtResLocale));
diff --git a/sfx2/source/bastyp/frmhtmlw.cxx b/sfx2/source/bastyp/frmhtmlw.cxx
index f25562df5647..773f5c09bdf8 100644
--- a/sfx2/source/bastyp/frmhtmlw.cxx
+++ b/sfx2/source/bastyp/frmhtmlw.cxx
@@ -25,7 +25,7 @@
 #include <svl/urihelper.hxx>
 #include <tools/datetime.hxx>
 #include <tools/stream.hxx>
-#include <tools/resmgr.hxx>
+#include <unotools/resmgr.hxx>
 
 #include <sfx2/frmhtmlw.hxx>
 #include <sfx2/evntconf.hxx>
diff --git a/sfx2/source/bastyp/sfxresid.cxx b/sfx2/source/bastyp/sfxresid.cxx
index 97c8f48a436d..3aa36da218f9 100644
--- a/sfx2/source/bastyp/sfxresid.cxx
+++ b/sfx2/source/bastyp/sfxresid.cxx
@@ -19,9 +19,8 @@
 
 
 #include <sfx2/sfxresid.hxx>
-#include <vcl/settings.hxx>
-#include <vcl/svapp.hxx>
-#include "tools/resmgr.hxx"
+#include <tools/solar.h>
+#include "unotools/resmgr.hxx"
 
 static std::locale* pResLocale = nullptr;
 
@@ -29,7 +28,7 @@ std::locale* SfxResLocale::GetResLocale()
 {
     if (!pResLocale)
     {
-        pResLocale = new std::locale(Translate::Create("sfx", Application::GetSettings().GetUILanguageTag()));
+        pResLocale = new std::locale(Translate::Create("sfx"));
     }
 
     return pResLocale;
diff --git a/sfx2/source/dialog/styfitem.cxx b/sfx2/source/dialog/styfitem.cxx
index 907b4ead60ef..6b4c453bfdd0 100644
--- a/sfx2/source/dialog/styfitem.cxx
+++ b/sfx2/source/dialog/styfitem.cxx
@@ -18,7 +18,7 @@
  */
 
 #include <sfx2/styfitem.hxx>
-#include <tools/resmgr.hxx>
+#include <unotools/resmgr.hxx>
 
 SfxStyleFamilyItem::SfxStyleFamilyItem(SfxStyleFamily nFamily_, const OUString &rName, const Image& rImage, const std::pair<const char*, int>* pStringArray, const std::locale& rResLocale)
     : nFamily(nFamily_)