summaryrefslogtreecommitdiff
path: root/vcl
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 /vcl
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 'vcl')
-rw-r--r--vcl/source/app/svdata.cxx4
-rw-r--r--vcl/source/app/svmain.cxx2
-rw-r--r--vcl/source/bitmap/BitmapTools.cxx2
-rw-r--r--vcl/source/filter/graphicfilter.cxx2
-rw-r--r--vcl/source/gdi/bitmapex.cxx2
-rw-r--r--vcl/source/image/Image.cxx2
-rw-r--r--vcl/source/window/builder.cxx4
-rw-r--r--vcl/unx/gtk/fpicker/resourceprovider.cxx2
8 files changed, 10 insertions, 10 deletions
diff --git a/vcl/source/app/svdata.cxx b/vcl/source/app/svdata.cxx
index 9c1e119ded7a..57d536a5c90c 100644
--- a/vcl/source/app/svdata.cxx
+++ b/vcl/source/app/svdata.cxx
@@ -23,7 +23,7 @@
#include <comphelper/string.hxx>
#include <rtl/process.h>
#include <tools/gen.hxx>
-#include <tools/resmgr.hxx>
+#include <unotools/resmgr.hxx>
#include <uno/current_context.hxx>
#include <vcl/button.hxx>
@@ -166,7 +166,7 @@ const std::locale& ImplGetResLocale()
ImplSVData* pSVData = ImplGetSVData();
if (!pSVData->mbResLocaleSet)
{
- pSVData->maResLocale = Translate::Create("vcl", Application::GetSettings().GetUILanguageTag());
+ pSVData->maResLocale = Translate::Create("vcl");
pSVData->mbResLocaleSet = true;
}
return pSVData->maResLocale;
diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx
index 58a5260d4e6b..61f589aaf93a 100644
--- a/vcl/source/app/svmain.cxx
+++ b/vcl/source/app/svmain.cxx
@@ -27,7 +27,7 @@
#include <desktop/exithelper.h>
#include <tools/debug.hxx>
-#include <tools/resmgr.hxx>
+#include <unotools/resmgr.hxx>
#include <comphelper/processfactory.hxx>
#include <comphelper/asyncnotification.hxx>
diff --git a/vcl/source/bitmap/BitmapTools.cxx b/vcl/source/bitmap/BitmapTools.cxx
index 39a7d2fb1a3e..554f16850c2c 100644
--- a/vcl/source/bitmap/BitmapTools.cxx
+++ b/vcl/source/bitmap/BitmapTools.cxx
@@ -21,7 +21,7 @@
#include <com/sun/star/rendering/XIntegerReadOnlyBitmap.hpp>
-#include <tools/resmgr.hxx>
+#include <unotools/resmgr.hxx>
#include <vcl/settings.hxx>
#include <vcl/svapp.hxx>
diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx
index 23070eb10622..5fea84fed4e2 100644
--- a/vcl/source/filter/graphicfilter.cxx
+++ b/vcl/source/filter/graphicfilter.cxx
@@ -27,7 +27,7 @@
#include <ucbhelper/content.hxx>
#include <cppuhelper/implbase.hxx>
#include <tools/fract.hxx>
-#include <tools/resmgr.hxx>
+#include <unotools/resmgr.hxx>
#include <tools/stream.hxx>
#include <tools/urlobj.hxx>
#include <tools/zcodec.hxx>
diff --git a/vcl/source/gdi/bitmapex.cxx b/vcl/source/gdi/bitmapex.cxx
index b72d10882e22..31da4bbff58c 100644
--- a/vcl/source/gdi/bitmapex.cxx
+++ b/vcl/source/gdi/bitmapex.cxx
@@ -22,7 +22,7 @@
#include <o3tl/any.hxx>
#include <tools/debug.hxx>
-#include <tools/resmgr.hxx>
+#include <unotools/resmgr.hxx>
#include <tools/stream.hxx>
#include <vcl/ImageTree.hxx>
#include <vcl/salbtype.hxx>
diff --git a/vcl/source/image/Image.cxx b/vcl/source/image/Image.cxx
index 2a81e8a59f02..76400558fe27 100644
--- a/vcl/source/image/Image.cxx
+++ b/vcl/source/image/Image.cxx
@@ -19,7 +19,7 @@
#include <osl/file.hxx>
#include <tools/stream.hxx>
-#include <tools/resmgr.hxx>
+#include <unotools/resmgr.hxx>
#include <vcl/settings.hxx>
#include <vcl/outdev.hxx>
#include <vcl/graph.hxx>
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 5a7faafb87a9..ac84840c29cf 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -13,7 +13,7 @@
#include <comphelper/processfactory.hxx>
#include <osl/module.hxx>
#include <sal/log.hxx>
-#include <tools/resmgr.hxx>
+#include <unotools/resmgr.hxx>
#include <vcl/builder.hxx>
#include <vcl/button.hxx>
#include <vcl/dialog.hxx>
@@ -2078,7 +2078,7 @@ void VclBuilder::handleChild(vcl::Window *pParent, xmlreader::XmlReader &reader)
{
name = reader.getAttributeValue(false);
sType = OString(name.begin, name.length);
- m_pParserState->m_aResLocale = Translate::Create(sType.getStr(), Application::GetSettings().GetUILanguageTag());
+ m_pParserState->m_aResLocale = Translate::Create(sType.getStr());
}
}
++nLevel;
diff --git a/vcl/unx/gtk/fpicker/resourceprovider.cxx b/vcl/unx/gtk/fpicker/resourceprovider.cxx
index 349247c9235a..152395d61463 100644
--- a/vcl/unx/gtk/fpicker/resourceprovider.cxx
+++ b/vcl/unx/gtk/fpicker/resourceprovider.cxx
@@ -18,7 +18,7 @@
*/
#include <vcl/svapp.hxx>
-#include <tools/resmgr.hxx>
+#include <unotools/resmgr.hxx>
#include <com/sun/star/ui/dialogs/CommonFilePickerElementIds.hpp>
#include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp>