Sun Apr 8 05:53:53 PDT 2012

dbaccess/CppunitTest_dbaccess_macros_test.mk               |   17 --
 extensions/CppunitTest_extensions_test_update.mk           |   11 -
 filter/CppunitTest_filter_tga_test.mk                      |   15 -
 filter/CppunitTest_filter_tiff_test.mk                     |   15 -
 hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk          |   20 --
 i18npool/CppunitTest_i18npool_test_breakiterator.mk        |   16 -
 lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk |   19 --
 offapi/UnoApiMerge_types.mk                                |    4 
 offapi/UnoApi_offapi.mk                                    |    2 
 oovbaapi/UnoApi_oovbaapi.mk                                |    2 
 sc/CppunitTest_sc_cellrangeobj.mk                          |   20 --
 sc/CppunitTest_sc_chart_regression_test.mk                 |   20 --
 sc/CppunitTest_sc_databaserangeobj.mk                      |   19 --
 sc/CppunitTest_sc_datapilotfieldobj.mk                     |   19 --
 sc/CppunitTest_sc_datapilottableobj.mk                     |   19 --
 sc/CppunitTest_sc_filters_test.mk                          |   17 --
 sc/CppunitTest_sc_macros_test.mk                           |   20 --
 sc/CppunitTest_sc_namedrangeobj.mk                         |   19 --
 sc/CppunitTest_sc_namedrangesobj.mk                        |   19 --
 sc/CppunitTest_sc_subsequent_filters_test.mk               |   17 --
 sc/CppunitTest_sc_tableautoformatfield.mk                  |   19 --
 sc/CppunitTest_sc_tablesheetobj.mk                         |   24 --
 sc/CppunitTest_sc_tablesheetsobj.mk                        |   23 --
 sc/CppunitTest_sc_ucalc.mk                                 |   11 -
 scaddins/InternalUnoApi_scaddins.mk                        |    4 
 sd/CppunitTest_sd_filters_test.mk                          |   16 -
 sd/CppunitTest_sd_regression_test.mk                       |   23 +-
 sd/CppunitTest_sd_uimpress.mk                              |   11 -
 sdext/CppunitTest_pdfimport.mk                             |   13 -
 smoketest/CppunitTest_smoketest.mk                         |    6 
 solenv/gbuild/CppunitTest.mk                               |  108 +++++++++----
 solenv/gbuild/InternalUnoApi.mk                            |   26 ++-
 solenv/gbuild/UnoApi.mk                                    |   17 +-
 solenv/gbuild/UnoApiMerge.mk                               |   19 +-
 solenv/gbuild/UnoApiTarget.mk                              |   32 +++
 solenv/gbuild/platform/WNT_INTEL_GCC.mk                    |    5 
 solenv/gbuild/platform/WNT_INTEL_MSC.mk                    |    5 
 solenv/gbuild/platform/com_GCC_defs.mk                     |    5 
 solenv/gbuild/platform/solaris.mk                          |    5 
 sot/CppunitTest_sot_test_sot.mk                            |   14 -
 starmath/CppunitTest_starmath_qa_cppunit.mk                |   12 -
 svl/CppunitTest_svl_urihelper.mk                           |   11 -
 svtools/CppunitTest_svtools_filters_test.mk                |   15 -
 sw/CppunitTest_sw_filters_test.mk                          |   14 -
 sw/CppunitTest_sw_layout_test.mk                           |   21 --
 sw/CppunitTest_sw_macros_test.mk                           |   21 --
 sw/CppunitTest_sw_regression_test.mk                       |   21 --
 sw/CppunitTest_sw_subsequent_ooxmltok.mk                   |   15 -
 sw/CppunitTest_sw_subsequent_rtftok.mk                     |   15 -
 sw/CppunitTest_sw_swdoc_test.mk                            |   11 -
 udkapi/UnoApiMerge_uretypes.mk                             |    2 
 writerfilter/CppunitTest_writerfilter_rtftok.mk            |   11 -
 52 files changed, 332 insertions(+), 533 deletions(-)

New commits:
commit cd2c512f9f6b6aa000fa48efb18033b3ebb3a264
Author: David Tardon <dtardon at redhat.com>
Date:   Sun Apr 8 14:45:43 2012 +0200

    clean up

diff --git a/filter/CppunitTest_filter_tga_test.mk b/filter/CppunitTest_filter_tga_test.mk
index 51edf53..126f605 100644
--- a/filter/CppunitTest_filter_tga_test.mk
+++ b/filter/CppunitTest_filter_tga_test.mk
@@ -41,10 +41,6 @@ $(eval $(call gb_CppunitTest_use_libraries,filter_tga_test, \
     $(gb_STDLIBS) \
 ))
 
