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

[Szymon Kłos (via logerrit)]

 desktop/source/lib/init.cxx                  |    2 +-
 sc/qa/unit/tiledrendering/tiledrendering.cxx |    2 +-
 sc/source/ui/docshell/docsh4.cxx             |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 47025060e4474d23e3bd97053a77b3943eeae724
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Wed Aug 28 14:36:42 2019 +0200
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Wed Aug 28 16:07:41 2019 +0200

    Send Bcp47 codes with region
    
    Change-Id: I816eddab3d88534bff6c1f1dba81b45107cdb372
    Reviewed-on: https://gerrit.libreoffice.org/78227
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>
    Tested-by: Jenkins

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 5f0075d2b45e..7c8b742dfb78 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -3865,7 +3865,7 @@ static char* getLanguages(const char* pCommand)
         if (sLanguage.startsWith("{") && sLanguage.endsWith("}"))
             continue;
 
-        sLanguage += ";" + LanguageTag(aLocales[itLocale]).getLanguage();
+        sLanguage += ";" + LanguageTag(aLocales[itLocale]).getBcp47(false);
         aChild.put("", sLanguage.toUtf8());
         aValues.push_back(std::make_pair("", aChild));
     }
diff --git a/sc/qa/unit/tiledrendering/tiledrendering.cxx b/sc/qa/unit/tiledrendering/tiledrendering.cxx
index 25beaa6f0c51..3a6e91ab9c51 100644
--- a/sc/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sc/qa/unit/tiledrendering/tiledrendering.cxx
@@ -1441,7 +1441,7 @@ void ScTiledRenderingTest::testLanguageStatus()
     SfxLokHelper::createView();
     SfxViewShell* pView2 = SfxViewShell::Current();
     CPPUNIT_ASSERT(pView1 != pView2);
-    const OUString aLangBolivia("Spanish (Bolivia);es");
+    const OUString aLangBolivia("Spanish (Bolivia);es-BO");
     {
         std::unique_ptr<SfxPoolItem> xItem1;
         std::unique_ptr<SfxPoolItem> xItem2;
diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx
index e5878182a424..895ca4cf3ce6 100644
--- a/sc/source/ui/docshell/docsh4.cxx
+++ b/sc/source/ui/docshell/docsh4.cxx
@@ -2009,7 +2009,7 @@ void ScDocShell::GetState( SfxItemSet &rSet )
                         if (eLatin == LANGUAGE_NONE)
                             sLanguage += ";-";
                         else
-                            sLanguage += ";" + LanguageTag(eLatin).getLanguage();
+                            sLanguage += ";" + LanguageTag(eLatin).getBcp47(false);
                     }
                     rSet.Put(SfxStringItem(nWhich, sLanguage));
                 }