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 /editeng | |
| 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 'editeng')
| -rw-r--r-- | editeng/inc/pch/precompiled_editeng.hxx | 2 | ||||
| -rw-r--r-- | editeng/source/editeng/eerdll.cxx | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/editeng/inc/pch/precompiled_editeng.hxx b/editeng/inc/pch/precompiled_editeng.hxx index a30afe4d008c..a881347ca551 100644 --- a/editeng/inc/pch/precompiled_editeng.hxx +++ b/editeng/inc/pch/precompiled_editeng.hxx @@ -273,7 +273,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/tenccvt.hxx> @@ -290,6 +289,7 @@ #include <unotools/localedatawrapper.hxx> #include <unotools/options.hxx> #include <unotools/readwritemutexguard.hxx> +#include <unotools/resmgr.hxx> #include <unotools/saveopt.hxx> #include <unotools/unotoolsdllapi.h> #include <xmloff/dllapi.h> diff --git a/editeng/source/editeng/eerdll.cxx b/editeng/source/editeng/eerdll.cxx index d23885ea1fec..ca66b2f55379 100644 --- a/editeng/source/editeng/eerdll.cxx +++ b/editeng/source/editeng/eerdll.cxx @@ -18,7 +18,7 @@ */ -#include <tools/resmgr.hxx> +#include <unotools/resmgr.hxx> #include <vcl/wrkwin.hxx> #include <vcl/dialog.hxx> #include <vcl/msgbox.hxx> @@ -209,11 +209,10 @@ EditDLL::~EditDLL() std::locale& EditDLL::GetResLocale() { - static std::locale loc = Translate::Create("editeng", Application::GetSettings().GetUILanguageTag()); + static std::locale loc = Translate::Create("editeng"); return loc; } - editeng::SharedVclResources::SharedVclResources() : m_pVirDev(VclPtr<VirtualDevice>::Create()) { |