Sun Apr 8 06:23:26 PDT 2012

dbaccess/CppunitTest_dbaccess_macros_test.mk               |    2 
 extensions/CppunitTest_extensions_test_update.mk           |    2 
 filter/CppunitTest_filter_tga_test.mk                      |    2 
 filter/CppunitTest_filter_tiff_test.mk                     |    2 
 hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk          |    2 
 i18npool/CppunitTest_i18npool_test_breakiterator.mk        |    2 
 lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk |    2 
 sc/CppunitTest_sc_cellrangeobj.mk                          |    2 
 sc/CppunitTest_sc_chart_regression_test.mk                 |    2 
 sc/CppunitTest_sc_databaserangeobj.mk                      |    2 
 sc/CppunitTest_sc_datapilotfieldobj.mk                     |    2 
 sc/CppunitTest_sc_datapilottableobj.mk                     |    2 
 sc/CppunitTest_sc_filters_test.mk                          |    2 
 sc/CppunitTest_sc_macros_test.mk                           |    2 
 sc/CppunitTest_sc_namedrangeobj.mk                         |    2 
 sc/CppunitTest_sc_namedrangesobj.mk                        |    2 
 sc/CppunitTest_sc_subsequent_filters_test.mk               |    2 
 sc/CppunitTest_sc_tableautoformatfield.mk                  |    2 
 sc/CppunitTest_sc_tablesheetobj.mk                         |    2 
 sc/CppunitTest_sc_tablesheetsobj.mk                        |    2 
 sc/CppunitTest_sc_ucalc.mk                                 |    2 
 sd/CppunitTest_sd_filters_test.mk                          |    2 
 sd/CppunitTest_sd_regression_test.mk                       |    2 
 sd/CppunitTest_sd_uimpress.mk                              |    2 
 sdext/CppunitTest_pdfimport.mk                             |    2 
 solenv/gbuild/CppunitTest.mk                               |   28 +++++++------
 sot/CppunitTest_sot_test_sot.mk                            |    2 
 starmath/CppunitTest_starmath_qa_cppunit.mk                |    2 
 svl/CppunitTest_svl_urihelper.mk                           |    2 
 svtools/CppunitTest_svtools_filters_test.mk                |    2 
 sw/CppunitTest_sw_filters_test.mk                          |    2 
 sw/CppunitTest_sw_layout_test.mk                           |    2 
 sw/CppunitTest_sw_macros_test.mk                           |    2 
 sw/CppunitTest_sw_regression_test.mk                       |    2 
 sw/CppunitTest_sw_subsequent_ooxmltok.mk                   |    2 
 sw/CppunitTest_sw_subsequent_rtftok.mk                     |    2 
 sw/CppunitTest_sw_swdoc_test.mk                            |    2 
 writerfilter/CppunitTest_writerfilter_rtftok.mk            |    2 
 38 files changed, 90 insertions(+), 12 deletions(-)

New commits:
commit e27674781a99faff65db42bc20eeffb8ef5596ae
Author: David Tardon <dtardon at redhat.com>
Date:   Sun Apr 8 15:19:08 2012 +0200

    only add -env: args for tests that use URE

diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index 862e3b8..2fb3411 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -59,16 +59,16 @@ gb_CppunitTest__get_linktargetname = CppunitTest/$(call gb_CppunitTest_get_filen
 
 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_Helper_make_url,$(item)))") \
-$(if $(strip $(UNO_SERVICES)),\
-	"-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_Helper_make_url,$(gb_CppunitTest_LIBDIR))) \
-	--protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector) \
+    $(if $(strip $(CONFIGURATION_LAYERS)),\
+	    "-env:CONFIGURATION_LAYERS=$(strip $(CONFIGURATION_LAYERS))") \
+    $(if $(strip $(UNO_TYPES)),\
+	    "-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_Helper_make_url,$(item)))") \
+    $(foreach dir,URE_INTERNAL_LIB_DIR LO_LIB_DIR,\
+	    -env:$(dir)=$(call gb_Helper_make_url,$(gb_CppunitTest_LIBDIR))) \
+    --protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector) \
 $(ARGS)
 endef
 
commit 5fcacd84082b039c4c2d6f3470d51b3c49b3110c
Author: David Tardon <dtardon at redhat.com>
Date:   Sun Apr 8 15:17:45 2012 +0200

    rename gb_CppunitTest_uses_ure

diff --git a/dbaccess/CppunitTest_dbaccess_macros_test.mk b/dbaccess/CppunitTest_dbaccess_macros_test.mk
index 4d37ab7..2d48691 100644
--- a/dbaccess/CppunitTest_dbaccess_macros_test.mk
+++ b/dbaccess/CppunitTest_dbaccess_macros_test.mk
@@ -83,7 +83,7 @@ $(eval $(call gb_CppunitTest_use_api,dbaccess_macros_test,\
     udkapi \
 ))
 