-$(eval $(call gb_CppunitTest_set_include,filter_tga_test,\
-    $$(INCLUDE) \
-))
-
 $(eval $(call gb_CppunitTest_use_api,filter_tga_test,\
     udkapi \
     offapi \
diff --git a/filter/CppunitTest_filter_tiff_test.mk b/filter/CppunitTest_filter_tiff_test.mk
index a647a32..035712b 100644
--- a/filter/CppunitTest_filter_tiff_test.mk
+++ b/filter/CppunitTest_filter_tiff_test.mk
@@ -41,10 +41,6 @@ $(eval $(call gb_CppunitTest_use_libraries,filter_tiff_test, \
     $(gb_STDLIBS) \
 ))
 
-$(eval $(call gb_CppunitTest_set_include,filter_tiff_test,\
-    $$(INCLUDE) \
-))
-
 $(eval $(call gb_CppunitTest_use_api,filter_tiff_test,\
     udkapi \
     offapi \
diff --git a/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk b/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk
index a0b0170..1d3fcd7 100644
--- a/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk
+++ b/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk
@@ -45,10 +45,6 @@ $(eval $(call gb_CppunitTest_use_libraries,hwpfilter_test_hwpfilter, \
     $(gb_STDLIBS) \
 ))
 
-$(eval $(call gb_CppunitTest_set_include,hwpfilter_test_hwpfilter,\
-    $$(INCLUDE) \
-))
-
 $(eval $(call gb_CppunitTest_use_api,hwpfilter_test_hwpfilter,\
     offapi \
     udkapi \
@@ -63,9 +59,4 @@ $(eval $(call gb_CppunitTest_use_components,hwpfilter_test_hwpfilter,\
 
 $(eval $(call gb_CppunitTest_use_configuration,hwpfilter_test_hwpfilter))
 
-# we need to explicitly depend on library hwp because it is not implied
-# by a link relation
-$(call gb_CppunitTest_get_target,hwpfilter_test_hwpfilter) : \
-	$(call gb_Library_get_target,hwp)
-
 # vim: set noet sw=4 ts=4:
diff --git a/i18npool/CppunitTest_i18npool_test_breakiterator.mk b/i18npool/CppunitTest_i18npool_test_breakiterator.mk
index 19808ff..de7bb0a 100644
--- a/i18npool/CppunitTest_i18npool_test_breakiterator.mk
+++ b/i18npool/CppunitTest_i18npool_test_breakiterator.mk
@@ -28,10 +28,6 @@
 
 $(eval $(call gb_CppunitTest_CppunitTest,i18npool_test_breakiterator))
 
-$(eval $(call gb_CppunitTest_set_include,i18npool_test_breakiterator,\
-    $$(INCLUDE) \
-))
-
 $(eval $(call gb_CppunitTest_use_api,i18npool_test_breakiterator,\
 	udkapi \
 	offapi \
@@ -52,6 +48,4 @@ $(eval $(call gb_CppunitTest_use_components,i18npool_test_breakiterator,\
 	i18npool/util/i18npool \
 ))
 
-$(call gb_CppunitTest_get_target,i18npool_test_breakiterator) : $(call gb_Module_get_target,i18npool)
-
 # vim: set noet sw=4 ts=4:
diff --git a/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk b/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk
index a9b1bcd..85e60f6 100644
--- a/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk
+++ b/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk
@@ -45,10 +45,6 @@ $(eval $(call gb_CppunitTest_use_libraries,lotuswordpro_test_lotuswordpro, \
     $(gb_STDLIBS) \
 ))
 
-$(eval $(call gb_CppunitTest_set_include,lotuswordpro_test_lotuswordpro,\
-    $$(INCLUDE) \
-))
-
 $(eval $(call gb_CppunitTest_use_api,lotuswordpro_test_lotuswordpro,\
     offapi \
     udkapi \
@@ -63,8 +59,4 @@ $(eval $(call gb_CppunitTest_use_components,lotuswordpro_test_lotuswordpro,\
 
 $(eval $(call gb_CppunitTest_use_configuration,lotuswordpro_test_lotuswordpro))
 
-# we need to explicitly depend on library lwpft because it is not implied
-# by a link relation
-$(call gb_CppunitTest_get_target,lotuswordpro_test_lotuswordpro) : $(call gb_Library_get_target,lwpft)
-
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_cellrangeobj.mk b/sc/CppunitTest_sc_cellrangeobj.mk
index a4ee45a..0935d90 100644
--- a/sc/CppunitTest_sc_cellrangeobj.mk
+++ b/sc/CppunitTest_sc_cellrangeobj.mk
@@ -76,7 +76,6 @@ $(eval $(call gb_CppunitTest_set_include,sc_cellrangesbase,\
     -I$(SRCDIR)/sc/source/ui/inc \
     -I$(SRCDIR)/sc/inc \
     $$(INCLUDE) \
-    -I$(OUTDIR)/inc \
 ))
 
 $(eval $(call gb_CppunitTest_use_api,sc_cellrangesbase,\
@@ -127,12 +126,11 @@ $(eval $(call gb_CppunitTest_use_extra_configuration,sc_cellrangesbase,\
 ))
 
 # we need to
-# a) explicitly depend on library msword because it is not implied by a link
+# a) explicitly depend on library localedata_en because it is not implied by a link
 #    relation
 # b) explicitly depend on the sc resource files needed at unit-test runtime
 $(call gb_CppunitTest_get_target,sc_cellrangesbase) : \
     $(WORKDIR)/AllLangRes/sc \
     $(call gb_Library_get_target,localedata_en) \
-    $(call gb_Library_get_target,scfilt) \
 
 # 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 4d4da30..0c746c2 100644
--- a/sc/CppunitTest_sc_chart_regression_test.mk
+++ b/sc/CppunitTest_sc_chart_regression_test.mk
@@ -133,12 +133,11 @@ $(eval $(call gb_CppunitTest_use_extra_configuration,sc_chart_regression_test,\
 ))
 
 # we need to
-# a) explicitly depend on library msword because it is not implied by a link
+# a) explicitly depend on library localedata_en because it is not implied by a link
 #    relation
 # b) explicitly depend on the sc resource files needed at unit-test runtime
 $(call gb_CppunitTest_get_target,sc_chart_regression_test) : \
     $(WORKDIR)/AllLangRes/sc \
     $(call gb_Library_get_target,localedata_en) \
-    $(call gb_Library_get_target,scfilt) \
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_databaserangeobj.mk b/sc/CppunitTest_sc_databaserangeobj.mk
index ff2f4e8..eb0e87b 100644
--- a/sc/CppunitTest_sc_databaserangeobj.mk
+++ b/sc/CppunitTest_sc_databaserangeobj.mk
@@ -125,12 +125,11 @@ $(eval $(call gb_CppunitTest_use_extra_configuration,sc_databaserangeobj,\
 ))
 
 # we need to
-# a) explicitly depend on library msword because it is not implied by a link
+# a) explicitly depend on library localedata_en because it is not implied by a link
 #    relation
 # b) explicitly depend on the sc resource files needed at unit-test runtime
 $(call gb_CppunitTest_get_target,sc_databaserangeobj) : \
     $(WORKDIR)/AllLangRes/sc \
     $(call gb_Library_get_target,localedata_en) \
-    $(call gb_Library_get_target,scfilt) \
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_datapilotfieldobj.mk b/sc/CppunitTest_sc_datapilotfieldobj.mk
index 096b37f..945be2b 100644
--- a/sc/CppunitTest_sc_datapilotfieldobj.mk
+++ b/sc/CppunitTest_sc_datapilotfieldobj.mk
@@ -125,12 +125,11 @@ $(eval $(call gb_CppunitTest_use_extra_configuration,sc_datapilotfieldobj,\
 ))
 
 # we need to
-# a) explicitly depend on library msword because it is not implied by a link
+# a) explicitly depend on library localedata_en because it is not implied by a link
 #    relation
 # b) explicitly depend on the sc resource files needed at unit-test runtime
 $(call gb_CppunitTest_get_target,sc_datapilotfieldobj) : \
     $(WORKDIR)/AllLangRes/sc \
     $(call gb_Library_get_target,localedata_en) \
-    $(call gb_Library_get_target,scfilt) \
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_datapilottableobj.mk b/sc/CppunitTest_sc_datapilottableobj.mk
index 921b576..a08d555 100644
--- a/sc/CppunitTest_sc_datapilottableobj.mk
+++ b/sc/CppunitTest_sc_datapilottableobj.mk
@@ -125,12 +125,11 @@ $(eval $(call gb_CppunitTest_use_extra_configuration,sc_datapilottableobj,\
 ))
 
 # we need to
-# a) explicitly depend on library msword because it is not implied by a link
+# a) explicitly depend on library localedata_en because it is not implied by a link
 #    relation
 # b) explicitly depend on the sc resource files needed at unit-test runtime
 $(call gb_CppunitTest_get_target,sc_datapilottableobj) : \
     $(WORKDIR)/AllLangRes/sc \
     $(call gb_Library_get_target,localedata_en) \
-    $(call gb_Library_get_target,scfilt) \
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_filters_test.mk b/sc/CppunitTest_sc_filters_test.mk
index a200570..c0ead8a 100644
--- a/sc/CppunitTest_sc_filters_test.mk
+++ b/sc/CppunitTest_sc_filters_test.mk
@@ -121,12 +121,11 @@ $(eval $(call gb_CppunitTest_use_configuration,sc_filters_test))
 $(eval $(call gb_CppunitTest_use_filter_configuration,sc_filters_test))
 
 # we need to
-# a) explicitly depend on library msword because it is not implied by a link
+# a) explicitly depend on library localedata_en because it is not implied by a link
 #    relation
 # b) explicitly depend on the sc resource files needed at unit-test runtime
 $(call gb_CppunitTest_get_target,sc_filters_test) : \
     $(WORKDIR)/AllLangRes/sc \
     $(call gb_Library_get_target,localedata_en) \
-    $(call gb_Library_get_target,scfilt) \
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_macros_test.mk b/sc/CppunitTest_sc_macros_test.mk
index bdfd820..af5ad01 100644
--- a/sc/CppunitTest_sc_macros_test.mk
+++ b/sc/CppunitTest_sc_macros_test.mk
@@ -122,12 +122,11 @@ $(eval $(call gb_CppunitTest_use_extra_configuration,sc_macros_test,\
 ))
 
 # we need to
-# a) explicitly depend on library msword because it is not implied by a link
+# a) explicitly depend on library localedata_en because it is not implied by a link
 #    relation
 # b) explicitly depend on the sc resource files needed at unit-test runtime
 $(call gb_CppunitTest_get_target,sc_macros_test) : \
     $(WORKDIR)/AllLangRes/sc \
     $(call gb_Library_get_target,localedata_en) \
-    $(call gb_Library_get_target,scfilt) \
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_namedrangeobj.mk b/sc/CppunitTest_sc_namedrangeobj.mk
index 33cd57d..11d23d2 100644
--- a/sc/CppunitTest_sc_namedrangeobj.mk
+++ b/sc/CppunitTest_sc_namedrangeobj.mk
@@ -125,12 +125,11 @@ $(eval $(call gb_CppunitTest_use_extra_configuration,sc_namedrangeobj,\
 ))
 
 # we need to
-# a) explicitly depend on library msword because it is not implied by a link
+# a) explicitly depend on library localedata_en because it is not implied by a link
 #    relation
 # b) explicitly depend on the sc resource files needed at unit-test runtime
 $(call gb_CppunitTest_get_target,sc_namedrangeobj) : \
     $(WORKDIR)/AllLangRes/sc \
     $(call gb_Library_get_target,localedata_en) \
-    $(call gb_Library_get_target,scfilt) \
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_namedrangesobj.mk b/sc/CppunitTest_sc_namedrangesobj.mk
index 1e60240..807e8a1 100644
--- a/sc/CppunitTest_sc_namedrangesobj.mk
+++ b/sc/CppunitTest_sc_namedrangesobj.mk
@@ -125,12 +125,11 @@ $(eval $(call gb_CppunitTest_use_extra_configuration,sc_namedrangesobj,\
 ))
 
 # we need to
-# a) explicitly depend on library msword because it is not implied by a link
+# a) explicitly depend on library localedata_en because it is not implied by a link
 #    relation
 # b) explicitly depend on the sc resource files needed at unit-test runtime
 $(call gb_CppunitTest_get_target,sc_namedrangesobj) : \
     $(WORKDIR)/AllLangRes/sc \
     $(call gb_Library_get_target,localedata_en) \
-    $(call gb_Library_get_target,scfilt) \
 
 # 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 d814dda..941bfed 100644
--- a/sc/CppunitTest_sc_subsequent_filters_test.mk
+++ b/sc/CppunitTest_sc_subsequent_filters_test.mk
@@ -134,12 +134,11 @@ $(eval $(call gb_CppunitTest_use_configuration,sc_subsequent_filters_test))
 $(eval $(call gb_CppunitTest_use_filter_configuration,sc_subsequent_filters_test))
 
 # we need to
-# a) explicitly depend on library msword because it is not implied by a link
+# a) explicitly depend on library localedata_en because it is not implied by a link
 #    relation
 # b) explicitly depend on the sc resource files needed at unit-test runtime
 $(call gb_CppunitTest_get_target,sc_subsequent_filters_test) : \
     $(WORKDIR)/AllLangRes/sc \
     $(call gb_Library_get_target,localedata_en) \
-    $(call gb_Library_get_target,scfilt) \
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_tableautoformatfield.mk b/sc/CppunitTest_sc_tableautoformatfield.mk
index 2e5a2c7..862617b 100644
--- a/sc/CppunitTest_sc_tableautoformatfield.mk
+++ b/sc/CppunitTest_sc_tableautoformatfield.mk
@@ -125,12 +125,11 @@ $(eval $(call gb_CppunitTest_use_extra_configuration,sc_tableautoformatfield,\
 ))
 
 # we need to
-# a) explicitly depend on library msword because it is not implied by a link
+# a) explicitly depend on library localedata_en because it is not implied by a link
 #    relation
 # b) explicitly depend on the sc resource files needed at unit-test runtime
 $(call gb_CppunitTest_get_target,sc_tableautoformatfield) : \
     $(WORKDIR)/AllLangRes/sc \
     $(call gb_Library_get_target,localedata_en) \
-    $(call gb_Library_get_target,scfilt) \
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_tablesheetobj.mk b/sc/CppunitTest_sc_tablesheetobj.mk
index b357548..0d23ae6 100644
--- a/sc/CppunitTest_sc_tablesheetobj.mk
+++ b/sc/CppunitTest_sc_tablesheetobj.mk
@@ -76,7 +76,6 @@ $(eval $(call gb_CppunitTest_set_include,sc_spreadsheetobj,\
     -I$(SRCDIR)/sc/source/ui/inc \
     -I$(SRCDIR)/sc/inc \
     $$(INCLUDE) \
-    -I$(OUTDIR)/inc \
 ))
 
 $(eval $(call gb_CppunitTest_use_api,sc_spreadsheetobj,\
@@ -126,10 +125,7 @@ $(eval $(call gb_CppunitTest_use_extra_configuration,sc_spreadsheetobj,\
 	$(OUTDIR)/unittest/registry \
 ))
 
-# we need to
-# a) explicitly depend on library msword because it is not implied by a link
-#    relation
-# b) explicitly depend on the sc resource files needed at unit-test runtime
-$(call gb_CppunitTest_get_target,sc_spreadsheetobj) : $(call gb_Library_get_target,scfilt) $(WORKDIR)/AllLangRes/sc
+# we need to explicitly depend on the sc resource files needed at unit-test runtime
+$(call gb_CppunitTest_get_target,sc_spreadsheetobj) : $(WORKDIR)/AllLangRes/sc
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_tablesheetsobj.mk b/sc/CppunitTest_sc_tablesheetsobj.mk
index 5794793..79774b4 100644
--- a/sc/CppunitTest_sc_tablesheetsobj.mk
+++ b/sc/CppunitTest_sc_tablesheetsobj.mk
@@ -124,10 +124,7 @@ $(eval $(call gb_CppunitTest_use_extra_configuration,sc_spreadsheetsobj,\
 	$(OUTDIR)/unittest/registry \
 ))
 
-# we need to
-# a) explicitly depend on library msword because it is not implied by a link
-#    relation
-# b) explicitly depend on the sc resource files needed at unit-test runtime
-$(call gb_CppunitTest_get_target,sc_spreadsheetsobj) : $(call gb_Library_get_target,scfilt) $(WORKDIR)/AllLangRes/sc
+# we need to explicitly depend on the sc resource files needed at unit-test runtime
+$(call gb_CppunitTest_get_target,sc_spreadsheetsobj) : $(WORKDIR)/AllLangRes/sc
 
 # vim: set noet sw=4 ts=4:
diff --git a/sd/CppunitTest_sd_filters_test.mk b/sd/CppunitTest_sd_filters_test.mk
index 9af86e0..afecc5a 100644
--- a/sd/CppunitTest_sd_filters_test.mk
+++ b/sd/CppunitTest_sd_filters_test.mk
@@ -110,8 +110,4 @@ $(eval $(call gb_CppunitTest_use_configuration,sd_filters_test))
 
 $(eval $(call gb_CppunitTest_use_filter_configuration,sd_filters_test))
 
-# we need to explicitly depend on library sdfilt because it is not implied
-# by a link relation
-$(call gb_CppunitTest_get_target,sd_filters_test) : $(call gb_Library_get_target,sdfilt)
-
 # vim: set noet sw=4 ts=4:
diff --git a/sd/CppunitTest_sd_regression_test.mk b/sd/CppunitTest_sd_regression_test.mk
index b8d157a..1ba8201 100644
--- a/sd/CppunitTest_sd_regression_test.mk
+++ b/sd/CppunitTest_sd_regression_test.mk
@@ -128,8 +128,4 @@ $(eval $(call gb_CppunitTest_add_arguments,sd_regression_test,\
     "-env:SVG_DISABLE_FONT_EMBEDDING=YEAH" \
 ))
 
-# we need to explicitly depend on library sdfilt because it is not implied
-# by a link relation
-$(call gb_CppunitTest_get_target,sd_regression_test) : $(call gb_Library_get_target,sdfilt)
-
 # vim: set noet sw=4 ts=4:
diff --git a/sot/CppunitTest_sot_test_sot.mk b/sot/CppunitTest_sot_test_sot.mk
index 003a346..72faace 100644
--- a/sot/CppunitTest_sot_test_sot.mk
+++ b/sot/CppunitTest_sot_test_sot.mk
@@ -47,10 +47,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sot_test_sot, \
     $(gb_STDLIBS) \
 ))
 
-$(eval $(call gb_CppunitTest_set_include,sot_test_sot,\
-    $$(INCLUDE) \
-))
-
 $(eval $(call gb_CppunitTest_use_api,sot_test_sot,\
     offapi \
     udkapi \
diff --git a/starmath/CppunitTest_starmath_qa_cppunit.mk b/starmath/CppunitTest_starmath_qa_cppunit.mk
index 1af3286..8d122da 100644
--- a/starmath/CppunitTest_starmath_qa_cppunit.mk
+++ b/starmath/CppunitTest_starmath_qa_cppunit.mk
@@ -81,10 +81,10 @@ $(eval $(call gb_CppunitTest_use_components,starmath_qa_cppunit,\
     i18npool/util/i18npool \
     toolkit/util/tk \
     sfx2/util/sfx \
+    vcl/vcl \
 ))
 
 $(eval $(call gb_CppunitTest_use_old_components,starmath_qa_cppunit,\
-    component/vcl/vcl \
     mcnttype \
 ))
 
diff --git a/svtools/CppunitTest_svtools_filters_test.mk b/svtools/CppunitTest_svtools_filters_test.mk
index 7d4353f..9cd4a53 100644
--- a/svtools/CppunitTest_svtools_filters_test.mk
+++ b/svtools/CppunitTest_svtools_filters_test.mk
@@ -44,10 +44,6 @@ $(eval $(call gb_CppunitTest_use_libraries,svtools_filters_test, \
     $(gb_STDLIBS) \
 ))
 
-$(eval $(call gb_CppunitTest_set_include,svtools_filters_test,\
-    $$(INCLUDE) \
-))
-
 $(eval $(call gb_CppunitTest_use_api,svtools_filters_test,\
     udkapi \
     offapi \
diff --git a/sw/CppunitTest_sw_filters_test.mk b/sw/CppunitTest_sw_filters_test.mk
index bf61682..ecfc8ce 100644
--- a/sw/CppunitTest_sw_filters_test.mk
+++ b/sw/CppunitTest_sw_filters_test.mk
@@ -92,10 +92,9 @@ $(eval $(call gb_CppunitTest_use_components,sw_filters_test,\
 
 $(eval $(call gb_CppunitTest_use_configuration,sw_filters_test))
 
-# we need to explicitly depend on library msword because it is not implied
+# we need to explicitly depend on library localedata_en because it is not implied
 # by a link relation
 $(call gb_CppunitTest_get_target,sw_filters_test) : \
     $(call gb_Library_get_target,localedata_en) \
-    $(call gb_Library_get_target,msword) \
 
 # vim: set noet sw=4 ts=4:
diff --git a/sw/CppunitTest_sw_layout_test.mk b/sw/CppunitTest_sw_layout_test.mk
index c3540ad..819babb 100644
--- a/sw/CppunitTest_sw_layout_test.mk
+++ b/sw/CppunitTest_sw_layout_test.mk
@@ -122,12 +122,10 @@ $(eval $(call gb_CppunitTest_use_extra_configuration,sw_layout_test,\
 ))
 
 # we need to
-# a) explicitly depend on library msword because it is not implied by a link
+# a) explicitly depend on library localedata_en because it is not implied by a link
 #    relation
 # b) explicitly depend on the sw resource files needed at unit-test runtime
 $(call gb_CppunitTest_get_target,sw_layout_test) : \
     $(call gb_Library_get_target,localedata_en) \
-    $(call gb_Library_get_target,msword) \
-    $(if $(filter-out $(OS),IOS),$(call gb_Library_get_target,vbaswobj)) \
 
 # vim: set noet sw=4 ts=4:
diff --git a/sw/CppunitTest_sw_macros_test.mk b/sw/CppunitTest_sw_macros_test.mk
index f7a053b..634f8f3 100644
--- a/sw/CppunitTest_sw_macros_test.mk
+++ b/sw/CppunitTest_sw_macros_test.mk
@@ -124,12 +124,10 @@ $(eval $(call gb_CppunitTest_use_extra_configuration,sw_macros_test,\
 ))
 
 # we need to
-# a) explicitly depend on library msword because it is not implied by a link
+# a) explicitly depend on library localedata_en because it is not implied by a link
 #    relation
 # b) explicitly depend on the sw resource files needed at unit-test runtime
 $(call gb_CppunitTest_get_target,sw_macros_test) : \
     $(call gb_Library_get_target,localedata_en) \
-    $(call gb_Library_get_target,msword) \
-    $(if $(filter SCRIPTING,$(BUILD_TYPE)),$(call gb_Library_get_target,vbaswobj)) \
 
 # vim: set noet sw=4 ts=4:
diff --git a/sw/CppunitTest_sw_regression_test.mk b/sw/CppunitTest_sw_regression_test.mk
index e1d35d8..c64a9d3 100644
--- a/sw/CppunitTest_sw_regression_test.mk
+++ b/sw/CppunitTest_sw_regression_test.mk
@@ -124,12 +124,10 @@ $(eval $(call gb_CppunitTest_use_extra_configuration,sw_regression_test,\
 ))
 
 # we need to
-# a) explicitly depend on library msword because it is not implied by a link
+# a) explicitly depend on library localedata_en because it is not implied by a link
 #    relation
 # b) explicitly depend on the sw resource files needed at unit-test runtime
 $(call gb_CppunitTest_get_target,sw_regression_test) : \
     $(call gb_Library_get_target,localedata_en) \
-    $(call gb_Library_get_target,msword) \
-    $(if $(filter-out $(OS),IOS),$(call gb_Library_get_target,vbaswobj)) \
 
 # vim: set noet sw=4 ts=4:
commit 36e7740104e2049518cf826c38eceedac36c8b73
Author: David Tardon <dtardon at redhat.com>
Date:   Sun Apr 8 14:13:05 2012 +0200

    add function for converting path to URL

diff --git a/sdext/CppunitTest_pdfimport.mk b/sdext/CppunitTest_pdfimport.mk
index e503ad7..9c29186 100644
--- a/sdext/CppunitTest_pdfimport.mk
+++ b/sdext/CppunitTest_pdfimport.mk
@@ -28,7 +28,7 @@
 $(eval $(call gb_CppunitTest_CppunitTest,sdext_pdfimport))
 
 $(eval $(call gb_CppunitTest_add_defs,sdext_pdfimport,\
-    -DPDFIMPORT_EXECUTABLE_LOCATION=\"$(call gb_CppunitTarget__make_url,\
+    -DPDFIMPORT_EXECUTABLE_LOCATION=\"$(call gb_Helper_make_url,\
         $(dir $(call gb_Executable_get_target,xpdfimport)))\" \
 ))
 
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index 77aae55..32f498b 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -57,20 +57,17 @@ endif
 
 gb_CppunitTest__get_linktargetname = CppunitTest/$(call gb_CppunitTest_get_filename,$(1))
 
-# TODO: move this to platform under suitable name
-gb_CppunitTarget__make_url = file://$(if $(filter WNT,$(OS_FOR_BUILD)),/)$(strip $(1))
-
 define gb_CppunitTest__make_args
 --headless \
 $(if $(strip $(CONFIGURATION_LAYERS)),\
 	"-env:CONFIGURATION_LAYERS=$(strip $(CONFIGURATION_LAYERS))") \
 $(if $(strip $(UNO_TYPES)),\
-	"-env:UNO_TYPES=$(foreach item,$(UNO_TYPES),$(call gb_CppunitTarget__make_url,$(item)))") \
+	"-env:UNO_TYPES=$(foreach item,$(UNO_TYPES),$(call gb_Helper_make_url,$(item)))") \
 $(if $(strip $(UNO_SERVICES)),\
-	"-env:UNO_SERVICES=$(foreach item,$(UNO_SERVICES),$(call gb_CppunitTarget__make_url,$(item)))") \
+	"-env:UNO_SERVICES=$(foreach item,$(UNO_SERVICES),$(call gb_Helper_make_url,$(item)))") \
 $(if $(URE),\
 	$(foreach dir,URE_INTERNAL_LIB_DIR LO_LIB_DIR,\
-		-env:$(dir)=$(call gb_CppunitTarget__make_url,$(gb_CppunitTest_LIBDIR))) \
+		-env:$(dir)=$(call gb_Helper_make_url,$(gb_CppunitTest_LIBDIR))) \
 	--protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector) \
 $(ARGS)
 endef
@@ -278,7 +275,7 @@ endef
 gb_ComponentTarget__get_old_component_target = $(OUTDIR)/xml/$(1).component
 
 define gb_CppunitTest__use_configuration
-$(call gb_CppunitTest_get_target,$(1)) : CONFIGURATION_LAYERS += $(2):$(call gb_CppunitTarget__make_url,$(3))
+$(call gb_CppunitTest_get_target,$(1)) : CONFIGURATION_LAYERS += $(2):$(call gb_Helper_make_url,$(3))
 
 endef
 
diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
index c1cf033..71b644c 100644
--- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
@@ -142,6 +142,11 @@ define gb_Helper_native_path
 $(1)
 endef
 
+# Convert path to file URL.
+define gb_Helper_make_url
+file://$(strip $(1))
+endef
+
 # AsmObject class
 
 gb_AsmObject_get_source = $(1)/$(2).s
diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index 90fca91..0df48c4 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -267,6 +267,11 @@ define gb_Helper_native_path
 $(shell cygpath -m $(1))
 endef
 
+# Convert path to file URL.
+define gb_Helper_make_url
+file:///$(strip $(1))
+endef
+
 # YaccTarget class
 
 define gb_YaccTarget__command
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk
index c025e70..36b2cc7 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -176,6 +176,11 @@ define gb_Helper_native_path
 $(1)
 endef
 
+# Convert path to file URL.
+define gb_Helper_make_url
+file://$(strip $(1))
+endef
+
 gb_Helper_OUTDIRLIBDIR := $(OUTDIR)/lib
 gb_Helper_OUTDIR_FOR_BUILDLIBDIR := $(OUTDIR_FOR_BUILD)/lib
 
diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk
index 3e10ca7..6e7199c 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -164,6 +164,11 @@ define gb_Helper_native_path
 $(1)
 endef
 
+# Convert path to file URL.
+define gb_Helper_make_url
+file://$(strip $(1))
+endef
+
 ifneq ($(HAVE_LD_BSYMBOLIC_FUNCTIONS),)
 gb_LinkTarget_LDFLAGS += \
 	-Wl,--dynamic-list-cpp-new \
commit 814484b2ac50edb2c5b4d296afefe3a4891596ba
Author: David Tardon <dtardon at redhat.com>
Date:   Sun Apr 8 13:52:52 2012 +0200

    rename gb_CppunitTest_set_arguments
    
    It does not actually _set_ the command line arguments, but rather _adds_
    to them. IMHO the new name reflects this fact better.

diff --git a/sd/CppunitTest_sd_regression_test.mk b/sd/CppunitTest_sd_regression_test.mk
index 4b24b25..b8d157a 100644
--- a/sd/CppunitTest_sd_regression_test.mk
+++ b/sd/CppunitTest_sd_regression_test.mk
@@ -124,7 +124,7 @@ $(eval $(call gb_CppunitTest_use_extra_configuration,sd_regression_test,\
 	$(OUTDIR)/unittest/registry \
 ))
 
-$(eval $(call gb_CppunitTest_set_args,sd_regression_test,\
+$(eval $(call gb_CppunitTest_add_arguments,sd_regression_test,\
     "-env:SVG_DISABLE_FONT_EMBEDDING=YEAH" \
 ))
 
diff --git a/smoketest/CppunitTest_smoketest.mk b/smoketest/CppunitTest_smoketest.mk
index c51df89..16a6ea3 100644
--- a/smoketest/CppunitTest_smoketest.mk
+++ b/smoketest/CppunitTest_smoketest.mk
@@ -48,9 +48,7 @@ else
 my_soffice:=path:$(OUTDIR)/installation/opt/program/soffice
 endif
 
-$(eval $(call gb_CppunitTest_set_args,smoketest,\
-	-env:UNO_SERVICES=$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/ure/services.rdb) \
-	-env:UNO_TYPES=$(call gb_CppunitTarget__make_url,$(OUTDIR)/bin/types.rdb) \
+$(eval $(call gb_CppunitTest_add_arguments,smoketest,\
 	-env:arg-soffice=$(my_soffice) \
 	-env:arg-user=$(WORKDIR)/CustomTarget/smoketest \
 	-env:arg-env=$(gb_Helper_LIBRARY_PATH_VAR)"$$$${$(gb_Helper_LIBRARY_PATH_VAR)+=$$$$$(gb_Helper_LIBRARY_PATH_VAR)}" \
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index a667253..77aae55 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -61,7 +61,6 @@ gb_CppunitTest__get_linktargetname = CppunitTest/$(call gb_CppunitTest_get_filen
 gb_CppunitTarget__make_url = file://$(if $(filter WNT,$(OS_FOR_BUILD)),/)$(strip $(1))
 
 define gb_CppunitTest__make_args
-$(ARGS) \
 --headless \
 $(if $(strip $(CONFIGURATION_LAYERS)),\
 	"-env:CONFIGURATION_LAYERS=$(strip $(CONFIGURATION_LAYERS))") \
@@ -72,7 +71,8 @@ $(if $(strip $(UNO_SERVICES)),\
 $(if $(URE),\
 	$(foreach dir,URE_INTERNAL_LIB_DIR LO_LIB_DIR,\
 		-env:$(dir)=$(call gb_CppunitTarget__make_url,$(gb_CppunitTest_LIBDIR))) \
-	--protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector)
+	--protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector) \
+$(ARGS)
 endef
 
 .PHONY : $(call gb_CppunitTest_get_clean_target,%)
@@ -136,7 +136,15 @@ $(call gb_CppunitTest_get_target,$(1)) : SAL_DIAGNOSE_ABORT := TRUE
 endef
 
 define gb_CppunitTest_set_args
-$(call gb_CppunitTest_get_target,$(1)) : ARGS := $(2)
+$$(call gb_Output_error,gb_CppunitTest_set_args: use gb_CppunitTest_add_arguments instead.))
+endef
+
+# Add additional command line arguments for the test.
+#
+# You should practically never need to use this, as there are special
+# functions for adding many commonly used arguments.
+define gb_CppunitTest_add_arguments
+$(call gb_CppunitTest_get_target,$(1)) : ARGS += $(2)
 
 endef
 
commit e3cf2b45f700fc5f4d19790b4b29175b33d38048
Author: David Tardon <dtardon at redhat.com>
Date:   Sun Apr 8 13:40:35 2012 +0200

    simplify use of configuration from unit tests

diff --git a/dbaccess/CppunitTest_dbaccess_macros_test.mk b/dbaccess/CppunitTest_dbaccess_macros_test.mk
index 60cc0e1..395075f 100644
--- a/dbaccess/CppunitTest_dbaccess_macros_test.mk
+++ b/dbaccess/CppunitTest_dbaccess_macros_test.mk
@@ -116,10 +116,13 @@ $(eval $(call gb_CppunitTest_use_components,dbaccess_macros_test,\
     unoxml/source/service/unoxml \
 ))
 
-$(eval $(call gb_CppunitTest_set_args,dbaccess_macros_test,\
-    "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry) module:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry/spool) xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/unittest/registry)" \
+$(eval $(call gb_CppunitTest_use_configuration,dbaccess_macros_test))
+
+$(eval $(call gb_CppunitTest_use_filter_configuration,dbaccess_macros_test))
+
+$(eval $(call gb_CppunitTest_use_extra_configuration,dbaccess_macros_test,\
+	$(OUTDIR)/unittest/registry \
 ))
-    # .../spool is required for the (somewhat strange) filter configuration
 
 # we need to
 # a) explicitly depend on library msword because it is not implied by a link
diff --git a/extensions/CppunitTest_extensions_test_update.mk b/extensions/CppunitTest_extensions_test_update.mk
index 6ce04b8..b7bf795 100644
--- a/extensions/CppunitTest_extensions_test_update.mk
+++ b/extensions/CppunitTest_extensions_test_update.mk
@@ -69,8 +69,6 @@ $(eval $(call gb_CppunitTest_use_components,extensions_test_update,\
     unoxml/source/service/unoxml \
 ))
 
-$(eval $(call gb_CppunitTest_set_args,extensions_test_update,\
-    "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry)" \
-))
+$(eval $(call gb_CppunitTest_use_configuration,extensions_test_update))
 
 # vim:set shiftwidth=4 softtabstop=4 noexpandtab:
diff --git a/filter/CppunitTest_filter_tga_test.mk b/filter/CppunitTest_filter_tga_test.mk
index 2a8ddd0..51edf53 100644
--- a/filter/CppunitTest_filter_tga_test.mk
+++ b/filter/CppunitTest_filter_tga_test.mk
@@ -54,8 +54,6 @@ $(eval $(call gb_CppunitTest_use_components,filter_tga_test,\
     configmgr/source/configmgr \
 ))
 
-$(eval $(call gb_CppunitTest_set_args,filter_tga_test,\
-    "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry)" \
-))
+$(eval $(call gb_CppunitTest_use_configuration,filter_tga_test))
 
 # vim: set noet sw=4 ts=4:
diff --git a/filter/CppunitTest_filter_tiff_test.mk b/filter/CppunitTest_filter_tiff_test.mk
index 1c07f80..a647a32 100644
--- a/filter/CppunitTest_filter_tiff_test.mk
+++ b/filter/CppunitTest_filter_tiff_test.mk
@@ -54,8 +54,6 @@ $(eval $(call gb_CppunitTest_use_components,filter_tiff_test,\
     configmgr/source/configmgr \
 ))
 
-$(eval $(call gb_CppunitTest_set_args,filter_tiff_test,\
-    "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry)" \
-))
+$(eval $(call gb_CppunitTest_use_configuration,filter_tiff_test))
 
 # vim: set noet sw=4 ts=4:
diff --git a/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk b/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk
index c5ea37a..a0b0170 100644
--- a/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk
+++ b/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk
@@ -61,9 +61,7 @@ $(eval $(call gb_CppunitTest_use_components,hwpfilter_test_hwpfilter,\
     ucb/source/ucp/file/ucpfile1 \
 ))
 
-$(eval $(call gb_CppunitTest_set_args,hwpfilter_test_hwpfilter,\
-    "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry)" \
-))
+$(eval $(call gb_CppunitTest_use_configuration,hwpfilter_test_hwpfilter))
 
 # we need to explicitly depend on library hwp because it is not implied
 # by a link relation
diff --git a/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk b/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk
index 945a96f..a9b1bcd 100644
--- a/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk
+++ b/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk
@@ -61,9 +61,7 @@ $(eval $(call gb_CppunitTest_use_components,lotuswordpro_test_lotuswordpro,\
     ucb/source/ucp/file/ucpfile1 \
 ))
 
-$(eval $(call gb_CppunitTest_set_args,lotuswordpro_test_lotuswordpro,\
-    "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry)" \
-))
+$(eval $(call gb_CppunitTest_use_configuration,lotuswordpro_test_lotuswordpro))
 
 # we need to explicitly depend on library lwpft because it is not implied
 # by a link relation
diff --git a/sc/CppunitTest_sc_cellrangeobj.mk b/sc/CppunitTest_sc_cellrangeobj.mk
index eb95f86..a4ee45a 100644
--- a/sc/CppunitTest_sc_cellrangeobj.mk
+++ b/sc/CppunitTest_sc_cellrangeobj.mk
@@ -118,10 +118,13 @@ $(eval $(call gb_CppunitTest_use_components,sc_cellrangesbase,\
     unoxml/source/service/unoxml \
 ))
 
-$(eval $(call gb_CppunitTest_set_args,sc_cellrangesbase,\
-    "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry) module:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry/spool) xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/unittest/registry)" \
+$(eval $(call gb_CppunitTest_use_configuration,sc_cellrangesbase))
+
+$(eval $(call gb_CppunitTest_use_filter_configuration,sc_cellrangesbase))
+
+$(eval $(call gb_CppunitTest_use_extra_configuration,sc_cellrangesbase,\
+	$(OUTDIR)/unittest/registry \
 ))
-    # .../spool is required for the (somewhat strange) filter configuration
 
 # we need to
 # a) explicitly depend on library msword because it is not implied by a link
diff --git a/sc/CppunitTest_sc_chart_regression_test.mk b/sc/CppunitTest_sc_chart_regression_test.mk
index 37c5915..4d4da30 100644
--- a/sc/CppunitTest_sc_chart_regression_test.mk
+++ b/sc/CppunitTest_sc_chart_regression_test.mk
@@ -124,10 +124,13 @@ $(eval $(call gb_CppunitTest_use_components,sc_chart_regression_test,\
     xmloff/util/xo \
 ))
 
-$(eval $(call gb_CppunitTest_set_args,sc_chart_regression_test,\
-    "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry) module:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry/spool) xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/unittest/registry)" \
+$(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_extra_configuration,sc_chart_regression_test,\
+	$(OUTDIR)/unittest/registry \
 ))
-    # .../spool is required for the (somewhat strange) filter configuration
 
 # we need to
 # a) explicitly depend on library msword because it is not implied by a link
diff --git a/sc/CppunitTest_sc_databaserangeobj.mk b/sc/CppunitTest_sc_databaserangeobj.mk
index a8292a3..ff2f4e8 100644
--- a/sc/CppunitTest_sc_databaserangeobj.mk
+++ b/sc/CppunitTest_sc_databaserangeobj.mk
@@ -116,10 +116,13 @@ $(eval $(call gb_CppunitTest_use_components,sc_databaserangeobj,\
     unoxml/source/service/unoxml \
 ))
 
-$(eval $(call gb_CppunitTest_set_args,sc_databaserangeobj,\
-    "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry) module:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry/spool) xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/unittest/registry)" \
+$(eval $(call gb_CppunitTest_use_configuration,sc_databaserangeobj))
+
+$(eval $(call gb_CppunitTest_use_filter_configuration,sc_databaserangeobj))
+
+$(eval $(call gb_CppunitTest_use_extra_configuration,sc_databaserangeobj,\
+	$(OUTDIR)/unittest/registry \
 ))
-    # .../spool is required for the (somewhat strange) filter configuration
 
 # we need to
 # a) explicitly depend on library msword because it is not implied by a link
diff --git a/sc/CppunitTest_sc_datapilotfieldobj.mk b/sc/CppunitTest_sc_datapilotfieldobj.mk
index 5eb0350..096b37f 100644
--- a/sc/CppunitTest_sc_datapilotfieldobj.mk
+++ b/sc/CppunitTest_sc_datapilotfieldobj.mk
@@ -116,10 +116,13 @@ $(eval $(call gb_CppunitTest_use_components,sc_datapilotfieldobj,\
     unoxml/source/service/unoxml \
 ))
 
-$(eval $(call gb_CppunitTest_set_args,sc_datapilotfieldobj,\
-    "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry) module:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry/spool) xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/unittest/registry)" \
+$(eval $(call gb_CppunitTest_use_configuration,sc_datapilotfieldobj))
+
+$(eval $(call gb_CppunitTest_use_filter_configuration,sc_datapilotfieldobj))
+
+$(eval $(call gb_CppunitTest_use_extra_configuration,sc_datapilotfieldobj,\
+	$(OUTDIR)/unittest/registry \
 ))
-    # .../spool is required for the (somewhat strange) filter configuration
 
 # we need to
 # a) explicitly depend on library msword because it is not implied by a link
diff --git a/sc/CppunitTest_sc_datapilottableobj.mk b/sc/CppunitTest_sc_datapilottableobj.mk
index 29ec3b9..921b576 100644
--- a/sc/CppunitTest_sc_datapilottableobj.mk
+++ b/sc/CppunitTest_sc_datapilottableobj.mk
@@ -116,10 +116,13 @@ $(eval $(call gb_CppunitTest_use_components,sc_datapilottableobj,\
     unoxml/source/service/unoxml \
 ))
 
-$(eval $(call gb_CppunitTest_set_args,sc_datapilottableobj,\
-    "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry) module:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry/spool) xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/unittest/registry)" \
+$(eval $(call gb_CppunitTest_use_configuration,sc_datapilottableobj))
+
+$(eval $(call gb_CppunitTest_use_filter_configuration,sc_datapilottableobj))
+
+$(eval $(call gb_CppunitTest_use_extra_configuration,sc_datapilottableobj,\
+	$(OUTDIR)/unittest/registry \
 ))
-    # .../spool is required for the (somewhat strange) filter configuration
 
 # we need to
 # a) explicitly depend on library msword because it is not implied by a link
diff --git a/sc/CppunitTest_sc_filters_test.mk b/sc/CppunitTest_sc_filters_test.mk
index b146647..a200570 100644
--- a/sc/CppunitTest_sc_filters_test.mk
+++ b/sc/CppunitTest_sc_filters_test.mk
@@ -116,10 +116,9 @@ $(eval $(call gb_CppunitTest_use_components,sc_filters_test,\
     unoxml/source/service/unoxml \
 ))
 
-$(eval $(call gb_CppunitTest_set_args,sc_filters_test,\
-    "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry) module:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry/spool)" \
-))
-    # .../spool is required for the (somewhat strange) filter configuration
+$(eval $(call gb_CppunitTest_use_configuration,sc_filters_test))
+
+$(eval $(call gb_CppunitTest_use_filter_configuration,sc_filters_test))
 
 # we need to
 # a) explicitly depend on library msword because it is not implied by a link
diff --git a/sc/CppunitTest_sc_macros_test.mk b/sc/CppunitTest_sc_macros_test.mk
index 4a87930..bdfd820 100644
--- a/sc/CppunitTest_sc_macros_test.mk
+++ b/sc/CppunitTest_sc_macros_test.mk
@@ -113,10 +113,13 @@ $(eval $(call gb_CppunitTest_use_components,sc_macros_test,\
     unoxml/source/service/unoxml \
 ))
 
-$(eval $(call gb_CppunitTest_set_args,sc_macros_test,\
-    "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry) module:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry/spool) xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/unittest/registry)" \
+$(eval $(call gb_CppunitTest_use_configuration,sc_macros_test))
+
+$(eval $(call gb_CppunitTest_use_filter_configuration,sc_macros_test))
+
+$(eval $(call gb_CppunitTest_use_extra_configuration,sc_macros_test,\
+	$(OUTDIR)/unittest/registry \
 ))
-    # .../spool is required for the (somewhat strange) filter configuration
 
 # we need to
 # a) explicitly depend on library msword because it is not implied by a link
diff --git a/sc/CppunitTest_sc_namedrangeobj.mk b/sc/CppunitTest_sc_namedrangeobj.mk
index 34689a5..33cd57d 100644
--- a/sc/CppunitTest_sc_namedrangeobj.mk
+++ b/sc/CppunitTest_sc_namedrangeobj.mk
@@ -116,10 +116,13 @@ $(eval $(call gb_CppunitTest_use_components,sc_namedrangeobj,\
     unoxml/source/service/unoxml \
 ))
 
-$(eval $(call gb_CppunitTest_set_args,sc_namedrangeobj,\
-    "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry) module:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry/spool) xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/unittest/registry)" \
+$(eval $(call gb_CppunitTest_use_configuration,sc_namedrangeobj))
+
+$(eval $(call gb_CppunitTest_use_filter_configuration,sc_namedrangeobj))
+
+$(eval $(call gb_CppunitTest_use_extra_configuration,sc_namedrangeobj,\
+	$(OUTDIR)/unittest/registry \
 ))
-    # .../spool is required for the (somewhat strange) filter configuration
 
 # we need to
 # a) explicitly depend on library msword because it is not implied by a link
diff --git a/sc/CppunitTest_sc_namedrangesobj.mk b/sc/CppunitTest_sc_namedrangesobj.mk
index 03addcf..1e60240 100644
--- a/sc/CppunitTest_sc_namedrangesobj.mk
+++ b/sc/CppunitTest_sc_namedrangesobj.mk
@@ -116,10 +116,13 @@ $(eval $(call gb_CppunitTest_use_components,sc_namedrangesobj,\
     unoxml/source/service/unoxml \
 ))
 
-$(eval $(call gb_CppunitTest_set_args,sc_namedrangesobj,\
-    "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry) module:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry/spool) xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/unittest/registry)" \
+$(eval $(call gb_CppunitTest_use_configuration,sc_namedrangesobj))
+
+$(eval $(call gb_CppunitTest_use_filter_configuration,sc_namedrangesobj))
+
+$(eval $(call gb_CppunitTest_use_extra_configuration,sc_namedrangesobj,\
+	$(OUTDIR)/unittest/registry \
 ))
-    # .../spool is required for the (somewhat strange) filter configuration
 
 # we need to
 # a) explicitly depend on library msword because it is not implied by a link
diff --git a/sc/CppunitTest_sc_subsequent_filters_test.mk b/sc/CppunitTest_sc_subsequent_filters_test.mk
index fb0436f..d814dda 100644
--- a/sc/CppunitTest_sc_subsequent_filters_test.mk
+++ b/sc/CppunitTest_sc_subsequent_filters_test.mk
@@ -129,10 +129,9 @@ $(eval $(call gb_CppunitTest_use_components,sc_subsequent_filters_test,\
 endif
 endif
 
-$(eval $(call gb_CppunitTest_set_args,sc_subsequent_filters_test,\
-    "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry) module:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry/spool)" \
-))
-    # .../spool is required for the (somewhat strange) filter configuration
+$(eval $(call gb_CppunitTest_use_configuration,sc_subsequent_filters_test))
+
+$(eval $(call gb_CppunitTest_use_filter_configuration,sc_subsequent_filters_test))
 
 # we need to
 # a) explicitly depend on library msword because it is not implied by a link
diff --git a/sc/CppunitTest_sc_tableautoformatfield.mk b/sc/CppunitTest_sc_tableautoformatfield.mk
index daadfb1..2e5a2c7 100644
--- a/sc/CppunitTest_sc_tableautoformatfield.mk
+++ b/sc/CppunitTest_sc_tableautoformatfield.mk
@@ -116,10 +116,13 @@ $(eval $(call gb_CppunitTest_use_components,sc_tableautoformatfield,\
     unoxml/source/service/unoxml \
 ))
 
-$(eval $(call gb_CppunitTest_set_args,sc_tableautoformatfield,\
-    "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry) module:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry/spool) xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/unittest/registry)" \
+$(eval $(call gb_CppunitTest_use_configuration,sc_tableautoformatfield))
+
+$(eval $(call gb_CppunitTest_use_filter_configuration,sc_tableautoformatfield))
+
+$(eval $(call gb_CppunitTest_use_extra_configuration,sc_tableautoformatfield,\
+	$(OUTDIR)/unittest/registry \
 ))
-    # .../spool is required for the (somewhat strange) filter configuration
 
 # we need to
 # a) explicitly depend on library msword because it is not implied by a link
diff --git a/sc/CppunitTest_sc_tablesheetobj.mk b/sc/CppunitTest_sc_tablesheetobj.mk
index f2f72e1..b357548 100644
--- a/sc/CppunitTest_sc_tablesheetobj.mk
+++ b/sc/CppunitTest_sc_tablesheetobj.mk
@@ -118,10 +118,13 @@ $(eval $(call gb_CppunitTest_use_components,sc_spreadsheetobj,\
     unoxml/source/service/unoxml \
 ))
 
-$(eval $(call gb_CppunitTest_set_args,sc_spreadsheetobj,\
-    "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry) module:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry/spool) xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/unittest/registry)" \
+$(eval $(call gb_CppunitTest_use_configuration,sc_spreadsheetobj))
+
+$(eval $(call gb_CppunitTest_use_filter_configuration,sc_spreadsheetobj))
+
+$(eval $(call gb_CppunitTest_use_extra_configuration,sc_spreadsheetobj,\
+	$(OUTDIR)/unittest/registry \
 ))
-    # .../spool is required for the (somewhat strange) filter configuration
 
 # we need to
 # a) explicitly depend on library msword because it is not implied by a link
diff --git a/sc/CppunitTest_sc_tablesheetsobj.mk b/sc/CppunitTest_sc_tablesheetsobj.mk
index a58afd3..5794793 100644
--- a/sc/CppunitTest_sc_tablesheetsobj.mk
+++ b/sc/CppunitTest_sc_tablesheetsobj.mk
@@ -116,10 +116,13 @@ $(eval $(call gb_CppunitTest_use_components,sc_spreadsheetsobj,\
     unoxml/source/service/unoxml \
 ))
 
-$(eval $(call gb_CppunitTest_set_args,sc_spreadsheetsobj,\
-    "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry) module:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry/spool) xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/unittest/registry)" \
+$(eval $(call gb_CppunitTest_use_configuration,sc_spreadsheetsobj))
+
+$(eval $(call gb_CppunitTest_use_filter_configuration,sc_spreadsheetsobj))
+
+$(eval $(call gb_CppunitTest_use_extra_configuration,sc_spreadsheetsobj,\
+	$(OUTDIR)/unittest/registry \
 ))
-    # .../spool is required for the (somewhat strange) filter configuration
 
 # we need to
 # a) explicitly depend on library msword because it is not implied by a link
diff --git a/sc/CppunitTest_sc_ucalc.mk b/sc/CppunitTest_sc_ucalc.mk
index b0d2e6a..2185f82 100644
--- a/sc/CppunitTest_sc_ucalc.mk
+++ b/sc/CppunitTest_sc_ucalc.mk
@@ -97,8 +97,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_ucalc,\
     unoxml/source/service/unoxml \
 ))
 
-$(eval $(call gb_CppunitTest_set_args,sc_ucalc,\
-    "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry)" \
-))
+$(eval $(call gb_CppunitTest_use_configuration,sc_ucalc))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sd/CppunitTest_sd_filters_test.mk b/sd/CppunitTest_sd_filters_test.mk
index 46ad622..9af86e0 100644
--- a/sd/CppunitTest_sd_filters_test.mk
+++ b/sd/CppunitTest_sd_filters_test.mk
@@ -106,10 +106,9 @@ $(eval $(call gb_CppunitTest_use_components,sd_filters_test,\
     unoxml/source/service/unoxml \
 ))
 
-$(eval $(call gb_CppunitTest_set_args,sd_filters_test,\
-    "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry) module:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry/spool)" \
-))
-    # .../spool is required for the (somewhat strange) filter configuration
+$(eval $(call gb_CppunitTest_use_configuration,sd_filters_test))
+
+$(eval $(call gb_CppunitTest_use_filter_configuration,sd_filters_test))
 
 # we need to explicitly depend on library sdfilt because it is not implied
 # by a link relation
diff --git a/sd/CppunitTest_sd_regression_test.mk b/sd/CppunitTest_sd_regression_test.mk
index 2716c50..4b24b25 100644
--- a/sd/CppunitTest_sd_regression_test.mk
+++ b/sd/CppunitTest_sd_regression_test.mk
@@ -116,11 +116,17 @@ $(eval $(call gb_CppunitTest_use_components,sd_regression_test,\
     xmlsecurity/util/xmlsecurity \
 ))
 
+$(eval $(call gb_CppunitTest_use_configuration,sd_regression_test))
+
+$(eval $(call gb_CppunitTest_use_filter_configuration,sd_regression_test))
+
+$(eval $(call gb_CppunitTest_use_extra_configuration,sd_regression_test,\
+	$(OUTDIR)/unittest/registry \
+))
+
 $(eval $(call gb_CppunitTest_set_args,sd_regression_test,\
-    "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry) module:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry/spool) xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/unittest/registry)" \
     "-env:SVG_DISABLE_FONT_EMBEDDING=YEAH" \
 ))
-    # .../spool is required for the (somewhat strange) filter configuration
 
 # we need to explicitly depend on library sdfilt because it is not implied
 # by a link relation
diff --git a/sd/CppunitTest_sd_uimpress.mk b/sd/CppunitTest_sd_uimpress.mk
index 658a240..86ba05e 100644
--- a/sd/CppunitTest_sd_uimpress.mk
+++ b/sd/CppunitTest_sd_uimpress.mk
@@ -82,8 +82,6 @@ $(eval $(call gb_CppunitTest_use_components,sd_uimpress,\
     i18npool/util/i18npool \
 ))
 
-$(eval $(call gb_CppunitTest_set_args,sd_uimpress,\
-    "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry)" \
-))
+$(eval $(call gb_CppunitTest_use_configuration,sd_uimpress))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sdext/CppunitTest_pdfimport.mk b/sdext/CppunitTest_pdfimport.mk
index 872c56e..e503ad7 100644
--- a/sdext/CppunitTest_pdfimport.mk
+++ b/sdext/CppunitTest_pdfimport.mk
@@ -73,8 +73,6 @@ $(eval $(call gb_CppunitTest_use_components,sdext_pdfimport,\
     ucb/source/ucp/file/ucpfile1 \
 ))
 
-$(eval $(call gb_CppunitTest_set_args,sdext_pdfimport,\
-    "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry)" \
-))
+$(eval $(call gb_CppunitTest_use_configuration,sdext_pdfimport))
 
 # vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index 51cde99..a667253 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -63,6 +63,8 @@ gb_CppunitTarget__make_url = file://$(if $(filter WNT,$(OS_FOR_BUILD)),/)$(strip
 define gb_CppunitTest__make_args
 $(ARGS) \
 --headless \
+$(if $(strip $(CONFIGURATION_LAYERS)),\
+	"-env:CONFIGURATION_LAYERS=$(strip $(CONFIGURATION_LAYERS))") \
 $(if $(strip $(UNO_TYPES)),\
 	"-env:UNO_TYPES=$(foreach item,$(UNO_TYPES),$(call gb_CppunitTarget__make_url,$(item)))") \
 $(if $(strip $(UNO_SERVICES)),\
@@ -117,6 +119,7 @@ $(call gb_CppunitTest_get_target,$(1)) : $(call gb_LinkTarget_get_target,$(2))
 $(call gb_CppunitTest_get_clean_target,$(1)) : $(call gb_LinkTarget_get_clean_target,$(2))
 $(call gb_CppunitTest_CppunitTest_platform,$(1),$(2),$(gb_CppunitTest_DLLDIR)/$(call gb_CppunitTest_get_libfilename,$(1)))
 $(call gb_CppunitTest_get_target,$(1)) : ARGS :=
+$(call gb_CppunitTest_get_target,$(1)) : CONFIGURATION_LAYERS :=
 $(call gb_CppunitTest_get_target,$(1)) : URE := $(false)
 $(call gb_CppunitTest_get_target,$(1)) : UNO_SERVICES :=
 $(call gb_CppunitTest_get_target,$(1)) : UNO_TYPES :=
@@ -266,6 +269,34 @@ endef
 
 gb_ComponentTarget__get_old_component_target = $(OUTDIR)/xml/$(1).component
 
+define gb_CppunitTest__use_configuration
+$(call gb_CppunitTest_get_target,$(1)) : CONFIGURATION_LAYERS += $(2):$(call gb_CppunitTarget__make_url,$(3))
+
+endef
+
+# Use standard configuration.
+define gb_CppunitTest_use_configuration
+$(call gb_CppunitTest_get_target,$(1)) : $(call gb_Configuration_get_target,officecfg)
+$(call gb_CppunitTest__use_configuration,$(1),xcsxcu,$(gb_Configuration_registry))
+
+endef
+
+# Use configuration for filters.
+#
+# Okay, this is not exactly true, because there may be configuration
+# for more things than just filters in spool, but it is good enough.
+define gb_CppunitTest_use_filter_configuration
+$(call gb_CppunitTest_get_target,$(1)) : $(call gb_Configuration_get_target,fcfg_langpack)
+$(call gb_CppunitTest__use_configuration,$(1),module,$(gb_Configuration_registry)/spool)
+
+endef
+
+# Use extra configuration dir(s).
+define gb_CppunitTest_use_extra_configuration
+$(foreach extra,$(2),$(call gb_CppunitTest__use_configuration,$(1),xcsxcu,$(extra)))
+
+endef
+
 define gb_CppunitTest__forward_to_Linktarget
 gb_CppunitTest_$(1) = $$(call gb_LinkTarget_$(1),$$(call gb_CppunitTest__get_linktargetname,$$(1)),$$(2),$$(3))
 
diff --git a/svtools/CppunitTest_svtools_filters_test.mk b/svtools/CppunitTest_svtools_filters_test.mk
index ff764a1..7d4353f 100644
--- a/svtools/CppunitTest_svtools_filters_test.mk
+++ b/svtools/CppunitTest_svtools_filters_test.mk
@@ -57,8 +57,6 @@ $(eval $(call gb_CppunitTest_use_components,svtools_filters_test,\
     configmgr/source/configmgr \
 ))
 
-$(eval $(call gb_CppunitTest_set_args,svtools_filters_test,\
-    "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry)" \
-))
+$(eval $(call gb_CppunitTest_use_configuration,svtools_filters_test))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sw/CppunitTest_sw_filters_test.mk b/sw/CppunitTest_sw_filters_test.mk
index 5400cde..bf61682 100644
--- a/sw/CppunitTest_sw_filters_test.mk
+++ b/sw/CppunitTest_sw_filters_test.mk
@@ -90,9 +90,7 @@ $(eval $(call gb_CppunitTest_use_components,sw_filters_test,\
     xmlhelp/util/ucpchelp1 \
 ))
 
-$(eval $(call gb_CppunitTest_set_args,sw_filters_test,\
-    "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry)" \
-))
+$(eval $(call gb_CppunitTest_use_configuration,sw_filters_test))
 
 # we need to explicitly depend on library msword because it is not implied
 # by a link relation
diff --git a/sw/CppunitTest_sw_layout_test.mk b/sw/CppunitTest_sw_layout_test.mk
index 44728df..c3540ad 100644
--- a/sw/CppunitTest_sw_layout_test.mk
+++ b/sw/CppunitTest_sw_layout_test.mk
@@ -113,10 +113,13 @@ $(eval $(call gb_CppunitTest_use_components,sw_layout_test,\
     unoxml/source/service/unoxml \
 ))
 
-$(eval $(call gb_CppunitTest_set_args,sw_layout_test,\
-    "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry) module:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry/spool) xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/unittest/registry)" \
+$(eval $(call gb_CppunitTest_use_configuration,sw_layout_test))
+
+$(eval $(call gb_CppunitTest_use_filter_configuration,sw_layout_test))
+
+$(eval $(call gb_CppunitTest_use_extra_configuration,sw_layout_test,\
+	$(OUTDIR)/unittest/registry \
 ))
-    # .../spool is required for the (somewhat strange) filter configuration
 
 # we need to
 # a) explicitly depend on library msword because it is not implied by a link
diff --git a/sw/CppunitTest_sw_macros_test.mk b/sw/CppunitTest_sw_macros_test.mk
index 9be7339..f7a053b 100644
--- a/sw/CppunitTest_sw_macros_test.mk
+++ b/sw/CppunitTest_sw_macros_test.mk
@@ -115,10 +115,13 @@ $(eval $(call gb_CppunitTest_use_components,sw_macros_test,\
     unoxml/source/service/unoxml \
 ))
 
-$(eval $(call gb_CppunitTest_set_args,sw_macros_test,\
-    "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry) module:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry/spool) xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/unittest/registry)" \
+$(eval $(call gb_CppunitTest_use_configuration,sw_macros_test))
+
+$(eval $(call gb_CppunitTest_use_filter_configuration,sw_macros_test))
+
+$(eval $(call gb_CppunitTest_use_extra_configuration,sw_macros_test,\
+	$(OUTDIR)/unittest/registry \
 ))
-    # .../spool is required for the (somewhat strange) filter configuration
 
 # we need to
 # a) explicitly depend on library msword because it is not implied by a link
diff --git a/sw/CppunitTest_sw_regression_test.mk b/sw/CppunitTest_sw_regression_test.mk
index 9d37f66..e1d35d8 100644
--- a/sw/CppunitTest_sw_regression_test.mk
+++ b/sw/CppunitTest_sw_regression_test.mk
@@ -115,10 +115,13 @@ $(eval $(call gb_CppunitTest_use_components,sw_regression_test,\
     unoxml/source/service/unoxml \
 ))
 
-$(eval $(call gb_CppunitTest_set_args,sw_regression_test,\
-    "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry) module:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry/spool) xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/unittest/registry)" \
+$(eval $(call gb_CppunitTest_use_configuration,sw_regression_test))
+
+$(eval $(call gb_CppunitTest_use_filter_configuration,sw_regression_test))
+
+$(eval $(call gb_CppunitTest_use_extra_configuration,sw_regression_test,\
+	$(OUTDIR)/unittest/registry \
 ))
-    # .../spool is required for the (somewhat strange) filter configuration
 
 # we need to
 # a) explicitly depend on library msword because it is not implied by a link
diff --git a/sw/CppunitTest_sw_subsequent_ooxmltok.mk b/sw/CppunitTest_sw_subsequent_ooxmltok.mk
index 21cfbff..db72f14 100644
--- a/sw/CppunitTest_sw_subsequent_ooxmltok.mk
+++ b/sw/CppunitTest_sw_subsequent_ooxmltok.mk
@@ -74,8 +74,12 @@ $(eval $(call gb_CppunitTest_use_components,sw_subsequent_ooxmltok,\
     writerfilter/util/writerfilter \
 ))
 
-$(eval $(call gb_CppunitTest_set_args,sw_subsequent_ooxmltok,\
-    "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry) module:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry/spool) xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/unittest/registry)" \
+$(eval $(call gb_CppunitTest_use_configuration,sw_subsequent_ooxmltok))
+
+$(eval $(call gb_CppunitTest_use_filter_configuration,sw_subsequent_ooxmltok))
+
+$(eval $(call gb_CppunitTest_use_extra_configuration,sw_subsequent_ooxmltok,\
+	$(OUTDIR)/unittest/registry \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sw/CppunitTest_sw_subsequent_rtftok.mk b/sw/CppunitTest_sw_subsequent_rtftok.mk
index 9689d04..a3e0f86 100644
--- a/sw/CppunitTest_sw_subsequent_rtftok.mk
+++ b/sw/CppunitTest_sw_subsequent_rtftok.mk
@@ -68,8 +68,12 @@ $(eval $(call gb_CppunitTest_use_components,sw_subsequent_rtftok,\
 	writerfilter/util/writerfilter \
 ))
 
-$(eval $(call gb_CppunitTest_set_args,sw_subsequent_rtftok,\
-    "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry) module:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry/spool) xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/unittest/registry)" \
+$(eval $(call gb_CppunitTest_use_configuration,sw_subsequent_rtftok))
+
+$(eval $(call gb_CppunitTest_use_filter_configuration,sw_subsequent_rtftok))
+
+$(eval $(call gb_CppunitTest_use_extra_configuration,sw_subsequent_rtftok,\
+	$(OUTDIR)/unittest/registry \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sw/CppunitTest_sw_swdoc_test.mk b/sw/CppunitTest_sw_swdoc_test.mk
index cb22c62..7629d1a 100644
--- a/sw/CppunitTest_sw_swdoc_test.mk
+++ b/sw/CppunitTest_sw_swdoc_test.mk
@@ -97,9 +97,7 @@ $(eval $(call gb_CppunitTest_use_components,sw_swdoc_test,\
     unoxml/source/service/unoxml \
 ))
 
-$(eval $(call gb_CppunitTest_set_args,sw_swdoc_test,\
-    "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry)" \
-))
+$(eval $(call gb_CppunitTest_use_configuration,sw_swdoc_test))
 
 # we need to explicitly depend on the sw resource files needed at unit-test
 # runtime
diff --git a/writerfilter/CppunitTest_writerfilter_rtftok.mk b/writerfilter/CppunitTest_writerfilter_rtftok.mk
index a1d4de4..ecc5d66 100644
--- a/writerfilter/CppunitTest_writerfilter_rtftok.mk
+++ b/writerfilter/CppunitTest_writerfilter_rtftok.mk
@@ -59,9 +59,7 @@ $(eval $(call gb_CppunitTest_use_components,writerfilter_rtftok,\
 	writerfilter/util/writerfilter \
 ))
 
-$(eval $(call gb_CppunitTest_set_args,writerfilter_rtftok,\
-    "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry)" \
-))
+$(eval $(call gb_CppunitTest_use_configuration,writerfilter_rtftok))
 
 # we need to explicitly depend on library rtftok and writerfilter because it is not implied
 # by a link relation
commit e5f16b8d3e4b0fc3c772c7cfdd0abdf3a749650e
Author: David Tardon <dtardon at redhat.com>
Date:   Sun Apr 8 12:36:24 2012 +0200

    always use --protector for UNO tests

diff --git a/dbaccess/CppunitTest_dbaccess_macros_test.mk b/dbaccess/CppunitTest_dbaccess_macros_test.mk
index fb7ea67..60cc0e1 100644
--- a/dbaccess/CppunitTest_dbaccess_macros_test.mk
+++ b/dbaccess/CppunitTest_dbaccess_macros_test.mk
@@ -117,7 +117,6 @@ $(eval $(call gb_CppunitTest_use_components,dbaccess_macros_test,\
 ))
 
 $(eval $(call gb_CppunitTest_set_args,dbaccess_macros_test,\
-    --protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \
     "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry) module:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry/spool) xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/unittest/registry)" \
 ))
     # .../spool is required for the (somewhat strange) filter configuration
diff --git a/extensions/CppunitTest_extensions_test_update.mk b/extensions/CppunitTest_extensions_test_update.mk
index 0ce7ad8..6ce04b8 100644
--- a/extensions/CppunitTest_extensions_test_update.mk
+++ b/extensions/CppunitTest_extensions_test_update.mk
@@ -70,7 +70,6 @@ $(eval $(call gb_CppunitTest_use_components,extensions_test_update,\
 ))
 
 $(eval $(call gb_CppunitTest_set_args,extensions_test_update,\
-    --protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \
     "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry)" \
 ))
 
diff --git a/filter/CppunitTest_filter_tga_test.mk b/filter/CppunitTest_filter_tga_test.mk
index 85d8a1f..2a8ddd0 100644
--- a/filter/CppunitTest_filter_tga_test.mk
+++ b/filter/CppunitTest_filter_tga_test.mk
@@ -55,7 +55,6 @@ $(eval $(call gb_CppunitTest_use_components,filter_tga_test,\
 ))
 
 $(eval $(call gb_CppunitTest_set_args,filter_tga_test,\
-    --protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \
     "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry)" \
 ))
 
diff --git a/filter/CppunitTest_filter_tiff_test.mk b/filter/CppunitTest_filter_tiff_test.mk
index 0fb7b10..1c07f80 100644
--- a/filter/CppunitTest_filter_tiff_test.mk
+++ b/filter/CppunitTest_filter_tiff_test.mk
@@ -55,7 +55,6 @@ $(eval $(call gb_CppunitTest_use_components,filter_tiff_test,\
 ))
 
 $(eval $(call gb_CppunitTest_set_args,filter_tiff_test,\
-    --protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \
     "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry)" \
 ))
 
diff --git a/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk b/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk
index 2da7ad9..c5ea37a 100644
--- a/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk
+++ b/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk
@@ -62,7 +62,6 @@ $(eval $(call gb_CppunitTest_use_components,hwpfilter_test_hwpfilter,\
 ))
 
 $(eval $(call gb_CppunitTest_set_args,hwpfilter_test_hwpfilter,\
-    --protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \
     "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry)" \
 ))
 
diff --git a/i18npool/CppunitTest_i18npool_test_breakiterator.mk b/i18npool/CppunitTest_i18npool_test_breakiterator.mk
index b723b7f..19808ff 100644
--- a/i18npool/CppunitTest_i18npool_test_breakiterator.mk
+++ b/i18npool/CppunitTest_i18npool_test_breakiterator.mk
@@ -52,10 +52,6 @@ $(eval $(call gb_CppunitTest_use_components,i18npool_test_breakiterator,\
 	i18npool/util/i18npool \
 ))
 
-$(eval $(call gb_CppunitTest_set_args,i18npool_test_breakiterator,\
-   --protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \
-))
-
 $(call gb_CppunitTest_get_target,i18npool_test_breakiterator) : $(call gb_Module_get_target,i18npool)
 
 # vim: set noet sw=4 ts=4:
diff --git a/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk b/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk
index 9e766e3..945a96f 100644
--- a/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk
+++ b/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk
@@ -62,7 +62,6 @@ $(eval $(call gb_CppunitTest_use_components,lotuswordpro_test_lotuswordpro,\
 ))
 
 $(eval $(call gb_CppunitTest_set_args,lotuswordpro_test_lotuswordpro,\
-    --protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \
     "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry)" \
 ))
 
diff --git a/sc/CppunitTest_sc_cellrangeobj.mk b/sc/CppunitTest_sc_cellrangeobj.mk
index 011a65a..eb95f86 100644
--- a/sc/CppunitTest_sc_cellrangeobj.mk
+++ b/sc/CppunitTest_sc_cellrangeobj.mk
@@ -119,7 +119,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_cellrangesbase,\
 ))
 
 $(eval $(call gb_CppunitTest_set_args,sc_cellrangesbase,\
-    --protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \
     "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry) module:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry/spool) xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/unittest/registry)" \
 ))
     # .../spool is required for the (somewhat strange) filter configuration
diff --git a/sc/CppunitTest_sc_chart_regression_test.mk b/sc/CppunitTest_sc_chart_regression_test.mk
index 64a1dd0..37c5915 100644
--- a/sc/CppunitTest_sc_chart_regression_test.mk
+++ b/sc/CppunitTest_sc_chart_regression_test.mk
@@ -125,7 +125,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_chart_regression_test,\
 ))
 
 $(eval $(call gb_CppunitTest_set_args,sc_chart_regression_test,\
-    --protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \
     "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry) module:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry/spool) xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/unittest/registry)" \
 ))
     # .../spool is required for the (somewhat strange) filter configuration
diff --git a/sc/CppunitTest_sc_databaserangeobj.mk b/sc/CppunitTest_sc_databaserangeobj.mk
index d9ff41b..a8292a3 100644
--- a/sc/CppunitTest_sc_databaserangeobj.mk
+++ b/sc/CppunitTest_sc_databaserangeobj.mk
@@ -117,7 +117,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_databaserangeobj,\
 ))
 
 $(eval $(call gb_CppunitTest_set_args,sc_databaserangeobj,\
-    --protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \
     "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry) module:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry/spool) xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/unittest/registry)" \
 ))
     # .../spool is required for the (somewhat strange) filter configuration
diff --git a/sc/CppunitTest_sc_datapilotfieldobj.mk b/sc/CppunitTest_sc_datapilotfieldobj.mk
index 82b6f05..5eb0350 100644
--- a/sc/CppunitTest_sc_datapilotfieldobj.mk
+++ b/sc/CppunitTest_sc_datapilotfieldobj.mk
@@ -117,7 +117,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_datapilotfieldobj,\
 ))
 
 $(eval $(call gb_CppunitTest_set_args,sc_datapilotfieldobj,\
-    --protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \
     "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry) module:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry/spool) xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/unittest/registry)" \
 ))
     # .../spool is required for the (somewhat strange) filter configuration
diff --git a/sc/CppunitTest_sc_datapilottableobj.mk b/sc/CppunitTest_sc_datapilottableobj.mk
index 4007f4f..29ec3b9 100644
--- a/sc/CppunitTest_sc_datapilottableobj.mk
+++ b/sc/CppunitTest_sc_datapilottableobj.mk
@@ -117,7 +117,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_datapilottableobj,\
 ))
 
 $(eval $(call gb_CppunitTest_set_args,sc_datapilottableobj,\
-    --protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \
     "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry) module:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry/spool) xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/unittest/registry)" \
 ))
     # .../spool is required for the (somewhat strange) filter configuration
diff --git a/sc/CppunitTest_sc_filters_test.mk b/sc/CppunitTest_sc_filters_test.mk
index 23177f3..b146647 100644
--- a/sc/CppunitTest_sc_filters_test.mk
+++ b/sc/CppunitTest_sc_filters_test.mk
@@ -117,7 +117,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_filters_test,\
 ))
 
 $(eval $(call gb_CppunitTest_set_args,sc_filters_test,\
-    --protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \
     "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry) module:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry/spool)" \
 ))
     # .../spool is required for the (somewhat strange) filter configuration
diff --git a/sc/CppunitTest_sc_macros_test.mk b/sc/CppunitTest_sc_macros_test.mk
index 60ceab3..4a87930 100644
--- a/sc/CppunitTest_sc_macros_test.mk
+++ b/sc/CppunitTest_sc_macros_test.mk
@@ -114,7 +114,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_macros_test,\
 ))
 
 $(eval $(call gb_CppunitTest_set_args,sc_macros_test,\
-    --protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \
     "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry) module:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry/spool) xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/unittest/registry)" \
 ))
     # .../spool is required for the (somewhat strange) filter configuration
diff --git a/sc/CppunitTest_sc_namedrangeobj.mk b/sc/CppunitTest_sc_namedrangeobj.mk
index 46c38be..34689a5 100644
--- a/sc/CppunitTest_sc_namedrangeobj.mk
+++ b/sc/CppunitTest_sc_namedrangeobj.mk
@@ -117,7 +117,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_namedrangeobj,\
 ))
 
 $(eval $(call gb_CppunitTest_set_args,sc_namedrangeobj,\
-    --protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \
     "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry) module:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry/spool) xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/unittest/registry)" \
 ))
     # .../spool is required for the (somewhat strange) filter configuration
diff --git a/sc/CppunitTest_sc_namedrangesobj.mk b/sc/CppunitTest_sc_namedrangesobj.mk
index 4bdb78d..03addcf 100644
--- a/sc/CppunitTest_sc_namedrangesobj.mk
+++ b/sc/CppunitTest_sc_namedrangesobj.mk
@@ -117,7 +117,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_namedrangesobj,\
 ))
 
 $(eval $(call gb_CppunitTest_set_args,sc_namedrangesobj,\
-    --protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \
     "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry) module:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry/spool) xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/unittest/registry)" \
 ))
     # .../spool is required for the (somewhat strange) filter configuration
diff --git a/sc/CppunitTest_sc_subsequent_filters_test.mk b/sc/CppunitTest_sc_subsequent_filters_test.mk
index a25b8d2..fb0436f 100644
--- a/sc/CppunitTest_sc_subsequent_filters_test.mk
+++ b/sc/CppunitTest_sc_subsequent_filters_test.mk
@@ -130,7 +130,6 @@ endif
 endif
 
 $(eval $(call gb_CppunitTest_set_args,sc_subsequent_filters_test,\
-    --protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \
     "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry) module:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry/spool)" \
 ))
     # .../spool is required for the (somewhat strange) filter configuration
diff --git a/sc/CppunitTest_sc_tableautoformatfield.mk b/sc/CppunitTest_sc_tableautoformatfield.mk
index 3fb51bf..daadfb1 100644
--- a/sc/CppunitTest_sc_tableautoformatfield.mk
+++ b/sc/CppunitTest_sc_tableautoformatfield.mk
@@ -117,7 +117,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_tableautoformatfield,\
 ))
 
 $(eval $(call gb_CppunitTest_set_args,sc_tableautoformatfield,\
-    --protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \
     "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry) module:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry/spool) xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/unittest/registry)" \
 ))
     # .../spool is required for the (somewhat strange) filter configuration
diff --git a/sc/CppunitTest_sc_tablesheetobj.mk b/sc/CppunitTest_sc_tablesheetobj.mk
index 4b5578c..f2f72e1 100644
--- a/sc/CppunitTest_sc_tablesheetobj.mk
+++ b/sc/CppunitTest_sc_tablesheetobj.mk
@@ -119,7 +119,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_spreadsheetobj,\
 ))
 
 $(eval $(call gb_CppunitTest_set_args,sc_spreadsheetobj,\
-    --protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \
     "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry) module:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry/spool) xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/unittest/registry)" \
 ))
     # .../spool is required for the (somewhat strange) filter configuration
diff --git a/sc/CppunitTest_sc_tablesheetsobj.mk b/sc/CppunitTest_sc_tablesheetsobj.mk
index 3b076ab..a58afd3 100644
--- a/sc/CppunitTest_sc_tablesheetsobj.mk
+++ b/sc/CppunitTest_sc_tablesheetsobj.mk
@@ -117,7 +117,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_spreadsheetsobj,\
 ))
 
 $(eval $(call gb_CppunitTest_set_args,sc_spreadsheetsobj,\
-    --protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \
     "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry) module:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry/spool) xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/unittest/registry)" \
 ))
     # .../spool is required for the (somewhat strange) filter configuration
diff --git a/sc/CppunitTest_sc_ucalc.mk b/sc/CppunitTest_sc_ucalc.mk
index 7cd6d0b..b0d2e6a 100644
--- a/sc/CppunitTest_sc_ucalc.mk
+++ b/sc/CppunitTest_sc_ucalc.mk
@@ -98,7 +98,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_ucalc,\
 ))
 
 $(eval $(call gb_CppunitTest_set_args,sc_ucalc,\
-    --protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \
     "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry)" \
 ))
 
diff --git a/sd/CppunitTest_sd_filters_test.mk b/sd/CppunitTest_sd_filters_test.mk
index 6b8a328..46ad622 100644
--- a/sd/CppunitTest_sd_filters_test.mk
+++ b/sd/CppunitTest_sd_filters_test.mk
@@ -107,7 +107,6 @@ $(eval $(call gb_CppunitTest_use_components,sd_filters_test,\
 ))
 
 $(eval $(call gb_CppunitTest_set_args,sd_filters_test,\
-    --protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \
     "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry) module:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry/spool)" \
 ))
     # .../spool is required for the (somewhat strange) filter configuration
diff --git a/sd/CppunitTest_sd_regression_test.mk b/sd/CppunitTest_sd_regression_test.mk
index bc055aa..2716c50 100644
--- a/sd/CppunitTest_sd_regression_test.mk
+++ b/sd/CppunitTest_sd_regression_test.mk
@@ -117,7 +117,6 @@ $(eval $(call gb_CppunitTest_use_components,sd_regression_test,\
 ))
 
 $(eval $(call gb_CppunitTest_set_args,sd_regression_test,\
-    --protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \
     "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry) module:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry/spool) xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/unittest/registry)" \
     "-env:SVG_DISABLE_FONT_EMBEDDING=YEAH" \
 ))
diff --git a/sd/CppunitTest_sd_uimpress.mk b/sd/CppunitTest_sd_uimpress.mk
index b996d2d..658a240 100644
--- a/sd/CppunitTest_sd_uimpress.mk
+++ b/sd/CppunitTest_sd_uimpress.mk
@@ -83,7 +83,6 @@ $(eval $(call gb_CppunitTest_use_components,sd_uimpress,\
 ))
 
 $(eval $(call gb_CppunitTest_set_args,sd_uimpress,\
-    --protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \
     "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry)" \
 ))
 
diff --git a/sdext/CppunitTest_pdfimport.mk b/sdext/CppunitTest_pdfimport.mk
index 931ebb1..872c56e 100644
--- a/sdext/CppunitTest_pdfimport.mk
+++ b/sdext/CppunitTest_pdfimport.mk
@@ -74,7 +74,6 @@ $(eval $(call gb_CppunitTest_use_components,sdext_pdfimport,\
 ))
 
 $(eval $(call gb_CppunitTest_set_args,sdext_pdfimport,\
-    --protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \
     "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry)" \
 ))
 
diff --git a/smoketest/CppunitTest_smoketest.mk b/smoketest/CppunitTest_smoketest.mk
index 851e2e4..c51df89 100644
--- a/smoketest/CppunitTest_smoketest.mk
+++ b/smoketest/CppunitTest_smoketest.mk
@@ -55,8 +55,6 @@ $(eval $(call gb_CppunitTest_set_args,smoketest,\
 	-env:arg-user=$(WORKDIR)/CustomTarget/smoketest \
 	-env:arg-env=$(gb_Helper_LIBRARY_PATH_VAR)"$$$${$(gb_Helper_LIBRARY_PATH_VAR)+=$$$$$(gb_Helper_LIBRARY_PATH_VAR)}" \
 	-env:arg-testarg.smoketest.doc=$(OUTDIR)/bin/smoketestdoc.sxw \
-	--protector $(call gb_Library_get_target,unoexceptionprotector) \
-	unoexceptionprotector \
 ))
 
 $(call gb_CppunitTest_get_target,smoketest): clean_CustomTarget_smoketest
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index d69777a..51cde99 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -69,7 +69,8 @@ $(if $(strip $(UNO_SERVICES)),\
 	"-env:UNO_SERVICES=$(foreach item,$(UNO_SERVICES),$(call gb_CppunitTarget__make_url,$(item)))") \
 $(if $(URE),\
 	$(foreach dir,URE_INTERNAL_LIB_DIR LO_LIB_DIR,\
-		-env:$(dir)=$(call gb_CppunitTarget__make_url,$(gb_CppunitTest_LIBDIR))))
+		-env:$(dir)=$(call gb_CppunitTarget__make_url,$(gb_CppunitTest_LIBDIR))) \
+	--protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector)
 endef
 
 .PHONY : $(call gb_CppunitTest_get_clean_target,%)
diff --git a/sot/CppunitTest_sot_test_sot.mk b/sot/CppunitTest_sot_test_sot.mk
index b63556c..003a346 100644
--- a/sot/CppunitTest_sot_test_sot.mk
+++ b/sot/CppunitTest_sot_test_sot.mk
@@ -56,8 +56,4 @@ $(eval $(call gb_CppunitTest_use_api,sot_test_sot,\
     udkapi \
 ))
 
-$(eval $(call gb_CppunitTest_set_args,sot_test_sot,\
-    --protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \
-))
-
 # vim: set noet sw=4 ts=4:
diff --git a/starmath/CppunitTest_starmath_qa_cppunit.mk b/starmath/CppunitTest_starmath_qa_cppunit.mk
index 2142762..1af3286 100644
--- a/starmath/CppunitTest_starmath_qa_cppunit.mk
+++ b/starmath/CppunitTest_starmath_qa_cppunit.mk
@@ -95,8 +95,4 @@ $(eval $(call gb_CppunitTest_use_old_components,starmath_qa_cppunit,\
 ))
 endif
 
-$(eval $(call gb_CppunitTest_set_args,starmath_qa_cppunit,\
-    --protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \
-))
-
 # vim: set noet sw=4 ts=4:
diff --git a/svl/CppunitTest_svl_urihelper.mk b/svl/CppunitTest_svl_urihelper.mk
index 7082371..8602756 100644
--- a/svl/CppunitTest_svl_urihelper.mk
+++ b/svl/CppunitTest_svl_urihelper.mk
@@ -50,8 +50,3 @@ $(eval $(call gb_CppunitTest_use_libraries,svl_urihelper, \
     utl \
     $(gb_STDLIBS) \
 ))
-
-$(eval $(call gb_CppunitTest_set_args,svl_urihelper, \
-    --protector unoexceptionprotector$(gb_Library_DLLEXT) \
-        unoexceptionprotector \
-))
diff --git a/svtools/CppunitTest_svtools_filters_test.mk b/svtools/CppunitTest_svtools_filters_test.mk
index ee26644..ff764a1 100644
--- a/svtools/CppunitTest_svtools_filters_test.mk
+++ b/svtools/CppunitTest_svtools_filters_test.mk
@@ -58,7 +58,6 @@ $(eval $(call gb_CppunitTest_use_components,svtools_filters_test,\
 ))
 
 $(eval $(call gb_CppunitTest_set_args,svtools_filters_test,\
-    --protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \
     "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry)" \
 ))
 
diff --git a/sw/CppunitTest_sw_filters_test.mk b/sw/CppunitTest_sw_filters_test.mk
index 2a3203c..5400cde 100644
--- a/sw/CppunitTest_sw_filters_test.mk
+++ b/sw/CppunitTest_sw_filters_test.mk
@@ -91,7 +91,6 @@ $(eval $(call gb_CppunitTest_use_components,sw_filters_test,\
 ))
 
 $(eval $(call gb_CppunitTest_set_args,sw_filters_test,\
-    --protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \
     "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry)" \
 ))
 
diff --git a/sw/CppunitTest_sw_layout_test.mk b/sw/CppunitTest_sw_layout_test.mk
index bf45188..44728df 100644
--- a/sw/CppunitTest_sw_layout_test.mk
+++ b/sw/CppunitTest_sw_layout_test.mk
@@ -114,7 +114,6 @@ $(eval $(call gb_CppunitTest_use_components,sw_layout_test,\
 ))
 
 $(eval $(call gb_CppunitTest_set_args,sw_layout_test,\
-    --protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \
     "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry) module:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry/spool) xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/unittest/registry)" \
 ))
     # .../spool is required for the (somewhat strange) filter configuration
diff --git a/sw/CppunitTest_sw_macros_test.mk b/sw/CppunitTest_sw_macros_test.mk
index 35801e6..9be7339 100644
--- a/sw/CppunitTest_sw_macros_test.mk
+++ b/sw/CppunitTest_sw_macros_test.mk
@@ -116,7 +116,6 @@ $(eval $(call gb_CppunitTest_use_components,sw_macros_test,\
 ))
 
 $(eval $(call gb_CppunitTest_set_args,sw_macros_test,\
-    --protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \
     "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry) module:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry/spool) xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/unittest/registry)" \
 ))
     # .../spool is required for the (somewhat strange) filter configuration
diff --git a/sw/CppunitTest_sw_regression_test.mk b/sw/CppunitTest_sw_regression_test.mk
index 9edc5c8..9d37f66 100644
--- a/sw/CppunitTest_sw_regression_test.mk
+++ b/sw/CppunitTest_sw_regression_test.mk
@@ -116,7 +116,6 @@ $(eval $(call gb_CppunitTest_use_components,sw_regression_test,\
 ))
 
 $(eval $(call gb_CppunitTest_set_args,sw_regression_test,\
-    --protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \
     "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry) module:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry/spool) xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/unittest/registry)" \
 ))
     # .../spool is required for the (somewhat strange) filter configuration
diff --git a/sw/CppunitTest_sw_subsequent_ooxmltok.mk b/sw/CppunitTest_sw_subsequent_ooxmltok.mk
index 46b333a..21cfbff 100644
--- a/sw/CppunitTest_sw_subsequent_ooxmltok.mk
+++ b/sw/CppunitTest_sw_subsequent_ooxmltok.mk
@@ -75,7 +75,6 @@ $(eval $(call gb_CppunitTest_use_components,sw_subsequent_ooxmltok,\
 ))
 
 $(eval $(call gb_CppunitTest_set_args,sw_subsequent_ooxmltok,\
-    --protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \
     "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry) module:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry/spool) xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/unittest/registry)" \
 ))
 
diff --git a/sw/CppunitTest_sw_subsequent_rtftok.mk b/sw/CppunitTest_sw_subsequent_rtftok.mk
index 01d75fe..9689d04 100644
--- a/sw/CppunitTest_sw_subsequent_rtftok.mk
+++ b/sw/CppunitTest_sw_subsequent_rtftok.mk
@@ -69,7 +69,6 @@ $(eval $(call gb_CppunitTest_use_components,sw_subsequent_rtftok,\
 ))
 
 $(eval $(call gb_CppunitTest_set_args,sw_subsequent_rtftok,\
-    --protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \
     "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry) module:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry/spool) xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/unittest/registry)" \
 ))
 
diff --git a/sw/CppunitTest_sw_swdoc_test.mk b/sw/CppunitTest_sw_swdoc_test.mk
index c4f8848..cb22c62 100644
--- a/sw/CppunitTest_sw_swdoc_test.mk
+++ b/sw/CppunitTest_sw_swdoc_test.mk
@@ -98,7 +98,6 @@ $(eval $(call gb_CppunitTest_use_components,sw_swdoc_test,\
 ))
 
 $(eval $(call gb_CppunitTest_set_args,sw_swdoc_test,\
-    --protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \
     "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry)" \
 ))
 
diff --git a/writerfilter/CppunitTest_writerfilter_rtftok.mk b/writerfilter/CppunitTest_writerfilter_rtftok.mk
index 6fee584..a1d4de4 100644
--- a/writerfilter/CppunitTest_writerfilter_rtftok.mk
+++ b/writerfilter/CppunitTest_writerfilter_rtftok.mk
@@ -60,7 +60,6 @@ $(eval $(call gb_CppunitTest_use_components,writerfilter_rtftok,\
 ))
 
 $(eval $(call gb_CppunitTest_set_args,writerfilter_rtftok,\
-	--protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \
     "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry)" \
 ))
 
commit 33e9f3d3d6b29545ef9df3f5334c015e15caa5c8
Author: David Tardon <dtardon at redhat.com>
Date:   Sun Apr 8 12:26:27 2012 +0200

    drop uses_ure

diff --git a/dbaccess/CppunitTest_dbaccess_macros_test.mk b/dbaccess/CppunitTest_dbaccess_macros_test.mk
index ec9b5ac..fb7ea67 100644
--- a/dbaccess/CppunitTest_dbaccess_macros_test.mk
+++ b/dbaccess/CppunitTest_dbaccess_macros_test.mk
@@ -83,8 +83,6 @@ $(eval $(call gb_CppunitTest_use_api,dbaccess_macros_test,\
     udkapi \
 ))
 
-$(eval $(call gb_CppunitTest_uses_ure,dbaccess_macros_test))
-
 $(eval $(call gb_CppunitTest_use_components,dbaccess_macros_test,\
     basic/util/sb \
     comphelper/util/comphelp \
diff --git a/extensions/CppunitTest_extensions_test_update.mk b/extensions/CppunitTest_extensions_test_update.mk
index 844a5f7..0ce7ad8 100644
--- a/extensions/CppunitTest_extensions_test_update.mk
+++ b/extensions/CppunitTest_extensions_test_update.mk
@@ -61,8 +61,6 @@ $(eval $(call gb_CppunitTest_use_api,extensions_test_update,\
 	udkapi \
 ))
 
-$(eval $(call gb_CppunitTest_uses_ure,extensions_test_update))
-
 $(eval $(call gb_CppunitTest_use_components,extensions_test_update,\
     configmgr/source/configmgr \
     extensions/source/update/feed/updatefeed \
diff --git a/filter/CppunitTest_filter_tga_test.mk b/filter/CppunitTest_filter_tga_test.mk
index 025dc9a..85d8a1f 100644
--- a/filter/CppunitTest_filter_tga_test.mk
+++ b/filter/CppunitTest_filter_tga_test.mk
@@ -50,8 +50,6 @@ $(eval $(call gb_CppunitTest_use_api,filter_tga_test,\
     offapi \
 ))
 
-$(eval $(call gb_CppunitTest_uses_ure,filter_tga_test))
-
 $(eval $(call gb_CppunitTest_use_components,filter_tga_test,\
     configmgr/source/configmgr \
 ))
diff --git a/filter/CppunitTest_filter_tiff_test.mk b/filter/CppunitTest_filter_tiff_test.mk
index 431d544..0fb7b10 100644
--- a/filter/CppunitTest_filter_tiff_test.mk
+++ b/filter/CppunitTest_filter_tiff_test.mk
@@ -50,8 +50,6 @@ $(eval $(call gb_CppunitTest_use_api,filter_tiff_test,\
     offapi \
 ))
 
-$(eval $(call gb_CppunitTest_uses_ure,filter_tiff_test))
-
 $(eval $(call gb_CppunitTest_use_components,filter_tiff_test,\
     configmgr/source/configmgr \
 ))
diff --git a/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk b/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk
index a5d5738..2da7ad9 100644
--- a/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk
+++ b/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk
@@ -54,8 +54,6 @@ $(eval $(call gb_CppunitTest_use_api,hwpfilter_test_hwpfilter,\
     udkapi \
 ))
 
-$(eval $(call gb_CppunitTest_uses_ure,hwpfilter_test_hwpfilter))
-
 $(eval $(call gb_CppunitTest_use_components,hwpfilter_test_hwpfilter,\
     configmgr/source/configmgr \
     hwpfilter/source/hwp \
diff --git a/i18npool/CppunitTest_i18npool_test_breakiterator.mk b/i18npool/CppunitTest_i18npool_test_breakiterator.mk
index 5528c5f..b723b7f 100644
--- a/i18npool/CppunitTest_i18npool_test_breakiterator.mk
+++ b/i18npool/CppunitTest_i18npool_test_breakiterator.mk
@@ -48,8 +48,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,i18npool_test_breakiterator,\
     i18npool/qa/cppunit/test_breakiterator \
 ))
 
-$(eval $(call gb_CppunitTest_uses_ure,i18npool_test_breakiterator))
-
 $(eval $(call gb_CppunitTest_use_components,i18npool_test_breakiterator,\
 	i18npool/util/i18npool \
 ))
diff --git a/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk b/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk
index 80d5681..9e766e3 100644
--- a/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk
+++ b/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk
@@ -54,8 +54,6 @@ $(eval $(call gb_CppunitTest_use_api,lotuswordpro_test_lotuswordpro,\
     udkapi \
 ))
 
-$(eval $(call gb_CppunitTest_uses_ure,lotuswordpro_test_lotuswordpro))
-
 $(eval $(call gb_CppunitTest_use_components,lotuswordpro_test_lotuswordpro,\
     configmgr/source/configmgr \
     lotuswordpro/util/lwpfilter \
diff --git a/sc/CppunitTest_sc_cellrangeobj.mk b/sc/CppunitTest_sc_cellrangeobj.mk
index 3c76ad7..011a65a 100644
--- a/sc/CppunitTest_sc_cellrangeobj.mk
+++ b/sc/CppunitTest_sc_cellrangeobj.mk
@@ -84,8 +84,6 @@ $(eval $(call gb_CppunitTest_use_api,sc_cellrangesbase,\
     udkapi \
 ))
 
-$(eval $(call gb_CppunitTest_uses_ure,sc_cellrangesbase))
-
 $(eval $(call gb_CppunitTest_use_components,sc_cellrangesbase,\
 	basic/util/sb \
     comphelper/util/comphelp \
diff --git a/sc/CppunitTest_sc_chart_regression_test.mk b/sc/CppunitTest_sc_chart_regression_test.mk
index f01a228..64a1dd0 100644
--- a/sc/CppunitTest_sc_chart_regression_test.mk
+++ b/sc/CppunitTest_sc_chart_regression_test.mk
@@ -80,8 +80,6 @@ $(eval $(call gb_CppunitTest_use_api,sc_chart_regression_test,\
     udkapi \
 ))
 
-$(eval $(call gb_CppunitTest_uses_ure,sc_chart_regression_test))
-
 $(eval $(call gb_CppunitTest_use_components,sc_chart_regression_test,\
     basic/util/sb \
     chart2/source/controller/chartcontroller \
diff --git a/sc/CppunitTest_sc_databaserangeobj.mk b/sc/CppunitTest_sc_databaserangeobj.mk
index 8704ac9..d9ff41b 100644
--- a/sc/CppunitTest_sc_databaserangeobj.mk
+++ b/sc/CppunitTest_sc_databaserangeobj.mk
@@ -83,8 +83,6 @@ $(eval $(call gb_CppunitTest_use_api,sc_databaserangeobj,\
     udkapi \
 ))
 
-$(eval $(call gb_CppunitTest_uses_ure,sc_databaserangeobj))
-
 $(eval $(call gb_CppunitTest_use_components,sc_databaserangeobj,\
     basic/util/sb \
     comphelper/util/comphelp \
diff --git a/sc/CppunitTest_sc_datapilotfieldobj.mk b/sc/CppunitTest_sc_datapilotfieldobj.mk
index f18cd8a..82b6f05 100644
--- a/sc/CppunitTest_sc_datapilotfieldobj.mk
+++ b/sc/CppunitTest_sc_datapilotfieldobj.mk
@@ -83,8 +83,6 @@ $(eval $(call gb_CppunitTest_use_api,sc_datapilotfieldobj,\
     udkapi \
 ))
 
-$(eval $(call gb_CppunitTest_uses_ure,sc_datapilotfieldobj))
-
 $(eval $(call gb_CppunitTest_use_components,sc_datapilotfieldobj,\
     basic/util/sb \
     comphelper/util/comphelp \
diff --git a/sc/CppunitTest_sc_datapilottableobj.mk b/sc/CppunitTest_sc_datapilottableobj.mk
index 2dc880a..4007f4f 100644
--- a/sc/CppunitTest_sc_datapilottableobj.mk
+++ b/sc/CppunitTest_sc_datapilottableobj.mk
@@ -83,8 +83,6 @@ $(eval $(call gb_CppunitTest_use_api,sc_datapilottableobj,\
     udkapi \
 ))
 
-$(eval $(call gb_CppunitTest_uses_ure,sc_datapilottableobj))
-
 $(eval $(call gb_CppunitTest_use_components,sc_datapilottableobj,\
 	basic/util/sb \
     comphelper/util/comphelp \
diff --git a/sc/CppunitTest_sc_filters_test.mk b/sc/CppunitTest_sc_filters_test.mk
index 8d9979b..23177f3 100644
--- a/sc/CppunitTest_sc_filters_test.mk
+++ b/sc/CppunitTest_sc_filters_test.mk
@@ -80,8 +80,6 @@ $(eval $(call gb_CppunitTest_use_api,sc_filters_test,\
     udkapi \
 ))
 
-$(eval $(call gb_CppunitTest_uses_ure,sc_filters_test))
-
 $(eval $(call gb_CppunitTest_use_components,sc_filters_test,\
     basic/util/sb \
     chart2/source/controller/chartcontroller \
diff --git a/sc/CppunitTest_sc_macros_test.mk b/sc/CppunitTest_sc_macros_test.mk
index 26d0ff6..60ceab3 100644
--- a/sc/CppunitTest_sc_macros_test.mk
+++ b/sc/CppunitTest_sc_macros_test.mk
@@ -80,8 +80,6 @@ $(eval $(call gb_CppunitTest_use_api,sc_macros_test,\
     udkapi \
 ))
 
-$(eval $(call gb_CppunitTest_uses_ure,sc_macros_test))
-
 $(eval $(call gb_CppunitTest_use_components,sc_macros_test,\
     basic/util/sb \
     comphelper/util/comphelp \
diff --git a/sc/CppunitTest_sc_namedrangeobj.mk b/sc/CppunitTest_sc_namedrangeobj.mk
index 250f2b7..46c38be 100644
--- a/sc/CppunitTest_sc_namedrangeobj.mk
+++ b/sc/CppunitTest_sc_namedrangeobj.mk
@@ -83,8 +83,6 @@ $(eval $(call gb_CppunitTest_use_api,sc_namedrangeobj,\
     udkapi \
 ))
 
-$(eval $(call gb_CppunitTest_uses_ure,sc_namedrangeobj))
-
 $(eval $(call gb_CppunitTest_use_components,sc_namedrangeobj,\
     basic/util/sb \
     comphelper/util/comphelp \
diff --git a/sc/CppunitTest_sc_namedrangesobj.mk b/sc/CppunitTest_sc_namedrangesobj.mk
index 5675387..4bdb78d 100644
--- a/sc/CppunitTest_sc_namedrangesobj.mk
+++ b/sc/CppunitTest_sc_namedrangesobj.mk
@@ -83,8 +83,6 @@ $(eval $(call gb_CppunitTest_use_api,sc_namedrangesobj,\
     udkapi \
 ))
 
-$(eval $(call gb_CppunitTest_uses_ure,sc_namedrangesobj))
-
 $(eval $(call gb_CppunitTest_use_components,sc_namedrangesobj,\
     basic/util/sb \
     comphelper/util/comphelp \
diff --git a/sc/CppunitTest_sc_subsequent_filters_test.mk b/sc/CppunitTest_sc_subsequent_filters_test.mk
index e714740..a25b8d2 100644
--- a/sc/CppunitTest_sc_subsequent_filters_test.mk
+++ b/sc/CppunitTest_sc_subsequent_filters_test.mk
@@ -80,8 +80,6 @@ $(eval $(call gb_CppunitTest_use_api,sc_subsequent_filters_test,\
     udkapi \
 ))
 
-$(eval $(call gb_CppunitTest_uses_ure,sc_subsequent_filters_test))
-
 $(eval $(call gb_CppunitTest_use_components,sc_subsequent_filters_test,\
     chart2/source/controller/chartcontroller \
     chart2/source/tools/charttools \
diff --git a/sc/CppunitTest_sc_tableautoformatfield.mk b/sc/CppunitTest_sc_tableautoformatfield.mk
index 3a803a5..3fb51bf 100644
--- a/sc/CppunitTest_sc_tableautoformatfield.mk
+++ b/sc/CppunitTest_sc_tableautoformatfield.mk
@@ -83,8 +83,6 @@ $(eval $(call gb_CppunitTest_use_api,sc_tableautoformatfield,\
     udkapi \
 ))
 
-$(eval $(call gb_CppunitTest_uses_ure,sc_tableautoformatfield))
-
 $(eval $(call gb_CppunitTest_use_components,sc_tableautoformatfield,\
     basic/util/sb \
     comphelper/util/comphelp \
diff --git a/sc/CppunitTest_sc_tablesheetobj.mk b/sc/CppunitTest_sc_tablesheetobj.mk
index 56b94ed..4b5578c 100644
--- a/sc/CppunitTest_sc_tablesheetobj.mk
+++ b/sc/CppunitTest_sc_tablesheetobj.mk
@@ -84,8 +84,6 @@ $(eval $(call gb_CppunitTest_use_api,sc_spreadsheetobj,\
     udkapi \
 ))
 
-$(eval $(call gb_CppunitTest_uses_ure,sc_spreadsheetobj))
-
 $(eval $(call gb_CppunitTest_use_components,sc_spreadsheetobj,\
     basic/util/sb \
     comphelper/util/comphelp \
diff --git a/sc/CppunitTest_sc_tablesheetsobj.mk b/sc/CppunitTest_sc_tablesheetsobj.mk
index 5fb39cb..3b076ab 100644
--- a/sc/CppunitTest_sc_tablesheetsobj.mk
+++ b/sc/CppunitTest_sc_tablesheetsobj.mk
@@ -83,8 +83,6 @@ $(eval $(call gb_CppunitTest_use_api,sc_spreadsheetsobj,\
     udkapi \
 ))
 
-$(eval $(call gb_CppunitTest_uses_ure,sc_spreadsheetsobj))
-
 $(eval $(call gb_CppunitTest_use_components,sc_spreadsheetsobj,\
     basic/util/sb \
     comphelper/util/comphelp \
diff --git a/sc/CppunitTest_sc_ucalc.mk b/sc/CppunitTest_sc_ucalc.mk
index abc2f1a..7cd6d0b 100644
--- a/sc/CppunitTest_sc_ucalc.mk
+++ b/sc/CppunitTest_sc_ucalc.mk
@@ -87,8 +87,6 @@ $(eval $(call gb_CppunitTest_use_api,sc_ucalc,\
     udkapi \
 ))
 
-$(eval $(call gb_CppunitTest_uses_ure,sc_ucalc))
-
 $(eval $(call gb_CppunitTest_use_components,sc_ucalc,\
     configmgr/source/configmgr \
     framework/util/fwk \
diff --git a/sd/CppunitTest_sd_filters_test.mk b/sd/CppunitTest_sd_filters_test.mk
index 46cae1e..6b8a328 100644
--- a/sd/CppunitTest_sd_filters_test.mk
+++ b/sd/CppunitTest_sd_filters_test.mk
@@ -78,8 +78,6 @@ $(eval $(call gb_CppunitTest_use_api,sd_filters_test,\
     udkapi \
 ))
 
-$(eval $(call gb_CppunitTest_uses_ure,sd_filters_test))
-
 $(eval $(call gb_CppunitTest_use_components,sd_filters_test,\
     basic/util/sb \
     comphelper/util/comphelp \
diff --git a/sd/CppunitTest_sd_regression_test.mk b/sd/CppunitTest_sd_regression_test.mk
index af1b60e..bc055aa 100644
--- a/sd/CppunitTest_sd_regression_test.mk
+++ b/sd/CppunitTest_sd_regression_test.mk
@@ -79,8 +79,6 @@ $(eval $(call gb_CppunitTest_use_api,sd_regression_test,\
     udkapi \
 ))
 
-$(eval $(call gb_CppunitTest_uses_ure,sd_regression_test))
-
 $(eval $(call gb_CppunitTest_use_components,sd_regression_test,\
     basic/util/sb \
     comphelper/util/comphelp \
diff --git a/sd/CppunitTest_sd_uimpress.mk b/sd/CppunitTest_sd_uimpress.mk
index b504c43..b996d2d 100644
--- a/sd/CppunitTest_sd_uimpress.mk
+++ b/sd/CppunitTest_sd_uimpress.mk
@@ -76,8 +76,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sd_uimpress,\
     sd/qa/unit/uimpress \
 ))
 
-$(eval $(call gb_CppunitTest_uses_ure,sd_uimpress))
-
 $(eval $(call gb_CppunitTest_use_components,sd_uimpress,\
     configmgr/source/configmgr \
     framework/util/fwk \
diff --git a/sdext/CppunitTest_pdfimport.mk b/sdext/CppunitTest_pdfimport.mk
index ebdfc8e..931ebb1 100644
--- a/sdext/CppunitTest_pdfimport.mk
+++ b/sdext/CppunitTest_pdfimport.mk
@@ -65,8 +65,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sdext_pdfimport,\
     sdext/source/pdfimport/test/tests \
 ))
 
-$(eval $(call gb_CppunitTest_uses_ure,sdext_pdfimport))
-
 $(eval $(call gb_CppunitTest_use_components,sdext_pdfimport,\
     comphelper/util/comphelp \
     configmgr/source/configmgr \
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index 010f2d6..d69777a 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -137,9 +137,7 @@ $(call gb_CppunitTest_get_target,$(1)) : ARGS := $(2)
 endef
 
 define gb_CppunitTest_uses_ure
-$(call gb_CppunitTest_use_rdb,$(1),ure/services)
-$(call gb_CppunitTest_get_target,$(1)) : URE := $(true)
-
+$$(call gb_Output_error,gb_CppunitTest_uses_ure: use gb_CppunitTest_use_api instead.))
 endef
 
 define gb_CppunitTest_add_type_rdb
@@ -171,6 +169,8 @@ endef
 define gb_CppunitTest_use_api
 $(call gb_LinkTarget_use_api,$(call gb_CppunitTest__get_linktargetname,$(1)),$(2))
 $(foreach rdb,$(2),$(call gb_CppunitTest__use_api,$(1),$(rdb)))
+$(call gb_CppunitTest_use_rdb,$(1),ure/services)
+$(call gb_CppunitTest_get_target,$(1)) : URE := $(true)
 
 endef
 
diff --git a/sot/CppunitTest_sot_test_sot.mk b/sot/CppunitTest_sot_test_sot.mk
index c193be9..b63556c 100644
--- a/sot/CppunitTest_sot_test_sot.mk
+++ b/sot/CppunitTest_sot_test_sot.mk
@@ -56,8 +56,6 @@ $(eval $(call gb_CppunitTest_use_api,sot_test_sot,\
     udkapi \
 ))
 
-$(eval $(call gb_CppunitTest_uses_ure,sot_test_sot))
-
 $(eval $(call gb_CppunitTest_set_args,sot_test_sot,\
     --protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \
 ))

... etc. - the rest is truncated
