summaryrefslogtreecommitdiff
path: root/desktop
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@collabora.com>2018-02-11 00:01:44 +0100
committerMichael Meeks <michael.meeks@collabora.com>2018-02-12 22:27:55 +0100
commit707f787cd991f9c59712cd3020d127d09605c792 (patch)
tree7d6fcb47d83e37e6baa53c901a53efc16181a75f /desktop
parentf8da775795052ad2eb879970c115d2e2a2fe8c81 (diff)
lok: enable pre-loading with Vcl's builder
Cache vclbuilder's loaded modules globally & simplify logic. Pre-populate that cache on preload for LOK vs. a somewhat inelegant pre-canned list of dialog libraries. Change-Id: I86d936862a41495fd37908f3ee7eb2e0c363d651 Reviewed-on: https://gerrit.libreoffice.org/49550 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Diffstat (limited to 'desktop')
-rw-r--r--desktop/source/lib/init.cxx6
1 files changed, 5 insertions, 1 deletions
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 2165a781725a..f5952665d148 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -98,6 +98,8 @@
#include <svl/undo.hxx>
#include <unotools/datetime.hxx>
#include <i18nlangtag/languagetag.hxx>
+#include <vcl/builder.hxx>
+#include <vcl/abstdlg.hxx>
#include <app.hxx>
@@ -3811,7 +3813,9 @@ static int lo_initialize(LibreOfficeKit* pThis, const char* pAppPath, const char
// 2) comphelper::setProcessServiceFactory(xSFactory);
// 3) InitVCL()
aService->initialize({css::uno::makeAny<OUString>("preload")});
-
+ // Force load some modules
+ VclBuilder::preload();
+ VclAbstractDialogFactory::Create();
preloadData();
// Release Solar Mutex, lo_startmain thread should acquire it.