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>

22 files changed, 0 insertions, 44 deletions

diff --git a/sc/CppunitTest_sc_annotationobj.mk b/sc/CppunitTest_sc_annotationobj.mk
index 06e0ac6cccb3..25bc1c657f27 100644
--- a/sc/CppunitTest_sc_annotationobj.mk
+++ b/sc/CppunitTest_sc_annotationobj.mk
@@ -106,8 +106,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_annotationobj,\
 
 $(eval $(call gb_CppunitTest_use_configuration,sc_annotationobj))
 
-$(eval $(call gb_CppunitTest_use_filter_configuration,sc_annotationobj))
-
 $(eval $(call gb_CppunitTest_use_unittest_configuration,sc_annotationobj))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_annotationshapeobj.mk b/sc/CppunitTest_sc_annotationshapeobj.mk
index f9f6a8c6478f..e9678126e752 100644
--- a/sc/CppunitTest_sc_annotationshapeobj.mk
+++ b/sc/CppunitTest_sc_annotationshapeobj.mk
@@ -104,8 +104,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_annonationshapeobj,\
 
 $(eval $(call gb_CppunitTest_use_configuration,sc_annonationshapeobj))
 
-$(eval $(call gb_CppunitTest_use_filter_configuration,sc_annonationshapeobj))
-
 $(eval $(call gb_CppunitTest_use_unittest_configuration,sc_annonationshapeobj))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_annotationsobj.mk b/sc/CppunitTest_sc_annotationsobj.mk
index 9728c948bf68..d36fb5a3ba2b 100644
--- a/sc/CppunitTest_sc_annotationsobj.mk
+++ b/sc/CppunitTest_sc_annotationsobj.mk
@@ -106,8 +106,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_annotationsobj,\
 
 $(eval $(call gb_CppunitTest_use_configuration,sc_annotationsobj))
 
-$(eval $(call gb_CppunitTest_use_filter_configuration,sc_annotationsobj))
-
 $(eval $(call gb_CppunitTest_use_unittest_configuration,sc_annotationsobj))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_cellrangeobj.mk b/sc/CppunitTest_sc_cellrangeobj.mk
index aecd1d7236bc..e27a7a51acaf 100644
--- a/sc/CppunitTest_sc_cellrangeobj.mk
+++ b/sc/CppunitTest_sc_cellrangeobj.mk
@@ -106,8 +106,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_cellrangesbase,\
 
 $(eval $(call gb_CppunitTest_use_configuration,sc_cellrangesbase))
 
-$(eval $(call gb_CppunitTest_use_filter_configuration,sc_cellrangesbase))
-
 $(eval $(call gb_CppunitTest_use_unittest_configuration,sc_cellrangesbase))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_chart_regression_test.mk b/sc/CppunitTest_sc_chart_regression_test.mk
index 6a6474704ea1..703ed0c351b7 100644
--- a/sc/CppunitTest_sc_chart_regression_test.mk
+++ b/sc/CppunitTest_sc_chart_regression_test.mk
@@ -109,8 +109,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_chart_regression_test,\
 
 $(eval $(call gb_CppunitTest_use_configuration,sc_chart_regression_test))
 
-$(eval $(call gb_CppunitTest_use_filter_configuration,sc_chart_regression_test))
-
 $(eval $(call gb_CppunitTest_use_unittest_configuration,sc_chart_regression_test))
 
 $(eval $(call gb_CppunitTest_use_external,sc_chart_regression_test,libxml2))
diff --git a/sc/CppunitTest_sc_databaserangeobj.mk b/sc/CppunitTest_sc_databaserangeobj.mk
index c867d93f481c..1022d943eaf4 100644
--- a/sc/CppunitTest_sc_databaserangeobj.mk
+++ b/sc/CppunitTest_sc_databaserangeobj.mk
@@ -104,8 +104,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_databaserangeobj,\
 
 $(eval $(call gb_CppunitTest_use_configuration,sc_databaserangeobj))
 
-$(eval $(call gb_CppunitTest_use_filter_configuration,sc_databaserangeobj))
-
 $(eval $(call gb_CppunitTest_use_unittest_configuration,sc_databaserangeobj))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_datapilotfieldobj.mk b/sc/CppunitTest_sc_datapilotfieldobj.mk
index e9e73d732c82..927f37d2c773 100644
--- a/sc/CppunitTest_sc_datapilotfieldobj.mk
+++ b/sc/CppunitTest_sc_datapilotfieldobj.mk
@@ -105,8 +105,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_datapilotfieldobj,\
 
 $(eval $(call gb_CppunitTest_use_configuration,sc_datapilotfieldobj))
 
-$(eval $(call gb_CppunitTest_use_filter_configuration,sc_datapilotfieldobj))
-
 $(eval $(call gb_CppunitTest_use_unittest_configuration,sc_datapilotfieldobj))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_datapilottableobj.mk b/sc/CppunitTest_sc_datapilottableobj.mk
