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

3 files changed, 10 insertions, 66 deletions

diff --git a/include/unotools/componentresmodule.hxx b/include/unotools/componentresmodule.hxx
deleted file mode 100644
index ee19e99f53b0..000000000000
--- a/include/unotools/componentresmodule.hxx
+++ /dev/null
@@ -1,57 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef INCLUDED_UNOTOOLS_COMPONENTRESMODULE_HXX
-#define INCLUDED_UNOTOOLS_COMPONENTRESMODULE_HXX
-
-#include <comphelper/componentmodule.hxx>
-#include <unotools/unotoolsdllapi.h>
-#include <osl/getglobalmutex.hxx>
-#include <memory>
-
-class LanguageTag;
-
-namespace utl
-{
-
-    class OComponentResModuleImpl;
-
-    /** extends the comphelper::OModule implementation with
-        simply resource access
-    */
-    class UNOTOOLS_DLLPUBLIC OComponentResourceModule : public ::comphelper::OModule
-    {
-    private:
-        typedef ::comphelper::OModule   BaseClass;
-
-    private:
-        ::std::unique_ptr< OComponentResModuleImpl >  m_pImpl;
-
-    public:
-        OComponentResourceModule(const OString& _rResFilePrefix, const LanguageTag& rLanguage);
-        virtual ~OComponentResourceModule() override;
-
-        /// get the resource locale of the module
-        const std::locale& getResLocale();
-    };
-
-} // namespace utl
-
-#endif // INCLUDED_UNOTOOLS_COMPONENTRESMODULE_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/tools/resmgr.hxx b/include/unotools/resmgr.hxx
index fe5b68e6328e..65e730bd0021 100644
--- a/include/tools/resmgr.hxx
+++ b/include/unotools/resmgr.hxx
@@ -16,21 +16,22 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_TOOLS_RESMGR_HXX
-#define INCLUDED_TOOLS_RESMGR_HXX
+#ifndef INCLUDED_UNOTOOLS_RESMGR_HXX
+#define INCLUDED_UNOTOOLS_RESMGR_HXX
 
-#include <tools/toolsdllapi.h>
+#include <unotools/unotoolsdllapi.h>
+#include <unotools/syslocale.hxx>
 #include <i18nlangtag/languagetag.hxx>
 
 typedef OUString (*ResHookProc)(const OUString& rStr);
 
 namespace Translate
 {
-    TOOLS_DLLPUBLIC std::locale Create(const sal_Char* pPrefixName, const LanguageTag& rLocale);
-    TOOLS_DLLPUBLIC OUString get(const char* pId, const std::locale &loc);
-    TOOLS_DLLPUBLIC void SetReadStringHook( ResHookProc pProc );
-    TOOLS_DLLPUBLIC ResHookProc GetReadStringHook();
-    TOOLS_DLLPUBLIC OUString ExpandVariables(const OUString& rString);
+    UNOTOOLS_DLLPUBLIC std::locale Create(const sal_Char* pPrefixName, const LanguageTag& rLocale = SvtSysLocale().GetUILanguageTag());
+    UNOTOOLS_DLLPUBLIC OUString get(const char* pId, const std::locale &loc);
+    UNOTOOLS_DLLPUBLIC void SetReadStringHook( ResHookProc pProc );
+    UNOTOOLS_DLLPUBLIC ResHookProc GetReadStringHook();
+    UNOTOOLS_DLLPUBLIC OUString ExpandVariables(const OUString& rString);
 }
 
 #endif
diff --git a/include/vcl/builder.hxx b/include/vcl/builder.hxx
index a098ff15d31f..27a1f86a2d71 100644
--- a/include/vcl/builder.hxx
+++ b/include/vcl/builder.hxx
@@ -13,7 +13,7 @@
 #include <typeinfo>
 #include <osl/module.hxx>
 #include <sal/log.hxx>
-#include <tools/resmgr.hxx>
+#include <unotools/resmgr.hxx>
 #include <tools/fldunit.hxx>
 #include <vcl/dllapi.h>
 #include <vcl/window.hxx>