commit dff729704687889f960562f0ac6fa62b47897cf9
author Dennis Francis <dennis.francis@collabora.com> Wed Apr 01 20:20:19 2020 +0530
committer Andras Timar <andras.timar@collabora.com> Thu Apr 02 11:14:37 2020 +0200
tree 0ca973c5a3fc69509acea39ba0df5cc86bdbc069
parent 13aebf3dc75a73b381fb8d72c9788a8ee5aa911c

tdf#127158 :lokit: preload liblocaledata_others.so

...even if LOK_WHITELIST_LANGUAGES does not contain an Asian language.
Not preloading this module causes locale-fallbacks for example
when a calc-cell with Asian locale has some date with number-formatting,
LOOL displays the date with the fallback locale(en_US).
(more details in comments)

Change-Id: Id8a31565f7f0f0262c044028f55fdf4fe33ecec8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91510
Tested-by: Jenkins
Reviewed-by: Andras Timar <andras.timar@collabora.com>

desktop/source/lib/init.cxx

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index c54fb77..4cf6949 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -91,6 +91,8 @@

#include <com/sun/star/linguistic2/LinguServiceManager.hpp>
#include <com/sun/star/linguistic2/XSpellChecker.hpp>
#include <com/sun/star/i18n/Calendar2.hpp>
#include <com/sun/star/i18n/LocaleCalendar2.hpp>
#include <com/sun/star/i18n/ScriptType.hpp>
#include <com/sun/star/lang/DisposedException.hpp>

@@ -5661,6 +5663,14 @@
    }
    std::cerr << "\n";

    // Hack to load and cache the module liblocaledata_others.so which is not loaded normally
    // (when loading dictionaries of just non-Asian locales). Creating a XCalendar4 of one Asian locale
    // will cheaply load this missing "others" locale library. Appending an Asian locale in
    // LOK_WHITELIST_LANGUAGES env-var also works but at the cost of loading that dictionary.
    css::uno::Reference< css::i18n::XCalendar4 > xCal = css::i18n::LocaleCalendar2::create(comphelper::getProcessComponentContext());
    css::lang::Locale aAsianLocale = {"hi", "IN", ""};
    xCal->loadDefaultCalendar(aAsianLocale);

    // preload all available thesauri
    css::uno::Reference<linguistic2::XThesaurus> xThesaurus(xLngSvcMgr->getThesaurus());
    css::uno::Reference<linguistic2::XSupportedLocales> xThesLocales(xSpellChecker, css::uno::UNO_QUERY_THROW);