filter: adapt to changes in LO

6 files changed, 15 insertions, 4 deletions

diff --git a/filter/Library_eps.mk b/filter/Library_eps.mk
index dde91657ef0b..a35c7b4d5ef8 100644
--- a/filter/Library_eps.mk
+++ b/filter/Library_eps.mk
@@ -32,6 +32,7 @@ $(eval $(call gb_Library_set_include,eps,\
 $(eval $(call gb_Library_add_linked_libs,eps,\
 	svt \
 	vcl \
+	utl \
 	tl \
 	cppu \
 	sal \
diff --git a/filter/Library_filterconfig.mk b/filter/Library_filterconfig.mk
index 20159f325042..bfc66a329b04 100644
--- a/filter/Library_filterconfig.mk
+++ b/filter/Library_filterconfig.mk
@@ -29,6 +29,7 @@ $(eval $(call gb_Library_add_api,filterconfig,\
 $(eval $(call gb_Library_set_include,filterconfig,\
 	-I$(SRCDIR)/filter/inc/pch \
 	$$(INCLUDE) \
+	-I$(SRCDIR)/filter/inc \
 ))
 
 $(eval $(call gb_Library_add_linked_libs,filterconfig,\
diff --git a/filter/Library_msfilter.mk b/filter/Library_msfilter.mk
index 3f11459562e1..2663a615ba65 100644
--- a/filter/Library_msfilter.mk
+++ b/filter/Library_msfilter.mk
@@ -68,11 +68,10 @@ $(eval $(call gb_Library_add_exception_objects,msfilter,\
 	filter/source/msfilter/msfiltertracer \
 	filter/source/msfilter/msocximex \
 	filter/source/msfilter/msoleexp \
+	filter/source/msfilter/mstoolbar \
 	filter/source/msfilter/msvbahelper \
-	filter/source/msfilter/msvbasic \
 	filter/source/msfilter/services \
 	filter/source/msfilter/svdfppt \
-	filter/source/msfilter/svxmsbas \
 	filter/source/msfilter/svxmsbas2 \
 ))
 
diff --git a/filter/Library_svgfilter.mk b/filter/Library_svgfilter.mk
index 425067d0e142..31087a1232ab 100644
--- a/filter/Library_svgfilter.mk
+++ b/filter/Library_svgfilter.mk
@@ -37,6 +37,7 @@ $(eval $(call gb_Library_add_linked_libs,svgfilter,\
 	xo \
 	svt \
 	vcl \
+	svl \
 	utl \
 	tl \
 	comphelper \
@@ -59,7 +60,6 @@ $(eval $(call gb_Library_add_exception_objects,svgfilter,\
 	filter/source/svg/svgexport \
 	filter/source/svg/svgfilter \
 	filter/source/svg/svgfontexport \
-	filter/source/svg/svguno \
 	filter/source/svg/svgwriter \
 ))
 
diff --git a/filter/Library_xsltfilter.mk b/filter/Library_xsltfilter.mk
index bc99b82a3074..7ee7244f2835 100644
--- a/filter/Library_xsltfilter.mk
+++ b/filter/Library_xsltfilter.mk
@@ -34,15 +34,24 @@ $(eval $(call gb_Library_set_include,xsltfilter,\
 $(eval $(call gb_Library_add_linked_libs,xsltfilter,\
 	xo \
 	tl \
+	package2 \
+	comphelper \
+	ucbhelper \
 	cppuhelper \
 	cppu \
 	sal \
 	$(gb_STDLIBS) \
 ))
 
+$(call gb_Library_use_externals,xsltfilter,\
+	libxml2 \
+	libxslt \
+)
+
 $(eval $(call gb_Library_add_exception_objects,xsltfilter,\
+	filter/source/xsltfilter/LibXSLTTransformer \
+	filter/source/xsltfilter/OleHandler \
 	filter/source/xsltfilter/XSLTFilter \
-	filter/source/xsltfilter/fla \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/filter/Package_inc.mk b/filter/Package_inc.mk
index 14f197290abb..af2ade6b539c 100644
--- a/filter/Package_inc.mk
+++ b/filter/Package_inc.mk
@@ -27,6 +27,7 @@ $(eval $(call gb_Package_add_file,filter_inc,inc/filter/msfilter/msdffimp.hxx,fi
 $(eval $(call gb_Package_add_file,filter_inc,inc/filter/msfilter/msfiltertracer.hxx,filter/msfilter/msfiltertracer.hxx))
 $(eval $(call gb_Package_add_file,filter_inc,inc/filter/msfilter/msocximex.hxx,filter/msfilter/msocximex.hxx))
 $(eval $(call gb_Package_add_file,filter_inc,inc/filter/msfilter/msoleexp.hxx,filter/msfilter/msoleexp.hxx))
+$(eval $(call gb_Package_add_file,filter_inc,inc/filter/msfilter/mstoolbar.hxx,filter/msfilter/mstoolbar.hxx))
 $(eval $(call gb_Package_add_file,filter_inc,inc/filter/msfilter/msvbahelper.hxx,filter/msfilter/msvbahelper.hxx))
 $(eval $(call gb_Package_add_file,filter_inc,inc/filter/msfilter/svdfppt.hxx,filter/msfilter/svdfppt.hxx))
 $(eval $(call gb_Package_add_file,filter_inc,inc/filter/msfilter/svxmsbas.hxx,filter/msfilter/svxmsbas.hxx))