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

15 files changed, 27 insertions, 27 deletions

diff --git a/uui/source/alreadyopen.cxx b/uui/source/alreadyopen.cxx
index 9445fc4b0fa0..755d82171edc 100644
--- a/uui/source/alreadyopen.cxx
+++ b/uui/source/alreadyopen.cxx
@@ -19,7 +19,7 @@
 
 #include "strings.hrc"
 #include "alreadyopen.hxx"
-#include <tools/resmgr.hxx>
+#include <unotools/resmgr.hxx>
 
 AlreadyOpenQueryBox::AlreadyOpenQueryBox( vcl::Window* pParent, const std::locale& rLocale, const OUString& aMessage, bool bIsStoring ) :
     MessBox(pParent, 0,
diff --git a/uui/source/filechanged.cxx b/uui/source/filechanged.cxx
index 7fefdba84f08..97c98d216438 100644
--- a/uui/source/filechanged.cxx
+++ b/uui/source/filechanged.cxx
@@ -18,7 +18,7 @@
  */
 
 #include "strings.hrc"
-#include <tools/resmgr.hxx>
+#include <unotools/resmgr.hxx>
 #include "filechanged.hxx"
 
 FileChangedQueryBox::FileChangedQueryBox( vcl::Window* pParent, const std::locale& rLocale ) :
diff --git a/uui/source/iahndl-authentication.cxx b/uui/source/iahndl-authentication.cxx
index bf1392e90f0f..a45cae432d1b 100644
--- a/uui/source/iahndl-authentication.cxx
+++ b/uui/source/iahndl-authentication.cxx
@@ -34,7 +34,7 @@
 
 #include <osl/diagnose.h>
 #include <rtl/digest.h>
-#include <tools/resmgr.hxx>
+#include <unotools/resmgr.hxx>
 #include <vcl/errcode.hxx>
 #include <vcl/errinf.hxx>
 #include <vcl/msgbox.hxx>
@@ -101,7 +101,7 @@ executeLoginDialog(
 
         if (bSavePassword)
         {
-            std::locale aLocale(Translate::Create("uui", Application::GetSettings().GetUILanguageTag()));
+            std::locale aLocale(Translate::Create("uui"));
             xDialog->SetSavePasswordText(
                 Translate::get(rInfo.GetIsRememberPersistent()
                           ? RID_SAVE_PASSWORD
@@ -414,7 +414,7 @@ executeMasterPasswordDialog(
     {
         SolarMutexGuard aGuard;
 
-        std::locale aResLocale(Translate::Create("uui", Application::GetSettings().GetUILanguageTag()));
+        std::locale aResLocale(Translate::Create("uui"));
         if( nMode == task::PasswordRequestMode_PASSWORD_CREATE )
         {
             ScopedVclPtrInstance< MasterPasswordCreateDialog > xDialog(
@@ -512,7 +512,7 @@ executePasswordDialog(
     {
         SolarMutexGuard aGuard;
 
-        std::locale aResLocale(Translate::Create("uui", Application::GetSettings().GetUILanguageTag()));
+        std::locale aResLocale(Translate::Create("uui"));
         if( nMode == task::PasswordRequestMode_PASSWORD_CREATE )
         {
             if (bIsSimplePasswordRequest)
diff --git a/uui/source/iahndl-errorhandler.cxx b/uui/source/iahndl-errorhandler.cxx
index 5818b24220eb..260ad0b9aa01 100644
--- a/uui/source/iahndl-errorhandler.cxx
+++ b/uui/source/iahndl-errorhandler.cxx
@@ -29,7 +29,7 @@
 #include <svtools/strings.hrc>
 #include <svx/svxerr.hxx>
 #include <svx/dialogs.hrc>
-#include <tools/resmgr.hxx>
+#include <unotools/resmgr.hxx>
 
 #include "ids.hxx"
 #include "ids.hrc"
@@ -167,7 +167,7 @@ UUIInteractionHelper::handleErrorHandlerRequest(
             SOURCE_SVX :
             SOURCE_UUI;
 
-        std::locale aResLocale = Translate::Create(aManager[eSource], Application::GetSettings().GetUILanguageTag());
+        std::locale aResLocale = Translate::Create(aManager[eSource]);
         ErrorResource aErrorResource(aId[eSource], aResLocale);
         if (!aErrorResource.getString(nErrorCode, aMessage))
             return;
diff --git a/uui/source/iahndl-locking.cxx b/uui/source/iahndl-locking.cxx
index 927351727129..1ea6cf3e9de4 100644
--- a/uui/source/iahndl-locking.cxx
+++ b/uui/source/iahndl-locking.cxx
@@ -30,7 +30,7 @@
 #include <com/sun/star/task/XInteractionAbort.hpp>
 #include <com/sun/star/task/XInteractionRequest.hpp>
 
-#include <tools/resmgr.hxx>
+#include <unotools/resmgr.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/msgbox.hxx>
 
@@ -74,7 +74,7 @@ handleLockedDocumentRequest_(
     try
     {
         SolarMutexGuard aGuard;
-        std::locale aResLocale = Translate::Create("uui", Application::GetSettings().GetUILanguageTag());
+        std::locale aResLocale = Translate::Create("uui");
 
         OUString aMessage;
         std::vector< OUString > aArguments;
@@ -153,7 +153,7 @@ handleChangedByOthersRequest_(
     try
     {
         SolarMutexGuard aGuard;
-        std::locale aResLocale = Translate::Create("uui", Application::GetSettings().GetUILanguageTag());
+        std::locale aResLocale = Translate::Create("uui");
         ScopedVclPtrInstance< FileChangedQueryBox > xDialog(pParent, aResLocale);
         sal_Int32 nResult = xDialog->Execute();
 
@@ -189,7 +189,7 @@ handleLockFileProblemRequest_(
     try
     {
         SolarMutexGuard aGuard;
-        std::locale aResLocale = Translate::Create("uui", Application::GetSettings().GetUILanguageTag());
+        std::locale aResLocale = Translate::Create("uui");
 
         sal_Int32 nResult;
 
diff --git a/uui/source/iahndl-ssl.cxx b/uui/source/iahndl-ssl.cxx
index c835cdeb1f04..e27efb9ff10f 100644
--- a/uui/source/iahndl-ssl.cxx
+++ b/uui/source/iahndl-ssl.cxx
@@ -31,7 +31,7 @@
 #include <comphelper/sequence.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <svl/zforlist.hxx>
-#include <tools/resmgr.hxx>
+#include <unotools/resmgr.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 
@@ -155,7 +155,7 @@ executeUnknownAuthDialog(
         std::vector< OUString > aArguments;
         aArguments.push_back( getContentPart( rXCert->getSubjectName()) );
 
-        std::locale aResLocale(Translate::Create("uui", Application::GetSettings().GetUILanguageTag()));
+        std::locale aResLocale(Translate::Create("uui"));
         ErrorResource aErrorResource(RID_UUI_ERRHDL, aResLocale);
 
         if (aErrorResource.getString(ERRCODE_UUI_UNKNOWNAUTH_UNTRUSTED, aMessage))
@@ -213,7 +213,7 @@ executeSSLWarnDialog(
                 break;
         }
 
-        std::locale aResLocale(Translate::Create("uui", Application::GetSettings().GetUILanguageTag()));
+        std::locale aResLocale(Translate::Create("uui"));
         ErrorResource aErrorResource(RID_UUI_ERRHDL, aResLocale);
 
         if (aErrorResource.getString(
diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx
index b397d52b7a97..5b4447bd83f2 100644
--- a/uui/source/iahndl.cxx
+++ b/uui/source/iahndl.cxx
@@ -61,7 +61,7 @@
 
 #include <rtl/strbuf.hxx>
 #include <osl/conditn.hxx>
-#include <tools/resmgr.hxx>
+#include <unotools/resmgr.hxx>
 #include <vcl/errinf.hxx>
 #include <osl/thread.hxx>
 #include <tools/diagnose_ex.h>
@@ -998,7 +998,7 @@ NameClashResolveDialogResult executeSimpleNameClashResolveDialog( vcl::Window *p
                                                                   OUString & rProposedNewName,
                                                                   bool bAllowOverwrite )
 {
-    std::locale aResLocale = Translate::Create("uui", Application::GetSettings().GetUILanguageTag());
+    std::locale aResLocale = Translate::Create("uui");
     ScopedVclPtrInstance<NameClashDialog> aDialog(pParent, aResLocale, rTargetFolderURL,
                                                   rClashingName, rProposedNewName, bAllowOverwrite);
 
@@ -1100,7 +1100,7 @@ UUIInteractionHelper::handleGenericErrorRequest(
             OUString aErrorString;
             ErrorHandler::GetErrorString( nErrorCode, aErrorString );
 
-            std::locale aResLocale = Translate::Create("uui", Application::GetSettings().GetUILanguageTag());
+            std::locale aResLocale = Translate::Create("uui");
             OUString aTitle( utl::ConfigManager::getProductName() );
 
             OUString aErrTitle = Translate::get(STR_WARNING_INCOMPLETE_ENCRYPTION_TITLE, aResLocale);
@@ -1194,7 +1194,7 @@ UUIInteractionHelper::handleBrokenPackageRequest(
 
     OUString aMessage;
     {
-        std::locale aResLocale = Translate::Create("uui", Application::GetSettings().GetUILanguageTag());
+        std::locale aResLocale = Translate::Create("uui");
         ErrorResource aErrorResource(RID_UUI_ERRHDL, aResLocale);
         if (!aErrorResource.getString(nErrorCode, aMessage))
             return;
diff --git a/uui/source/lockcorrupt.cxx b/uui/source/lockcorrupt.cxx
index 9230dc80e890..a101a6794332 100644
--- a/uui/source/lockcorrupt.cxx
+++ b/uui/source/lockcorrupt.cxx
@@ -20,7 +20,7 @@
 #include "ids.hxx"
 #include "strings.hrc"
 #include "lockcorrupt.hxx"
-#include <tools/resmgr.hxx>
+#include <unotools/resmgr.hxx>
 #include <vcl/button.hxx>
 
 LockCorruptQueryBox::LockCorruptQueryBox(vcl::Window* pParent, const std::locale& rResLocale)
diff --git a/uui/source/lockfailed.cxx b/uui/source/lockfailed.cxx
index 4b829e9af568..e5d00b9a01a6 100644
--- a/uui/source/lockfailed.cxx
+++ b/uui/source/lockfailed.cxx
@@ -19,7 +19,7 @@
 
 #include "strings.hrc"
 #include "lockfailed.hxx"
-#include <tools/resmgr.hxx>
+#include <unotools/resmgr.hxx>
 #include <vcl/button.hxx>
 
 LockFailedQueryBox::LockFailedQueryBox(vcl::Window* pParent, const std::locale& rResLocale)
diff --git a/uui/source/masterpasscrtdlg.cxx b/uui/source/masterpasscrtdlg.cxx
index 58e6a736a316..37e5c2a53116 100644
--- a/uui/source/masterpasscrtdlg.cxx
+++ b/uui/source/masterpasscrtdlg.cxx
@@ -18,7 +18,7 @@
  */
 
 #include <sal/macros.h>
-#include <tools/resmgr.hxx>
+#include <unotools/resmgr.hxx>
 #include <vcl/layout.hxx>
 #include "strings.hrc"
 #include "masterpasscrtdlg.hxx"
diff --git a/uui/source/masterpassworddlg.cxx b/uui/source/masterpassworddlg.cxx
index 3afe239cd039..2ee6308c6cbc 100644
--- a/uui/source/masterpassworddlg.cxx
+++ b/uui/source/masterpassworddlg.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 <vcl/layout.hxx>
 #include "strings.hrc"
 #include "masterpassworddlg.hxx"
diff --git a/uui/source/nameclashdlg.cxx b/uui/source/nameclashdlg.cxx
index 2d5f1f0ed24b..a2b8164a8eab 100644
--- a/uui/source/nameclashdlg.cxx
+++ b/uui/source/nameclashdlg.cxx
@@ -18,7 +18,7 @@
  */
 
 #include <osl/file.hxx>
-#include <tools/resmgr.hxx>
+#include <unotools/resmgr.hxx>
 #include <vcl/layout.hxx>
 
 #include "strings.hrc"
diff --git a/uui/source/openlocked.cxx b/uui/source/openlocked.cxx
index 1808a405995d..cae6baa2b0c0 100644
--- a/uui/source/openlocked.cxx
+++ b/uui/source/openlocked.cxx
@@ -19,7 +19,7 @@
 
 #include "strings.hrc"
 #include "openlocked.hxx"
-#include <tools/resmgr.hxx>
+#include <unotools/resmgr.hxx>
 
 OpenLockedQueryBox::OpenLockedQueryBox( vcl::Window* pParent, const std::locale& rResLocale, const OUString& aMessage ) :
     MessBox(pParent, 0,
diff --git a/uui/source/passworddlg.cxx b/uui/source/passworddlg.cxx
index aa1fd0e53cb5..c4edd844b0d5 100644
--- a/uui/source/passworddlg.cxx
+++ b/uui/source/passworddlg.cxx
@@ -20,7 +20,7 @@
 #include "passworddlg.hxx"
 #include "strings.hrc"
 
-#include <tools/resmgr.hxx>
+#include <unotools/resmgr.hxx>
 #include <tools/urlobj.hxx>
 #include <vcl/layout.hxx>
 
diff --git a/uui/source/trylater.cxx b/uui/source/trylater.cxx
index de5ca390580d..a7eb623d1fc4 100644
--- a/uui/source/trylater.cxx
+++ b/uui/source/trylater.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 "strings.hrc"
 #include "trylater.hxx"