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 /writerperfect | |
| 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 'writerperfect')
| -rw-r--r-- | writerperfect/Library_writerperfect.mk | 1 | ||||
| -rw-r--r-- | writerperfect/inc/WPFTResMgr.hxx | 7 | ||||
| -rw-r--r-- | writerperfect/source/common/WPFTResMgr.cxx | 11 |
3 files changed, 1 insertions, 18 deletions
diff --git a/writerperfect/Library_writerperfect.mk b/writerperfect/Library_writerperfect.mk index 430503ff81b5..fd7e344822f3 100644 --- a/writerperfect/Library_writerperfect.mk +++ b/writerperfect/Library_writerperfect.mk @@ -53,7 +53,6 @@ $(eval $(call gb_Library_add_exception_objects,writerperfect,\ writerperfect/source/common/DirectoryStream \ writerperfect/source/common/DocumentHandler \ writerperfect/source/common/WPFTEncodingDialog \ - writerperfect/source/common/WPFTResMgr \ writerperfect/source/common/WPXSvInputStream \ )) diff --git a/writerperfect/inc/WPFTResMgr.hxx b/writerperfect/inc/WPFTResMgr.hxx index 17bfc872731a..1ac6796bb91e 100644 --- a/writerperfect/inc/WPFTResMgr.hxx +++ b/writerperfect/inc/WPFTResMgr.hxx @@ -7,14 +7,9 @@ #include <unotools/resmgr.hxx> -struct WRITERPERFECT_DLLPUBLIC WPFTResLocale -{ - static std::locale &GetResLocale(); -}; - inline OUString WpResId(const char *pId) { - return Translate::get(pId, WPFTResLocale::GetResLocale()); + return Translate::get(pId, Translate::Create("wpt")); } #endif diff --git a/writerperfect/source/common/WPFTResMgr.cxx b/writerperfect/source/common/WPFTResMgr.cxx deleted file mode 100644 index 6d3d12381aa0..000000000000 --- a/writerperfect/source/common/WPFTResMgr.cxx +++ /dev/null @@ -1,11 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ - -#include <WPFTResMgr.hxx> - -std::locale &WPFTResLocale::GetResLocale() -{ - static std::locale loc(Translate::Create("wpt")); - return loc; -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |