From 33e9f3d3d6b29545ef9df3f5334c015e15caa5c8 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Sun, 8 Apr 2012 12:26:27 +0200 Subject: drop uses_ure --- 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 | 6 +++--- 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, 3 insertions(+), 77 deletions(-) diff --git a/dbaccess/CppunitTest_dbaccess_macros_test.mk b/dbaccess/CppunitTest_dbaccess_macros_test.mk index ec9b5acff975..fb7ea6738cc0 100644 --- a/dbaccess/CppunitTest_dbaccess_macros_test.mk +++ b/dbaccess/CppunitTest_dbaccess_macros_test.mk @@ -83,8 +83,6 @@ $(eval $(call gb_CppunitTest_use_api,dbaccess_macros_test,\ udkapi \ )) -$(eval $(call gb_CppunitTest_uses_ure,dbaccess_macros_test)) - $(eval $(call gb_CppunitTest_use_components,dbaccess_macros_test,\ basic/util/sb \ comphelper/util/comphelp \ diff --git a/extensions/CppunitTest_extensions_test_update.mk b/extensions/CppunitTest_extensions_test_update.mk index 844a5f7bf47d..0ce7ad853573 100644 --- a/extensions/CppunitTest_extensions_test_update.mk +++ b/extensions/CppunitTest_extensions_test_update.mk @@ -61,8 +61,6 @@ $(eval $(call gb_CppunitTest_use_api,extensions_test_update,\ udkapi \ )) -$(eval $(call gb_CppunitTest_uses_ure,extensions_test_update)) - $(eval $(call gb_CppunitTest_use_components,extensions_test_update,\ configmgr/source/configmgr \ extensions/source/update/feed/updatefeed \ diff --git a/filter/CppunitTest_filter_tga_test.mk b/filter/CppunitTest_filter_tga_test.mk index 025dc9a0f0d7..85d8a1f4738f 100644 --- a/filter/CppunitTest_filter_tga_test.mk +++ b/filter/CppunitTest_filter_tga_test.mk @@ -50,8 +50,6 @@ $(eval $(call gb_CppunitTest_use_api,filter_tga_test,\ offapi \ )) -$(eval $(call gb_CppunitTest_uses_ure,filter_tga_test)) - $(eval $(call gb_CppunitTest_use_components,filter_tga_test,\ configmgr/source/configmgr \ )) diff --git a/filter/CppunitTest_filter_tiff_test.mk b/filter/CppunitTest_filter_tiff_test.mk index 431d5441d349..0fb7b1002399 100644 --- a/filter/CppunitTest_filter_tiff_test.mk +++ b/filter/CppunitTest_filter_tiff_test.mk @@ -50,8 +50,6 @@ $(eval $(call gb_CppunitTest_use_api,filter_tiff_test,\ offapi \ )) -$(eval $(call gb_CppunitTest_uses_ure,filter_tiff_test)) - $(eval $(call gb_CppunitTest_use_components,filter_tiff_test,\ configmgr/source/configmgr \ )) diff --git a/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk b/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk index a5d5738b014e..2da7ad976d23 100644 --- a/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk +++ b/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk @@ -54,8 +54,6 @@ $(eval $(call gb_CppunitTest_use_api,hwpfilter_test_hwpfilter,\ udkapi \ )) -$(eval $(call gb_CppunitTest_uses_ure,hwpfilter_test_hwpfilter)) - $(eval $(call gb_CppunitTest_use_components,hwpfilter_test_hwpfilter,\ configmgr/source/configmgr \ hwpfilter/source/hwp \ diff --git a/i18npool/CppunitTest_i18npool_test_breakiterator.mk b/i18npool/CppunitTest_i18npool_test_breakiterator.mk index 5528c5f14c95..b723b7ff2dd9 100644 --- a/i18npool/CppunitTest_i18npool_test_breakiterator.mk +++ b/i18npool/CppunitTest_i18npool_test_breakiterator.mk @@ -48,8 +48,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,i18npool_test_breakiterator,\ i18npool/qa/cppunit/test_breakiterator \ )) -$(eval $(call gb_CppunitTest_uses_ure,i18npool_test_breakiterator)) - $(eval $(call gb_CppunitTest_use_components,i18npool_test_breakiterator,\ i18npool/util/i18npool \ )) diff --git a/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk b/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk index 80d5681d4bd8..9e766e3a0718 100644 --- a/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk +++ b/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk @@ -54,8 +54,6 @@ $(eval $(call gb_CppunitTest_use_api,lotuswordpro_test_lotuswordpro,\ udkapi \ )) -$(eval $(call gb_CppunitTest_uses_ure,lotuswordpro_test_lotuswordpro)) - $(eval $(call gb_CppunitTest_use_components,lotuswordpro_test_lotuswordpro,\ configmgr/source/configmgr \ lotuswordpro/util/lwpfilter \ diff --git a/sc/CppunitTest_sc_cellrangeobj.mk b/sc/CppunitTest_sc_cellrangeobj.mk index 3c76ad7e61a8..011a65af92fe 100644 --- a/sc/CppunitTest_sc_cellrangeobj.mk +++ b/sc/CppunitTest_sc_cellrangeobj.mk @@ -84,8 +84,6 @@ $(eval $(call gb_CppunitTest_use_api,sc_cellrangesbase,\ udkapi \ )) -$(eval $(call gb_CppunitTest_uses_ure,sc_cellrangesbase)) - $(eval $(call gb_CppunitTest_use_components,sc_cellrangesbase,\ basic/util/sb \ comphelper/util/comphelp \ diff --git a/sc/CppunitTest_sc_chart_regression_test.mk b/sc/CppunitTest_sc_chart_regression_test.mk index f01a2289d632..64a1dd0c3e4d 100644 --- a/sc/CppunitTest_sc_chart_regression_test.mk +++ b/sc/CppunitTest_sc_chart_regression_test.mk @@ -80,8 +80,6 @@ $(eval $(call gb_CppunitTest_use_api,sc_chart_regression_test,\ udkapi \ )) -$(eval $(call gb_CppunitTest_uses_ure,sc_chart_regression_test)) - $(eval $(call gb_CppunitTest_use_components,sc_chart_regression_test,\ basic/util/sb \ chart2/source/controller/chartcontroller \ diff --git a/sc/CppunitTest_sc_databaserangeobj.mk b/sc/CppunitTest_sc_databaserangeobj.mk index 8704ac9aea00..d9ff41b33db0 100644 --- a/sc/CppunitTest_sc_databaserangeobj.mk +++ b/sc/CppunitTest_sc_databaserangeobj.mk @@ -83,8 +83,6 @@ $(eval $(call gb_CppunitTest_use_api,sc_databaserangeobj,\ udkapi \ )) -$(eval $(call gb_CppunitTest_uses_ure,sc_databaserangeobj)) - $(eval $(call gb_CppunitTest_use_components,sc_databaserangeobj,\ basic/util/sb \ comphelper/util/comphelp \ diff --git a/sc/CppunitTest_sc_datapilotfieldobj.mk b/sc/CppunitTest_sc_datapilotfieldobj.mk index f18cd8aacb74..82b6f05e2dfd 100644 --- a/sc/CppunitTest_sc_datapilotfieldobj.mk +++ b/sc/CppunitTest_sc_datapilotfieldobj.mk @@ -83,8 +83,6 @@ $(eval $(call gb_CppunitTest_use_api,sc_datapilotfieldobj,\ udkapi \ )) -$(eval $(call gb_CppunitTest_uses_ure,sc_datapilotfieldobj)) - $(eval $(call gb_CppunitTest_use_components,sc_datapilotfieldobj,\ basic/util/sb \ comphelper/util/comphelp \ diff --git a/sc/CppunitTest_sc_datapilottableobj.mk b/sc/CppunitTest_sc_datapilottableobj.mk index 2dc880a0038d..4007f4f5ed51 100644 --- a/sc/CppunitTest_sc_datapilottableobj.mk +++ b/sc/CppunitTest_sc_datapilottableobj.mk @@ -83,8 +83,6 @@ $(eval $(call gb_CppunitTest_use_api,sc_datapilottableobj,\ udkapi \ )) -$(eval $(call gb_CppunitTest_uses_ure,sc_datapilottableobj)) - $(eval $(call gb_CppunitTest_use_components,sc_datapilottableobj,\ basic/util/sb \ comphelper/util/comphelp \ diff --git a/sc/CppunitTest_sc_filters_test.mk b/sc/CppunitTest_sc_filters_test.mk index 8d9979b301e7..23177f3169f6 100644 --- a/sc/CppunitTest_sc_filters_test.mk +++ b/sc/CppunitTest_sc_filters_test.mk @@ -80,8 +80,6 @@ $(eval $(call gb_CppunitTest_use_api,sc_filters_test,\ udkapi \ )) -$(eval $(call gb_CppunitTest_uses_ure,sc_filters_test)) - $(eval $(call gb_CppunitTest_use_components,sc_filters_test,\ basic/util/sb \ chart2/source/controller/chartcontroller \ diff --git a/sc/CppunitTest_sc_macros_test.mk b/sc/CppunitTest_sc_macros_test.mk index 26d0ff619619..60ceab324ce9 100644 --- a/sc/CppunitTest_sc_macros_test.mk +++ b/sc/CppunitTest_sc_macros_test.mk @@ -80,8 +80,6 @@ $(eval $(call gb_CppunitTest_use_api,sc_macros_test,\ udkapi \ )) -$(eval $(call gb_CppunitTest_uses_ure,sc_macros_test)) - $(eval $(call gb_CppunitTest_use_components,sc_macros_test,\ basic/util/sb \ comphelper/util/comphelp \ diff --git a/sc/CppunitTest_sc_namedrangeobj.mk b/sc/CppunitTest_sc_namedrangeobj.mk index 250f2b70fdd4..46c38bea8eb6 100644 --- a/sc/CppunitTest_sc_namedrangeobj.mk +++ b/sc/CppunitTest_sc_namedrangeobj.mk @@ -83,8 +83,6 @@ $(eval $(call gb_CppunitTest_use_api,sc_namedrangeobj,\ udkapi \ )) -$(eval $(call gb_CppunitTest_uses_ure,sc_namedrangeobj)) - $(eval $(call gb_CppunitTest_use_components,sc_namedrangeobj,\ basic/util/sb \ comphelper/util/comphelp \ diff --git a/sc/CppunitTest_sc_namedrangesobj.mk b/sc/CppunitTest_sc_namedrangesobj.mk index 5675387ae55c..4bdb78d9c686 100644 --- a/sc/CppunitTest_sc_namedrangesobj.mk +++ b/sc/CppunitTest_sc_namedrangesobj.mk @@ -83,8 +83,6 @@ $(eval $(call gb_CppunitTest_use_api,sc_namedrangesobj,\ udkapi \ )) -$(eval $(call gb_CppunitTest_uses_ure,sc_namedrangesobj)) - $(eval $(call gb_CppunitTest_use_components,sc_namedrangesobj,\ basic/util/sb \ comphelper/util/comphelp \ diff --git a/sc/CppunitTest_sc_subsequent_filters_test.mk b/sc/CppunitTest_sc_subsequent_filters_test.mk index e714740190c4..a25b8d265cd7 100644 --- a/sc/CppunitTest_sc_subsequent_filters_test.mk +++ b/sc/CppunitTest_sc_subsequent_filters_test.mk @@ -80,8 +80,6 @@ $(eval $(call gb_CppunitTest_use_api,sc_subsequent_filters_test,\ udkapi \ )) -$(eval $(call gb_CppunitTest_uses_ure,sc_subsequent_filters_test)) - $(eval $(call gb_CppunitTest_use_components,sc_subsequent_filters_test,\ chart2/source/controller/chartcontroller \ chart2/source/tools/charttools \ diff --git a/sc/CppunitTest_sc_tableautoformatfield.mk b/sc/CppunitTest_sc_tableautoformatfield.mk index 3a803a5fbb95..3fb51bfacbdb 100644 --- a/sc/CppunitTest_sc_tableautoformatfield.mk +++ b/sc/CppunitTest_sc_tableautoformatfield.mk @@ -83,8 +83,6 @@ $(eval $(call gb_CppunitTest_use_api,sc_tableautoformatfield,\ udkapi \ )) -$(eval $(call gb_CppunitTest_uses_ure,sc_tableautoformatfield)) - $(eval $(call gb_CppunitTest_use_components,sc_tableautoformatfield,\ basic/util/sb \ comphelper/util/comphelp \ diff --git a/sc/CppunitTest_sc_tablesheetobj.mk b/sc/CppunitTest_sc_tablesheetobj.mk index 56b94edb702d..4b5578c98fa6 100644 --- a/sc/CppunitTest_sc_tablesheetobj.mk +++ b/sc/CppunitTest_sc_tablesheetobj.mk @@ -84,8 +84,6 @@ $(eval $(call gb_CppunitTest_use_api,sc_spreadsheetobj,\ udkapi \ )) -$(eval $(call gb_CppunitTest_uses_ure,sc_spreadsheetobj)) - $(eval $(call gb_CppunitTest_use_components,sc_spreadsheetobj,\ basic/util/sb \ comphelper/util/comphelp \ diff --git a/sc/CppunitTest_sc_tablesheetsobj.mk b/sc/CppunitTest_sc_tablesheetsobj.mk index 5fb39cb8b5b4..3b076abc8d6d 100644 --- a/sc/CppunitTest_sc_tablesheetsobj.mk +++ b/sc/CppunitTest_sc_tablesheetsobj.mk @@ -83,8 +83,6 @@ $(eval $(call gb_CppunitTest_use_api,sc_spreadsheetsobj,\ udkapi \ )) -$(eval $(call gb_CppunitTest_uses_ure,sc_spreadsheetsobj)) - $(eval $(call gb_CppunitTest_use_components,sc_spreadsheetsobj,\ basic/util/sb \ comphelper/util/comphelp \ diff --git a/sc/CppunitTest_sc_ucalc.mk b/sc/CppunitTest_sc_ucalc.mk index abc2f1acceb4..7cd6d0b2559a 100644 --- a/sc/CppunitTest_sc_ucalc.mk +++ b/sc/CppunitTest_sc_ucalc.mk @@ -87,8 +87,6 @@ $(eval $(call gb_CppunitTest_use_api,sc_ucalc,\ udkapi \ )) -$(eval $(call gb_CppunitTest_uses_ure,sc_ucalc)) - $(eval $(call gb_CppunitTest_use_components,sc_ucalc,\ configmgr/source/configmgr \ framework/util/fwk \ diff --git a/sd/CppunitTest_sd_filters_test.mk b/sd/CppunitTest_sd_filters_test.mk index 46cae1e12449..6b8a328384b1 100644 --- a/sd/CppunitTest_sd_filters_test.mk +++ b/sd/CppunitTest_sd_filters_test.mk @@ -78,8 +78,6 @@ $(eval $(call gb_CppunitTest_use_api,sd_filters_test,\ udkapi \ )) -$(eval $(call gb_CppunitTest_uses_ure,sd_filters_test)) - $(eval $(call gb_CppunitTest_use_components,sd_filters_test,\ basic/util/sb \ comphelper/util/comphelp \ diff --git a/sd/CppunitTest_sd_regression_test.mk b/sd/CppunitTest_sd_regression_test.mk index af1b60e3ad33..bc055aab6579 100644 --- a/sd/CppunitTest_sd_regression_test.mk +++ b/sd/CppunitTest_sd_regression_test.mk @@ -79,8 +79,6 @@ $(eval $(call gb_CppunitTest_use_api,sd_regression_test,\ udkapi \ )) -$(eval $(call gb_CppunitTest_uses_ure,sd_regression_test)) - $(eval $(call gb_CppunitTest_use_components,sd_regression_test,\ basic/util/sb \ comphelper/util/comphelp \ diff --git a/sd/CppunitTest_sd_uimpress.mk b/sd/CppunitTest_sd_uimpress.mk index b504c436af9e..b996d2d08130 100644 --- a/sd/CppunitTest_sd_uimpress.mk +++ b/sd/CppunitTest_sd_uimpress.mk @@ -76,8 +76,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sd_uimpress,\ sd/qa/unit/uimpress \ )) -$(eval $(call gb_CppunitTest_uses_ure,sd_uimpress)) - $(eval $(call gb_CppunitTest_use_components,sd_uimpress,\ configmgr/source/configmgr \ framework/util/fwk \ diff --git a/sdext/CppunitTest_pdfimport.mk b/sdext/CppunitTest_pdfimport.mk index ebdfc8e788f9..931ebb1f5735 100644 --- a/sdext/CppunitTest_pdfimport.mk +++ b/sdext/CppunitTest_pdfimport.mk @@ -65,8 +65,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sdext_pdfimport,\ sdext/source/pdfimport/test/tests \ )) -$(eval $(call gb_CppunitTest_uses_ure,sdext_pdfimport)) - $(eval $(call gb_CppunitTest_use_components,sdext_pdfimport,\ comphelper/util/comphelp \ configmgr/source/configmgr \ diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk index 010f2d6fd4c2..d69777ac62bb 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -137,9 +137,7 @@ $(call gb_CppunitTest_get_target,$(1)) : ARGS := $(2) endef define gb_CppunitTest_uses_ure -$(call gb_CppunitTest_use_rdb,$(1),ure/services) -$(call gb_CppunitTest_get_target,$(1)) : URE := $(true) - +$$(call gb_Output_error,gb_CppunitTest_uses_ure: use gb_CppunitTest_use_api instead.)) endef define gb_CppunitTest_add_type_rdb @@ -171,6 +169,8 @@ endef define gb_CppunitTest_use_api $(call gb_LinkTarget_use_api,$(call gb_CppunitTest__get_linktargetname,$(1)),$(2)) $(foreach rdb,$(2),$(call gb_CppunitTest__use_api,$(1),$(rdb))) +$(call gb_CppunitTest_use_rdb,$(1),ure/services) +$(call gb_CppunitTest_get_target,$(1)) : URE := $(true) endef diff --git a/sot/CppunitTest_sot_test_sot.mk b/sot/CppunitTest_sot_test_sot.mk index c193be992c46..b63556c0d947 100644 --- a/sot/CppunitTest_sot_test_sot.mk +++ b/sot/CppunitTest_sot_test_sot.mk @@ -56,8 +56,6 @@ $(eval $(call gb_CppunitTest_use_api,sot_test_sot,\ udkapi \ )) -$(eval $(call gb_CppunitTest_uses_ure,sot_test_sot)) - $(eval $(call gb_CppunitTest_set_args,sot_test_sot,\ --protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \ )) diff --git a/starmath/CppunitTest_starmath_qa_cppunit.mk b/starmath/CppunitTest_starmath_qa_cppunit.mk index f09d981fdbe6..21427629eed8 100644 --- a/starmath/CppunitTest_starmath_qa_cppunit.mk +++ b/starmath/CppunitTest_starmath_qa_cppunit.mk @@ -75,8 +75,6 @@ $(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 ac88cd1fac78..70823717b9bf 100644 --- a/svl/CppunitTest_svl_urihelper.mk +++ b/svl/CppunitTest_svl_urihelper.mk @@ -55,5 +55,3 @@ $(eval $(call gb_CppunitTest_set_args,svl_urihelper, \ --protector unoexceptionprotector$(gb_Library_DLLEXT) \ unoexceptionprotector \ )) - -$(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 cab848dde003..ee266443b314 100644 --- a/svtools/CppunitTest_svtools_filters_test.mk +++ b/svtools/CppunitTest_svtools_filters_test.mk @@ -53,8 +53,6 @@ $(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 8c81ccde3211..2a3203cff39d 100644 --- a/sw/CppunitTest_sw_filters_test.mk +++ b/sw/CppunitTest_sw_filters_test.mk @@ -71,8 +71,6 @@ $(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 24fcdd560b88..bf451885b7bf 100644 --- a/sw/CppunitTest_sw_layout_test.mk +++ b/sw/CppunitTest_sw_layout_test.mk @@ -81,8 +81,6 @@ $(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 7cbdbe1bb8c0..35801e63c27f 100644 --- a/sw/CppunitTest_sw_macros_test.mk +++ b/sw/CppunitTest_sw_macros_test.mk @@ -82,8 +82,6 @@ $(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 f89114a38e7f..9edc5c8293f3 100644 --- a/sw/CppunitTest_sw_regression_test.mk +++ b/sw/CppunitTest_sw_regression_test.mk @@ -82,8 +82,6 @@ $(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 a1d77f51d9cf..46b333a9ad66 100644 --- a/sw/CppunitTest_sw_subsequent_ooxmltok.mk +++ b/sw/CppunitTest_sw_subsequent_ooxmltok.mk @@ -48,8 +48,6 @@ $(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 1a63a6d16877..01d75fe06671 100644 --- a/sw/CppunitTest_sw_subsequent_rtftok.mk +++ b/sw/CppunitTest_sw_subsequent_rtftok.mk @@ -48,8 +48,6 @@ $(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 5b3073492a0c..c4f88488dec0 100644 --- a/sw/CppunitTest_sw_swdoc_test.mk +++ b/sw/CppunitTest_sw_swdoc_test.mk @@ -85,8 +85,6 @@ $(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 6cbec0b099ef..6fee584d4e98 100644 --- a/writerfilter/CppunitTest_writerfilter_rtftok.mk +++ b/writerfilter/CppunitTest_writerfilter_rtftok.mk @@ -52,8 +52,6 @@ $(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 \ -- cgit v1.2.3