index 2f18dae54f00..79a106dd0efb 100644
--- a/sc/CppunitTest_sc_datapilottableobj.mk
+++ b/sc/CppunitTest_sc_datapilottableobj.mk
@@ -105,8 +105,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_datapilottableobj,\
 
 $(eval $(call gb_CppunitTest_use_configuration,sc_datapilottableobj))
 
-$(eval $(call gb_CppunitTest_use_filter_configuration,sc_datapilottableobj))
-
 $(eval $(call gb_CppunitTest_use_unittest_configuration,sc_datapilottableobj))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_editfieldobj_cell.mk b/sc/CppunitTest_sc_editfieldobj_cell.mk
index 2a48401ca171..a1859970baa8 100644
--- a/sc/CppunitTest_sc_editfieldobj_cell.mk
+++ b/sc/CppunitTest_sc_editfieldobj_cell.mk
@@ -104,8 +104,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_editfieldobj_cell,\
 
 $(eval $(call gb_CppunitTest_use_configuration,sc_editfieldobj_cell))
 
-$(eval $(call gb_CppunitTest_use_filter_configuration,sc_editfieldobj_cell))
-
 $(eval $(call gb_CppunitTest_use_unittest_configuration,sc_editfieldobj_cell))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_editfieldobj_header.mk b/sc/CppunitTest_sc_editfieldobj_header.mk
index dd5d052fa0f8..90160b1f23b5 100644
--- a/sc/CppunitTest_sc_editfieldobj_header.mk
+++ b/sc/CppunitTest_sc_editfieldobj_header.mk
@@ -104,8 +104,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_editfieldobj_header,\
 
 $(eval $(call gb_CppunitTest_use_configuration,sc_editfieldobj_header))
 
-$(eval $(call gb_CppunitTest_use_filter_configuration,sc_editfieldobj_header))
-
 $(eval $(call gb_CppunitTest_use_unittest_configuration,sc_editfieldobj_header))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_filters_test.mk b/sc/CppunitTest_sc_filters_test.mk
