summaryrefslogtreecommitdiff
path: root/desktop
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.com>2019-07-04 11:57:27 +0200
committerMichael Meeks <michael.meeks@collabora.com>2019-07-04 13:03:00 +0200
commitb90733fceb9d831a2c796f8ce6b3fffc309f4153 (patch)
tree1c27fc9b2e0d80637f72a0ad8904c348481b710a /desktop
parent6c5063da1dc6ba4b6b4cd9a82d7c54b053cdfb38 (diff)
vcl lok: pre-load graphic libraries
This is needed to be able to load e.g. TIFF files in Online, which does not have code in the chroot since online.git commit ad21717498cc214d5d5d5c0ff378238552137e2f (Avoid copying most code into the chroot jail., 2018-03-10). Conflicts: vcl/source/filter/graphicfilter.cxx Change-Id: Ib095191ee690d9da6269878a82b1c6995df50dfa Reviewed-on: https://gerrit.libreoffice.org/75078 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com>
Diffstat (limited to 'desktop')
-rw-r--r--desktop/source/lib/init.cxx3
1 files changed, 3 insertions, 0 deletions
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 8cfa28881d90..6abda3e775a5 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -5171,6 +5171,9 @@ static int lo_initialize(LibreOfficeKit* pThis, const char* pAppPath, const char
InitVCL();
}
+ // pre-load all graphic libraries.
+ GraphicFilter::GetGraphicFilter().preload();
+
// pre-load all component libraries.
if (!xContext.is())
throw css::uno::DeploymentException("preInit: XComponentContext is not created");