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 /desktop/inc | |
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 'desktop/inc')
-rw-r--r-- | desktop/inc/app.hxx | 2 | ||||
-rw-r--r-- | desktop/inc/dp_shared.hxx | 6 | ||||
-rw-r--r-- | desktop/inc/pch/precompiled_sofficeapp.hxx | 2 |
3 files changed, 4 insertions, 6 deletions
diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx index f4af4bcecc9d..50e3a0fa3811 100644 --- a/desktop/inc/app.hxx +++ b/desktop/inc/app.hxx @@ -25,8 +25,8 @@ #include <sal/log.hxx> #include <vcl/svapp.hxx> #include <vcl/timer.hxx> -#include <tools/resmgr.hxx> #include <unotools/bootstrap.hxx> +#include <unotools/resmgr.hxx> #include <com/sun/star/frame/XDesktop2.hpp> #include <com/sun/star/task/XStatusIndicator.hpp> #include <com/sun/star/uno/Reference.h> diff --git a/desktop/inc/dp_shared.hxx b/desktop/inc/dp_shared.hxx index 425cda8ea906..8c38545ed7fa 100644 --- a/desktop/inc/dp_shared.hxx +++ b/desktop/inc/dp_shared.hxx @@ -22,16 +22,14 @@ #include <osl/diagnose.h> #include <rtl/instance.hxx> -#include <tools/resmgr.hxx> -#include <vcl/settings.hxx> -#include <vcl/svapp.hxx> +#include <unotools/resmgr.hxx> namespace dp { struct DeploymentLocale : public ::rtl::StaticWithInit<std::locale, DeploymentLocale > { std::locale operator () () { - return Translate::Create("dkt", Application::GetSettings().GetUILanguageTag()); + return Translate::Create("dkt"); } }; diff --git a/desktop/inc/pch/precompiled_sofficeapp.hxx b/desktop/inc/pch/precompiled_sofficeapp.hxx index 95e6c6fa7892..efc3a6dcc909 100644 --- a/desktop/inc/pch/precompiled_sofficeapp.hxx +++ b/desktop/inc/pch/precompiled_sofficeapp.hxx @@ -246,7 +246,6 @@ #include <tools/mapunit.hxx> #include <tools/poly.hxx> #include <tools/ref.hxx> -#include <tools/resmgr.hxx> #include <tools/solar.h> #include <tools/stream.hxx> #include <tools/toolsdllapi.h> @@ -262,6 +261,7 @@ #include <unotools/localedatawrapper.hxx> #include <unotools/options.hxx> #include <unotools/readwritemutexguard.hxx> +#include <unotools/resmgr.hxx> #include <unotools/syslocale.hxx> #include <unotools/unotoolsdllapi.h> |