diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2018-01-03 17:49:25 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2018-03-20 15:50:31 +0100 |
| commit | 7ff6b33f740ff28d6821863978df1ff82fa7616a (patch) | |
| tree | ee01ad8e37a0e14920cd8d9769e1b9b35c42adc5 /svl | |
| parent | 23b811466e53a30efde898a6fd9b3a55aff33a38 (diff) | |
lokdialog: Use only one of the installed langpacks when setting locale.
Change-Id: I446775b121b7806a549f4dbbaa1f2dcf019d9bc2
Reviewed-on: https://gerrit.libreoffice.org/47334
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Jan Holesovsky <kendy@collabora.com>
Diffstat (limited to 'svl')
| -rw-r--r-- | svl/source/config/languageoptions.cxx | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/svl/source/config/languageoptions.cxx b/svl/source/config/languageoptions.cxx index 9f9fe4513819..faa573069e5c 100644 --- a/svl/source/config/languageoptions.cxx +++ b/svl/source/config/languageoptions.cxx @@ -283,9 +283,13 @@ OUString getInstalledLocaleForLanguage(css::uno::Sequence<OUString> const & inst return OUString(); } -OUString getInstalledLocaleForSystemUILanguage(const css::uno::Sequence<OUString>& rLocaleElementNames) +OUString getInstalledLocaleForSystemUILanguage(const css::uno::Sequence<OUString>& rLocaleElementNames, const OUString& rPreferredLocale) { - OUString locale = getInstalledLocaleForLanguage(rLocaleElementNames, officecfg::System::L10N::UILocale::get()); + OUString aPreferredLocale(rPreferredLocale); + if (aPreferredLocale.isEmpty()) + aPreferredLocale = officecfg::System::L10N::UILocale::get(); + + OUString locale = getInstalledLocaleForLanguage(rLocaleElementNames, aPreferredLocale); if (locale.isEmpty()) locale = getInstalledLocaleForLanguage(rLocaleElementNames, "en-US"); if (locale.isEmpty() && rLocaleElementNames.hasElements()) |