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

38 files changed, 77 insertions, 3 deletions

diff --git a/dbaccess/CppunitTest_dbaccess_macros_test.mk b/dbaccess/CppunitTest_dbaccess_macros_test.mk
index 395075f4a434..4d37ab7a5b7f 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 b7bf79567ea8..906ca787bc63 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 126f60593ac7..65a56e224c3c 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 035712b8f1d0..d0a26627ffca 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 1d3fcd716835..d9b070aaa34f 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 de7bb0a833e4..85d35402d462 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 85e60f6ece89..9ffe30552b90 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 0935d900fa9b..b6f91a5d464f 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 0c746c2debb3..9c99f12b3159 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 eb0e87b58fbe..c52bc12704a8 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 945be2b97278..02e5db5adbfd 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 a08d5557d24b..2f43a61c6d31 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 c0ead8a1dd33..ea96f11c4250 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 af5ad014159d..1692d53fdddb 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 11d23d2132a5..f1b8ae8a0fe3 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 807e8a14a5fc..d0a02f39aba9 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 941bfeddac81..5f027c8ad580 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 862617b32c11..451cd315bf40 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 0d23ae6c2e53..21ab60b24b9c 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 79774b4bf1ed..135874353569 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 2185f8232bf8..d387ace446b6 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 afecc5ac00c5..5b812d72956e 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 1ba820191691..ce0aeb80a3b9 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 86ba05e6f90c..ad7ece2db1c8 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 9c29186e9599..184244253a99 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 32f498bb0918..28538358d15d 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 72faace86aed..589920143293 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 8d122dacbffa..9c7e7b063d98 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 8602756f2b9a..addd3e22e23b 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 9cd4a53c9be8..b0234d5e04af 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 ecfc8ce11c0b..d7f026eb1852 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 819babbae19f..b7d2d5d95cf1 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 634f8f3d04b0..77e8bb178068 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 c64a9d30df77..17680d887962 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 db72f14b7918..f60f318734b5 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 a3e0f86f7a87..a3714a06c9e9 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 7629d1afd66e..13c9fb2414db 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 ecc5d6693da1..bd5b33c10d3e 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 \