diff options
| author | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2018-06-28 01:07:32 -0400 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2018-09-12 17:58:49 +0200 |
| commit | bcef1c1c21b5819343e2d4b324fe57635ffcb4a1 (patch) | |
| tree | d7ace7de997ea3f6278d10afa9cf7b46a18b0ed5 /desktop/source/lib/init.cxx | |
| parent | 713e8d6ebc5e25c287dcc645cc61b247d50edf3a (diff) | |
desktop: initialize fonts in pre-init
Reviewed-on: https://gerrit.libreoffice.org/56573
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Tested-by: Jan Holesovsky <kendy@collabora.com>
(cherry picked from commit e7f65920b12517b31f0c5cbfd0dcb8df96d20ba4)
Change-Id: I5a3acc41196c7e0672514fa2dae00e5fc0f76a1f
Diffstat (limited to 'desktop/source/lib/init.cxx')
| -rw-r--r-- | desktop/source/lib/init.cxx | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index 79e975ddbe6e..a09bd793e159 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -63,6 +63,7 @@ #include <com/sun/star/linguistic2/LinguServiceManager.hpp> #include <com/sun/star/linguistic2/XSpellChecker.hpp> +#include <com/sun/star/i18n/ScriptType.hpp> #include <editeng/fontitem.hxx> #include <editeng/flstitem.hxx> @@ -105,6 +106,7 @@ #include <svl/undo.hxx> #include <unotools/datetime.hxx> #include <android/compatibility.hxx> +#include <i18nlangtag/mslangid.hxx> #include <i18nlangtag/languagetag.hxx> #include <vcl/builder.hxx> #include <vcl/abstdlg.hxx> @@ -3923,6 +3925,31 @@ static int lo_initialize(LibreOfficeKit* pThis, const char* pAppPath, const char // Force load some modules VclBuilder::preload(); VclAbstractDialogFactory::Create(); + + // 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); + } + preloadData(); // Release Solar Mutex, lo_startmain thread should acquire it. |