diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-07-31 17:16:27 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-08-01 13:42:21 +0100 |
| commit | b1d829e52e826b6ea4ae884a64fdb68b66c74dd7 (patch) | |
| tree | d6aa2ee59178ecf5ea78e80917df18149ae9bb66 /formula | |
| parent | f4e5940abbbaa3c2747108b0954e8912d164f3e5 (diff) | |
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
Diffstat (limited to 'formula')
| -rw-r--r-- | formula/source/core/api/FormulaCompiler.cxx | 2 | ||||
| -rw-r--r-- | formula/source/core/resource/core_resource.cxx | 6 | ||||
| -rw-r--r-- | formula/source/ui/inc/ModuleHelper.hxx | 2 | ||||
| -rw-r--r-- | formula/source/ui/resource/ModuleHelper.cxx | 2 |
4 files changed, 5 insertions, 7 deletions
diff --git a/formula/source/core/api/FormulaCompiler.cxx b/formula/source/core/api/FormulaCompiler.cxx index 8f778bde6b45..5ff5067505c6 100644 --- a/formula/source/core/api/FormulaCompiler.cxx +++ b/formula/source/core/api/FormulaCompiler.cxx @@ -27,7 +27,7 @@ #include "osl/mutex.hxx" #include <svl/zforlist.hxx> -#include <tools/resmgr.hxx> +#include <unotools/resmgr.hxx> #include <com/sun/star/sheet/FormulaOpCodeMapEntry.hpp> #include <com/sun/star/sheet/FormulaMapGroup.hpp> #include <com/sun/star/sheet/FormulaMapGroupSpecialOffset.hpp> diff --git a/formula/source/core/resource/core_resource.cxx b/formula/source/core/resource/core_resource.cxx index b03668d3c783..5163d41b5ae7 100644 --- a/formula/source/core/resource/core_resource.cxx +++ b/formula/source/core/resource/core_resource.cxx @@ -19,11 +19,9 @@ #include "core_resource.hxx" -#include <tools/resmgr.hxx> +#include <unotools/resmgr.hxx> // ---- needed as long as we have no contexts for components --- -#include <vcl/svapp.hxx> -#include <vcl/settings.hxx> #include <rtl/instance.hxx> #include <svl/solar.hrc> @@ -48,7 +46,7 @@ namespace formula if (m_pImpl) return; - m_pImpl = new std::locale(Translate::Create("for", Application::GetSettings().GetUILanguageTag())); + m_pImpl = new std::locale(Translate::Create("for")); } void ResourceManager::registerClient() diff --git a/formula/source/ui/inc/ModuleHelper.hxx b/formula/source/ui/inc/ModuleHelper.hxx index c5e92847b701..91cbb88a0b29 100644 --- a/formula/source/ui/inc/ModuleHelper.hxx +++ b/formula/source/ui/inc/ModuleHelper.hxx @@ -21,7 +21,7 @@ #define INCLUDED_FORMULA_SOURCE_UI_INC_MODULEHELPER_HXX #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <tools/resmgr.hxx> +#include <unotools/resmgr.hxx> namespace formula { diff --git a/formula/source/ui/resource/ModuleHelper.cxx b/formula/source/ui/resource/ModuleHelper.cxx index 80636792aa14..0b0ff18403b7 100644 --- a/formula/source/ui/resource/ModuleHelper.cxx +++ b/formula/source/ui/resource/ModuleHelper.cxx @@ -66,7 +66,7 @@ const std::locale& OModuleImpl::getResLocale() if (!m_xResources) { // create a manager with a fixed prefix - m_xResources.reset(new std::locale(Translate::Create("for", Application::GetSettings().GetUILanguageTag()))); + m_xResources.reset(new std::locale(Translate::Create("for"))); } return *m_xResources; } |