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

[Szymon Kłos (via logerrit)]

 sc/source/ui/docshell/docsh4.cxx |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 0c6b491db2113bef0ce03784d004ad25afb39a8f
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Wed Jul 24 11:55:33 2019 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Thu Aug 29 14:09:47 2019 +0200

    Handle LANGUAGE_NONE case
    
    Change-Id: I4dde96d488fc1e956bc2385c5e311eeadacd4be0
    Reviewed-on: https://gerrit.libreoffice.org/78226
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>
    Tested-by: Jenkins
    (cherry picked from commit efb5973ad31735212a165f6ec72467ae6b6ebd43)
    Reviewed-on: https://gerrit.libreoffice.org/78255
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx
index e22fdb5cd1fd..2127e430cb52 100644
--- a/sc/source/ui/docshell/docsh4.cxx
+++ b/sc/source/ui/docshell/docsh4.cxx
@@ -2003,8 +2003,12 @@ void ScDocShell::GetState( SfxItemSet &rSet )
 
                     GetDocument().GetLanguage( eLatin, eCjk, eCtl );
                     OUString sLanguage = SvtLanguageTable::GetLanguageString(eLatin);
-                    if (comphelper::LibreOfficeKit::isActive())
-                        sLanguage += ";" + LanguageTag(eLatin).getLanguage();
+                    if (comphelper::LibreOfficeKit::isActive()) {
+                        if (eLatin == LANGUAGE_NONE)
+                            sLanguage += ";-";
+                        else
+                            sLanguage += ";" + LanguageTag(eLatin).getLanguage();
+                    }
                     rSet.Put(SfxStringItem(nWhich, sLanguage));
                 }
                 break;