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 /framework/source/fwe | |
| 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 'framework/source/fwe')
| -rw-r--r-- | framework/source/fwe/classes/fwkresid.cxx | 24 |
1 files changed, 3 insertions, 21 deletions
diff --git a/framework/source/fwe/classes/fwkresid.cxx b/framework/source/fwe/classes/fwkresid.cxx index 8ed6c1dbb5e5..4d421df5c4bd 100644 --- a/framework/source/fwe/classes/fwkresid.cxx +++ b/framework/source/fwe/classes/fwkresid.cxx @@ -18,30 +18,12 @@ */ #include "classes/fwkresid.hxx" -#include <tools/resmgr.hxx> -#include <vcl/svapp.hxx> -#include <vcl/settings.hxx> - -#include <rtl/strbuf.hxx> - -namespace -{ - const std::locale& GetResLocale() - { - static std::locale* pResLocale = nullptr; - if (!pResLocale) - { - SolarMutexGuard aSolarGuard; - static std::locale loc(Translate::Create("fwe", Application::GetSettings().GetUILanguageTag())); - pResLocale = &loc; - } - return *pResLocale; - } -} +#include <unotools/resmgr.hxx> OUString FwkResId(const char* pId) { - return Translate::get(pId, GetResLocale()); + static std::locale loc(Translate::Create("fwe")); + return Translate::get(pId, loc); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |