summaryrefslogtreecommitdiff
path: root/sd/source/ui
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@collabora.com>2018-11-21 19:07:41 +0000
committerThorsten Behrens <Thorsten.Behrens@CIB.de>2018-12-06 11:28:53 +0100
commit9fae95fef82bab8e0760d49ccce51a30ab705941 (patch)
tree51030892b2940a408aecdfd2e8ce1559dca21032 /sd/source/ui
parente5871345dbf77bd09df6dd7bd201d3f9e84e2390 (diff)
fix tdf#121468: preload fixes for Impress filters
was: Re-factor internal filter logic, and impl. preload properly. Reviewed-on: https://gerrit.libreoffice.org/63761 Tested-by: Jenkins Reviewed-by: Michael Meeks <michael.meeks@collabora.com> (cherry picked from commit 7b34fb18a4d60bfc4e32b7c382ac596cbc2e776f) Reviewed-on: https://gerrit.libreoffice.org/63850 Conflicts: sd/inc/sdfilter.hxx sd/source/ui/app/sddll.cxx Change-Id: I4c55ceb19d5db2c1e4756901d0d8b14878641a99 Reviewed-on: https://gerrit.libreoffice.org/64616 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Diffstat (limited to 'sd/source/ui')
-rw-r--r--sd/source/ui/app/sddll.cxx3
1 files changed, 3 insertions, 0 deletions
diff --git a/sd/source/ui/app/sddll.cxx b/sd/source/ui/app/sddll.cxx
index 072702db97d7..35b7ca6f5113 100644
--- a/sd/source/ui/app/sddll.cxx
+++ b/sd/source/ui/app/sddll.cxx
@@ -95,6 +95,8 @@
#include <vcl/FilterConfigItem.hxx>
#include <o3tl/make_unique.hxx>
#include <sdabstdlg.hxx>
+#include <sdfilter.hxx>
+#include <sdmod.hxx>
using namespace ::com::sun::star;
@@ -293,6 +295,7 @@ void SdDLL::Init()
extern "C" SAL_DLLPUBLIC_EXPORT
void lok_preload_hook()
{
+ SdFilter::Preload();
SdAbstractDialogFactory::Create();
}