diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2017-12-13 19:17:48 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2018-03-20 11:50:16 +0100 |
| commit | 155d62ba24d217427c52a4ba319d8b01a9c22cd2 (patch) | |
| tree | fd18f5363814eba5112f74f3981e339c73016207 /xmlsecurity | |
| parent | 4f1850e77a045989657748212037192f35c5d9bd (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>
(cherry picked from commit 101a79cc4d13a1f566c1b97c1329813eb7c61bcf)
Diffstat (limited to 'xmlsecurity')
| -rw-r--r-- | xmlsecurity/inc/resourcemanager.hxx | 4 | ||||
| -rw-r--r-- | xmlsecurity/source/dialogs/resourcemanager.cxx | 6 |
2 files changed, 1 insertions, 9 deletions
diff --git a/xmlsecurity/inc/resourcemanager.hxx b/xmlsecurity/inc/resourcemanager.hxx index 3516bcfa0db4..d621c4bc7328 100644 --- a/xmlsecurity/inc/resourcemanager.hxx +++ b/xmlsecurity/inc/resourcemanager.hxx @@ -34,8 +34,6 @@ class LocaleDataWrapper; namespace XmlSec { - const std::locale& GetResLocale(); - const LocaleDataWrapper& GetLocaleData(); DateTime GetDateTime( const css::util::DateTime& _rDT ); OUString GetDateTimeString( const css::util::DateTime& _rDT ); @@ -53,7 +51,7 @@ namespace XmlSec inline OUString XsResId(const char* pId) { - return Translate::get(pId, XmlSec::GetResLocale()); + return Translate::get(pId, Translate::Create("xsc")); } #endif diff --git a/xmlsecurity/source/dialogs/resourcemanager.cxx b/xmlsecurity/source/dialogs/resourcemanager.cxx index 2e869691cdc2..102466a8159f 100644 --- a/xmlsecurity/source/dialogs/resourcemanager.cxx +++ b/xmlsecurity/source/dialogs/resourcemanager.cxx @@ -32,12 +32,6 @@ using namespace std; namespace XmlSec { - const std::locale& GetResLocale() - { - static const std::locale loc = Translate::Create("xsc"); - return loc; - } - const LocaleDataWrapper& GetLocaleData() { static SvtSysLocale ourSysLocale; |