From 0efaa14cda8fa607a57c465052a32dc1a9960931 Mon Sep 17 00:00:00 2001 From: Ashod Nakashian Date: Fri, 6 Jul 2018 16:49:29 -0400 Subject: [PATCH] desktop: move font initialization into preloadData Change-Id: I66840512b45e987cc7b08b07b65bdb24f2023a41 Reviewed-on: https://gerrit.libreoffice.org/57160 Reviewed-by: Jan Holesovsky Tested-by: Jan Holesovsky --- desktop/source/lib/init.cxx | 50 +++++++++++++++++++++++---------------------- 1 file changed, 26 insertions(+), 24 deletions(-) diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index 72b441709be5..e63653507093 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -3638,9 +3638,35 @@ static void preloadData() images.getImageUrl("forcefed.png", "style", "FO_oo"); std::cerr << "Preload languages\n"; + // force load language singleton SvtLanguageTable::HasLanguageType(LANGUAGE_SYSTEM); LanguageTag::isValidBcp47("foo"); + + std::cerr << "Preload fonts\n"; + + // Initialize fonts. + css::uno::Reference xLangSrv = css::linguistic2::LinguServiceManager::create(xContext); + if (xLangSrv.is()) + { + css::uno::Reference xSpell(xLangSrv->getSpellChecker(), css::uno::UNO_QUERY); + css::uno::Reference 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) @@ -3760,30 +3786,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 xLangSrv = css::linguistic2::LinguServiceManager::create(xContext); - if (xLangSrv.is()) - { - css::uno::Reference xSpell(xLangSrv->getSpellChecker(), css::uno::UNO_QUERY); - css::uno::Reference 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(); } -- 2.11.4.GIT