[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - desktop/source

[Libreoffice Gerrit user]

 desktop/source/lib/init.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit d5e8de3c1e4a8bf6fb9cf7676bca13a9cb348633
Author:     Ashod Nakashian <ashod.nakashian at collabora.co.uk>
AuthorDate: Wed Jan 23 21:29:42 2019 -0500
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Mon Mar 4 15:19:45 2019 +0100

    LOK: set the language for LOK before document loading
    
    So default dialogs will be created in the correct
    language, as requested by the client.
    
    Change-Id: I12ebf7443b7f19e733f66b88b5fadfb01cd5e75e
    Reviewed-on: https://gerrit.libreoffice.org/68260
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index e3d9259ba0ea..2fa9a3b7ce2b 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -1534,6 +1534,8 @@ static LibreOfficeKitDocument* lo_documentLoadWithOptions(LibreOfficeKit* pThis,
             SvtSysLocaleOptions aSysLocaleOptions;
             aSysLocaleOptions.SetLocaleConfigString(aLanguage);
             aSysLocaleOptions.SetUILocaleConfigString(aLanguage);
+            // Set the LOK language tag, used for dialog tunneling.
+            comphelper::LibreOfficeKit::setLanguageTag(aSysLocaleOptions.GetLanguageTag());
         }
 
         uno::Sequence<css::beans::PropertyValue> aFilterOptions(2);