gbuild: use .xcd configuration files from instdir

..instead of .xcu files in solver/*/xml/registry
when running unittests and gengal.

Change-Id: I390a6c531d653acca7ef3379c49fe65fcb8f3c2a
Reviewed-on: https://gerrit.libreoffice.org/6057
Tested-by: Michael Stahl <mstahl@redhat.com>
Reviewed-by: Michael Stahl <mstahl@redhat.com>

12 files changed, 0 insertions, 24 deletions

diff --git a/sw/CppunitTest_sw_filters_test.mk b/sw/CppunitTest_sw_filters_test.mk
index 2545b35d3c0a..0e2c044d4110 100644
--- a/sw/CppunitTest_sw_filters_test.mk
+++ b/sw/CppunitTest_sw_filters_test.mk
@@ -87,6 +87,4 @@ $(eval $(call gb_CppunitTest_use_components,sw_filters_test,\
 
 $(eval $(call gb_CppunitTest_use_configuration,sw_filters_test))
 
-$(eval $(call gb_CppunitTest_use_filter_configuration,sw_filters_test))
-
 # vim: set noet sw=4 ts=4:
diff --git a/sw/CppunitTest_sw_htmlexport.mk b/sw/CppunitTest_sw_htmlexport.mk
index 5041627c03e9..32134351faad 100644
--- a/sw/CppunitTest_sw_htmlexport.mk
+++ b/sw/CppunitTest_sw_htmlexport.mk
@@ -82,8 +82,6 @@ $(eval $(call gb_CppunitTest_use_components,sw_htmlexport,\
 
 $(eval $(call gb_CppunitTest_use_configuration,sw_htmlexport))
 
-$(eval $(call gb_CppunitTest_use_filter_configuration,sw_htmlexport))
-
 $(eval $(call gb_CppunitTest_use_unittest_configuration,sw_htmlexport))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sw/CppunitTest_sw_layout_test.mk b/sw/CppunitTest_sw_layout_test.mk
index c074f1db4593..1a52610cb441 100644
--- a/sw/CppunitTest_sw_layout_test.mk
+++ b/sw/CppunitTest_sw_layout_test.mk
@@ -99,8 +99,6 @@ $(eval $(call gb_CppunitTest_use_components,sw_layout_test,\
 
 $(eval $(call gb_CppunitTest_use_configuration,sw_layout_test))
 
-$(eval $(call gb_CppunitTest_use_filter_configuration,sw_layout_test))
-
 $(eval $(call gb_CppunitTest_use_unittest_configuration,sw_layout_test))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sw/CppunitTest_sw_macros_test.mk b/sw/CppunitTest_sw_macros_test.mk
index cf3c425318ff..49b8b53f4d55 100644
--- a/sw/CppunitTest_sw_macros_test.mk
+++ b/sw/CppunitTest_sw_macros_test.mk
@@ -104,8 +104,6 @@ $(eval $(call gb_CppunitTest_use_components,sw_macros_test,\
 
 $(eval $(call gb_CppunitTest_use_configuration,sw_macros_test))
 
-$(eval $(call gb_CppunitTest_use_filter_configuration,sw_macros_test))
-
 $(eval $(call gb_CppunitTest_use_unittest_configuration,sw_macros_test))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sw/CppunitTest_sw_odfexport.mk b/sw/CppunitTest_sw_odfexport.mk
index a484b9afcb4a..179f344f823a 100644
--- a/sw/CppunitTest_sw_odfexport.mk
+++ b/sw/CppunitTest_sw_odfexport.mk
@@ -82,8 +82,6 @@ $(eval $(call gb_CppunitTest_use_components,sw_odfexport,\
 
 $(eval $(call gb_CppunitTest_use_configuration,sw_odfexport))
 
-$(eval $(call gb_CppunitTest_use_filter_configuration,sw_odfexport))
-
 $(eval $(call gb_CppunitTest_use_unittest_configuration,sw_odfexport))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sw/CppunitTest_sw_odfimport.mk b/sw/CppunitTest_sw_odfimport.mk
index 756f1810bcc4..1320fefac3d3 100644
--- a/sw/CppunitTest_sw_odfimport.mk
+++ b/sw/CppunitTest_sw_odfimport.mk
@@ -82,8 +82,6 @@ $(eval $(call gb_CppunitTest_use_components,sw_odfimport,\
 
 $(eval $(call gb_CppunitTest_use_configuration,sw_odfimport))
 
-$(eval $(call gb_CppunitTest_use_filter_configuration,sw_odfimport))
-
 $(eval $(call gb_CppunitTest_use_unittest_configuration,sw_odfimport))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sw/CppunitTest_sw_ooxmlexport.mk b/sw/CppunitTest_sw_ooxmlexport.mk
index 2e90beca897c..0158be6cd5cf 100644
--- a/sw/CppunitTest_sw_ooxmlexport.mk
+++ b/sw/CppunitTest_sw_ooxmlexport.mk
@@ -83,8 +83,6 @@ $(eval $(call gb_CppunitTest_use_components,sw_ooxmlexport,\
 
 $(eval $(call gb_CppunitTest_use_configuration,sw_ooxmlexport))
 
-$(eval $(call gb_CppunitTest_use_filter_configuration,sw_ooxmlexport))
-
 $(eval $(call gb_CppunitTest_use_unittest_configuration,sw_ooxmlexport))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sw/CppunitTest_sw_ooxmlimport.mk b/sw/CppunitTest_sw_ooxmlimport.mk
index 45cac9ec1d0e..583189368e56 100644
--- a/sw/CppunitTest_sw_ooxmlimport.mk
+++ b/sw/CppunitTest_sw_ooxmlimport.mk
@@ -82,8 +82,6 @@ $(eval $(call gb_CppunitTest_use_components,sw_ooxmlimport,\
 
 $(eval $(call gb_CppunitTest_use_configuration,sw_ooxmlimport))
 
-$(eval $(call gb_CppunitTest_use_filter_configuration,sw_ooxmlimport))
-
 $(eval $(call gb_CppunitTest_use_unittest_configuration,sw_ooxmlimport))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sw/CppunitTest_sw_rtfexport.mk b/sw/CppunitTest_sw_rtfexport.mk
index e62647ca885c..7bc28b4c61d9 100644
--- a/sw/CppunitTest_sw_rtfexport.mk
+++ b/sw/CppunitTest_sw_rtfexport.mk
@@ -78,8 +78,6 @@ $(eval $(call gb_CppunitTest_use_components,sw_rtfexport,\
 
 $(eval $(call gb_CppunitTest_use_configuration,sw_rtfexport))
 
-$(eval $(call gb_CppunitTest_use_filter_configuration,sw_rtfexport))
-
 $(eval $(call gb_CppunitTest_use_unittest_configuration,sw_rtfexport))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sw/CppunitTest_sw_rtfimport.mk b/sw/CppunitTest_sw_rtfimport.mk
index be6613adf2ff..ba09f4b50498 100644
--- a/sw/CppunitTest_sw_rtfimport.mk
+++ b/sw/CppunitTest_sw_rtfimport.mk
@@ -80,8 +80,6 @@ $(eval $(call gb_CppunitTest_use_components,sw_rtfimport,\
 
 $(eval $(call gb_CppunitTest_use_configuration,sw_rtfimport))
 
-$(eval $(call gb_CppunitTest_use_filter_configuration,sw_rtfimport))
-
 $(eval $(call gb_CppunitTest_use_unittest_configuration,sw_rtfimport))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sw/CppunitTest_sw_ww8export.mk b/sw/CppunitTest_sw_ww8export.mk
index 2b1a4751f20d..78ee4e3b6da4 100644
--- a/sw/CppunitTest_sw_ww8export.mk
+++ b/sw/CppunitTest_sw_ww8export.mk
@@ -80,8 +80,6 @@ $(eval $(call gb_CppunitTest_use_components,sw_ww8export,\
 
 $(eval $(call gb_CppunitTest_use_configuration,sw_ww8export))
 
-$(eval $(call gb_CppunitTest_use_filter_configuration,sw_ww8export))
-
 $(eval $(call gb_CppunitTest_use_unittest_configuration,sw_ww8export))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sw/CppunitTest_sw_ww8import.mk b/sw/CppunitTest_sw_ww8import.mk
index 1cb3425c5f2b..e45addc88063 100644
--- a/sw/CppunitTest_sw_ww8import.mk
+++ b/sw/CppunitTest_sw_ww8import.mk
@@ -72,8 +72,6 @@ $(eval $(call gb_CppunitTest_use_components,sw_ww8import,\
 
 $(eval $(call gb_CppunitTest_use_configuration,sw_ww8import))
 
-$(eval $(call gb_CppunitTest_use_filter_configuration,sw_ww8import))
-
 $(eval $(call gb_CppunitTest_use_unittest_configuration,sw_ww8import))
 
 # vim: set noet sw=4 ts=4: