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 /dbaccess | |
| parent | tdf#110743: Use page position to insert master page, not id (diff) | |
| download | core-b1d829e52e826b6ea4ae884a64fdb68b66c74dd7.tar.gz core-b1d829e52e826b6ea4ae884a64fdb68b66c74dd7.zip | |
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 'dbaccess')
| -rw-r--r-- | dbaccess/inc/pch/precompiled_dba.hxx | 2 | ||||
| -rw-r--r-- | dbaccess/inc/pch/precompiled_dbmm.hxx | 2 | ||||
| -rw-r--r-- | dbaccess/source/core/resource/core_resource.cxx | 6 |
3 files changed, 4 insertions, 6 deletions
diff --git a/dbaccess/inc/pch/precompiled_dba.hxx b/dbaccess/inc/pch/precompiled_dba.hxx index 592f0f7acb1e..d74fe1b1d2cd 100644 --- a/dbaccess/inc/pch/precompiled_dba.hxx +++ b/dbaccess/inc/pch/precompiled_dba.hxx @@ -276,7 +276,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> @@ -292,6 +291,7 @@ #include <unotools/localedatawrapper.hxx> #include <unotools/options.hxx> #include <unotools/readwritemutexguard.hxx> +#include <unotools/resmgr.hxx> #include <unotools/saveopt.hxx> #include <unotools/sharedunocomponent.hxx> #include <unotools/syslocale.hxx> diff --git a/dbaccess/inc/pch/precompiled_dbmm.hxx b/dbaccess/inc/pch/precompiled_dbmm.hxx index 5280bb6c3ba2..dd65550f889e 100644 --- a/dbaccess/inc/pch/precompiled_dbmm.hxx +++ b/dbaccess/inc/pch/precompiled_dbmm.hxx @@ -202,7 +202,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> @@ -217,6 +216,7 @@ #include <unotools/fontdefs.hxx> #include <unotools/localedatawrapper.hxx> #include <unotools/readwritemutexguard.hxx> +#include <unotools/resmgr.hxx> #include <unotools/syslocale.hxx> #include <unotools/unotoolsdllapi.h> diff --git a/dbaccess/source/core/resource/core_resource.cxx b/dbaccess/source/core/resource/core_resource.cxx index ad52b1638f90..a82f56fec58d 100644 --- a/dbaccess/source/core/resource/core_resource.cxx +++ b/dbaccess/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> @@ -45,7 +43,7 @@ namespace dbaccess if (m_pImpl) return; - m_pImpl = new std::locale(Translate::Create("dba", Application::GetSettings().GetUILanguageTag())); + m_pImpl = new std::locale(Translate::Create("dba")); } OUString ResourceManager::loadString(const char* pResId) |