diff options
38 files changed, 14 insertions, 159 deletions
diff --git a/dbaccess/CppunitTest_dbaccess_macros_test.mk b/dbaccess/CppunitTest_dbaccess_macros_test.mk index 95129467341c..ec9b5acff975 100644 --- a/dbaccess/CppunitTest_dbaccess_macros_test.mk +++ b/dbaccess/CppunitTest_dbaccess_macros_test.mk @@ -85,11 +85,6 @@ $(eval $(call gb_CppunitTest_use_api,dbaccess_macros_test,\ $(eval $(call gb_CppunitTest_uses_ure,dbaccess_macros_test)) -$(eval $(call gb_CppunitTest_use_type_rdbs,dbaccess_macros_test,\ - oovbaapi \ - types \ -)) - $(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 265d9323d4b7..844a5f7bf47d 100644 --- a/extensions/CppunitTest_extensions_test_update.mk +++ b/extensions/CppunitTest_extensions_test_update.mk @@ -63,10 +63,6 @@ $(eval $(call gb_CppunitTest_use_api,extensions_test_update,\ $(eval $(call gb_CppunitTest_uses_ure,extensions_test_update)) -$(eval $(call gb_CppunitTest_use_type_rdbs,extensions_test_update,\ - types \ -)) - $(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 fb0eccc534cf..025dc9a0f0d7 100644 --- a/filter/CppunitTest_filter_tga_test.mk +++ b/filter/CppunitTest_filter_tga_test.mk @@ -52,10 +52,6 @@ $(eval $(call gb_CppunitTest_use_api,filter_tga_test,\ $(eval $(call gb_CppunitTest_uses_ure,filter_tga_test)) -$(eval $(call gb_CppunitTest_use_type_rdbs,filter_tga_test,\ - types \ -)) - $(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 dc52b2e6746c..431d5441d349 100644 --- a/filter/CppunitTest_filter_tiff_test.mk +++ b/filter/CppunitTest_filter_tiff_test.mk @@ -52,10 +52,6 @@ $(eval $(call gb_CppunitTest_use_api,filter_tiff_test,\ $(eval $(call gb_CppunitTest_uses_ure,filter_tiff_test)) -$(eval $(call gb_CppunitTest_use_type_rdbs,filter_tiff_test,\ - types \ -)) - $(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 2df1dbda1170..a5d5738b014e 100644 --- a/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk +++ b/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk @@ -56,10 +56,6 @@ $(eval $(call gb_CppunitTest_use_api,hwpfilter_test_hwpfilter,\ $(eval $(call gb_CppunitTest_uses_ure,hwpfilter_test_hwpfilter)) -$(eval $(call gb_CppunitTest_use_type_rdbs,hwpfilter_test_hwpfilter,\ - types \ -)) - $(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 3d8b160b4017..5528c5f14c95 100644 --- a/i18npool/CppunitTest_i18npool_test_breakiterator.mk +++ b/i18npool/CppunitTest_i18npool_test_breakiterator.mk @@ -50,10 +50,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,i18npool_test_breakiterator,\ $(eval $(call gb_CppunitTest_uses_ure,i18npool_test_breakiterator)) -$(eval $(call gb_CppunitTest_use_type_rdbs,i18npool_test_breakiterator,\ - types \ -)) - $(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 2dc96aac3dea..80d5681d4bd8 100644 --- a/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk +++ b/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk @@ -56,10 +56,6 @@ $(eval $(call gb_CppunitTest_use_api,lotuswordpro_test_lotuswordpro,\ $(eval $(call gb_CppunitTest_uses_ure,lotuswordpro_test_lotuswordpro)) -$(eval $(call gb_CppunitTest_use_type_rdbs,lotuswordpro_test_lotuswordpro,\ - types \ -)) - $(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 49d3f2f9f273..3c76ad7e61a8 100644 --- a/sc/CppunitTest_sc_cellrangeobj.mk +++ b/sc/CppunitTest_sc_cellrangeobj.mk @@ -86,10 +86,6 @@ $(eval $(call gb_CppunitTest_use_api,sc_cellrangesbase,\ $(eval $(call gb_CppunitTest_uses_ure,sc_cellrangesbase)) -$(eval $(call gb_CppunitTest_use_type_rdbs,sc_cellrangesbase,\ - types \ -)) - $(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 0b7158074e91..f01a2289d632 100644 --- a/sc/CppunitTest_sc_chart_regression_test.mk +++ b/sc/CppunitTest_sc_chart_regression_test.mk @@ -82,11 +82,6 @@ $(eval $(call gb_CppunitTest_use_api,sc_chart_regression_test,\ $(eval $(call gb_CppunitTest_uses_ure,sc_chart_regression_test)) -$(eval $(call gb_CppunitTest_use_type_rdbs,sc_chart_regression_test,\ - oovbaapi \ - types \ -)) - $(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 3475740834ba..8704ac9aea00 100644 --- a/sc/CppunitTest_sc_databaserangeobj.mk +++ b/sc/CppunitTest_sc_databaserangeobj.mk @@ -85,10 +85,6 @@ $(eval $(call gb_CppunitTest_use_api,sc_databaserangeobj,\ $(eval $(call gb_CppunitTest_uses_ure,sc_databaserangeobj)) -$(eval $(call gb_CppunitTest_use_type_rdbs,sc_databaserangeobj,\ - types \ -)) - $(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 68c85d8bd62a..f18cd8aacb74 100644 --- a/sc/CppunitTest_sc_datapilotfieldobj.mk +++ b/sc/CppunitTest_sc_datapilotfieldobj.mk @@ -85,10 +85,6 @@ $(eval $(call gb_CppunitTest_use_api,sc_datapilotfieldobj,\ $(eval $(call gb_CppunitTest_uses_ure,sc_datapilotfieldobj)) -$(eval $(call gb_CppunitTest_use_type_rdbs,sc_datapilotfieldobj,\ - types \ -)) - $(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 0bd815641e8b..2dc880a0038d 100644 --- a/sc/CppunitTest_sc_datapilottableobj.mk +++ b/sc/CppunitTest_sc_datapilottableobj.mk @@ -85,10 +85,6 @@ $(eval $(call gb_CppunitTest_use_api,sc_datapilottableobj,\ $(eval $(call gb_CppunitTest_uses_ure,sc_datapilottableobj)) -$(eval $(call gb_CppunitTest_use_type_rdbs,sc_datapilottableobj,\ - types \ -)) - $(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 307a1e83e1e2..8d9979b301e7 100644 --- a/sc/CppunitTest_sc_filters_test.mk +++ b/sc/CppunitTest_sc_filters_test.mk @@ -82,10 +82,6 @@ $(eval $(call gb_CppunitTest_use_api,sc_filters_test,\ $(eval $(call gb_CppunitTest_uses_ure,sc_filters_test)) -$(eval $(call gb_CppunitTest_use_type_rdbs,sc_filters_test,\ - types \ -)) - $(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 e497f1ae9f52..26d0ff619619 100644 --- a/sc/CppunitTest_sc_macros_test.mk +++ b/sc/CppunitTest_sc_macros_test.mk @@ -82,11 +82,6 @@ $(eval $(call gb_CppunitTest_use_api,sc_macros_test,\ $(eval $(call gb_CppunitTest_uses_ure,sc_macros_test)) -$(eval $(call gb_CppunitTest_use_type_rdbs,sc_macros_test,\ - oovbaapi \ - types \ -)) - $(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 d9e7b4b74bb0..250f2b70fdd4 100644 --- a/sc/CppunitTest_sc_namedrangeobj.mk +++ b/sc/CppunitTest_sc_namedrangeobj.mk @@ -85,10 +85,6 @@ $(eval $(call gb_CppunitTest_use_api,sc_namedrangeobj,\ $(eval $(call gb_CppunitTest_uses_ure,sc_namedrangeobj)) -$(eval $(call gb_CppunitTest_use_type_rdbs,sc_namedrangeobj,\ - types \ -)) - $(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 805415e13897..5675387ae55c 100644 --- a/sc/CppunitTest_sc_namedrangesobj.mk +++ b/sc/CppunitTest_sc_namedrangesobj.mk @@ -85,10 +85,6 @@ $(eval $(call gb_CppunitTest_use_api,sc_namedrangesobj,\ $(eval $(call gb_CppunitTest_uses_ure,sc_namedrangesobj)) -$(eval $(call gb_CppunitTest_use_type_rdbs,sc_namedrangesobj,\ - types \ -)) - $(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 2f2a82631463..e714740190c4 100644 --- a/sc/CppunitTest_sc_subsequent_filters_test.mk +++ b/sc/CppunitTest_sc_subsequent_filters_test.mk @@ -82,10 +82,6 @@ $(eval $(call gb_CppunitTest_use_api,sc_subsequent_filters_test,\ $(eval $(call gb_CppunitTest_uses_ure,sc_subsequent_filters_test)) -$(eval $(call gb_CppunitTest_use_type_rdbs,sc_subsequent_filters_test,\ - types \ -)) - $(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 b2cf36626d4a..3a803a5fbb95 100644 --- a/sc/CppunitTest_sc_tableautoformatfield.mk +++ b/sc/CppunitTest_sc_tableautoformatfield.mk @@ -85,10 +85,6 @@ $(eval $(call gb_CppunitTest_use_api,sc_tableautoformatfield,\ $(eval $(call gb_CppunitTest_uses_ure,sc_tableautoformatfield)) -$(eval $(call gb_CppunitTest_use_type_rdbs,sc_tableautoformatfield,\ - types \ -)) - $(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 a5afbf777767..56b94edb702d 100644 --- a/sc/CppunitTest_sc_tablesheetobj.mk +++ b/sc/CppunitTest_sc_tablesheetobj.mk @@ -86,10 +86,6 @@ $(eval $(call gb_CppunitTest_use_api,sc_spreadsheetobj,\ $(eval $(call gb_CppunitTest_uses_ure,sc_spreadsheetobj)) -$(eval $(call gb_CppunitTest_use_type_rdbs,sc_spreadsheetobj,\ - types \ -)) - $(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 d30c53ec17a2..5fb39cb8b5b4 100644 --- a/sc/CppunitTest_sc_tablesheetsobj.mk +++ b/sc/CppunitTest_sc_tablesheetsobj.mk @@ -85,10 +85,6 @@ $(eval $(call gb_CppunitTest_use_api,sc_spreadsheetsobj,\ $(eval $(call gb_CppunitTest_uses_ure,sc_spreadsheetsobj)) -$(eval $(call gb_CppunitTest_use_type_rdbs,sc_spreadsheetsobj,\ - types \ -)) - $(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 0c893dc70622..abc2f1acceb4 100644 --- a/sc/CppunitTest_sc_ucalc.mk +++ b/sc/CppunitTest_sc_ucalc.mk @@ -89,10 +89,6 @@ $(eval $(call gb_CppunitTest_use_api,sc_ucalc,\ $(eval $(call gb_CppunitTest_uses_ure,sc_ucalc)) -$(eval $(call gb_CppunitTest_use_type_rdbs,sc_ucalc,\ - types \ -)) - $(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 50f1e1191bdf..46cae1e12449 100644 --- a/sd/CppunitTest_sd_filters_test.mk +++ b/sd/CppunitTest_sd_filters_test.mk @@ -80,10 +80,6 @@ $(eval $(call gb_CppunitTest_use_api,sd_filters_test,\ $(eval $(call gb_CppunitTest_uses_ure,sd_filters_test)) -$(eval $(call gb_CppunitTest_use_type_rdbs,sd_filters_test,\ - types \ -)) - $(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 5d3f2e0fd36d..af1b60e3ad33 100644 --- a/sd/CppunitTest_sd_regression_test.mk +++ b/sd/CppunitTest_sd_regression_test.mk @@ -81,10 +81,6 @@ $(eval $(call gb_CppunitTest_use_api,sd_regression_test,\ $(eval $(call gb_CppunitTest_uses_ure,sd_regression_test)) -$(eval $(call gb_CppunitTest_use_type_rdbs,sd_regression_test,\ - types \ -)) - $(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 67691f17edd3..b504c436af9e 100644 --- a/sd/CppunitTest_sd_uimpress.mk +++ b/sd/CppunitTest_sd_uimpress.mk @@ -78,10 +78,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sd_uimpress,\ $(eval $(call gb_CppunitTest_uses_ure,sd_uimpress)) -$(eval $(call gb_CppunitTest_use_type_rdbs,sd_uimpress,\ - types \ -)) - $(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 9f27654e648d..ebdfc8e788f9 100644 --- a/sdext/CppunitTest_pdfimport.mk +++ b/sdext/CppunitTest_pdfimport.mk @@ -67,10 +67,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sdext_pdfimport,\ $(eval $(call gb_CppunitTest_uses_ure,sdext_pdfimport)) -$(eval $(call gb_CppunitTest_use_type_rdbs,sdext_pdfimport,\ - types \ -)) - $(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 9135d336edae..4eda559b7038 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -137,7 +137,6 @@ $(call gb_CppunitTest_get_target,$(1)) : ARGS := $(2) endef define gb_CppunitTest_uses_ure -$(call gb_CppunitTest_use_type_rdb,$(1),udkapi) $(call gb_CppunitTest_use_service_rdb,$(1),ure/services) $(call gb_CppunitTest_get_target,$(1)) : URE := $(true) @@ -145,10 +144,15 @@ endef define gb_CppunitTest_add_type_rdb $$(call gb_Output_error,\ - gb_CppunitTest_add_type_rdb: use gb_CppunitTest_use_type_rdb instead.) + gb_CppunitTest_add_type_rdb: use gb_CppunitTest_use_api instead.) endef define gb_CppunitTest_use_type_rdb +$$(call gb_Output_error,\ + gb_CppunitTest_use_type_rdb: use gb_CppunitTest_use_api instead.) +endef + +define gb_CppunitTest__use_api $(call gb_CppunitTest_get_target,$(1)) : $(call gb_UnoApi_get_target,$(2)) $(call gb_CppunitTest_get_target,$(1)) : UNO_TYPES += $(call gb_UnoApi_get_target,$(2)) @@ -156,11 +160,17 @@ endef define gb_CppunitTest_add_type_rdbs $$(call gb_Output_error,\ - gb_CppunitTest_add_type_rdbs: use gb_CppunitTest_use_type_rdbs instead.) + gb_CppunitTest_add_type_rdbs: use gb_CppunitTest_use_api instead.) endef define gb_CppunitTest_use_type_rdbs -$(foreach rdb,$(2),$(call gb_CppunitTest_use_type_rdb,$(1),$(rdb))) +$$(call gb_Output_error,\ + gb_CppunitTest_use_type_rdbs: use gb_CppunitTest_use_api instead.) +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))) endef @@ -254,7 +264,6 @@ endef $(eval $(foreach method,\ add_api \ - use_api \ add_cobject \ add_cobjects \ add_cxxobject \ diff --git a/sot/CppunitTest_sot_test_sot.mk b/sot/CppunitTest_sot_test_sot.mk index 1af4eef0ca01..c193be992c46 100644 --- a/sot/CppunitTest_sot_test_sot.mk +++ b/sot/CppunitTest_sot_test_sot.mk @@ -58,10 +58,6 @@ $(eval $(call gb_CppunitTest_use_api,sot_test_sot,\ $(eval $(call gb_CppunitTest_uses_ure,sot_test_sot)) -$(eval $(call gb_CppunitTest_use_type_rdbs,sot_test_sot,\ - types \ -)) - $(eval $(call gb_CppunitTest_set_args,sot_test_sot,\ --protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \ )) diff --git a/starmath/CppunitTest_starmath_qa_cppunit.mk b/starmath/CppunitTest_starmath_qa_cppunit.mk index fd65302353d2..f09d981fdbe6 100644 --- a/starmath/CppunitTest_starmath_qa_cppunit.mk +++ b/starmath/CppunitTest_starmath_qa_cppunit.mk @@ -77,10 +77,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,starmath_qa_cppunit,\ $(eval $(call gb_CppunitTest_uses_ure,starmath_qa_cppunit)) -$(eval $(call gb_CppunitTest_use_type_rdbs,starmath_qa_cppunit,\ - types \ -)) - $(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 e8c4132149b3..ac88cd1fac78 100644 --- a/svl/CppunitTest_svl_urihelper.mk +++ b/svl/CppunitTest_svl_urihelper.mk @@ -51,10 +51,6 @@ $(eval $(call gb_CppunitTest_use_libraries,svl_urihelper, \ $(gb_STDLIBS) \ )) -$(eval $(call gb_CppunitTest_use_type_rdbs,svl_urihelper, \ - types \ -)) - $(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 671fb3ded20f..cab848dde003 100644 --- a/svtools/CppunitTest_svtools_filters_test.mk +++ b/svtools/CppunitTest_svtools_filters_test.mk @@ -55,10 +55,6 @@ $(eval $(call gb_CppunitTest_use_api,svtools_filters_test,\ $(eval $(call gb_CppunitTest_uses_ure,svtools_filters_test)) -$(eval $(call gb_CppunitTest_use_type_rdbs,svtools_filters_test,\ - types \ -)) - $(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 614cf194f887..8c81ccde3211 100644 --- a/sw/CppunitTest_sw_filters_test.mk +++ b/sw/CppunitTest_sw_filters_test.mk @@ -73,10 +73,6 @@ $(eval $(call gb_CppunitTest_use_api,sw_filters_test,\ $(eval $(call gb_CppunitTest_uses_ure,sw_filters_test)) -$(eval $(call gb_CppunitTest_use_type_rdbs,sw_filters_test,\ - types \ -)) - $(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 3891c383f689..24fcdd560b88 100644 --- a/sw/CppunitTest_sw_layout_test.mk +++ b/sw/CppunitTest_sw_layout_test.mk @@ -83,11 +83,6 @@ $(eval $(call gb_CppunitTest_use_api,sw_layout_test,\ $(eval $(call gb_CppunitTest_uses_ure,sw_layout_test)) -$(eval $(call gb_CppunitTest_use_type_rdbs,sw_layout_test,\ - oovbaapi \ - types \ -)) - $(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 fb4d8ec65815..7cbdbe1bb8c0 100644 --- a/sw/CppunitTest_sw_macros_test.mk +++ b/sw/CppunitTest_sw_macros_test.mk @@ -84,11 +84,6 @@ $(eval $(call gb_CppunitTest_use_api,sw_macros_test,\ $(eval $(call gb_CppunitTest_uses_ure,sw_macros_test)) -$(eval $(call gb_CppunitTest_use_type_rdbs,sw_macros_test,\ - oovbaapi \ - types \ -)) - $(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 f98aa6162310..f89114a38e7f 100644 --- a/sw/CppunitTest_sw_regression_test.mk +++ b/sw/CppunitTest_sw_regression_test.mk @@ -84,11 +84,6 @@ $(eval $(call gb_CppunitTest_use_api,sw_regression_test,\ $(eval $(call gb_CppunitTest_uses_ure,sw_regression_test)) -$(eval $(call gb_CppunitTest_use_type_rdbs,sw_regression_test,\ - oovbaapi \ - types \ -)) - $(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 0b73c55a2fe9..a1d77f51d9cf 100644 --- a/sw/CppunitTest_sw_subsequent_ooxmltok.mk +++ b/sw/CppunitTest_sw_subsequent_ooxmltok.mk @@ -50,10 +50,6 @@ $(eval $(call gb_CppunitTest_use_api,sw_subsequent_ooxmltok,\ $(eval $(call gb_CppunitTest_uses_ure,sw_subsequent_ooxmltok)) -$(eval $(call gb_CppunitTest_use_type_rdbs,sw_subsequent_ooxmltok,\ - types \ -)) - $(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 0e04dc012204..1a63a6d16877 100644 --- a/sw/CppunitTest_sw_subsequent_rtftok.mk +++ b/sw/CppunitTest_sw_subsequent_rtftok.mk @@ -50,10 +50,6 @@ $(eval $(call gb_CppunitTest_use_api,sw_subsequent_rtftok,\ $(eval $(call gb_CppunitTest_uses_ure,sw_subsequent_rtftok)) -$(eval $(call gb_CppunitTest_use_type_rdbs,sw_subsequent_rtftok,\ - types \ -)) - $(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 086c4eec2743..5b3073492a0c 100644 --- a/sw/CppunitTest_sw_swdoc_test.mk +++ b/sw/CppunitTest_sw_swdoc_test.mk @@ -87,10 +87,6 @@ $(eval $(call gb_CppunitTest_use_api,sw_swdoc_test,\ $(eval $(call gb_CppunitTest_uses_ure,sw_swdoc_test)) -$(eval $(call gb_CppunitTest_use_type_rdbs,sw_swdoc_test,\ - types \ -)) - $(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 64ef3d02e8b3..6cbec0b099ef 100644 --- a/writerfilter/CppunitTest_writerfilter_rtftok.mk +++ b/writerfilter/CppunitTest_writerfilter_rtftok.mk @@ -54,10 +54,6 @@ $(eval $(call gb_CppunitTest_use_api,writerfilter_rtftok,\ $(eval $(call gb_CppunitTest_uses_ure,writerfilter_rtftok)) -$(eval $(call gb_CppunitTest_use_type_rdbs,writerfilter_rtftok,\ - types \ -)) - $(eval $(call gb_CppunitTest_use_components,writerfilter_rtftok,\ configmgr/source/configmgr \ ucb/source/core/ucb1 \ |