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 33e9f3d.

Conflicts:

	sot/CppunitTest_sot_test_sot.mk
	svl/CppunitTest_svl_urihelper.mk

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 \

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 \

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 \
 ))

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 \
 ))

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 \

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 \
 ))

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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
 

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:

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 \

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))

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 \
 ))

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \