summaryrefslogtreecommitdiff
path: root/chart2
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2017-07-31 17:16:27 +0100
committerCaolán McNamara <caolanm@redhat.com>2017-08-01 13:42:21 +0100
commitb1d829e52e826b6ea4ae884a64fdb68b66c74dd7 (patch)
treed6aa2ee59178ecf5ea78e80917df18149ae9bb66 /chart2
parentf4e5940abbbaa3c2747108b0954e8912d164f3e5 (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 'chart2')
-rw-r--r--chart2/inc/pch/precompiled_chartcontroller.hxx2
-rw-r--r--chart2/source/tools/ResId.cxx2
-rw-r--r--chart2/source/tools/ResourceManager.cxx6
3 files changed, 4 insertions, 6 deletions
diff --git a/chart2/inc/pch/precompiled_chartcontroller.hxx b/chart2/inc/pch/precompiled_chartcontroller.hxx
index f85aafda5899..df610d888408 100644
--- a/chart2/inc/pch/precompiled_chartcontroller.hxx
+++ b/chart2/inc/pch/precompiled_chartcontroller.hxx
@@ -496,7 +496,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>
@@ -520,6 +519,7 @@
#include <unotools/nativenumberwrapper.hxx>
#include <unotools/options.hxx>
#include <unotools/readwritemutexguard.hxx>
+#include <unotools/resmgr.hxx>
#include <unotools/syslocale.hxx>
#include <unotools/transliterationwrapper.hxx>
#include <unotools/unotoolsdllapi.h>
diff --git a/chart2/source/tools/ResId.cxx b/chart2/source/tools/ResId.cxx
index 68ea0df902f7..2a82b11aa48e 100644
--- a/chart2/source/tools/ResId.cxx
+++ b/chart2/source/tools/ResId.cxx
@@ -19,7 +19,7 @@
#include "ResId.hxx"
#include "ResourceManager.hxx"
-#include <tools/resmgr.hxx>
+#include <unotools/resmgr.hxx>
namespace chart
{
diff --git a/chart2/source/tools/ResourceManager.cxx b/chart2/source/tools/ResourceManager.cxx
index 3cd51d70c7a7..8449c6c44988 100644
--- a/chart2/source/tools/ResourceManager.cxx
+++ b/chart2/source/tools/ResourceManager.cxx
@@ -18,16 +18,14 @@
*/
#include "ResourceManager.hxx"
-#include <tools/resmgr.hxx>
-#include <vcl/settings.hxx>
-#include <vcl/svapp.hxx>
+#include <unotools/resmgr.hxx>
namespace chart
{
const std::locale& ResourceManager::getResourceLocale()
{
- static std::locale loc = Translate::Create("chart", Application::GetSettings().GetUILanguageTag());
+ static std::locale loc = Translate::Create("chart");
return loc;
}