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 /include | |
| 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 'include')
| -rw-r--r-- | include/sfx2/viewsh.hxx | 2 | ||||
| -rw-r--r-- | include/svl/languageoptions.hxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx index 023a37c98620..87f975352853 100644 --- a/include/sfx2/viewsh.hxx +++ b/include/sfx2/viewsh.hxx @@ -352,7 +352,7 @@ public: virtual vcl::Window* GetEditWindowForActiveOLEObj() const override; /// Set the LibreOfficeKit language of this view. - void SetLOKLanguageTag(const OUString& rBcp47LanguageTag) { maLOKLanguageTag = LanguageTag(rBcp47LanguageTag, true); } + void SetLOKLanguageTag(const OUString& rBcp47LanguageTag); /// Get the LibreOfficeKit language of this view. const LanguageTag& GetLOKLanguageTag() const { return maLOKLanguageTag; } }; diff --git a/include/svl/languageoptions.hxx b/include/svl/languageoptions.hxx index f223904a2f6e..c1c4db608b22 100644 --- a/include/svl/languageoptions.hxx +++ b/include/svl/languageoptions.hxx @@ -133,7 +133,7 @@ public: }; OUString SVL_DLLPUBLIC getInstalledLocaleForLanguage(css::uno::Sequence<OUString> const & installed, OUString const & locale); -OUString SVL_DLLPUBLIC getInstalledLocaleForSystemUILanguage(css::uno::Sequence<OUString> const & installed); +OUString SVL_DLLPUBLIC getInstalledLocaleForSystemUILanguage(css::uno::Sequence<OUString> const & installed, const OUString& rPreferredLocale = OUString()); #endif // INCLUDED_SVL_LANGUAGEOPTIONS_HXX |