diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2018-01-05 15:37:29 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2018-03-21 10:26:37 +0100 |
| commit | e0fb4afa676372ce28e15adb01f3f15d4a7f4a09 (patch) | |
| tree | a7e1f813d4ead308b4ce4c94fa8679212aba8297 | |
| parent | 9097a8ffe265cf18c0e10b9707b82fbb99c08e6a (diff) | |
lokdialog: Few more places that need to take LOK's LanguageTag into account.
Change-Id: Ida41025c70d45f426304fabe702a3bccd6e2385d
Reviewed-on: https://gerrit.libreoffice.org/47474
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
(cherry picked from commit a9e294ff5c8466bd1577ae43b0feaa002f9fd5ab)
| -rw-r--r-- | unotools/source/misc/syslocale.cxx | 8 | ||||
| -rw-r--r-- | vcl/source/app/svdata.cxx | 3 |
2 files changed, 10 insertions, 1 deletions
diff --git a/unotools/source/misc/syslocale.cxx b/unotools/source/misc/syslocale.cxx index 8dd7a5824982..951ac9e3b4aa 100644 --- a/unotools/source/misc/syslocale.cxx +++ b/unotools/source/misc/syslocale.cxx @@ -23,12 +23,14 @@ #include <unotools/configmgr.hxx> #include <unotools/syslocale.hxx> #include <unotools/syslocaleoptions.hxx> +#include <comphelper/lok.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/sequence.hxx> #include <rtl/tencinfo.h> #include <rtl/locale.h> #include <osl/thread.h> #include <osl/nlsupport.h> + #include <vector> using namespace osl; @@ -169,11 +171,17 @@ SvtSysLocaleOptions& SvtSysLocale::GetOptions() const const LanguageTag& SvtSysLocale::GetLanguageTag() const { + if (comphelper::LibreOfficeKit::isActive()) + return comphelper::LibreOfficeKit::getLanguageTag(); + return pImpl->aSysLocaleOptions.GetRealLanguageTag(); } const LanguageTag& SvtSysLocale::GetUILanguageTag() const { + if (comphelper::LibreOfficeKit::isActive()) + return comphelper::LibreOfficeKit::getLanguageTag(); + return pImpl->aSysLocaleOptions.GetRealUILanguageTag(); } diff --git a/vcl/source/app/svdata.cxx b/vcl/source/app/svdata.cxx index 69a9db6d008d..8d5d329a7478 100644 --- a/vcl/source/app/svdata.cxx +++ b/vcl/source/app/svdata.cxx @@ -19,6 +19,7 @@ #include <string.h> +#include <comphelper/lok.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/string.hxx> #include <rtl/process.h> @@ -165,7 +166,7 @@ vcl::Window *ImplGetDefaultContextWindow() const std::locale& ImplGetResLocale() { ImplSVData* pSVData = ImplGetSVData(); - if (!pSVData->mbResLocaleSet) + if (!pSVData->mbResLocaleSet || comphelper::LibreOfficeKit::isActive()) { pSVData->maResLocale = Translate::Create("vcl"); pSVData->mbResLocaleSet = true; |