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 /filter | |
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 'filter')
-rw-r--r-- | filter/source/graphicfilter/eps/eps.cxx | 4 | ||||
-rw-r--r-- | filter/source/pdf/impdialog.cxx | 4 | ||||
-rw-r--r-- | filter/source/pdf/pdfexport.cxx | 4 | ||||
-rw-r--r-- | filter/source/t602/t602filter.cxx | 2 | ||||
-rw-r--r-- | filter/source/xsltdialog/xmlfiltersettingsdialog.cxx | 4 | ||||
-rw-r--r-- | filter/source/xsltdialog/xmlfiltertabdialog.cxx | 2 |
6 files changed, 10 insertions, 10 deletions
diff --git a/filter/source/graphicfilter/eps/eps.cxx b/filter/source/graphicfilter/eps/eps.cxx index 93d216bc8cc9..51577eb31393 100644 --- a/filter/source/graphicfilter/eps/eps.cxx +++ b/filter/source/graphicfilter/eps/eps.cxx @@ -21,7 +21,7 @@ #include <tools/stream.hxx> #include <tools/poly.hxx> #include <tools/fract.hxx> -#include <tools/resmgr.hxx> +#include <unotools/resmgr.hxx> #include <vcl/svapp.hxx> #include <vcl/metaact.hxx> #include <vcl/graph.hxx> @@ -437,7 +437,7 @@ bool PSWriter::WritePS( const Graphic& rGraphic, SvStream& rTargetStream, Filter if ( mbStatus && mnLevelWarning && pFilterConfigItem ) { - std::locale loc = Translate::Create("flt", Application::GetSettings().GetUILanguageTag()); + std::locale loc = Translate::Create("flt"); ScopedVclPtrInstance< InfoBox > aInfoBox(nullptr, Translate::get(KEY_VERSION_CHECK, loc)); aInfoBox->Execute(); } diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx index 56e3370158e0..8419678e6564 100644 --- a/filter/source/pdf/impdialog.cxx +++ b/filter/source/pdf/impdialog.cxx @@ -28,7 +28,7 @@ #include <vcl/svapp.hxx> #include "sfx2/passwd.hxx" #include "svtools/miscopt.hxx" -#include "tools/resmgr.hxx" +#include "unotools/resmgr.hxx" #include "comphelper/propertyvalue.hxx" #include "comphelper/sequence.hxx" @@ -44,7 +44,7 @@ static std::locale& getPDFFilterResLocale() { - static std::locale loc = Translate::Create("flt", Application::GetSettings().GetUILanguageTag()); + static std::locale loc = Translate::Create("flt"); return loc; } diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx index 611315c51d5f..818946bd69df 100644 --- a/filter/source/pdf/pdfexport.cxx +++ b/filter/source/pdf/pdfexport.cxx @@ -22,7 +22,7 @@ #include <tools/urlobj.hxx> #include <tools/fract.hxx> #include <tools/poly.hxx> -#include <tools/resmgr.hxx> +#include <unotools/resmgr.hxx> #include <vcl/mapmod.hxx> #include <vcl/virdev.hxx> #include <vcl/metaact.hxx> @@ -884,7 +884,7 @@ bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue >& if ( mxStatusIndicator.is() ) { - std::locale loc(Translate::Create("flt", Application::GetSettings().GetUILanguageTag())); + std::locale loc(Translate::Create("flt")); sal_Int32 nTotalPageCount = aRangeEnum.size(); if ( bExportPages && bExportNotesPages ) nTotalPageCount *= 2; diff --git a/filter/source/t602/t602filter.cxx b/filter/source/t602/t602filter.cxx index ea20785d4995..476d3b59cdae 100644 --- a/filter/source/t602/t602filter.cxx +++ b/filter/source/t602/t602filter.cxx @@ -38,7 +38,7 @@ #include <osl/diagnose.h> #include <rtl/ref.hxx> #include <rtl/character.hxx> -#include <tools/resmgr.hxx> +#include <unotools/resmgr.hxx> #include <unotools/streamwrap.hxx> using namespace ::cppu; diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx index 9ff9d81a046e..7d6c81f6edae 100644 --- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx +++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx @@ -23,7 +23,7 @@ #include <com/sun/star/beans/PropertyValue.hpp> #include "com/sun/star/ui/dialogs/TemplateDescription.hpp" -#include <tools/resmgr.hxx> +#include <unotools/resmgr.hxx> #include <tools/urlobj.hxx> #include <svtools/headbar.hxx> #include <unotools/streamwrap.hxx> @@ -71,7 +71,7 @@ EnsureResLocale::EnsureResLocale() { if (!pXSLTResLocale) { - m_xResLocale.reset(new std::locale(Translate::Create("flt", Application::GetSettings().GetUILanguageTag()))); + m_xResLocale.reset(new std::locale(Translate::Create("flt"))); pXSLTResLocale = m_xResLocale.get(); } } diff --git a/filter/source/xsltdialog/xmlfiltertabdialog.cxx b/filter/source/xsltdialog/xmlfiltertabdialog.cxx index 2db0f6a08707..624fed6ef3a1 100644 --- a/filter/source/xsltdialog/xmlfiltertabdialog.cxx +++ b/filter/source/xsltdialog/xmlfiltertabdialog.cxx @@ -21,7 +21,7 @@ #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <comphelper/fileurl.hxx> -#include <tools/resmgr.hxx> +#include <unotools/resmgr.hxx> #include <vcl/layout.hxx> #include <osl/file.hxx> |