-$(eval $(call gb_CppunitTest_uses_ure,dbaccess_macros_test))
+$(eval $(call gb_CppunitTest_use_ure,dbaccess_macros_test))
 
 $(eval $(call gb_CppunitTest_use_components,dbaccess_macros_test,\
     basic/util/sb \
diff --git a/extensions/CppunitTest_extensions_test_update.mk b/extensions/CppunitTest_extensions_test_update.mk
index 906ca78..b59d5ca 100644
--- a/extensions/CppunitTest_extensions_test_update.mk
+++ b/extensions/CppunitTest_extensions_test_update.mk
@@ -61,7 +61,7 @@ $(eval $(call gb_CppunitTest_use_api,extensions_test_update,\
 	udkapi \
 ))
 
-$(eval $(call gb_CppunitTest_uses_ure,extensions_test_update))
+$(eval $(call gb_CppunitTest_use_ure,extensions_test_update))
 
 $(eval $(call gb_CppunitTest_use_components,extensions_test_update,\
     configmgr/source/configmgr \
diff --git a/filter/CppunitTest_filter_tga_test.mk b/filter/CppunitTest_filter_tga_test.mk
index 65a56e2..b8e1e3d 100644
--- a/filter/CppunitTest_filter_tga_test.mk
+++ b/filter/CppunitTest_filter_tga_test.mk
@@ -46,7 +46,7 @@ $(eval $(call gb_CppunitTest_use_api,filter_tga_test,\
     offapi \
 ))
 
-$(eval $(call gb_CppunitTest_uses_ure,filter_tga_test))
+$(eval $(call gb_CppunitTest_use_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 d0a2662..7f0852f 100644
--- a/filter/CppunitTest_filter_tiff_test.mk
+++ b/filter/CppunitTest_filter_tiff_test.mk
@@ -46,7 +46,7 @@ $(eval $(call gb_CppunitTest_use_api,filter_tiff_test,\
     offapi \
 ))
 
-$(eval $(call gb_CppunitTest_uses_ure,filter_tiff_test))
+$(eval $(call gb_CppunitTest_use_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 d9b070a..aa5903b 100644
--- a/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk
+++ b/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk
@@ -50,7 +50,7 @@ $(eval $(call gb_CppunitTest_use_api,hwpfilter_test_hwpfilter,\
     udkapi \
 ))
 
-$(eval $(call gb_CppunitTest_uses_ure,hwpfilter_test_hwpfilter))
+$(eval $(call gb_CppunitTest_use_ure,hwpfilter_test_hwpfilter))
 
 $(eval $(call gb_CppunitTest_use_components,hwpfilter_test_hwpfilter,\
     configmgr/source/configmgr \
diff --git a/i18npool/CppunitTest_i18npool_test_breakiterator.mk b/i18npool/CppunitTest_i18npool_test_breakiterator.mk
index 85d3540..b9e972c 100644
--- a/i18npool/CppunitTest_i18npool_test_breakiterator.mk
+++ b/i18npool/CppunitTest_i18npool_test_breakiterator.mk
@@ -44,7 +44,7 @@ $(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_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 9ffe305..8605c37 100644
--- a/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk
+++ b/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk
@@ -50,7 +50,7 @@ $(eval $(call gb_CppunitTest_use_api,lotuswordpro_test_lotuswordpro,\
     udkapi \
 ))
 
-$(eval $(call gb_CppunitTest_uses_ure,lotuswordpro_test_lotuswordpro))
+$(eval $(call gb_CppunitTest_use_ure,lotuswordpro_test_lotuswordpro))
 
 $(eval $(call gb_CppunitTest_use_components,lotuswordpro_test_lotuswordpro,\
     configmgr/source/configmgr \
diff --git a/sc/CppunitTest_sc_cellrangeobj.mk b/sc/CppunitTest_sc_cellrangeobj.mk
index b6f91a5..5a66fd0 100644
--- a/sc/CppunitTest_sc_cellrangeobj.mk
+++ b/sc/CppunitTest_sc_cellrangeobj.mk
@@ -83,7 +83,7 @@ $(eval $(call gb_CppunitTest_use_api,sc_cellrangesbase,\
     udkapi \
 ))
 
-$(eval $(call gb_CppunitTest_uses_ure,sc_cellrangesbase))
+$(eval $(call gb_CppunitTest_use_ure,sc_cellrangesbase))
 
 $(eval $(call gb_CppunitTest_use_components,sc_cellrangesbase,\
 	basic/util/sb \
diff --git a/sc/CppunitTest_sc_chart_regression_test.mk b/sc/CppunitTest_sc_chart_regression_test.mk
index 9c99f12..2c28e5a 100644
--- a/sc/CppunitTest_sc_chart_regression_test.mk
+++ b/sc/CppunitTest_sc_chart_regression_test.mk
@@ -80,7 +80,7 @@ $(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_ure,sc_chart_regression_test))
 
 $(eval $(call gb_CppunitTest_use_components,sc_chart_regression_test,\
     basic/util/sb \
diff --git a/sc/CppunitTest_sc_databaserangeobj.mk b/sc/CppunitTest_sc_databaserangeobj.mk
index c52bc12..a519a39 100644
--- a/sc/CppunitTest_sc_databaserangeobj.mk
+++ b/sc/CppunitTest_sc_databaserangeobj.mk
@@ -83,7 +83,7 @@ $(eval $(call gb_CppunitTest_use_api,sc_databaserangeobj,\
     udkapi \
 ))
 
-$(eval $(call gb_CppunitTest_uses_ure,sc_databaserangeobj))
+$(eval $(call gb_CppunitTest_use_ure,sc_databaserangeobj))
 
 $(eval $(call gb_CppunitTest_use_components,sc_databaserangeobj,\
     basic/util/sb \
diff --git a/sc/CppunitTest_sc_datapilotfieldobj.mk b/sc/CppunitTest_sc_datapilotfieldobj.mk
index 02e5db5..9fc3ec7 100644
--- a/sc/CppunitTest_sc_datapilotfieldobj.mk
+++ b/sc/CppunitTest_sc_datapilotfieldobj.mk
@@ -83,7 +83,7 @@ $(eval $(call gb_CppunitTest_use_api,sc_datapilotfieldobj,\
     udkapi \
 ))
 
-$(eval $(call gb_CppunitTest_uses_ure,sc_datapilotfieldobj))
+$(eval $(call gb_CppunitTest_use_ure,sc_datapilotfieldobj))
 
 $(eval $(call gb_CppunitTest_use_components,sc_datapilotfieldobj,\
     basic/util/sb \
diff --git a/sc/CppunitTest_sc_datapilottableobj.mk b/sc/CppunitTest_sc_datapilottableobj.mk
index 2f43a61..2a07ad5 100644
--- a/sc/CppunitTest_sc_datapilottableobj.mk
+++ b/sc/CppunitTest_sc_datapilottableobj.mk
@@ -83,7 +83,7 @@ $(eval $(call gb_CppunitTest_use_api,sc_datapilottableobj,\
     udkapi \
 ))
 
-$(eval $(call gb_CppunitTest_uses_ure,sc_datapilottableobj))
+$(eval $(call gb_CppunitTest_use_ure,sc_datapilottableobj))
 
 $(eval $(call gb_CppunitTest_use_components,sc_datapilottableobj,\
 	basic/util/sb \
diff --git a/sc/CppunitTest_sc_filters_test.mk b/sc/CppunitTest_sc_filters_test.mk
index ea96f11..e186aac 100644
--- a/sc/CppunitTest_sc_filters_test.mk
+++ b/sc/CppunitTest_sc_filters_test.mk
@@ -80,7 +80,7 @@ $(eval $(call gb_CppunitTest_use_api,sc_filters_test,\
     udkapi \
 ))
 
-$(eval $(call gb_CppunitTest_uses_ure,sc_filters_test))
+$(eval $(call gb_CppunitTest_use_ure,sc_filters_test))
 
 $(eval $(call gb_CppunitTest_use_components,sc_filters_test,\
     basic/util/sb \
diff --git a/sc/CppunitTest_sc_macros_test.mk b/sc/CppunitTest_sc_macros_test.mk
index 1692d53..f3d7660 100644
--- a/sc/CppunitTest_sc_macros_test.mk
+++ b/sc/CppunitTest_sc_macros_test.mk
@@ -80,7 +80,7 @@ $(eval $(call gb_CppunitTest_use_api,sc_macros_test,\
     udkapi \
 ))
 
-$(eval $(call gb_CppunitTest_uses_ure,sc_macros_test))
+$(eval $(call gb_CppunitTest_use_ure,sc_macros_test))
 
 $(eval $(call gb_CppunitTest_use_components,sc_macros_test,\
     basic/util/sb \
diff --git a/sc/CppunitTest_sc_namedrangeobj.mk b/sc/CppunitTest_sc_namedrangeobj.mk
index f1b8ae8..d71144c 100644
--- a/sc/CppunitTest_sc_namedrangeobj.mk
+++ b/sc/CppunitTest_sc_namedrangeobj.mk
@@ -83,7 +83,7 @@ $(eval $(call gb_CppunitTest_use_api,sc_namedrangeobj,\
     udkapi \
 ))
 
-$(eval $(call gb_CppunitTest_uses_ure,sc_namedrangeobj))
+$(eval $(call gb_CppunitTest_use_ure,sc_namedrangeobj))
 
 $(eval $(call gb_CppunitTest_use_components,sc_namedrangeobj,\
     basic/util/sb \
diff --git a/sc/CppunitTest_sc_namedrangesobj.mk b/sc/CppunitTest_sc_namedrangesobj.mk
index d0a02f3..da83682 100644
--- a/sc/CppunitTest_sc_namedrangesobj.mk
+++ b/sc/CppunitTest_sc_namedrangesobj.mk
@@ -83,7 +83,7 @@ $(eval $(call gb_CppunitTest_use_api,sc_namedrangesobj,\
     udkapi \
 ))
 
-$(eval $(call gb_CppunitTest_uses_ure,sc_namedrangesobj))
+$(eval $(call gb_CppunitTest_use_ure,sc_namedrangesobj))
 
 $(eval $(call gb_CppunitTest_use_components,sc_namedrangesobj,\
     basic/util/sb \
diff --git a/sc/CppunitTest_sc_subsequent_filters_test.mk b/sc/CppunitTest_sc_subsequent_filters_test.mk
index 5f027c8..990d519 100644
--- a/sc/CppunitTest_sc_subsequent_filters_test.mk
+++ b/sc/CppunitTest_sc_subsequent_filters_test.mk
@@ -80,7 +80,7 @@ $(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_ure,sc_subsequent_filters_test))
 
 $(eval $(call gb_CppunitTest_use_components,sc_subsequent_filters_test,\
     chart2/source/controller/chartcontroller \
diff --git a/sc/CppunitTest_sc_tableautoformatfield.mk b/sc/CppunitTest_sc_tableautoformatfield.mk
index 451cd31..c210d51 100644
--- a/sc/CppunitTest_sc_tableautoformatfield.mk
+++ b/sc/CppunitTest_sc_tableautoformatfield.mk
@@ -83,7 +83,7 @@ $(eval $(call gb_CppunitTest_use_api,sc_tableautoformatfield,\
     udkapi \
 ))
 
-$(eval $(call gb_CppunitTest_uses_ure,sc_tableautoformatfield))
+$(eval $(call gb_CppunitTest_use_ure,sc_tableautoformatfield))
 
 $(eval $(call gb_CppunitTest_use_components,sc_tableautoformatfield,\
     basic/util/sb \
diff --git a/sc/CppunitTest_sc_tablesheetobj.mk b/sc/CppunitTest_sc_tablesheetobj.mk
index 21ab60b..fdb230a 100644
--- a/sc/CppunitTest_sc_tablesheetobj.mk
+++ b/sc/CppunitTest_sc_tablesheetobj.mk
@@ -83,7 +83,7 @@ $(eval $(call gb_CppunitTest_use_api,sc_spreadsheetobj,\
     udkapi \
 ))
 
-$(eval $(call gb_CppunitTest_uses_ure,sc_spreadsheetobj))
+$(eval $(call gb_CppunitTest_use_ure,sc_spreadsheetobj))
 
 $(eval $(call gb_CppunitTest_use_components,sc_spreadsheetobj,\
     basic/util/sb \
diff --git a/sc/CppunitTest_sc_tablesheetsobj.mk b/sc/CppunitTest_sc_tablesheetsobj.mk
index 1358743..9c58bc2 100644
--- a/sc/CppunitTest_sc_tablesheetsobj.mk
+++ b/sc/CppunitTest_sc_tablesheetsobj.mk
@@ -83,7 +83,7 @@ $(eval $(call gb_CppunitTest_use_api,sc_spreadsheetsobj,\
     udkapi \
 ))
 
-$(eval $(call gb_CppunitTest_uses_ure,sc_spreadsheetsobj))
+$(eval $(call gb_CppunitTest_use_ure,sc_spreadsheetsobj))
 
 $(eval $(call gb_CppunitTest_use_components,sc_spreadsheetsobj,\
     basic/util/sb \
diff --git a/sc/CppunitTest_sc_ucalc.mk b/sc/CppunitTest_sc_ucalc.mk
index d387ace..f949078 100644
--- a/sc/CppunitTest_sc_ucalc.mk
+++ b/sc/CppunitTest_sc_ucalc.mk
@@ -87,7 +87,7 @@ $(eval $(call gb_CppunitTest_use_api,sc_ucalc,\
     udkapi \
 ))
 
-$(eval $(call gb_CppunitTest_uses_ure,sc_ucalc))
+$(eval $(call gb_CppunitTest_use_ure,sc_ucalc))
 
 $(eval $(call gb_CppunitTest_use_components,sc_ucalc,\
     configmgr/source/configmgr \
diff --git a/sd/CppunitTest_sd_filters_test.mk b/sd/CppunitTest_sd_filters_test.mk
index 5b812d7..82512dc 100644
--- a/sd/CppunitTest_sd_filters_test.mk
+++ b/sd/CppunitTest_sd_filters_test.mk
@@ -78,7 +78,7 @@ $(eval $(call gb_CppunitTest_use_api,sd_filters_test,\
     udkapi \
 ))
 
-$(eval $(call gb_CppunitTest_uses_ure,sd_filters_test))
+$(eval $(call gb_CppunitTest_use_ure,sd_filters_test))
 
 $(eval $(call gb_CppunitTest_use_components,sd_filters_test,\
     basic/util/sb \
diff --git a/sd/CppunitTest_sd_regression_test.mk b/sd/CppunitTest_sd_regression_test.mk
index ce0aeb8..22d049e 100644
--- a/sd/CppunitTest_sd_regression_test.mk
+++ b/sd/CppunitTest_sd_regression_test.mk
@@ -79,7 +79,7 @@ $(eval $(call gb_CppunitTest_use_api,sd_regression_test,\
     udkapi \
 ))
 
-$(eval $(call gb_CppunitTest_uses_ure,sd_regression_test))
+$(eval $(call gb_CppunitTest_use_ure,sd_regression_test))
 
 $(eval $(call gb_CppunitTest_use_components,sd_regression_test,\
     basic/util/sb \
diff --git a/sd/CppunitTest_sd_uimpress.mk b/sd/CppunitTest_sd_uimpress.mk
index ad7ece2..ab96b2a 100644
--- a/sd/CppunitTest_sd_uimpress.mk
+++ b/sd/CppunitTest_sd_uimpress.mk
@@ -76,7 +76,7 @@ $(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_ure,sd_uimpress))
 
 $(eval $(call gb_CppunitTest_use_components,sd_uimpress,\
     configmgr/source/configmgr \
diff --git a/sdext/CppunitTest_pdfimport.mk b/sdext/CppunitTest_pdfimport.mk
index 1842442..fd0ebda 100644
--- a/sdext/CppunitTest_pdfimport.mk
+++ b/sdext/CppunitTest_pdfimport.mk
@@ -65,7 +65,7 @@ $(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_ure,sdext_pdfimport))
 
 $(eval $(call gb_CppunitTest_use_components,sdext_pdfimport,\
     comphelper/util/comphelp \
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index 2853835..862e3b8 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -146,6 +146,10 @@ $(call gb_CppunitTest_get_target,$(1)) : ARGS += $(2)
 endef
 
 define gb_CppunitTest_uses_ure
+$$(call gb_Output_error,gb_CppunitTest_uses_ure: use gb_CppunitTest_use_ure instead.))
+endef
+
+define gb_CppunitTest_use_ure
 $(call gb_CppunitTest_use_rdb,$(1),ure/services)
 $(call gb_CppunitTest_get_target,$(1)) : URE := $(true)
 
diff --git a/sot/CppunitTest_sot_test_sot.mk b/sot/CppunitTest_sot_test_sot.mk
index 5899201..22143e1 100644
--- a/sot/CppunitTest_sot_test_sot.mk
+++ b/sot/CppunitTest_sot_test_sot.mk
@@ -52,6 +52,6 @@ $(eval $(call gb_CppunitTest_use_api,sot_test_sot,\
     udkapi \
 ))
 
-$(eval $(call gb_CppunitTest_uses_ure,sot_test_sot))
+$(eval $(call gb_CppunitTest_use_ure,sot_test_sot))
 
 # vim: set noet sw=4 ts=4:
diff --git a/starmath/CppunitTest_starmath_qa_cppunit.mk b/starmath/CppunitTest_starmath_qa_cppunit.mk
index 9c7e7b0..d8ecc78 100644
--- a/starmath/CppunitTest_starmath_qa_cppunit.mk
+++ b/starmath/CppunitTest_starmath_qa_cppunit.mk
@@ -75,7 +75,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,starmath_qa_cppunit,\
     starmath/qa/cppunit/test_starmath \
 ))
 
-$(eval $(call gb_CppunitTest_uses_ure,starmath_qa_cppunit))
+$(eval $(call gb_CppunitTest_use_ure,starmath_qa_cppunit))
 
 $(eval $(call gb_CppunitTest_use_components,starmath_qa_cppunit,\
     configmgr/source/configmgr \
diff --git a/svl/CppunitTest_svl_urihelper.mk b/svl/CppunitTest_svl_urihelper.mk
index addd3e2..3586a42 100644
--- a/svl/CppunitTest_svl_urihelper.mk
+++ b/svl/CppunitTest_svl_urihelper.mk
@@ -51,4 +51,4 @@ $(eval $(call gb_CppunitTest_use_libraries,svl_urihelper, \
     $(gb_STDLIBS) \
 ))
 
-$(eval $(call gb_CppunitTest_uses_ure,svl_urihelper))
+$(eval $(call gb_CppunitTest_use_ure,svl_urihelper))
diff --git a/svtools/CppunitTest_svtools_filters_test.mk b/svtools/CppunitTest_svtools_filters_test.mk
index b0234d5..f2669fb 100644
--- a/svtools/CppunitTest_svtools_filters_test.mk
+++ b/svtools/CppunitTest_svtools_filters_test.mk
@@ -49,7 +49,7 @@ $(eval $(call gb_CppunitTest_use_api,svtools_filters_test,\
     offapi \
 ))
 
-$(eval $(call gb_CppunitTest_uses_ure,svtools_filters_test))
+$(eval $(call gb_CppunitTest_use_ure,svtools_filters_test))
 
 $(eval $(call gb_CppunitTest_use_components,svtools_filters_test,\
     configmgr/source/configmgr \
diff --git a/sw/CppunitTest_sw_filters_test.mk b/sw/CppunitTest_sw_filters_test.mk
index d7f026e..86e144f 100644
--- a/sw/CppunitTest_sw_filters_test.mk
+++ b/sw/CppunitTest_sw_filters_test.mk
@@ -71,7 +71,7 @@ $(eval $(call gb_CppunitTest_use_api,sw_filters_test,\
     udkapi \
 ))
 
-$(eval $(call gb_CppunitTest_uses_ure,sw_filters_test))
+$(eval $(call gb_CppunitTest_use_ure,sw_filters_test))
 
 $(eval $(call gb_CppunitTest_use_components,sw_filters_test,\
     comphelper/util/comphelp \
diff --git a/sw/CppunitTest_sw_layout_test.mk b/sw/CppunitTest_sw_layout_test.mk
index b7d2d5d..8b7587f 100644
--- a/sw/CppunitTest_sw_layout_test.mk
+++ b/sw/CppunitTest_sw_layout_test.mk
@@ -81,7 +81,7 @@ $(eval $(call gb_CppunitTest_use_api,sw_layout_test,\
     udkapi \
 ))
 
-$(eval $(call gb_CppunitTest_uses_ure,sw_layout_test))
+$(eval $(call gb_CppunitTest_use_ure,sw_layout_test))
 
 $(eval $(call gb_CppunitTest_use_components,sw_layout_test,\
     comphelper/util/comphelp \
diff --git a/sw/CppunitTest_sw_macros_test.mk b/sw/CppunitTest_sw_macros_test.mk
index 77e8bb1..b1e5375 100644
--- a/sw/CppunitTest_sw_macros_test.mk
+++ b/sw/CppunitTest_sw_macros_test.mk
@@ -82,7 +82,7 @@ $(eval $(call gb_CppunitTest_use_api,sw_macros_test,\
     udkapi \
 ))
 
-$(eval $(call gb_CppunitTest_uses_ure,sw_macros_test))
+$(eval $(call gb_CppunitTest_use_ure,sw_macros_test))
 
 $(eval $(call gb_CppunitTest_use_components,sw_macros_test,\
     basic/util/sb \
diff --git a/sw/CppunitTest_sw_regression_test.mk b/sw/CppunitTest_sw_regression_test.mk
index 17680d8..ca0f9a6 100644
--- a/sw/CppunitTest_sw_regression_test.mk
+++ b/sw/CppunitTest_sw_regression_test.mk
@@ -82,7 +82,7 @@ $(eval $(call gb_CppunitTest_use_api,sw_regression_test,\
     udkapi \
 ))
 
-$(eval $(call gb_CppunitTest_uses_ure,sw_regression_test))
+$(eval $(call gb_CppunitTest_use_ure,sw_regression_test))
 
 $(eval $(call gb_CppunitTest_use_components,sw_regression_test,\
     basic/util/sb \
diff --git a/sw/CppunitTest_sw_subsequent_ooxmltok.mk b/sw/CppunitTest_sw_subsequent_ooxmltok.mk
index f60f318..92a4cc4 100644
--- a/sw/CppunitTest_sw_subsequent_ooxmltok.mk
+++ b/sw/CppunitTest_sw_subsequent_ooxmltok.mk
@@ -48,7 +48,7 @@ $(eval $(call gb_CppunitTest_use_api,sw_subsequent_ooxmltok,\
     udkapi \
 ))
 
-$(eval $(call gb_CppunitTest_uses_ure,sw_subsequent_ooxmltok))
+$(eval $(call gb_CppunitTest_use_ure,sw_subsequent_ooxmltok))
 
 $(eval $(call gb_CppunitTest_use_components,sw_subsequent_ooxmltok,\
     comphelper/util/comphelp \
diff --git a/sw/CppunitTest_sw_subsequent_rtftok.mk b/sw/CppunitTest_sw_subsequent_rtftok.mk
index a3714a0..50ee0d6 100644
--- a/sw/CppunitTest_sw_subsequent_rtftok.mk
+++ b/sw/CppunitTest_sw_subsequent_rtftok.mk
@@ -48,7 +48,7 @@ $(eval $(call gb_CppunitTest_use_api,sw_subsequent_rtftok,\
     udkapi \
 ))
 
-$(eval $(call gb_CppunitTest_uses_ure,sw_subsequent_rtftok))
+$(eval $(call gb_CppunitTest_use_ure,sw_subsequent_rtftok))
 
 $(eval $(call gb_CppunitTest_use_components,sw_subsequent_rtftok,\
     configmgr/source/configmgr \
diff --git a/sw/CppunitTest_sw_swdoc_test.mk b/sw/CppunitTest_sw_swdoc_test.mk
index 13c9fb2..5c32a9a 100644
--- a/sw/CppunitTest_sw_swdoc_test.mk
+++ b/sw/CppunitTest_sw_swdoc_test.mk
@@ -85,7 +85,7 @@ $(eval $(call gb_CppunitTest_use_api,sw_swdoc_test,\
     udkapi \
 ))
 
-$(eval $(call gb_CppunitTest_uses_ure,sw_swdoc_test))
+$(eval $(call gb_CppunitTest_use_ure,sw_swdoc_test))
 
 $(eval $(call gb_CppunitTest_use_components,sw_swdoc_test,\
     comphelper/util/comphelp \
diff --git a/writerfilter/CppunitTest_writerfilter_rtftok.mk b/writerfilter/CppunitTest_writerfilter_rtftok.mk
index bd5b33c..8307091 100644
--- a/writerfilter/CppunitTest_writerfilter_rtftok.mk
+++ b/writerfilter/CppunitTest_writerfilter_rtftok.mk
@@ -52,7 +52,7 @@ $(eval $(call gb_CppunitTest_use_api,writerfilter_rtftok,\
 	udkapi \
 ))
 
-$(eval $(call gb_CppunitTest_uses_ure,writerfilter_rtftok))
+$(eval $(call gb_CppunitTest_use_ure,writerfilter_rtftok))
 
 $(eval $(call gb_CppunitTest_use_components,writerfilter_rtftok,\
 	configmgr/source/configmgr \
commit fbbb833dda9e86d93e8f45f02a1286edb81033a3
Author: David Tardon <dtardon at redhat.com>
Date:   Sun Apr 8 15:12:18 2012 +0200

    compile- and run-time use of UNO must be split
    
    There are unit tests that do not use URE, e.g., in cppuhelper.
    
    This reverts commit 33e9f3d3d6b29545ef9df3f5334c015e15caa5c8.
    
    Conflicts:
    
    	sot/CppunitTest_sot_test_sot.mk
    	svl/CppunitTest_svl_urihelper.mk

diff --git a/dbaccess/CppunitTest_dbaccess_macros_test.mk b/dbaccess/CppunitTest_dbaccess_macros_test.mk
index 395075f..4d37ab7 100644
--- a/dbaccess/CppunitTest_dbaccess_macros_test.mk
+++ b/dbaccess/CppunitTest_dbaccess_macros_test.mk
@@ -83,6 +83,8 @@ $(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 b7bf795..906ca78 100644
--- a/extensions/CppunitTest_extensions_test_update.mk
+++ b/extensions/CppunitTest_extensions_test_update.mk
@@ -61,6 +61,8 @@ $(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 126f605..65a56e2 100644
--- a/filter/CppunitTest_filter_tga_test.mk
+++ b/filter/CppunitTest_filter_tga_test.mk
@@ -46,6 +46,8 @@ $(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 035712b..d0a2662 100644
--- a/filter/CppunitTest_filter_tiff_test.mk
+++ b/filter/CppunitTest_filter_tiff_test.mk
@@ -46,6 +46,8 @@ $(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 1d3fcd7..d9b070a 100644
--- a/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk
+++ b/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk
@@ -50,6 +50,8 @@ $(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 de7bb0a..85d3540 100644
--- a/i18npool/CppunitTest_i18npool_test_breakiterator.mk
+++ b/i18npool/CppunitTest_i18npool_test_breakiterator.mk
@@ -44,6 +44,8 @@ $(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 85e60f6..9ffe305 100644
--- a/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk
+++ b/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk
@@ -50,6 +50,8 @@ $(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 0935d90..b6f91a5 100644
--- a/sc/CppunitTest_sc_cellrangeobj.mk
+++ b/sc/CppunitTest_sc_cellrangeobj.mk
@@ -83,6 +83,8 @@ $(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 0c746c2..9c99f12 100644
--- a/sc/CppunitTest_sc_chart_regression_test.mk
+++ b/sc/CppunitTest_sc_chart_regression_test.mk
@@ -80,6 +80,8 @@ $(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 eb0e87b..c52bc12 100644
--- a/sc/CppunitTest_sc_databaserangeobj.mk
+++ b/sc/CppunitTest_sc_databaserangeobj.mk
@@ -83,6 +83,8 @@ $(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 945be2b..02e5db5 100644
--- a/sc/CppunitTest_sc_datapilotfieldobj.mk
+++ b/sc/CppunitTest_sc_datapilotfieldobj.mk
@@ -83,6 +83,8 @@ $(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 a08d555..2f43a61 100644
--- a/sc/CppunitTest_sc_datapilottableobj.mk
+++ b/sc/CppunitTest_sc_datapilottableobj.mk
@@ -83,6 +83,8 @@ $(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 c0ead8a..ea96f11 100644
--- a/sc/CppunitTest_sc_filters_test.mk
+++ b/sc/CppunitTest_sc_filters_test.mk
@@ -80,6 +80,8 @@ $(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 af5ad01..1692d53 100644
--- a/sc/CppunitTest_sc_macros_test.mk
+++ b/sc/CppunitTest_sc_macros_test.mk
@@ -80,6 +80,8 @@ $(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 11d23d2..f1b8ae8 100644
--- a/sc/CppunitTest_sc_namedrangeobj.mk
+++ b/sc/CppunitTest_sc_namedrangeobj.mk
@@ -83,6 +83,8 @@ $(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 807e8a1..d0a02f3 100644
--- a/sc/CppunitTest_sc_namedrangesobj.mk
+++ b/sc/CppunitTest_sc_namedrangesobj.mk
@@ -83,6 +83,8 @@ $(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 941bfed..5f027c8 100644
--- a/sc/CppunitTest_sc_subsequent_filters_test.mk
+++ b/sc/CppunitTest_sc_subsequent_filters_test.mk
@@ -80,6 +80,8 @@ $(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 862617b..451cd31 100644
--- a/sc/CppunitTest_sc_tableautoformatfield.mk
+++ b/sc/CppunitTest_sc_tableautoformatfield.mk
@@ -83,6 +83,8 @@ $(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 0d23ae6..21ab60b 100644
--- a/sc/CppunitTest_sc_tablesheetobj.mk
+++ b/sc/CppunitTest_sc_tablesheetobj.mk
@@ -83,6 +83,8 @@ $(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 79774b4..1358743 100644
--- a/sc/CppunitTest_sc_tablesheetsobj.mk
+++ b/sc/CppunitTest_sc_tablesheetsobj.mk
@@ -83,6 +83,8 @@ $(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 2185f82..d387ace 100644
--- a/sc/CppunitTest_sc_ucalc.mk
+++ b/sc/CppunitTest_sc_ucalc.mk
@@ -87,6 +87,8 @@ $(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 afecc5a..5b812d7 100644
--- a/sd/CppunitTest_sd_filters_test.mk
+++ b/sd/CppunitTest_sd_filters_test.mk
@@ -78,6 +78,8 @@ $(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 1ba8201..ce0aeb8 100644
--- a/sd/CppunitTest_sd_regression_test.mk
+++ b/sd/CppunitTest_sd_regression_test.mk
@@ -79,6 +79,8 @@ $(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 86ba05e..ad7ece2 100644
--- a/sd/CppunitTest_sd_uimpress.mk
+++ b/sd/CppunitTest_sd_uimpress.mk
@@ -76,6 +76,8 @@ $(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 9c29186..1842442 100644
--- a/sdext/CppunitTest_pdfimport.mk
+++ b/sdext/CppunitTest_pdfimport.mk
@@ -65,6 +65,8 @@ $(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 32f498b..2853835 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -146,7 +146,9 @@ $(call gb_CppunitTest_get_target,$(1)) : ARGS += $(2)
 endef
 
 define gb_CppunitTest_uses_ure
-$$(call gb_Output_error,gb_CppunitTest_uses_ure: use gb_CppunitTest_use_api instead.))
+$(call gb_CppunitTest_use_rdb,$(1),ure/services)
+$(call gb_CppunitTest_get_target,$(1)) : URE := $(true)
+
 endef
 
 define gb_CppunitTest_add_type_rdb
@@ -178,8 +180,6 @@ 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 72faace..5899201 100644
--- a/sot/CppunitTest_sot_test_sot.mk
+++ b/sot/CppunitTest_sot_test_sot.mk
@@ -52,4 +52,6 @@ $(eval $(call gb_CppunitTest_use_api,sot_test_sot,\
     udkapi \
 ))
 
+$(eval $(call gb_CppunitTest_uses_ure,sot_test_sot))
+
 # vim: set noet sw=4 ts=4:
diff --git a/starmath/CppunitTest_starmath_qa_cppunit.mk b/starmath/CppunitTest_starmath_qa_cppunit.mk
index 8d122da..9c7e7b0 100644
--- a/starmath/CppunitTest_starmath_qa_cppunit.mk
+++ b/starmath/CppunitTest_starmath_qa_cppunit.mk
@@ -75,6 +75,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,starmath_qa_cppunit,\
     starmath/qa/cppunit/test_starmath \
 ))
 
+$(eval $(call gb_CppunitTest_uses_ure,starmath_qa_cppunit))
+
 $(eval $(call gb_CppunitTest_use_components,starmath_qa_cppunit,\
     configmgr/source/configmgr \
     framework/util/fwk \
diff --git a/svl/CppunitTest_svl_urihelper.mk b/svl/CppunitTest_svl_urihelper.mk
index 8602756..addd3e2 100644
--- a/svl/CppunitTest_svl_urihelper.mk
+++ b/svl/CppunitTest_svl_urihelper.mk
@@ -50,3 +50,5 @@ $(eval $(call gb_CppunitTest_use_libraries,svl_urihelper, \
     utl \
     $(gb_STDLIBS) \
 ))
+
+$(eval $(call gb_CppunitTest_uses_ure,svl_urihelper))
diff --git a/svtools/CppunitTest_svtools_filters_test.mk b/svtools/CppunitTest_svtools_filters_test.mk
index 9cd4a53..b0234d5 100644
--- a/svtools/CppunitTest_svtools_filters_test.mk
+++ b/svtools/CppunitTest_svtools_filters_test.mk
@@ -49,6 +49,8 @@ $(eval $(call gb_CppunitTest_use_api,svtools_filters_test,\
     offapi \
 ))
 
+$(eval $(call gb_CppunitTest_uses_ure,svtools_filters_test))
+
 $(eval $(call gb_CppunitTest_use_components,svtools_filters_test,\
     configmgr/source/configmgr \
 ))
diff --git a/sw/CppunitTest_sw_filters_test.mk b/sw/CppunitTest_sw_filters_test.mk
index ecfc8ce..d7f026e 100644
--- a/sw/CppunitTest_sw_filters_test.mk
+++ b/sw/CppunitTest_sw_filters_test.mk
@@ -71,6 +71,8 @@ $(eval $(call gb_CppunitTest_use_api,sw_filters_test,\
     udkapi \
 ))
 
+$(eval $(call gb_CppunitTest_uses_ure,sw_filters_test))
+
 $(eval $(call gb_CppunitTest_use_components,sw_filters_test,\
     comphelper/util/comphelp \
     configmgr/source/configmgr \
diff --git a/sw/CppunitTest_sw_layout_test.mk b/sw/CppunitTest_sw_layout_test.mk
index 819babb..b7d2d5d 100644
--- a/sw/CppunitTest_sw_layout_test.mk
+++ b/sw/CppunitTest_sw_layout_test.mk
@@ -81,6 +81,8 @@ $(eval $(call gb_CppunitTest_use_api,sw_layout_test,\
     udkapi \
 ))
 
+$(eval $(call gb_CppunitTest_uses_ure,sw_layout_test))
+
 $(eval $(call gb_CppunitTest_use_components,sw_layout_test,\
     comphelper/util/comphelp \
     configmgr/source/configmgr \
diff --git a/sw/CppunitTest_sw_macros_test.mk b/sw/CppunitTest_sw_macros_test.mk
index 634f8f3..77e8bb1 100644
--- a/sw/CppunitTest_sw_macros_test.mk
+++ b/sw/CppunitTest_sw_macros_test.mk
@@ -82,6 +82,8 @@ $(eval $(call gb_CppunitTest_use_api,sw_macros_test,\
     udkapi \
 ))
 
+$(eval $(call gb_CppunitTest_uses_ure,sw_macros_test))
+
 $(eval $(call gb_CppunitTest_use_components,sw_macros_test,\
     basic/util/sb \
     comphelper/util/comphelp \
diff --git a/sw/CppunitTest_sw_regression_test.mk b/sw/CppunitTest_sw_regression_test.mk
index c64a9d3..17680d8 100644
--- a/sw/CppunitTest_sw_regression_test.mk
+++ b/sw/CppunitTest_sw_regression_test.mk
@@ -82,6 +82,8 @@ $(eval $(call gb_CppunitTest_use_api,sw_regression_test,\
     udkapi \
 ))
 
+$(eval $(call gb_CppunitTest_uses_ure,sw_regression_test))
+
 $(eval $(call gb_CppunitTest_use_components,sw_regression_test,\
     basic/util/sb \
     comphelper/util/comphelp \
diff --git a/sw/CppunitTest_sw_subsequent_ooxmltok.mk b/sw/CppunitTest_sw_subsequent_ooxmltok.mk
index db72f14..f60f318 100644
--- a/sw/CppunitTest_sw_subsequent_ooxmltok.mk
+++ b/sw/CppunitTest_sw_subsequent_ooxmltok.mk
@@ -48,6 +48,8 @@ $(eval $(call gb_CppunitTest_use_api,sw_subsequent_ooxmltok,\
     udkapi \
 ))
 
+$(eval $(call gb_CppunitTest_uses_ure,sw_subsequent_ooxmltok))
+
 $(eval $(call gb_CppunitTest_use_components,sw_subsequent_ooxmltok,\
     comphelper/util/comphelp \
     configmgr/source/configmgr \
diff --git a/sw/CppunitTest_sw_subsequent_rtftok.mk b/sw/CppunitTest_sw_subsequent_rtftok.mk
index a3e0f86..a3714a0 100644
--- a/sw/CppunitTest_sw_subsequent_rtftok.mk
+++ b/sw/CppunitTest_sw_subsequent_rtftok.mk
@@ -48,6 +48,8 @@ $(eval $(call gb_CppunitTest_use_api,sw_subsequent_rtftok,\
     udkapi \
 ))
 
+$(eval $(call gb_CppunitTest_uses_ure,sw_subsequent_rtftok))
+
 $(eval $(call gb_CppunitTest_use_components,sw_subsequent_rtftok,\
     configmgr/source/configmgr \
     fileaccess/source/fileacc \
diff --git a/sw/CppunitTest_sw_swdoc_test.mk b/sw/CppunitTest_sw_swdoc_test.mk
index 7629d1a..13c9fb2 100644
--- a/sw/CppunitTest_sw_swdoc_test.mk
+++ b/sw/CppunitTest_sw_swdoc_test.mk
@@ -85,6 +85,8 @@ $(eval $(call gb_CppunitTest_use_api,sw_swdoc_test,\
     udkapi \
 ))
 
+$(eval $(call gb_CppunitTest_uses_ure,sw_swdoc_test))
+
 $(eval $(call gb_CppunitTest_use_components,sw_swdoc_test,\
     comphelper/util/comphelp \
     configmgr/source/configmgr \
diff --git a/writerfilter/CppunitTest_writerfilter_rtftok.mk b/writerfilter/CppunitTest_writerfilter_rtftok.mk
index ecc5d66..bd5b33c 100644
--- a/writerfilter/CppunitTest_writerfilter_rtftok.mk
+++ b/writerfilter/CppunitTest_writerfilter_rtftok.mk
@@ -52,6 +52,8 @@ $(eval $(call gb_CppunitTest_use_api,writerfilter_rtftok,\
 	udkapi \
 ))
 
+$(eval $(call gb_CppunitTest_uses_ure,writerfilter_rtftok))
+
 $(eval $(call gb_CppunitTest_use_components,writerfilter_rtftok,\
 	configmgr/source/configmgr \
 	ucb/source/core/ucb1 \