index 82a6cf753833..58c3949dbe6d 100644
--- a/sc/CppunitTest_sc_filters_test.mk
+++ b/sc/CppunitTest_sc_filters_test.mk
@@ -116,6 +116,4 @@ $(eval $(call gb_CppunitTest_use_components,sc_filters_test,\
 
 $(eval $(call gb_CppunitTest_use_configuration,sc_filters_test))
 
-$(eval $(call gb_CppunitTest_use_filter_configuration,sc_filters_test))
-
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_macros_test.mk b/sc/CppunitTest_sc_macros_test.mk
index ace83ce3a182..516474e48699 100644
--- a/sc/CppunitTest_sc_macros_test.mk
+++ b/sc/CppunitTest_sc_macros_test.mk
@@ -112,8 +112,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_macros_test,\
 
 $(eval $(call gb_CppunitTest_use_configuration,sc_macros_test))
 
-$(eval $(call gb_CppunitTest_use_filter_configuration,sc_macros_test))
-
 $(eval $(call gb_CppunitTest_use_unittest_configuration,sc_macros_test))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_modelobj.mk b/sc/CppunitTest_sc_modelobj.mk
index 65be2c5eac82..760842a9d73b 100644
--- a/sc/CppunitTest_sc_modelobj.mk
+++ b/sc/CppunitTest_sc_modelobj.mk
@@ -105,8 +105,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_modelobj,\
 
 $(eval $(call gb_CppunitTest_use_configuration,sc_modelobj))
 
-$(eval $(call gb_CppunitTest_use_filter_configuration,sc_modelobj))
-
 $(eval $(call gb_CppunitTest_use_unittest_configuration,sc_modelobj))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_namedrangeobj.mk b/sc/CppunitTest_sc_namedrangeobj.mk
index 337936b438a0..5af7ada215bd 100644
--- a/sc/CppunitTest_sc_namedrangeobj.mk
+++ b/sc/CppunitTest_sc_namedrangeobj.mk
@@ -105,8 +105,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_namedrangeobj,\
 
 $(eval $(call gb_CppunitTest_use_configuration,sc_namedrangeobj))
 
-$(eval $(call gb_CppunitTest_use_filter_configuration,sc_namedrangeobj))
-
 $(eval $(call gb_CppunitTest_use_unittest_configuration,sc_namedrangeobj))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_namedrangesobj.mk b/sc/CppunitTest_sc_namedrangesobj.mk
index 92a160c249f6..c346ff99578a 100644
--- a/sc/CppunitTest_sc_namedrangesobj.mk
+++ b/sc/CppunitTest_sc_namedrangesobj.mk
@@ -105,8 +105,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_namedrangesobj,\
 
 $(eval $(call gb_CppunitTest_use_configuration,sc_namedrangesobj))
 
-$(eval $(call gb_CppunitTest_use_filter_configuration,sc_namedrangesobj))
-
 $(eval $(call gb_CppunitTest_use_unittest_configuration,sc_namedrangesobj))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_outlineobj.mk b/sc/CppunitTest_sc_outlineobj.mk
index 62043f03e9d1..8d661719117c 100644
--- a/sc/CppunitTest_sc_outlineobj.mk
+++ b/sc/CppunitTest_sc_outlineobj.mk
@@ -106,8 +106,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_outlineobj,\
 
 $(eval $(call gb_CppunitTest_use_configuration,sc_outlineobj))
 
-$(eval $(call gb_CppunitTest_use_filter_configuration,sc_outlineobj))
-
 $(eval $(call gb_CppunitTest_use_unittest_configuration,sc_outlineobj))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_rangelst_test.mk b/sc/CppunitTest_sc_rangelst_test.mk
index 5618c0466ca9..45cef04a437c 100644
--- a/sc/CppunitTest_sc_rangelst_test.mk
+++ b/sc/CppunitTest_sc_rangelst_test.mk
@@ -125,8 +125,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_rangelst_test,\
 
 $(eval $(call gb_CppunitTest_use_configuration,sc_rangelst_test))
 
-$(eval $(call gb_CppunitTest_use_filter_configuration,sc_rangelst_test))
-
 $(eval $(call gb_CppunitTest_use_unittest_configuration,sc_rangelst_test))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_subsequent_export_test.mk b/sc/CppunitTest_sc_subsequent_export_test.mk
index 1896bbd5ab3d..fc53cc7b5169 100644
--- a/sc/CppunitTest_sc_subsequent_export_test.mk
+++ b/sc/CppunitTest_sc_subsequent_export_test.mk
@@ -121,6 +121,4 @@ endif
 
 $(eval $(call gb_CppunitTest_use_configuration,sc_subsequent_export_test))
 
-$(eval $(call gb_CppunitTest_use_filter_configuration,sc_subsequent_export_test))
-
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_subsequent_filters_test.mk b/sc/CppunitTest_sc_subsequent_filters_test.mk
index 4bc57c3b6eba..a5acabd791f8 100644
--- a/sc/CppunitTest_sc_subsequent_filters_test.mk
+++ b/sc/CppunitTest_sc_subsequent_filters_test.mk
@@ -121,6 +121,4 @@ endif
 
 $(eval $(call gb_CppunitTest_use_configuration,sc_subsequent_filters_test))
 
-$(eval $(call gb_CppunitTest_use_filter_configuration,sc_subsequent_filters_test))
-
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_tableautoformatfield.mk b/sc/CppunitTest_sc_tableautoformatfield.mk
index c5fff4edcf27..413c6c5fe6f5 100644
--- a/sc/CppunitTest_sc_tableautoformatfield.mk
+++ b/sc/CppunitTest_sc_tableautoformatfield.mk
@@ -102,8 +102,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_tableautoformatfield,\
 
 $(eval $(call gb_CppunitTest_use_configuration,sc_tableautoformatfield))
 
-$(eval $(call gb_CppunitTest_use_filter_configuration,sc_tableautoformatfield))
-
 $(eval $(call gb_CppunitTest_use_unittest_configuration,sc_tableautoformatfield))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_tablesheetobj.mk b/sc/CppunitTest_sc_tablesheetobj.mk
index 84bcd6051a41..06a8e6f48469 100644
--- a/sc/CppunitTest_sc_tablesheetobj.mk
+++ b/sc/CppunitTest_sc_tablesheetobj.mk
@@ -106,8 +106,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_tablesheetobj,\
 
 $(eval $(call gb_CppunitTest_use_configuration,sc_tablesheetobj))
 
-$(eval $(call gb_CppunitTest_use_filter_configuration,sc_tablesheetobj))
-
 $(eval $(call gb_CppunitTest_use_unittest_configuration,sc_tablesheetobj))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_tablesheetsobj.mk b/sc/CppunitTest_sc_tablesheetsobj.mk
index 210651cd3cc4..dd6a8d81720a 100644
--- a/sc/CppunitTest_sc_tablesheetsobj.mk
+++ b/sc/CppunitTest_sc_tablesheetsobj.mk
@@ -106,8 +106,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_tablesheetsobj,\
 
 $(eval $(call gb_CppunitTest_use_configuration,sc_tablesheetsobj))
 
-$(eval $(call gb_CppunitTest_use_filter_configuration,sc_tablesheetsobj))
-
 $(eval $(call gb_CppunitTest_use_unittest_configuration,sc_tablesheetsobj))
 
 # vim: set noet sw=4 ts=4: