[Libreoffice-commits] core.git: Branch 'distro/collabora/cd-5.3-3.2' - 2 commits - configure.ac desktop/source
Jan Holesovsky
kendy at collabora.com
Thu Jul 12 21:15:06 UTC 2018
configure.ac | 2 -
desktop/source/lib/init.cxx | 50 ++++++++++++++++++++++----------------------
2 files changed, 27 insertions(+), 25 deletions(-)
New commits:
commit 9247187ea846ca956d48330708a43932559c7be6
Author: Jan Holesovsky <kendy at collabora.com>
Date: Thu Jul 12 23:14:19 2018 +0200
Bump version 5.3-49
Change-Id: I27cbc26e1623123ad522ceefdaf9aaa9b235bd25
diff --git a/configure.ac b/configure.ac
index 6d93aa49f500..daa8073287b9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
# several non-alphanumeric characters, those are split off and used only for the
# ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea.
-AC_INIT([Collabora Office],[5.3.10.48],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[5.3.10.49],[],[],[https://collaboraoffice.com/])
AC_PREREQ([2.59])
commit 0efaa14cda8fa607a57c465052a32dc1a9960931
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date: Fri Jul 6 16:49:29 2018 -0400
desktop: move font initialization into preloadData
Change-Id: I66840512b45e987cc7b08b07b65bdb24f2023a41
Reviewed-on: https://gerrit.libreoffice.org/57160
Reviewed-by: Jan Holesovsky <kendy at collabora.com>
Tested-by: Jan Holesovsky <kendy at collabora.com>
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<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)
@@ -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<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();
}
More information about the Libreoffice-commits
mailing list