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

[Aron Budea]

 desktop/source/lib/init.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit bd88f41d53881fd1a3ad42268cd76d598bdd7838
Author: Aron Budea <aron.budea at collabora.com>
Date:   Fri Jul 6 15:32:49 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 687e37e7f29d..fe1368376076 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -3835,6 +3835,8 @@ static int lo_initialize(LibreOfficeKit* pThis, const char* pAppPath, const char
                 // 3) InitVCL()
                 aService->initialize({css::uno::makeAny<OUString>("preload")});
 
+                preloadData();
+
                 // Initialize fonts.
                 css::uno::Sequence< css::lang::Locale > aLocales;
                 css::uno::Reference<css::linguistic2::XLinguServiceManager2> xLangSrv = css::linguistic2::LinguServiceManager::create(xContext);
@@ -3859,8 +3861,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();
             }