desktop/source/lib/init.cxx | 1 + sc/qa/unit/tiledrendering/tiledrendering.cxx | 2 +- sc/source/ui/docshell/docsh4.cxx | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-)
New commits: commit 8505b2203a5e1fc1f262c76a32cafcc6cc71e4a5 Author: Szymon Kłos <[email protected]> AuthorDate: Tue Jul 23 11:30:17 2019 +0200 Commit: Miklos Vajna <[email protected]> CommitDate: Thu Aug 29 13:45:57 2019 +0200 Send ISO language code on state changed [ Miklos: commit 13c77cc3b34555aefd898a15c6ad898049f8aed6 (Send iso code for languages, 2019-07-19) only changed the behavior in case the LOK client asks for a list of languages explicitly. This one affects the case when the language under the cursor changes and core initiates the core -> client information sending. ] Also contains: Fix language unit test Change-Id: I45b4263026928de898fe89e25c21d97c82e1beeb Change-Id: I2f82cee1fda613636fc421449a2d8a56b0a35b7f Reviewed-on: https://gerrit.libreoffice.org/78222 Reviewed-by: Miklos Vajna <[email protected]> Tested-by: Jenkins (cherry picked from commit 616718a05c5625f1752a86d2223241d2dde2bdee) Reviewed-on: https://gerrit.libreoffice.org/78254 Tested-by: Jenkins CollaboraOffice <[email protected]> diff --git a/sc/qa/unit/tiledrendering/tiledrendering.cxx b/sc/qa/unit/tiledrendering/tiledrendering.cxx index 4fe90e751a45..aa4744cfbdfc 100644 --- a/sc/qa/unit/tiledrendering/tiledrendering.cxx +++ b/sc/qa/unit/tiledrendering/tiledrendering.cxx @@ -1492,7 +1492,7 @@ void ScTiledRenderingTest::testLanguageStatus() SfxLokHelper::createView(); SfxViewShell* pView2 = SfxViewShell::Current(); CPPUNIT_ASSERT(pView1 != pView2); - const OUString aLangBolivia("Spanish (Bolivia)"); + const OUString aLangBolivia("Spanish (Bolivia);es"); { 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 e0214146bce9..e22fdb5cd1fd 100644 --- a/sc/source/ui/docshell/docsh4.cxx +++ b/sc/source/ui/docshell/docsh4.cxx @@ -2002,7 +2002,10 @@ void ScDocShell::GetState( SfxItemSet &rSet ) LanguageType eLatin, eCjk, eCtl; GetDocument().GetLanguage( eLatin, eCjk, eCtl ); - rSet.Put(SfxStringItem(nWhich, SvtLanguageTable::GetLanguageString(eLatin))); + OUString sLanguage = SvtLanguageTable::GetLanguageString(eLatin); + if (comphelper::LibreOfficeKit::isActive()) + sLanguage += ";" + LanguageTag(eLatin).getLanguage(); + rSet.Put(SfxStringItem(nWhich, sLanguage)); } break; commit ff68e14155a58ac5b55949ec8fd461e8301c8680 Author: Szymon Kłos <[email protected]> AuthorDate: Fri Jul 19 17:50:55 2019 +0200 Commit: Miklos Vajna <[email protected]> CommitDate: Thu Aug 29 13:45:51 2019 +0200 Send iso code for languages [ Miklos: the motivation for this change is that LOK clients may display information on their UI depending on screen size. Mobile clients may want to have a more compact display, where showing the full language name takes too much space, and showing some kind of language code is a better way. ] (cherry picked from commit 13c77cc3b34555aefd898a15c6ad898049f8aed6) Change-Id: Iec93ad05d83a8ce871eab33bd12e99aee9aafa86 Reviewed-on: https://gerrit.libreoffice.org/78253 Reviewed-by: Miklos Vajna <[email protected]> Tested-by: Miklos Vajna <[email protected]> diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index 5b269e8a2fe1..ba82cfc8e0b4 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -3847,6 +3847,7 @@ static char* getLanguages(const char* pCommand) if (sLanguage.startsWith("{") && sLanguage.endsWith("}")) continue; + sLanguage += ";" + LanguageTag(aLocales[itLocale]).getLanguage(); aChild.put("", sLanguage.toUtf8()); aValues.push_back(std::make_pair("", aChild)); } _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
