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 /reportdesign/source | |
| 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 'reportdesign/source')
| -rw-r--r-- | reportdesign/source/core/resource/core_resource.cxx | 7 | ||||
| -rw-r--r-- | reportdesign/source/core/sdr/RptModel.cxx | 2 |
2 files changed, 3 insertions, 6 deletions
diff --git a/reportdesign/source/core/resource/core_resource.cxx b/reportdesign/source/core/resource/core_resource.cxx index 21718d124830..8f1a10f7bbeb 100644 --- a/reportdesign/source/core/resource/core_resource.cxx +++ b/reportdesign/source/core/resource/core_resource.cxx @@ -17,12 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ #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 <osl/thread.h> #include <com/sun/star/util/XMacroExpander.hpp> #include <com/sun/star/beans/XPropertySet.hpp> @@ -33,7 +30,7 @@ OUString RptResId(const char* pId) { - static std::locale loc = Translate::Create("rpt", Application::GetSettings().GetUILanguageTag()); + static std::locale loc = Translate::Create("rpt"); return Translate::get(pId, loc); } diff --git a/reportdesign/source/core/sdr/RptModel.cxx b/reportdesign/source/core/sdr/RptModel.cxx index 36a25e337294..60cf31e4d2fe 100644 --- a/reportdesign/source/core/sdr/RptModel.cxx +++ b/reportdesign/source/core/sdr/RptModel.cxx @@ -20,7 +20,7 @@ #include "RptModel.hxx" #include "RptPage.hxx" #include <dbaccess/dbsubcomponentcontroller.hxx> -#include <tools/resmgr.hxx> +#include <unotools/resmgr.hxx> #include <unotools/pathoptions.hxx> #include <vcl/svapp.hxx> |