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

[Libreoffice Gerrit user]

 desktop/source/lib/init.cxx |   50 ++++++++++++++++++++++----------------------
 1 file changed, 26 insertions(+), 24 deletions(-)

New commits:
commit 6fed64c36c4a198d960e22a8489dbade512be575
Author:     Ashod Nakashian <ashod.nakashian at collabora.co.uk>
AuthorDate: Fri Jul 6 16:49:29 2018 -0400
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Mon Oct 8 17:31:03 2018 +0200

    desktop: move font initialization into preloadData
    
    Reviewed-on: https://gerrit.libreoffice.org/57160
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>
    (cherry picked from commit bbba0902fc1f1c6bb2a7f1e6ff2b682e2fbd3cc9)
    
    Change-Id: I66840512b45e987cc7b08b07b65bdb24f2023a41

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index a5b79d6ec840..eef796ce91a0 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -3815,9 +3815,35 @@ static void preloadData()
     images.getImageUrl("forcefed.png", "style", "FO_oo");
 
     std::cerr << "Preload languages\n";
+
     // force load language singleton
     SvtLanguageTable::HasLanguageType(LANGUAGE_SYSTEM);
     (void)LanguageTag::isValidBcp47("foo", nullptr);
+
+    std::cerr << "Preload fonts\n";
+
+    // Initialize fonts.
+    css::uno::Reference<css::linguistic2::XLinguServiceManager2> xLangSrv = css::linguistic2::LinguServiceManager::create(xContext);
+    if (xLangSrv.is())
+    {
+        css::uno::Reference<css::linguistic2::XSpellChecker> xSpell(xLangSrv->getSpellChecker(), css::uno::UNO_QUERY);
+        css::uno::Reference<css::linguistic2::XSupportedLocales> xLocales(xSpell, css::uno::UNO_QUERY);
+        if (xLocales.is())
+            aLocales = xLocales->getLocales();
+    }
+
+    for (const auto& aLocale : aLocales)
+    {
+        //TODO: Add more types and cache more aggessively. For now this initializes the fontcache.
+        using namespace ::com::sun::star::i18n::ScriptType;
+        LanguageType nLang;
+        nLang = MsLangId::resolveSystemLanguageByScriptType(LanguageTag::convertToLanguageType(aLocale, false), LATIN);
+        OutputDevice::GetDefaultFont(DefaultFontType::LATIN_SPREADSHEET, nLang, GetDefaultFontFlags::OnlyOne);
+        nLang = MsLangId::resolveSystemLanguageByScriptType(LanguageTag::convertToLanguageType(aLocale, false), ASIAN);
+        OutputDevice::GetDefaultFont(DefaultFontType::CJK_SPREADSHEET, nLang, GetDefaultFontFlags::OnlyOne);
+        nLang = MsLangId::resolveSystemLanguageByScriptType(LanguageTag::convertToLanguageType(aLocale, false), COMPLEX);
+        OutputDevice::GetDefaultFont(DefaultFontType::CTL_SPREADSHEET, nLang, GetDefaultFontFlags::OnlyOne);
+    }
 }
 
 static int lo_initialize(LibreOfficeKit* pThis, const char* pAppPath, const char* pUserProfileUrl)
@@ -3987,30 +4013,6 @@ static int lo_initialize(LibreOfficeKit* pThis, const char* pAppPath, const char
 
                 preloadData();
 
-                // Initialize fonts.
-                css::uno::Sequence< css::lang::Locale > aLocales;
-                css::uno::Reference<css::linguistic2::XLinguServiceManager2> xLangSrv = css::linguistic2::LinguServiceManager::create(xContext);
-                if (xLangSrv.is())
-                {
-                    css::uno::Reference<css::linguistic2::XSpellChecker> xSpell(xLangSrv->getSpellChecker(), css::uno::UNO_QUERY);
-                    css::uno::Reference<css::linguistic2::XSupportedLocales> xLocales(xSpell, css::uno::UNO_QUERY);
-                    if (xLocales.is())
-                        aLocales = xLocales->getLocales();
-                }
-
-                for (const auto& aLocale : aLocales)
-                {
-                    //TODO: Add more types and cache more aggessively. For now this initializes the fontcache.
-                    using namespace ::com::sun::star::i18n::ScriptType;
-                    LanguageType nLang;
-                    nLang = MsLangId::resolveSystemLanguageByScriptType(LanguageTag::convertToLanguageType(aLocale, false), LATIN);
-                    OutputDevice::GetDefaultFont(DefaultFontType::LATIN_SPREADSHEET, nLang, GetDefaultFontFlags::OnlyOne);
-                    nLang = MsLangId::resolveSystemLanguageByScriptType(LanguageTag::convertToLanguageType(aLocale, false), ASIAN);
-                    OutputDevice::GetDefaultFont(DefaultFontType::CJK_SPREADSHEET, nLang, GetDefaultFontFlags::OnlyOne);
-                    nLang = MsLangId::resolveSystemLanguageByScriptType(LanguageTag::convertToLanguageType(aLocale, false), COMPLEX);
-                    OutputDevice::GetDefaultFont(DefaultFontType::CTL_SPREADSHEET, nLang, GetDefaultFontFlags::OnlyOne);
-                }
-
                 // Release Solar Mutex, lo_startmain thread should acquire it.
                 Application::ReleaseSolarMutex();
             }
commit e93a5993c370203cfd4104803b6976626d1389e1
Author:     Aron Budea <aron.budea at collabora.com>
AuthorDate: Fri Jul 6 15:32:49 2018 +0200
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Mon Oct 8 17:31:03 2018 +0200

    desktop: move dictionary preload before font init
    
    spell-checker is initialized during font init
    
    since e7f65920b12517b31f0c5cbfd0dcb8df96d20ba4
    
    Change-Id: Ia5b5223aa8cc00d0e80451142ae18a7046ad00d4
    Reviewed-on: https://gerrit.libreoffice.org/57064
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
    Tested-by: Ashod Nakashian <ashnakash at gmail.com>

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index db92368d6cb0..a5b79d6ec840 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -3985,6 +3985,8 @@ static int lo_initialize(LibreOfficeKit* pThis, const char* pAppPath, const char
                 VclBuilder::preload();
                 VclAbstractDialogFactory::Create();
 
+                preloadData();
+
                 // Initialize fonts.
                 css::uno::Sequence< css::lang::Locale > aLocales;
                 css::uno::Reference<css::linguistic2::XLinguServiceManager2> xLangSrv = css::linguistic2::LinguServiceManager::create(xContext);
@@ -4009,8 +4011,6 @@ static int lo_initialize(LibreOfficeKit* pThis, const char* pAppPath, const char
                     OutputDevice::GetDefaultFont(DefaultFontType::CTL_SPREADSHEET, nLang, GetDefaultFontFlags::OnlyOne);
                 }
 
-                preloadData();
-
                 // Release Solar Mutex, lo_startmain thread should acquire it.
                 Application::ReleaseSolarMutex();
             }