From a97b392879c96145701b2454b26dc0c4f6aa4bb2 Mon Sep 17 00:00:00 2001 From: Gleb Mishchenko Date: Tue, 22 Mar 2016 10:43:56 +0300 Subject: tdf#94698 cleanup Makefiles. Get rid of udkapi and offapi This patch changes occurences in makefiles from $(eval $(call gb_CppunitTest_use_api,comphelper_test_config, \ udkapi \ offapi \ )) to $(eval $(call gb_CppunitTest_use_sdk_api,comphelper_test_config)) (corrected instead of abandon, jani) Change-Id: Ic96ec65d82d7452e288f05a8b6d576ef543b068e Reviewed-on: https://gerrit.libreoffice.org/23426 Tested-by: Jenkins Reviewed-by: jan iversen Tested-by: jan iversen --- sc/CppunitTest_sc_annotationobj.mk | 5 +---- sc/CppunitTest_sc_annotationshapeobj.mk | 5 +---- sc/CppunitTest_sc_annotationsobj.mk | 5 +---- sc/CppunitTest_sc_bugfix_test.mk | 5 +---- sc/CppunitTest_sc_cellrangeobj.mk | 5 +---- sc/CppunitTest_sc_check_xcell_ranges_query.mk | 7 ++----- sc/CppunitTest_sc_condformats.mk | 5 +---- sc/CppunitTest_sc_copypaste.mk | 5 +---- sc/CppunitTest_sc_core.mk | 5 +---- sc/CppunitTest_sc_databaserangeobj.mk | 5 +---- sc/CppunitTest_sc_datapilotfieldobj.mk | 5 +---- sc/CppunitTest_sc_datapilottableobj.mk | 5 +---- sc/CppunitTest_sc_editfieldobj_cell.mk | 5 +---- sc/CppunitTest_sc_editfieldobj_header.mk | 5 +---- sc/CppunitTest_sc_filters_test.mk | 5 +---- sc/CppunitTest_sc_html_export_test.mk | 5 +---- sc/CppunitTest_sc_modelobj.mk | 5 +---- sc/CppunitTest_sc_namedrangeobj.mk | 5 +---- sc/CppunitTest_sc_namedrangesobj.mk | 5 +---- sc/CppunitTest_sc_new_cond_format_api.mk | 5 +---- sc/CppunitTest_sc_opencl_test.mk | 5 +---- sc/CppunitTest_sc_outlineobj.mk | 5 +---- sc/CppunitTest_sc_perfobj.mk | 5 +---- sc/CppunitTest_sc_recordchanges.mk | 5 +---- sc/CppunitTest_sc_styleloaderobj.mk | 5 +---- sc/CppunitTest_sc_subsequent_export_test.mk | 5 +---- sc/CppunitTest_sc_subsequent_filters_test.mk | 5 +---- sc/CppunitTest_sc_tablesheetobj.mk | 5 +---- sc/CppunitTest_sc_tablesheetsobj.mk | 5 +---- sc/CppunitTest_sc_tiledrendering.mk | 5 +---- sc/CppunitTest_sc_ucalc.mk | 5 +---- 31 files changed, 32 insertions(+), 125 deletions(-) (limited to 'sc') diff --git a/sc/CppunitTest_sc_annotationobj.mk b/sc/CppunitTest_sc_annotationobj.mk index 92d0ebf4c60e..b52e8de3c23b 100644 --- a/sc/CppunitTest_sc_annotationobj.mk +++ b/sc/CppunitTest_sc_annotationobj.mk @@ -59,10 +59,7 @@ $(eval $(call gb_CppunitTest_set_include,sc_annotationobj,\ $$(INCLUDE) \ )) -$(eval $(call gb_CppunitTest_use_api,sc_annotationobj,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_CppunitTest_use_sdk_api,sc_annotationobj)) $(eval $(call gb_CppunitTest_use_ure,sc_annotationobj)) $(eval $(call gb_CppunitTest_use_vcl,sc_annotationobj)) diff --git a/sc/CppunitTest_sc_annotationshapeobj.mk b/sc/CppunitTest_sc_annotationshapeobj.mk index 501d52d7a4ba..382614f41832 100644 --- a/sc/CppunitTest_sc_annotationshapeobj.mk +++ b/sc/CppunitTest_sc_annotationshapeobj.mk @@ -59,10 +59,7 @@ $(eval $(call gb_CppunitTest_set_include,sc_annotationshapeobj,\ $$(INCLUDE) \ )) -$(eval $(call gb_CppunitTest_use_api,sc_annotationshapeobj,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_CppunitTest_use_sdk_api,sc_annotationshapeobj)) $(eval $(call gb_CppunitTest_use_ure,sc_annotationshapeobj)) $(eval $(call gb_CppunitTest_use_vcl,sc_annotationshapeobj)) diff --git a/sc/CppunitTest_sc_annotationsobj.mk b/sc/CppunitTest_sc_annotationsobj.mk index 148cf182fed4..f6bdf5e4978b 100644 --- a/sc/CppunitTest_sc_annotationsobj.mk +++ b/sc/CppunitTest_sc_annotationsobj.mk @@ -59,10 +59,7 @@ $(eval $(call gb_CppunitTest_set_include,sc_annotationsobj,\ $$(INCLUDE) \ )) -$(eval $(call gb_CppunitTest_use_api,sc_annotationsobj,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_CppunitTest_use_sdk_api,sc_annotationsobj)) $(eval $(call gb_CppunitTest_use_ure,sc_annotationsobj)) $(eval $(call gb_CppunitTest_use_vcl,sc_annotationsobj)) diff --git a/sc/CppunitTest_sc_bugfix_test.mk b/sc/CppunitTest_sc_bugfix_test.mk index 712f44489c1e..5cab2c0caba3 100644 --- a/sc/CppunitTest_sc_bugfix_test.mk +++ b/sc/CppunitTest_sc_bugfix_test.mk @@ -62,10 +62,7 @@ $(eval $(call gb_CppunitTest_set_include,sc_bugfix_test,\ $$(INCLUDE) \ )) -$(eval $(call gb_CppunitTest_use_api,sc_bugfix_test,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_CppunitTest_use_sdk_api,sc_bugfix_test)) $(eval $(call gb_CppunitTest_use_ure,sc_bugfix_test)) $(eval $(call gb_CppunitTest_use_vcl,sc_bugfix_test)) diff --git a/sc/CppunitTest_sc_cellrangeobj.mk b/sc/CppunitTest_sc_cellrangeobj.mk index c5901150a3f3..d6f6cdd34491 100644 --- a/sc/CppunitTest_sc_cellrangeobj.mk +++ b/sc/CppunitTest_sc_cellrangeobj.mk @@ -59,10 +59,7 @@ $(eval $(call gb_CppunitTest_set_include,sc_cellrangeobj,\ $$(INCLUDE) \ )) -$(eval $(call gb_CppunitTest_use_api,sc_cellrangeobj,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_CppunitTest_use_sdk_api,sc_cellrangeobj)) $(eval $(call gb_CppunitTest_use_ure,sc_cellrangeobj)) $(eval $(call gb_CppunitTest_use_vcl,sc_cellrangeobj)) diff --git a/sc/CppunitTest_sc_check_xcell_ranges_query.mk b/sc/CppunitTest_sc_check_xcell_ranges_query.mk index 5ca88d9082c1..aee68d90a1b0 100644 --- a/sc/CppunitTest_sc_check_xcell_ranges_query.mk +++ b/sc/CppunitTest_sc_check_xcell_ranges_query.mk @@ -57,10 +57,7 @@ $(eval $(call gb_CppunitTest_set_include,sc_check_xcell_ranges_query,\ $$(INCLUDE) \ )) -$(eval $(call gb_CppunitTest_use_api,sc_check_xcell_ranges_query,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_CppunitTest_use_sdk_api,sc_check_xcell_ranges_query)) $(eval $(call gb_CppunitTest_use_ure,sc_check_xcell_ranges_query)) $(eval $(call gb_CppunitTest_use_vcl,sc_check_xcell_ranges_query)) @@ -100,4 +97,4 @@ $(eval $(call gb_CppunitTest_use_components,sc_check_xcell_ranges_query,\ $(eval $(call gb_CppunitTest_use_configuration,sc_check_xcell_ranges_query,)) -# vim: set noet sw=4 ts=4: \ No newline at end of file +# vim: set noet sw=4 ts=4: diff --git a/sc/CppunitTest_sc_condformats.mk b/sc/CppunitTest_sc_condformats.mk index 799306a4aad9..775d81c6ef6d 100644 --- a/sc/CppunitTest_sc_condformats.mk +++ b/sc/CppunitTest_sc_condformats.mk @@ -60,10 +60,7 @@ $(eval $(call gb_CppunitTest_set_include,sc_condformats,\ $$(INCLUDE) \ )) -$(eval $(call gb_CppunitTest_use_api,sc_condformats,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_CppunitTest_use_sdk_api,sc_condformats)) $(eval $(call gb_CppunitTest_use_ure,sc_condformats)) $(eval $(call gb_CppunitTest_use_vcl,sc_condformats)) diff --git a/sc/CppunitTest_sc_copypaste.mk b/sc/CppunitTest_sc_copypaste.mk index 641709c6cd69..ece6209d2720 100644 --- a/sc/CppunitTest_sc_copypaste.mk +++ b/sc/CppunitTest_sc_copypaste.mk @@ -62,10 +62,7 @@ $(eval $(call gb_CppunitTest_set_include,sc_copypaste,\ $$(INCLUDE) \ )) -$(eval $(call gb_CppunitTest_use_api,sc_copypaste,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_CppunitTest_use_sdk_api,sc_copypaste)) $(eval $(call gb_CppunitTest_use_ure,sc_copypaste)) $(eval $(call gb_CppunitTest_use_vcl,sc_copypaste)) diff --git a/sc/CppunitTest_sc_core.mk b/sc/CppunitTest_sc_core.mk index 1247e94f6289..b37f7649b5fa 100644 --- a/sc/CppunitTest_sc_core.mk +++ b/sc/CppunitTest_sc_core.mk @@ -13,10 +13,7 @@ $(eval $(call gb_CppunitTest_use_externals,sc_core, \ boost_headers \ )) -$(eval $(call gb_CppunitTest_use_api,sc_core, \ - offapi \ - udkapi \ -)) +$(eval $(call gb_CppunitTest_use_sdk_api,sc_core)) $(eval $(call gb_CppunitTest_add_exception_objects,sc_core, \ sc/qa/unit/test_ScChartListenerCollection \ diff --git a/sc/CppunitTest_sc_databaserangeobj.mk b/sc/CppunitTest_sc_databaserangeobj.mk index 90e3ece095c2..ff52b2ab4d67 100644 --- a/sc/CppunitTest_sc_databaserangeobj.mk +++ b/sc/CppunitTest_sc_databaserangeobj.mk @@ -59,10 +59,7 @@ $(eval $(call gb_CppunitTest_set_include,sc_databaserangeobj,\ $$(INCLUDE) \ )) -$(eval $(call gb_CppunitTest_use_api,sc_databaserangeobj,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_CppunitTest_use_sdk_api,sc_databaserangeobj)) $(eval $(call gb_CppunitTest_use_ure,sc_databaserangeobj)) $(eval $(call gb_CppunitTest_use_vcl,sc_databaserangeobj)) diff --git a/sc/CppunitTest_sc_datapilotfieldobj.mk b/sc/CppunitTest_sc_datapilotfieldobj.mk index 3c5cb55c0f84..073dfe814b4c 100644 --- a/sc/CppunitTest_sc_datapilotfieldobj.mk +++ b/sc/CppunitTest_sc_datapilotfieldobj.mk @@ -59,10 +59,7 @@ $(eval $(call gb_CppunitTest_set_include,sc_datapilotfieldobj,\ $$(INCLUDE) \ )) -$(eval $(call gb_CppunitTest_use_api,sc_datapilotfieldobj,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_CppunitTest_use_sdk_api,sc_datapilotfieldobj)) $(eval $(call gb_CppunitTest_use_ure,sc_datapilotfieldobj)) $(eval $(call gb_CppunitTest_use_vcl,sc_datapilotfieldobj)) diff --git a/sc/CppunitTest_sc_datapilottableobj.mk b/sc/CppunitTest_sc_datapilottableobj.mk index 8a1f3aef6d5f..5562706804c5 100644 --- a/sc/CppunitTest_sc_datapilottableobj.mk +++ b/sc/CppunitTest_sc_datapilottableobj.mk @@ -59,10 +59,7 @@ $(eval $(call gb_CppunitTest_set_include,sc_datapilottableobj,\ $$(INCLUDE) \ )) -$(eval $(call gb_CppunitTest_use_api,sc_datapilottableobj,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_CppunitTest_use_sdk_api,sc_datapilottableobj)) $(eval $(call gb_CppunitTest_use_ure,sc_datapilottableobj)) $(eval $(call gb_CppunitTest_use_vcl,sc_datapilottableobj)) diff --git a/sc/CppunitTest_sc_editfieldobj_cell.mk b/sc/CppunitTest_sc_editfieldobj_cell.mk index d1e8ce8246c6..bca3a589d270 100644 --- a/sc/CppunitTest_sc_editfieldobj_cell.mk +++ b/sc/CppunitTest_sc_editfieldobj_cell.mk @@ -59,10 +59,7 @@ $(eval $(call gb_CppunitTest_set_include,sc_editfieldobj_cell,\ $$(INCLUDE) \ )) -$(eval $(call gb_CppunitTest_use_api,sc_editfieldobj_cell,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_CppunitTest_use_sdk_api,sc_editfieldobj_cell)) $(eval $(call gb_CppunitTest_use_ure,sc_editfieldobj_cell)) $(eval $(call gb_CppunitTest_use_vcl,sc_editfieldobj_cell)) diff --git a/sc/CppunitTest_sc_editfieldobj_header.mk b/sc/CppunitTest_sc_editfieldobj_header.mk index 90fb12ea81fb..78930d7ff611 100644 --- a/sc/CppunitTest_sc_editfieldobj_header.mk +++ b/sc/CppunitTest_sc_editfieldobj_header.mk @@ -59,10 +59,7 @@ $(eval $(call gb_CppunitTest_set_include,sc_editfieldobj_header,\ $$(INCLUDE) \ )) -$(eval $(call gb_CppunitTest_use_api,sc_editfieldobj_header,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_CppunitTest_use_sdk_api,sc_editfieldobj_header)) $(eval $(call gb_CppunitTest_use_ure,sc_editfieldobj_header)) $(eval $(call gb_CppunitTest_use_vcl,sc_editfieldobj_header)) diff --git a/sc/CppunitTest_sc_filters_test.mk b/sc/CppunitTest_sc_filters_test.mk index db445f53cb05..946799b942b7 100644 --- a/sc/CppunitTest_sc_filters_test.mk +++ b/sc/CppunitTest_sc_filters_test.mk @@ -64,10 +64,7 @@ $(eval $(call gb_CppunitTest_set_include,sc_filters_test,\ $$(INCLUDE) \ )) -$(eval $(call gb_CppunitTest_use_api,sc_filters_test,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_CppunitTest_use_sdk_api,sc_filters_test)) $(eval $(call gb_CppunitTest_use_ure,sc_filters_test)) $(eval $(call gb_CppunitTest_use_vcl,sc_filters_test)) diff --git a/sc/CppunitTest_sc_html_export_test.mk b/sc/CppunitTest_sc_html_export_test.mk index 6a69a67e3ae1..2b7f53041e52 100644 --- a/sc/CppunitTest_sc_html_export_test.mk +++ b/sc/CppunitTest_sc_html_export_test.mk @@ -58,10 +58,7 @@ $(eval $(call gb_CppunitTest_set_include,sc_html_export_test,\ $$(INCLUDE) \ )) -$(eval $(call gb_CppunitTest_use_api,sc_html_export_test,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_CppunitTest_use_sdk_api,sc_html_export_test)) $(eval $(call gb_CppunitTest_use_ure,sc_html_export_test)) $(eval $(call gb_CppunitTest_use_vcl,sc_html_export_test)) diff --git a/sc/CppunitTest_sc_modelobj.mk b/sc/CppunitTest_sc_modelobj.mk index ece6f5a49d7d..0a3b6277f910 100644 --- a/sc/CppunitTest_sc_modelobj.mk +++ b/sc/CppunitTest_sc_modelobj.mk @@ -59,10 +59,7 @@ $(eval $(call gb_CppunitTest_set_include,sc_modelobj,\ $$(INCLUDE) \ )) -$(eval $(call gb_CppunitTest_use_api,sc_modelobj,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_CppunitTest_use_sdk_api,sc_modelobj)) $(eval $(call gb_CppunitTest_use_ure,sc_modelobj)) $(eval $(call gb_CppunitTest_use_vcl,sc_modelobj)) diff --git a/sc/CppunitTest_sc_namedrangeobj.mk b/sc/CppunitTest_sc_namedrangeobj.mk index ba2f9b58d6eb..cf8b4f69fccb 100644 --- a/sc/CppunitTest_sc_namedrangeobj.mk +++ b/sc/CppunitTest_sc_namedrangeobj.mk @@ -59,10 +59,7 @@ $(eval $(call gb_CppunitTest_set_include,sc_namedrangeobj,\ $$(INCLUDE) \ )) -$(eval $(call gb_CppunitTest_use_api,sc_namedrangeobj,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_CppunitTest_use_sdk_api,sc_namedrangeobj)) $(eval $(call gb_CppunitTest_use_ure,sc_namedrangeobj)) $(eval $(call gb_CppunitTest_use_vcl,sc_namedrangeobj)) diff --git a/sc/CppunitTest_sc_namedrangesobj.mk b/sc/CppunitTest_sc_namedrangesobj.mk index cca0de7210c0..36a65cbdc977 100644 --- a/sc/CppunitTest_sc_namedrangesobj.mk +++ b/sc/CppunitTest_sc_namedrangesobj.mk @@ -59,10 +59,7 @@ $(eval $(call gb_CppunitTest_set_include,sc_namedrangesobj,\ $$(INCLUDE) \ )) -$(eval $(call gb_CppunitTest_use_api,sc_namedrangesobj,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_CppunitTest_use_sdk_api,sc_namedrangesobj)) $(eval $(call gb_CppunitTest_use_ure,sc_namedrangesobj)) $(eval $(call gb_CppunitTest_use_vcl,sc_namedrangesobj)) diff --git a/sc/CppunitTest_sc_new_cond_format_api.mk b/sc/CppunitTest_sc_new_cond_format_api.mk index c0558d12264a..7916363c77f4 100644 --- a/sc/CppunitTest_sc_new_cond_format_api.mk +++ b/sc/CppunitTest_sc_new_cond_format_api.mk @@ -58,10 +58,7 @@ $(eval $(call gb_CppunitTest_set_include,sc_new_cond_format_api,\ $$(INCLUDE) \ )) -$(eval $(call gb_CppunitTest_use_api,sc_new_cond_format_api,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_CppunitTest_use_sdk_api,sc_new_cond_format_api)) $(eval $(call gb_CppunitTest_use_ure,sc_new_cond_format_api)) $(eval $(call gb_CppunitTest_use_vcl,sc_new_cond_format_api)) diff --git a/sc/CppunitTest_sc_opencl_test.mk b/sc/CppunitTest_sc_opencl_test.mk index 60ab72bd896b..ee1d0504bc0c 100644 --- a/sc/CppunitTest_sc_opencl_test.mk +++ b/sc/CppunitTest_sc_opencl_test.mk @@ -60,10 +60,7 @@ $(eval $(call gb_CppunitTest_set_include,sc_opencl_test,\ $$(INCLUDE) \ )) -$(eval $(call gb_CppunitTest_use_api,sc_opencl_test,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_CppunitTest_use_sdk_api,sc_opencl_test)) $(eval $(call gb_CppunitTest_use_ure,sc_opencl_test)) $(eval $(call gb_CppunitTest_use_vcl,sc_opencl_test)) diff --git a/sc/CppunitTest_sc_outlineobj.mk b/sc/CppunitTest_sc_outlineobj.mk index 2356032d5d35..a7ee2e4f881c 100644 --- a/sc/CppunitTest_sc_outlineobj.mk +++ b/sc/CppunitTest_sc_outlineobj.mk @@ -59,10 +59,7 @@ $(eval $(call gb_CppunitTest_set_include,sc_outlineobj,\ $$(INCLUDE) \ )) -$(eval $(call gb_CppunitTest_use_api,sc_outlineobj,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_CppunitTest_use_sdk_api,sc_outlineobj)) $(eval $(call gb_CppunitTest_use_ure,sc_outlineobj)) $(eval $(call gb_CppunitTest_use_vcl,sc_outlineobj)) diff --git a/sc/CppunitTest_sc_perfobj.mk b/sc/CppunitTest_sc_perfobj.mk index 285991af90b5..c3e02686d16b 100644 --- a/sc/CppunitTest_sc_perfobj.mk +++ b/sc/CppunitTest_sc_perfobj.mk @@ -59,10 +59,7 @@ $(eval $(call gb_CppunitTest_set_include,sc_perfobj,\ $$(INCLUDE) \ )) -$(eval $(call gb_CppunitTest_use_api,sc_perfobj,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_CppunitTest_use_sdk_api,sc_perfobj)) $(eval $(call gb_CppunitTest_use_ure,sc_perfobj)) $(eval $(call gb_CppunitTest_use_vcl,sc_perfobj)) diff --git a/sc/CppunitTest_sc_recordchanges.mk b/sc/CppunitTest_sc_recordchanges.mk index 225ac2c306bf..1f2602130ea5 100644 --- a/sc/CppunitTest_sc_recordchanges.mk +++ b/sc/CppunitTest_sc_recordchanges.mk @@ -59,10 +59,7 @@ $(eval $(call gb_CppunitTest_set_include,sc_recordchanges,\ $$(INCLUDE) \ )) -$(eval $(call gb_CppunitTest_use_api,sc_recordchanges,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_CppunitTest_use_sdk_api,sc_recordchanges)) $(eval $(call gb_CppunitTest_use_ure,sc_recordchanges)) $(eval $(call gb_CppunitTest_use_vcl,sc_recordchanges)) diff --git a/sc/CppunitTest_sc_styleloaderobj.mk b/sc/CppunitTest_sc_styleloaderobj.mk index 3769fe992d82..a07518e51781 100644 --- a/sc/CppunitTest_sc_styleloaderobj.mk +++ b/sc/CppunitTest_sc_styleloaderobj.mk @@ -59,10 +59,7 @@ $(eval $(call gb_CppunitTest_set_include,sc_styleloaderobj,\ $$(INCLUDE) \ )) -$(eval $(call gb_CppunitTest_use_api,sc_styleloaderobj,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_CppunitTest_use_sdk_api,sc_styleloaderobj)) $(eval $(call gb_CppunitTest_use_ure,sc_styleloaderobj)) $(eval $(call gb_CppunitTest_use_vcl,sc_styleloaderobj)) diff --git a/sc/CppunitTest_sc_subsequent_export_test.mk b/sc/CppunitTest_sc_subsequent_export_test.mk index 6c2c9e573388..5dae44c64d16 100644 --- a/sc/CppunitTest_sc_subsequent_export_test.mk +++ b/sc/CppunitTest_sc_subsequent_export_test.mk @@ -59,10 +59,7 @@ $(eval $(call gb_CppunitTest_set_include,sc_subsequent_export_test,\ $$(INCLUDE) \ )) -$(eval $(call gb_CppunitTest_use_api,sc_subsequent_export_test,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_CppunitTest_use_sdk_api,sc_subsequent_export_test)) $(eval $(call gb_CppunitTest_use_ure,sc_subsequent_export_test)) $(eval $(call gb_CppunitTest_use_vcl,sc_subsequent_export_test)) diff --git a/sc/CppunitTest_sc_subsequent_filters_test.mk b/sc/CppunitTest_sc_subsequent_filters_test.mk index 845206b38423..bd0a06b2c092 100644 --- a/sc/CppunitTest_sc_subsequent_filters_test.mk +++ b/sc/CppunitTest_sc_subsequent_filters_test.mk @@ -62,10 +62,7 @@ $(eval $(call gb_CppunitTest_set_include,sc_subsequent_filters_test,\ $$(INCLUDE) \ )) -$(eval $(call gb_CppunitTest_use_api,sc_subsequent_filters_test,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_CppunitTest_use_sdk_api,sc_subsequent_filters_test)) $(eval $(call gb_CppunitTest_use_ure,sc_subsequent_filters_test)) $(eval $(call gb_CppunitTest_use_vcl,sc_subsequent_filters_test)) diff --git a/sc/CppunitTest_sc_tablesheetobj.mk b/sc/CppunitTest_sc_tablesheetobj.mk index 107012d10590..9215f19f8e21 100644 --- a/sc/CppunitTest_sc_tablesheetobj.mk +++ b/sc/CppunitTest_sc_tablesheetobj.mk @@ -59,10 +59,7 @@ $(eval $(call gb_CppunitTest_set_include,sc_tablesheetobj,\ $$(INCLUDE) \ )) -$(eval $(call gb_CppunitTest_use_api,sc_tablesheetobj,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_CppunitTest_use_sdk_api,sc_tablesheetobj)) $(eval $(call gb_CppunitTest_use_ure,sc_tablesheetobj)) $(eval $(call gb_CppunitTest_use_vcl,sc_tablesheetobj)) diff --git a/sc/CppunitTest_sc_tablesheetsobj.mk b/sc/CppunitTest_sc_tablesheetsobj.mk index a6506e417186..8da2cc39301e 100644 --- a/sc/CppunitTest_sc_tablesheetsobj.mk +++ b/sc/CppunitTest_sc_tablesheetsobj.mk @@ -59,10 +59,7 @@ $(eval $(call gb_CppunitTest_set_include,sc_tablesheetsobj,\ $$(INCLUDE) \ )) -$(eval $(call gb_CppunitTest_use_api,sc_tablesheetsobj,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_CppunitTest_use_sdk_api,sc_tablesheetsobj)) $(eval $(call gb_CppunitTest_use_ure,sc_tablesheetsobj)) $(eval $(call gb_CppunitTest_use_vcl,sc_tablesheetsobj)) diff --git a/sc/CppunitTest_sc_tiledrendering.mk b/sc/CppunitTest_sc_tiledrendering.mk index d1200b1ec323..fb86e258ba6e 100644 --- a/sc/CppunitTest_sc_tiledrendering.mk +++ b/sc/CppunitTest_sc_tiledrendering.mk @@ -46,10 +46,7 @@ $(eval $(call gb_CppunitTest_set_include,sc_tiledrendering,\ $$(INCLUDE) \ )) -$(eval $(call gb_CppunitTest_use_api,sc_tiledrendering,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_CppunitTest_use_sdk_api,sc_tiledrendering)) $(eval $(call gb_CppunitTest_use_ure,sc_tiledrendering)) $(eval $(call gb_CppunitTest_use_vcl,sc_tiledrendering)) diff --git a/sc/CppunitTest_sc_ucalc.mk b/sc/CppunitTest_sc_ucalc.mk index 51ac410996fa..207cfba57484 100644 --- a/sc/CppunitTest_sc_ucalc.mk +++ b/sc/CppunitTest_sc_ucalc.mk @@ -86,10 +86,7 @@ $(eval $(call gb_CppunitTest_set_include,sc_ucalc,\ $$(INCLUDE) \ )) -$(eval $(call gb_CppunitTest_use_api,sc_ucalc,\ - offapi \ - udkapi \ -)) +$(eval $(call gb_CppunitTest_use_sdk_api,sc_ucalc)) $(eval $(call gb_CppunitTest_use_custom_headers,sc_ucalc,\ officecfg/registry \ -- cgit