diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2017-12-13 19:17:48 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2017-12-22 22:39:39 +0100 |
| commit | 101a79cc4d13a1f566c1b97c1329813eb7c61bcf (patch) | |
| tree | 31bba77cc8656d6882992ea753917adc787241a9 /filter | |
| parent | a5fe3117e1877fa0bfb55f1cf22cf9394b3f0795 (diff) | |
lokdialog: Allow switching language of some of the ResMgr's.
This way, it is possible to have all the strings translated in dialogs even
when different users use different languages. [It was already possible
to have different languages previously, but not everything in the dialog has
switched - like the buttons at the bottom of the dialogs etc.]
Change-Id: I29a5ae6d31a370eec60397884200b684ec1bf5b9
Reviewed-on: https://gerrit.libreoffice.org/46417
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/46979
Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/pdf/impdialog.cxx | 9 | ||||
| -rw-r--r-- | filter/source/xsltdialog/xmlfiltersettingsdialog.cxx | 3 |
2 files changed, 2 insertions, 10 deletions
diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx index 82aaf012505a..88d0e9687d05 100644 --- a/filter/source/pdf/impdialog.cxx +++ b/filter/source/pdf/impdialog.cxx @@ -42,21 +42,14 @@ #include <com/sun/star/security/DocumentDigitalSignatures.hpp> #include <com/sun/star/security/XCertificate.hpp> -static std::locale& getPDFFilterResLocale() -{ - static std::locale loc = Translate::Create("flt"); - return loc; -} - OUString PDFFilterResId(const char* pId) { - return Translate::get(pId, getPDFFilterResLocale()); + return Translate::get(pId, Translate::Create("flt")); } using namespace ::com::sun::star; using namespace ::com::sun::star::uno; - /** Tabbed PDF dialog implementation Please note: the default used here are the same as per specification, They should be the same in PDFFilter::implExport and in PDFExport::PDFExport diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx index 35ece49e3b4c..2146ddd1a1be 100644 --- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx +++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx @@ -60,8 +60,7 @@ using ::rtl::Uri; OUString XsltResId(const char* pId) { - static std::locale loc = Translate::Create("flt"); - return Translate::get(pId, loc); + return Translate::get(pId, Translate::Create("flt")); } XMLFilterSettingsDialog::XMLFilterSettingsDialog(vcl::Window* pParent, |