From b1d829e52e826b6ea4ae884a64fdb68b66c74dd7 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Mon, 31 Jul 2017 17:16:27 +0100
Subject: 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
---
 basctl/inc/pch/precompiled_basctl.hxx | 2 +-
 basctl/source/basicide/iderdll.cxx    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'basctl')

diff --git a/basctl/inc/pch/precompiled_basctl.hxx b/basctl/inc/pch/precompiled_basctl.hxx
index 69b2ecdd34c3..bdaaa6058bc6 100644
--- a/basctl/inc/pch/precompiled_basctl.hxx
+++ b/basctl/inc/pch/precompiled_basctl.hxx
@@ -543,7 +543,6 @@
 #include <tools/mapunit.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>
@@ -565,6 +564,7 @@
 #include <unotools/fontdefs.hxx>
 #include <unotools/options.hxx>
 #include <unotools/readwritemutexguard.hxx>
+#include <unotools/resmgr.hxx>
 #include <unotools/unotoolsdllapi.h>
 #include <xmlscript/xmldlg_imexp.hxx>
 
diff --git a/basctl/source/basicide/iderdll.cxx b/basctl/source/basicide/iderdll.cxx
index 7a2b80ae4c78..2435b9b31901 100644
--- a/basctl/source/basicide/iderdll.cxx
+++ b/basctl/source/basicide/iderdll.cxx
@@ -33,7 +33,7 @@
 #include <svx/svxids.hrc>
 #include <com/sun/star/frame/Desktop.hpp>
 #include <com/sun/star/script/XLibraryContainerPassword.hpp>
-#include <tools/resmgr.hxx>
+#include <unotools/resmgr.hxx>
 #include <vcl/settings.hxx>
 #include <o3tl/make_unique.hxx>
 
@@ -118,7 +118,7 @@ Dll::Dll () :
 {
     SfxObjectFactory& rFactory = DocShell::Factory();
 
-    std::locale loc = Translate::Create("basctl", Application::GetSettings().GetUILanguageTag());
+    std::locale loc = Translate::Create("basctl");
 
     auto pModule = o3tl::make_unique<Module>(loc, &rFactory);
     SfxModule* pMod = pModule.get();
-- 
cgit