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

4 files changed, 9 insertions, 10 deletions

diff --git a/svtools/inc/pch/precompiled_svt.hxx b/svtools/inc/pch/precompiled_svt.hxx
index 189391a74379..d7e516d25daf 100644
--- a/svtools/inc/pch/precompiled_svt.hxx
+++ b/svtools/inc/pch/precompiled_svt.hxx
@@ -375,7 +375,6 @@
 #include <tools/multisel.hxx>
 #include <tools/poly.hxx>
 #include <tools/ref.hxx>
-#include <tools/resmgr.hxx>
 #include <tools/solar.h>
 #include <tools/stream.hxx>
 #include <tools/time.hxx>
@@ -398,6 +397,7 @@
 #include <unotools/nativenumberwrapper.hxx>
 #include <unotools/options.hxx>
 #include <unotools/readwritemutexguard.hxx>
+#include <unotools/resmgr.hxx>
 #include <unotools/streamwrap.hxx>
 #include <unotools/syslocale.hxx>
 #include <unotools/transliterationwrapper.hxx>
diff --git a/svtools/source/graphic/provider.cxx b/svtools/source/graphic/provider.cxx
index 6c8f162da847..892f4299977f 100644
--- a/svtools/source/graphic/provider.cxx
+++ b/svtools/source/graphic/provider.cxx
@@ -22,7 +22,7 @@
 #include <vcl/metaact.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/imagerepository.hxx>
-#include <tools/resmgr.hxx>
+#include <unotools/resmgr.hxx>
 #include <tools/fract.hxx>
 #include <unotools/ucbstreamhelper.hxx>
 #include <vcl/graphicfilter.hxx>
diff --git a/svtools/source/misc/ehdl.cxx b/svtools/source/misc/ehdl.cxx
index 6e38437f79ac..47a5689ec031 100644
--- a/svtools/source/misc/ehdl.cxx
+++ b/svtools/source/misc/ehdl.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <tools/resmgr.hxx>
+#include <unotools/resmgr.hxx>
 #include <tools/wintypes.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/svapp.hxx>
@@ -145,7 +145,7 @@ SfxErrorHandler::SfxErrorHandler(const ErrMsgCode* pIdPs, ErrCode lStartP, ErrCo
     ErrorRegistry::RegisterDisplay(&aWndFunc);
     if (!pResLocale)
     {
-        xFreeLocale.reset(new std::locale(Translate::Create("svt", Application::GetSettings().GetUILanguageTag())));
+        xFreeLocale.reset(new std::locale(Translate::Create("svt")));
         pResLocale = xFreeLocale.get();
     }
 }
@@ -197,7 +197,7 @@ void SfxErrorHandler::GetClassString(sal_uLong lClassId, OUString &rStr)
     */
 
 {
-    std::locale loc(Translate::Create("svt", Application::GetSettings().GetUILanguageTag()));
+    std::locale loc(Translate::Create("svt"));
     for (const ErrMsgCode* pItem = getRID_ERRHDL(); pItem->second; ++pItem)
     {
         if (sal_uInt32(pItem->second) == lClassId)
@@ -277,7 +277,7 @@ bool SfxErrorContext::GetString(ErrCode nErrId, OUString &rStr)
     std::locale* pFreeLocale = nullptr;
     if (!pResLocale)
     {
-        pFreeLocale = new std::locale(Translate::Create("svt", Application::GetSettings().GetUILanguageTag()));
+        pFreeLocale = new std::locale(Translate::Create("svt"));
         pResLocale = pFreeLocale;
     }
     if (pResLocale)
diff --git a/svtools/source/misc/svtresid.cxx b/svtools/source/misc/svtresid.cxx
index c3e5ecbd1239..e6cac0b9b981 100644
--- a/svtools/source/misc/svtresid.cxx
+++ b/svtools/source/misc/svtresid.cxx
@@ -17,17 +17,16 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <tools/resmgr.hxx>
+#include <unotools/resmgr.hxx>
+#include <tools/solar.h>
 #include <svtools/svtresid.hxx>
-#include <vcl/svapp.hxx>
-#include <vcl/settings.hxx>
 
 static std::locale* pResLocale=nullptr;
 
 std::locale* SvtResLocale::GetResLocale()
 {
     if (!pResLocale)
-        pResLocale = new std::locale(Translate::Create("svt", SvtSysLocale().GetUILanguageTag()));
+        pResLocale = new std::locale(Translate::Create("svt"));
     return pResLocale;
 }