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 /cui | |
| 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 'cui')
| -rw-r--r-- | cui/inc/pch/precompiled_cui.hxx | 2 | ||||
| -rw-r--r-- | cui/source/factory/cuiresmgr.cxx | 16 |
2 files changed, 4 insertions, 14 deletions
diff --git a/cui/inc/pch/precompiled_cui.hxx b/cui/inc/pch/precompiled_cui.hxx index 9fb83399de3f..26dc928a4f77 100644 --- a/cui/inc/pch/precompiled_cui.hxx +++ b/cui/inc/pch/precompiled_cui.hxx @@ -457,7 +457,6 @@ #include <tools/multisel.hxx> #include <tools/poly.hxx> #include <tools/ref.hxx> -#include <tools/resmgr.hxx> #include <tools/solar.h> #include <tools/stream.hxx> #include <tools/time.hxx> @@ -481,6 +480,7 @@ #include <unotools/options.hxx> #include <unotools/pathoptions.hxx> #include <unotools/readwritemutexguard.hxx> +#include <unotools/resmgr.hxx> #include <unotools/unotoolsdllapi.h> /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/factory/cuiresmgr.cxx b/cui/source/factory/cuiresmgr.cxx index c03d3dbbc476..7a3b82f25335 100644 --- a/cui/source/factory/cuiresmgr.cxx +++ b/cui/source/factory/cuiresmgr.cxx @@ -18,22 +18,12 @@ */ #include <dialmgr.hxx> -#include <tools/resmgr.hxx> -#include <vcl/svapp.hxx> -#include <vcl/settings.hxx> - -namespace -{ - const std::locale& GetResLocale() - { - static std::locale loc(Translate::Create("cui", Application::GetSettings().GetUILanguageTag())); - return loc; - } -} +#include <unotools/resmgr.hxx> OUString CuiResId(const char *pKey) { - return Translate::get(pKey, GetResLocale()); + static std::locale loc(Translate::Create("cui")); + return Translate::get(pKey, loc); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |