[Libreoffice-commits] core.git: desktop/source

[Ashod Nakashian (via logerrit)]

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

New commits:
commit b7ea87bf13c2faea24c95a0394f63279f2bb2966
Author:     Ashod Nakashian <ashod.nakashian at collabora.co.uk>
AuthorDate: Wed Jan 23 21:29:42 2019 -0500
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Wed Jun 12 09:43:41 2019 +0200

    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>
    Reviewed-on: https://gerrit.libreoffice.org/73484
    Tested-by: Jenkins
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 7c1a9533b073..a8fd89e4d523 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -1695,6 +1695,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);