diff options
Diffstat (limited to 'sd')
-rw-r--r-- | sd/CppunitTest_sd_activex_controls_tests.mk | 48 | ||||
-rw-r--r-- | sd/CppunitTest_sd_filters_test.mk | 34 | ||||
-rw-r--r-- | sd/CppunitTest_sd_html_export_tests.mk | 43 | ||||
-rw-r--r-- | sd/CppunitTest_sd_import_tests_smartart.mk | 47 |
4 files changed, 4 insertions, 168 deletions
diff --git a/sd/CppunitTest_sd_activex_controls_tests.mk b/sd/CppunitTest_sd_activex_controls_tests.mk index 3a50ba709049..d4a265c832a5 100644 --- a/sd/CppunitTest_sd_activex_controls_tests.mk +++ b/sd/CppunitTest_sd_activex_controls_tests.mk @@ -62,53 +62,7 @@ $(eval $(call gb_CppunitTest_use_sdk_api,sd_activex_controls_tests)) $(eval $(call gb_CppunitTest_use_ure,sd_activex_controls_tests)) $(eval $(call gb_CppunitTest_use_vcl,sd_activex_controls_tests)) -$(eval $(call gb_CppunitTest_use_components,sd_activex_controls_tests,\ - animations/source/animcore/animcore \ - basic/util/sb \ - chart2/source/chartcore \ - chart2/source/controller/chartcontroller \ - comphelper/util/comphelp \ - configmgr/source/configmgr \ - dbaccess/util/dba \ - desktop/source/deployment/deployment \ - embeddedobj/util/embobj \ - emfio/emfio \ - filter/source/config/cache/filterconfig1 \ - filter/source/odfflatxml/odfflatxml \ - filter/source/svg/svgfilter \ - filter/source/xmlfilteradaptor/xmlfa \ - filter/source/xmlfilterdetect/xmlfd \ - forms/util/frm \ - framework/util/fwk \ - i18npool/util/i18npool \ - linguistic/source/lng \ - oox/util/oox \ - package/source/xstor/xstor \ - package/util/package2 \ - sax/source/expatwrap/expwrap \ - sd/util/sd \ - sd/util/sdfilt \ - sd/util/sdd \ - $(if $(ENABLE_POPPLER),sdext/source/pdfimport/pdfimport) \ - sfx2/util/sfx \ - sot/util/sot \ - svl/source/fsstor/fsstorage \ - svtools/util/svt \ - svx/util/svxcore \ - toolkit/util/tk \ - ucb/source/core/ucb1 \ - ucb/source/ucp/expand/ucpexpand1 \ - ucb/source/ucp/file/ucpfile1 \ - ucb/source/ucp/package/ucppkg1 \ - ucb/source/ucp/tdoc/ucptdoc1 \ - unotools/util/utl \ - unoxml/source/rdf/unordf \ - unoxml/source/service/unoxml \ - uui/util/uui \ - vcl/vcl.common \ - xmloff/util/xo \ - xmlsecurity/util/xmlsecurity \ -)) +$(eval $(call gb_CppunitTest_use_rdb,sd_activex_controls_tests,services)) $(eval $(call gb_CppunitTest_use_configuration,sd_activex_controls_tests)) diff --git a/sd/CppunitTest_sd_filters_test.mk b/sd/CppunitTest_sd_filters_test.mk index 430b31c39e0d..0fae2d43248a 100644 --- a/sd/CppunitTest_sd_filters_test.mk +++ b/sd/CppunitTest_sd_filters_test.mk @@ -65,39 +65,7 @@ $(eval $(call gb_CppunitTest_use_sdk_api,sd_filters_test)) $(eval $(call gb_CppunitTest_use_ure,sd_filters_test)) $(eval $(call gb_CppunitTest_use_vcl,sd_filters_test)) -$(eval $(call gb_CppunitTest_use_components,sd_filters_test,\ - animations/source/animcore/animcore \ - basic/util/sb \ - comphelper/util/comphelp \ - configmgr/source/configmgr \ - dbaccess/util/dba \ - embeddedobj/util/embobj \ - emfio/emfio \ - filter/source/config/cache/filterconfig1 \ - framework/util/fwk \ - i18npool/util/i18npool \ - linguistic/source/lng \ - oox/util/oox \ - package/source/xstor/xstor \ - package/util/package2 \ - sax/source/expatwrap/expwrap \ - sd/util/sd \ - sd/util/sdfilt \ - sfx2/util/sfx \ - sot/util/sot \ - svtools/util/svt \ - svx/util/svx \ - toolkit/util/tk \ - ucb/source/core/ucb1 \ - ucb/source/ucp/file/ucpfile1 \ - ucb/source/ucp/tdoc/ucptdoc1 \ - unotools/util/utl \ - unoxml/source/rdf/unordf \ - unoxml/source/service/unoxml \ - uui/util/uui \ - vcl/vcl.common \ - xmloff/util/xo \ -)) +$(eval $(call gb_CppunitTest_use_rdb,sd_filters_test,services)) $(eval $(call gb_CppunitTest_use_configuration,sd_filters_test)) diff --git a/sd/CppunitTest_sd_html_export_tests.mk b/sd/CppunitTest_sd_html_export_tests.mk index c6d2ff9a83f3..8cf2881e718a 100644 --- a/sd/CppunitTest_sd_html_export_tests.mk +++ b/sd/CppunitTest_sd_html_export_tests.mk @@ -63,48 +63,7 @@ $(eval $(call gb_CppunitTest_use_sdk_api,sd_html_export_tests)) $(eval $(call gb_CppunitTest_use_ure,sd_html_export_tests)) $(eval $(call gb_CppunitTest_use_vcl,sd_html_export_tests)) -$(eval $(call gb_CppunitTest_use_components,sd_html_export_tests,\ - animations/source/animcore/animcore \ - basic/util/sb \ - chart2/source/chartcore \ - chart2/source/controller/chartcontroller \ - comphelper/util/comphelp \ - configmgr/source/configmgr \ - dbaccess/util/dba \ - desktop/source/deployment/deployment \ - embeddedobj/util/embobj \ - filter/source/config/cache/filterconfig1 \ - filter/source/svg/svgfilter \ - forms/util/frm \ - framework/util/fwk \ - i18npool/util/i18npool \ - linguistic/source/lng \ - oox/util/oox \ - package/source/xstor/xstor \ - package/util/package2 \ - sax/source/expatwrap/expwrap \ - sd/util/sd \ - sd/util/sdfilt \ - sd/util/sdd \ - sfx2/util/sfx \ - sot/util/sot \ - svl/source/fsstor/fsstorage \ - svtools/util/svt \ - svx/util/svxcore \ - toolkit/util/tk \ - ucb/source/core/ucb1 \ - ucb/source/ucp/expand/ucpexpand1 \ - ucb/source/ucp/file/ucpfile1 \ - ucb/source/ucp/package/ucppkg1 \ - ucb/source/ucp/tdoc/ucptdoc1 \ - unotools/util/utl \ - unoxml/source/rdf/unordf \ - unoxml/source/service/unoxml \ - uui/util/uui \ - vcl/vcl.common \ - xmloff/util/xo \ - xmlsecurity/util/xmlsecurity \ -)) +$(eval $(call gb_CppunitTest_use_rdb,sd_html_export_tests,services)) $(eval $(call gb_CppunitTest_use_configuration,sd_html_export_tests)) diff --git a/sd/CppunitTest_sd_import_tests_smartart.mk b/sd/CppunitTest_sd_import_tests_smartart.mk index a35bea16422f..ed947a44b4f7 100644 --- a/sd/CppunitTest_sd_import_tests_smartart.mk +++ b/sd/CppunitTest_sd_import_tests_smartart.mk @@ -64,52 +64,7 @@ $(eval $(call gb_CppunitTest_use_sdk_api,sd_import_tests_smartart)) $(eval $(call gb_CppunitTest_use_ure,sd_import_tests_smartart)) $(eval $(call gb_CppunitTest_use_vcl,sd_import_tests_smartart)) -$(eval $(call gb_CppunitTest_use_components,sd_import_tests_smartart,\ - animations/source/animcore/animcore \ - basic/util/sb \ - chart2/source/chartcore \ - chart2/source/controller/chartcontroller \ - comphelper/util/comphelp \ - configmgr/source/configmgr \ - dbaccess/util/dba \ - desktop/source/deployment/deployment \ - embeddedobj/util/embobj \ - emfio/emfio \ - filter/source/config/cache/filterconfig1 \ - filter/source/odfflatxml/odfflatxml \ - filter/source/svg/svgfilter \ - filter/source/xmlfilteradaptor/xmlfa \ - filter/source/xmlfilterdetect/xmlfd \ - forms/util/frm \ - framework/util/fwk \ - i18npool/util/i18npool \ - linguistic/source/lng \ - oox/util/oox \ - package/source/xstor/xstor \ - package/util/package2 \ - sax/source/expatwrap/expwrap \ - sd/util/sd \ - sd/util/sdfilt \ - sd/util/sdd \ - sfx2/util/sfx \ - sot/util/sot \ - svl/source/fsstor/fsstorage \ - svtools/util/svt \ - svx/util/svxcore \ - toolkit/util/tk \ - ucb/source/core/ucb1 \ - ucb/source/ucp/expand/ucpexpand1 \ - ucb/source/ucp/file/ucpfile1 \ - ucb/source/ucp/package/ucppkg1 \ - ucb/source/ucp/tdoc/ucptdoc1 \ - unotools/util/utl \ - unoxml/source/rdf/unordf \ - unoxml/source/service/unoxml \ - uui/util/uui \ - vcl/vcl.common \ - xmloff/util/xo \ - xmlsecurity/util/xmlsecurity \ -)) +$(eval $(call gb_CppunitTest_use_rdb,sd_import_tests_smartart,services)) $(eval $(call gb_CppunitTest_use_configuration,sd_import_tests_smartart)) |