diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2018-01-03 17:49:25 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2018-01-04 11:24:53 +0100 |
| commit | 7ba33578d683031f50ad901361a69cb4f5aee50f (patch) | |
| tree | 8717fe240699f48fce2066a12e8a053aab901fd2 /svl | |
| parent | b37e7aa35a1c927a7154f87c7f1ce75ce5a6a229 (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 8757244437f7..9fb7a0f1a3c1 100644 --- a/svl/source/config/languageoptions.cxx +++ b/svl/source/config/languageoptions.cxx @@ -286,9 +286,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()) |