diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2017-12-01 21:56:55 +0000 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2018-01-25 10:08:19 +0100 |
| commit | 5fc484a786a04d65811518b7effab66925dcec72 (patch) | |
| tree | 9a798ae0d79a16cb22fba69bf3d7e1085dded8c1 | |
| parent | fa72a3379d3641565ddab561d32d0a7d03b83665 (diff) | |
Initialize more for sharing during pre-init.
Change-Id: I12b90504ec9161318683ebad8f8e4dd1e614da89
Reviewed-on: https://gerrit.libreoffice.org/46120
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Tested-by: Jan Holesovsky <kendy@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/48510
| -rw-r--r-- | desktop/source/lib/init.cxx | 17 | ||||
| -rw-r--r-- | framework/source/accelerators/globalacceleratorconfiguration.cxx | 3 |
2 files changed, 20 insertions, 0 deletions
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index 569960e82f02..381e727ee954 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -55,6 +55,7 @@ #include <com/sun/star/datatransfer/clipboard/XClipboard.hpp> #include <com/sun/star/text/TextContentAnchorType.hpp> #include <com/sun/star/document/XRedlinesSupplier.hpp> +#include <com/sun/star/ui/GlobalAcceleratorConfiguration.hpp> #include <com/sun/star/linguistic2/LinguServiceManager.hpp> #include <com/sun/star/linguistic2/XSpellChecker.hpp> @@ -84,6 +85,7 @@ #include <vcl/ptrstyle.hxx> #include <vcl/sysdata.hxx> #include <vcl/virdev.hxx> +#include <vcl/ImageTree.hxx> #include <vcl/ITiledRenderable.hxx> #include <vcl/IDialogRenderable.hxx> #include <unicode/uchar.h> @@ -95,6 +97,7 @@ #include <sfx2/sfxbasemodel.hxx> #include <svl/undo.hxx> #include <unotools/datetime.hxx> +#include <i18nlangtag/languagetag.hxx> #include <app.hxx> @@ -3665,6 +3668,20 @@ static void preloadData() xThesaurus->queryMeanings("forcefed", it, aNone); } std::cerr << "\n"; + + css::uno::Reference< css::ui::XAcceleratorConfiguration > xGlobalCfg; + xGlobalCfg = css::ui::GlobalAcceleratorConfiguration::create( + comphelper::getProcessComponentContext()); + xGlobalCfg->getAllKeyEvents(); + + std::cerr << "Preload icons\n"; + ImageTree &images = ImageTree::get(); + images.getImageUrl("forcefed.png", "style", "FO_oo"); + + std::cerr << "Preload languages\n"; + // force load language singleton + SvtLanguageTable::HasLanguageType(LANGUAGE_SYSTEM); + LanguageTag::isValidBcp47("foo", nullptr); } static int lo_initialize(LibreOfficeKit* pThis, const char* pAppPath, const char* pUserProfileUrl) diff --git a/framework/source/accelerators/globalacceleratorconfiguration.cxx b/framework/source/accelerators/globalacceleratorconfiguration.cxx index 36691cb3f2d7..2a05887f7c98 100644 --- a/framework/source/accelerators/globalacceleratorconfiguration.cxx +++ b/framework/source/accelerators/globalacceleratorconfiguration.cxx @@ -19,6 +19,7 @@ #include <accelerators/acceleratorconfiguration.hxx> #include <accelerators/presethandler.hxx> +#include <accelerators/keymapping.hxx> #include <helper/mischelper.hxx> #include <acceleratorconst.h> @@ -81,6 +82,8 @@ private: GlobalAcceleratorConfiguration::GlobalAcceleratorConfiguration(const css::uno::Reference< css::uno::XComponentContext >& xContext) : GlobalAcceleratorConfiguration_BASE(xContext) { + // force keyboard string registration. + KeyMapping::get(); } void GlobalAcceleratorConfiguration::fillCache() |