summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGleb Mishchenko <gleb.mishchenko.96@gmail.com>2016-03-22 10:43:56 +0300
committerjan iversen <jani@documentfoundation.org>2016-06-09 09:47:11 +0000
commita97b392879c96145701b2454b26dc0c4f6aa4bb2 (patch)
treecbc4f327035084aaf1a1fd5fe927dedc20ff2f99
parentaaebe3c45d3ceac7aba19ad8fd5b1cb621e337b3 (diff)
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 <ci@libreoffice.org> Reviewed-by: jan iversen <jani@documentfoundation.org> Tested-by: jan iversen <jani@documentfoundation.org>
-rw-r--r--basegfx/CppunitTest_basegfx.mk5
-rw-r--r--chart2/CppunitTest_chart2_common_functors.mk5
-rw-r--r--chart2/CppunitTest_chart2_export.mk5
-rw-r--r--chart2/CppunitTest_chart2_import.mk5
-rw-r--r--chart2/CppunitTest_chart2_trendcalculators.mk5
-rw-r--r--chart2/CppunitTest_chart2_xshape.mk5
-rw-r--r--comphelper/CppunitTest_comphelper_syntaxhighlight_test.mk5
-rw-r--r--comphelper/CppunitTest_comphelper_test.mk5
-rw-r--r--comphelper/CppunitTest_comphelper_variadictemplates_test.mk5
-rw-r--r--connectivity/CppunitTest_connectivity_ado.mk5
-rw-r--r--connectivity/CppunitTest_connectivity_mork.mk5
-rw-r--r--cppcanvas/CppunitTest_cppcanvas_emfplus.mk5
-rw-r--r--cppcanvas/CppunitTest_cppcanvas_test.mk5
-rw-r--r--desktop/CppunitTest_desktop_lib.mk5
-rw-r--r--editeng/CppunitTest_editeng_borderline.mk5
-rw-r--r--editeng/CppunitTest_editeng_core.mk5
-rw-r--r--editeng/CppunitTest_editeng_lookuptree.mk5
-rw-r--r--extensions/CppunitTest_extensions_test_update.mk5
-rw-r--r--filter/CppunitTest_filter_dxf_test.mk5
-rw-r--r--filter/CppunitTest_filter_eps_test.mk5
-rw-r--r--filter/CppunitTest_filter_met_test.mk5
-rw-r--r--filter/CppunitTest_filter_pcd_test.mk5
-rw-r--r--filter/CppunitTest_filter_pcx_test.mk5
-rw-r--r--filter/CppunitTest_filter_pict_test.mk5
-rw-r--r--filter/CppunitTest_filter_ppm_test.mk5
-rw-r--r--filter/CppunitTest_filter_psd_test.mk5
-rw-r--r--filter/CppunitTest_filter_ras_test.mk5
-rw-r--r--filter/CppunitTest_filter_tga_test.mk5
-rw-r--r--filter/CppunitTest_filter_tiff_test.mk5
-rw-r--r--hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk5
-rw-r--r--i18nlangtag/CppunitTest_i18nlangtag_test_languagetag.mk5
-rw-r--r--i18npool/CppunitTest_i18npool_test_breakiterator.mk5
-rw-r--r--i18npool/CppunitTest_i18npool_test_characterclassification.mk5
-rw-r--r--i18npool/CppunitTest_i18npool_test_ordinalsuffix.mk5
-rw-r--r--i18npool/CppunitTest_i18npool_test_textsearch.mk5
-rw-r--r--lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk5
-rw-r--r--oox/CppunitTest_oox_tokenmap.mk5
-rw-r--r--oox/CppunitTest_oox_vba_compression.mk5
-rw-r--r--oox/CppunitTest_oox_vba_encryption.mk5
-rw-r--r--package/CppunitTest_package2_test.mk5
-rw-r--r--sax/CppunitTest_sax.mk5
-rw-r--r--sc/CppunitTest_sc_annotationobj.mk5
-rw-r--r--sc/CppunitTest_sc_annotationshapeobj.mk5
-rw-r--r--sc/CppunitTest_sc_annotationsobj.mk5
-rw-r--r--sc/CppunitTest_sc_bugfix_test.mk5
-rw-r--r--sc/CppunitTest_sc_cellrangeobj.mk5
-rw-r--r--sc/CppunitTest_sc_check_xcell_ranges_query.mk7
-rw-r--r--sc/CppunitTest_sc_condformats.mk5
-rw-r--r--sc/CppunitTest_sc_copypaste.mk5
-rw-r--r--sc/CppunitTest_sc_core.mk5
-rw-r--r--sc/CppunitTest_sc_databaserangeobj.mk5
-rw-r--r--sc/CppunitTest_sc_datapilotfieldobj.mk5
-rw-r--r--sc/CppunitTest_sc_datapilottableobj.mk5
-rw-r--r--sc/CppunitTest_sc_editfieldobj_cell.mk5
-rw-r--r--sc/CppunitTest_sc_editfieldobj_header.mk5
-rw-r--r--sc/CppunitTest_sc_filters_test.mk5
-rw-r--r--sc/CppunitTest_sc_html_export_test.mk5
-rw-r--r--sc/CppunitTest_sc_modelobj.mk5
-rw-r--r--sc/CppunitTest_sc_namedrangeobj.mk5
-rw-r--r--sc/CppunitTest_sc_namedrangesobj.mk5
-rw-r--r--sc/CppunitTest_sc_new_cond_format_api.mk5
-rw-r--r--sc/CppunitTest_sc_opencl_test.mk5
-rw-r--r--sc/CppunitTest_sc_outlineobj.mk5
-rw-r--r--sc/CppunitTest_sc_perfobj.mk5
-rw-r--r--sc/CppunitTest_sc_recordchanges.mk5
-rw-r--r--sc/CppunitTest_sc_styleloaderobj.mk5
-rw-r--r--sc/CppunitTest_sc_subsequent_export_test.mk5
-rw-r--r--sc/CppunitTest_sc_subsequent_filters_test.mk5
-rw-r--r--sc/CppunitTest_sc_tablesheetobj.mk5
-rw-r--r--sc/CppunitTest_sc_tablesheetsobj.mk5
-rw-r--r--sc/CppunitTest_sc_tiledrendering.mk5
-rw-r--r--sc/CppunitTest_sc_ucalc.mk5
-rw-r--r--sccomp/CppunitTest_sccomp_lpsolver.mk5
-rw-r--r--sd/CppunitTest_sd_export_tests.mk5
-rw-r--r--sd/CppunitTest_sd_filters_test.mk5
-rw-r--r--sd/CppunitTest_sd_html_export_tests.mk5
-rw-r--r--sd/CppunitTest_sd_import_tests.mk5
-rw-r--r--sd/CppunitTest_sd_misc_tests.mk5
-rw-r--r--sd/CppunitTest_sd_svg_export_tests.mk5
-rw-r--r--sd/CppunitTest_sd_tiledrendering.mk5
-rw-r--r--sd/CppunitTest_sd_uimpress.mk5
-rw-r--r--sdext/CppunitTest_sdext_pdfimport.mk5
-rw-r--r--slideshow/CppunitTest_slideshow.mk5
-rw-r--r--smoketest/CppunitTest_smoketest.mk5
-rw-r--r--sot/CppunitTest_sot_test_sot.mk5
-rw-r--r--starmath/CppunitTest_starmath_import.mk5
-rw-r--r--starmath/CppunitTest_starmath_qa_cppunit.mk5
-rw-r--r--svgio/CppunitTest_svgio.mk5
-rw-r--r--svl/CppunitTest_svl_itempool.mk5
-rw-r--r--svl/CppunitTest_svl_items.mk5
-rw-r--r--svl/CppunitTest_svl_notify.mk5
-rw-r--r--svl/CppunitTest_svl_qa_cppunit.mk5
-rw-r--r--svl/CppunitTest_svl_urihelper.mk5
-rw-r--r--svtools/CppunitTest_svtools_graphic.mk5
-rw-r--r--svtools/CppunitTest_svtools_html.mk5
-rw-r--r--svx/CppunitTest_svx_unit.mk5
-rw-r--r--sw/CppunitTest_sw_docbookexport.mk5
-rw-r--r--sw/CppunitTest_sw_filters_test.mk5
-rw-r--r--sw/CppunitTest_sw_globalfilter.mk5
-rw-r--r--sw/CppunitTest_sw_htmlexport.mk5
-rw-r--r--sw/CppunitTest_sw_mailmerge.mk5
-rw-r--r--sw/CppunitTest_sw_odfexport.mk5
-rw-r--r--sw/CppunitTest_sw_odfimport.mk5
-rw-r--r--sw/CppunitTest_sw_ooxmlfieldexport.mk5
-rw-r--r--sw/CppunitTest_sw_ooxmlimport.mk5
-rw-r--r--sw/CppunitTest_sw_ooxmlw14export.mk5
-rw-r--r--sw/CppunitTest_sw_rtfexport.mk5
-rw-r--r--sw/CppunitTest_sw_rtfimport.mk5
-rw-r--r--sw/CppunitTest_sw_tiledrendering.mk5
-rw-r--r--sw/CppunitTest_sw_uiwriter.mk5
-rw-r--r--sw/CppunitTest_sw_uwriter.mk5
-rw-r--r--sw/CppunitTest_sw_ww8export.mk5
-rw-r--r--sw/CppunitTest_sw_ww8import.mk5
-rw-r--r--sw/ooxmlexport_setup.mk5
-rw-r--r--tools/CppunitTest_tools_test.mk5
-rw-r--r--ucb/CppunitTest_ucb_webdav_local_neon.mk5
-rw-r--r--unotools/CppunitTest_unotools_fontdefs.mk5
-rw-r--r--unoxml/CppunitTest_unoxml_domtest.mk5
-rw-r--r--vcl/CppunitTest_vcl_bitmap_test.mk5
-rw-r--r--vcl/CppunitTest_vcl_blocklistparser_test.mk5
-rw-r--r--vcl/CppunitTest_vcl_complextext.mk5
-rw-r--r--vcl/CppunitTest_vcl_filters_test.mk5
-rw-r--r--vcl/CppunitTest_vcl_font.mk5
-rw-r--r--vcl/CppunitTest_vcl_fontcharmap.mk5
-rw-r--r--vcl/CppunitTest_vcl_fontmetric.mk5
-rw-r--r--vcl/CppunitTest_vcl_lifecycle.mk5
-rw-r--r--vcl/CppunitTest_vcl_mapmode.mk5
-rw-r--r--vcl/CppunitTest_vcl_outdev.mk5
-rw-r--r--vcl/CppunitTest_vcl_timer.mk5
-rw-r--r--vcl/CppunitTest_vcl_wmf_test.mk5
-rw-r--r--writerfilter/CppunitTest_writerfilter_misc.mk5
-rw-r--r--writerfilter/CppunitTest_writerfilter_rtftok.mk5
-rw-r--r--writerperfect/CppunitTest_writerperfect_calc.mk5
-rw-r--r--writerperfect/CppunitTest_writerperfect_draw.mk5
-rw-r--r--writerperfect/CppunitTest_writerperfect_impress.mk5
-rw-r--r--writerperfect/CppunitTest_writerperfect_stream.mk5
-rw-r--r--writerperfect/CppunitTest_writerperfect_writer.mk5
-rw-r--r--xmloff/CppunitTest_xmloff_uxmloff.mk5
-rw-r--r--xmlsecurity/CppunitTest_qa_certext.mk5
139 files changed, 140 insertions, 557 deletions
diff --git a/basegfx/CppunitTest_basegfx.mk b/basegfx/CppunitTest_basegfx.mk
index fdffba3b1f7d..3941a3e1ce52 100644
--- a/basegfx/CppunitTest_basegfx.mk
+++ b/basegfx/CppunitTest_basegfx.mk
@@ -11,10 +11,7 @@ $(eval $(call gb_CppunitTest_CppunitTest,basegfx))
$(eval $(call gb_CppunitTest_use_external,basegfx,boost_headers))
-$(eval $(call gb_CppunitTest_use_api,basegfx,\
- offapi \
- udkapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,basegfx))
$(eval $(call gb_CppunitTest_use_libraries,basegfx,\
basegfx \
diff --git a/chart2/CppunitTest_chart2_common_functors.mk b/chart2/CppunitTest_chart2_common_functors.mk
index 46e58bc9967a..203de1d17b64 100644
--- a/chart2/CppunitTest_chart2_common_functors.mk
+++ b/chart2/CppunitTest_chart2_common_functors.mk
@@ -33,10 +33,7 @@ $(eval $(call gb_CppunitTest_set_include,chart2_common_functors,\
$$(INCLUDE) \
))
-$(eval $(call gb_CppunitTest_use_api,chart2_common_functors,\
- offapi \
- udkapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,chart2_common_functors))
$(eval $(call gb_CppunitTest_use_ure,chart2_common_functors))
diff --git a/chart2/CppunitTest_chart2_export.mk b/chart2/CppunitTest_chart2_export.mk
index 51ce6b651300..50780b1095e3 100644
--- a/chart2/CppunitTest_chart2_export.mk
+++ b/chart2/CppunitTest_chart2_export.mk
@@ -64,10 +64,7 @@ $(eval $(call gb_CppunitTest_set_include,chart2_export,\
$$(INCLUDE) \
))
-$(eval $(call gb_CppunitTest_use_api,chart2_export,\
- offapi \
- udkapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,chart2_export))
$(eval $(call gb_CppunitTest_use_ure,chart2_export))
$(eval $(call gb_CppunitTest_use_vcl,chart2_export))
diff --git a/chart2/CppunitTest_chart2_import.mk b/chart2/CppunitTest_chart2_import.mk
index e101993e9eb4..a2263a840134 100644
--- a/chart2/CppunitTest_chart2_import.mk
+++ b/chart2/CppunitTest_chart2_import.mk
@@ -63,10 +63,7 @@ $(eval $(call gb_CppunitTest_set_include,chart2_import,\
$$(INCLUDE) \
))
-$(eval $(call gb_CppunitTest_use_api,chart2_import,\
- offapi \
- udkapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,chart2_import))
$(eval $(call gb_CppunitTest_use_ure,chart2_import))
$(eval $(call gb_CppunitTest_use_vcl,chart2_import))
diff --git a/chart2/CppunitTest_chart2_trendcalculators.mk b/chart2/CppunitTest_chart2_trendcalculators.mk
index 51872983b68f..9e6e2758cb74 100644
--- a/chart2/CppunitTest_chart2_trendcalculators.mk
+++ b/chart2/CppunitTest_chart2_trendcalculators.mk
@@ -63,10 +63,7 @@ $(eval $(call gb_CppunitTest_set_include,chart2_trendcalculators,\
$$(INCLUDE) \
))
-$(eval $(call gb_CppunitTest_use_api,chart2_trendcalculators,\
- offapi \
- udkapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,chart2_trendcalculators))
$(eval $(call gb_CppunitTest_use_ure,chart2_trendcalculators))
$(eval $(call gb_CppunitTest_use_vcl,chart2_trendcalculators))
diff --git a/chart2/CppunitTest_chart2_xshape.mk b/chart2/CppunitTest_chart2_xshape.mk
index bb50d5b59608..92c26447f559 100644
--- a/chart2/CppunitTest_chart2_xshape.mk
+++ b/chart2/CppunitTest_chart2_xshape.mk
@@ -64,10 +64,7 @@ $(eval $(call gb_CppunitTest_set_include,chart2_xshape,\
$$(INCLUDE) \
))
-$(eval $(call gb_CppunitTest_use_api,chart2_xshape,\
- offapi \
- udkapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,chart2_xshape))
$(eval $(call gb_CppunitTest_use_ure,chart2_xshape))
$(eval $(call gb_CppunitTest_use_vcl,chart2_xshape))
diff --git a/comphelper/CppunitTest_comphelper_syntaxhighlight_test.mk b/comphelper/CppunitTest_comphelper_syntaxhighlight_test.mk
index 73ab199e625e..9dade8b53877 100644
--- a/comphelper/CppunitTest_comphelper_syntaxhighlight_test.mk
+++ b/comphelper/CppunitTest_comphelper_syntaxhighlight_test.mk
@@ -17,10 +17,7 @@ $(eval $(call gb_CppunitTest_use_externals,comphelper_syntaxhighlight_test,\
boost_headers \
))
-$(eval $(call gb_CppunitTest_use_api,comphelper_syntaxhighlight_test, \
- udkapi \
- offapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,comphelper_syntaxhighlight_test))
$(eval $(call gb_CppunitTest_use_libraries,comphelper_syntaxhighlight_test, \
comphelper \
diff --git a/comphelper/CppunitTest_comphelper_test.mk b/comphelper/CppunitTest_comphelper_test.mk
index 47843c6ba8ad..f67601e6a6de 100644
--- a/comphelper/CppunitTest_comphelper_test.mk
+++ b/comphelper/CppunitTest_comphelper_test.mk
@@ -14,10 +14,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,comphelper_test, \
comphelper/qa/container/testifcontainer \
))
-$(eval $(call gb_CppunitTest_use_api,comphelper_test, \
- udkapi \
- offapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,comphelper_test))
$(eval $(call gb_CppunitTest_use_libraries,comphelper_test, \
comphelper \
diff --git a/comphelper/CppunitTest_comphelper_variadictemplates_test.mk b/comphelper/CppunitTest_comphelper_variadictemplates_test.mk
index 21e8753f6605..58d490a5d64a 100644
--- a/comphelper/CppunitTest_comphelper_variadictemplates_test.mk
+++ b/comphelper/CppunitTest_comphelper_variadictemplates_test.mk
@@ -13,10 +13,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,comphelper_variadictemplates_
comphelper/qa/unit/variadictemplates \
))
-$(eval $(call gb_CppunitTest_use_api,comphelper_variadictemplates_test, \
- udkapi \
- offapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,comphelper_variadictemplates_test))
$(eval $(call gb_CppunitTest_use_externals,comphelper_variadictemplates_test, \
boost_headers \
diff --git a/connectivity/CppunitTest_connectivity_ado.mk b/connectivity/CppunitTest_connectivity_ado.mk
index 316031485a05..ce2e2c2c5032 100644
--- a/connectivity/CppunitTest_connectivity_ado.mk
+++ b/connectivity/CppunitTest_connectivity_ado.mk
@@ -17,10 +17,7 @@ $(eval $(call gb_CppunitTest_set_include,connectivity_ado,\
$(eval $(call gb_CppunitTest_use_external,connectivity_ado,boost_headers))
-$(eval $(call gb_CppunitTest_use_api,connectivity_ado,\
- udkapi \
- offapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,connectivity_ado))
$(eval $(call gb_CppunitTest_use_ure,connectivity_ado))
$(eval $(call gb_CppunitTest_use_vcl,connectivity_ado))
diff --git a/connectivity/CppunitTest_connectivity_mork.mk b/connectivity/CppunitTest_connectivity_mork.mk
index f07601493871..be3b0413b8d1 100644
--- a/connectivity/CppunitTest_connectivity_mork.mk
+++ b/connectivity/CppunitTest_connectivity_mork.mk
@@ -17,10 +17,7 @@ $(eval $(call gb_CppunitTest_set_include,connectivity_mork,\
$(eval $(call gb_CppunitTest_use_external,connectivity_mork,boost_headers))
-$(eval $(call gb_CppunitTest_use_api,connectivity_mork,\
- udkapi \
- offapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,connectivity_mork))
$(eval $(call gb_CppunitTest_use_ure,connectivity_mork))
$(eval $(call gb_CppunitTest_use_vcl,connectivity_mork))
diff --git a/cppcanvas/CppunitTest_cppcanvas_emfplus.mk b/cppcanvas/CppunitTest_cppcanvas_emfplus.mk
index d4cc7c1add5d..e545e347f3d7 100644
--- a/cppcanvas/CppunitTest_cppcanvas_emfplus.mk
+++ b/cppcanvas/CppunitTest_cppcanvas_emfplus.mk
@@ -30,10 +30,7 @@ $(eval $(call gb_CppunitTest_use_libraries,cppcanvas_emfplus, \
$(eval $(call gb_CppunitTest_use_external,cppcanvas_emfplus,boost_headers))
-$(eval $(call gb_CppunitTest_use_api,cppcanvas_emfplus,\
- offapi \
- udkapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,cppcanvas_emfplus))
$(eval $(call gb_CppunitTest_use_ure,cppcanvas_emfplus))
$(eval $(call gb_CppunitTest_use_vcl_non_headless,cppcanvas_emfplus))
diff --git a/cppcanvas/CppunitTest_cppcanvas_test.mk b/cppcanvas/CppunitTest_cppcanvas_test.mk
index 64f222cc8d24..2e3784263b2e 100644
--- a/cppcanvas/CppunitTest_cppcanvas_test.mk
+++ b/cppcanvas/CppunitTest_cppcanvas_test.mk
@@ -33,10 +33,7 @@ $(eval $(call gb_CppunitTest_use_libraries,cppcanvas_test, \
$(gb_UWINAPI) \
))
-$(eval $(call gb_CppunitTest_use_api,cppcanvas_test,\
- offapi \
- udkapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,cppcanvas_test))
$(eval $(call gb_CppunitTest_use_ure,cppcanvas_test))
$(eval $(call gb_CppunitTest_use_vcl,cppcanvas_test))
diff --git a/desktop/CppunitTest_desktop_lib.mk b/desktop/CppunitTest_desktop_lib.mk
index 9ce2a03aa779..aed16db65eb9 100644
--- a/desktop/CppunitTest_desktop_lib.mk
+++ b/desktop/CppunitTest_desktop_lib.mk
@@ -41,10 +41,7 @@ $(eval $(call gb_CppunitTest_set_include,desktop_lib,\
$$(INCLUDE) \
))
-$(eval $(call gb_CppunitTest_use_api,desktop_lib,\
- offapi \
- udkapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,desktop_lib))
$(eval $(call gb_CppunitTest_use_ure,desktop_lib))
diff --git a/editeng/CppunitTest_editeng_borderline.mk b/editeng/CppunitTest_editeng_borderline.mk
index 354b9cfad092..121f4951e26e 100644
--- a/editeng/CppunitTest_editeng_borderline.mk
+++ b/editeng/CppunitTest_editeng_borderline.mk
@@ -51,9 +51,6 @@ $(eval $(call gb_CppunitTest_use_externals,editeng_borderline,\
icuuc \
))
-$(eval $(call gb_CppunitTest_use_api,editeng_borderline,\
- offapi \
- udkapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,editeng_borderline))
# vim: set noet sw=4 ts=4:
diff --git a/editeng/CppunitTest_editeng_core.mk b/editeng/CppunitTest_editeng_core.mk
index ea7f6896b52b..36fb35be49ff 100644
--- a/editeng/CppunitTest_editeng_core.mk
+++ b/editeng/CppunitTest_editeng_core.mk
@@ -52,10 +52,7 @@ $(eval $(call gb_CppunitTest_set_include,editeng_core,\
$$(INCLUDE) \
))
-$(eval $(call gb_CppunitTest_use_api,editeng_core,\
- offapi \
- udkapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,editeng_core))
$(eval $(call gb_CppunitTest_use_ure,editeng_core))
$(eval $(call gb_CppunitTest_use_vcl,editeng_core))
diff --git a/editeng/CppunitTest_editeng_lookuptree.mk b/editeng/CppunitTest_editeng_lookuptree.mk
index eafde6500641..0a1422d4b036 100644
--- a/editeng/CppunitTest_editeng_lookuptree.mk
+++ b/editeng/CppunitTest_editeng_lookuptree.mk
@@ -51,9 +51,6 @@ $(eval $(call gb_CppunitTest_use_externals,editeng_lookuptree,\
icuuc \
))
-$(eval $(call gb_CppunitTest_use_api,editeng_lookuptree,\
- offapi \
- udkapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,editeng_lookuptree))
# vim: set noet sw=4 ts=4:
diff --git a/extensions/CppunitTest_extensions_test_update.mk b/extensions/CppunitTest_extensions_test_update.mk
index b6149b04a312..1d802522c65e 100644
--- a/extensions/CppunitTest_extensions_test_update.mk
+++ b/extensions/CppunitTest_extensions_test_update.mk
@@ -46,10 +46,7 @@ $(eval $(call gb_CppunitTest_set_include,extensions_test_update,\
-I$(SRCDIR)/extensions/inc \
))
-$(eval $(call gb_CppunitTest_use_api,extensions_test_update,\
- offapi \
- udkapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,extensions_test_update))
$(eval $(call gb_CppunitTest_use_ure,extensions_test_update))
$(eval $(call gb_CppunitTest_use_vcl,extensions_test_update))
diff --git a/filter/CppunitTest_filter_dxf_test.mk b/filter/CppunitTest_filter_dxf_test.mk
index e8afc39bf266..362c89b6af75 100644
--- a/filter/CppunitTest_filter_dxf_test.mk
+++ b/filter/CppunitTest_filter_dxf_test.mk
@@ -25,10 +25,7 @@ $(eval $(call gb_CppunitTest_use_libraries,filter_dxf_test, \
$(gb_UWINAPI) \
))
-$(eval $(call gb_CppunitTest_use_api,filter_dxf_test,\
- udkapi \
- offapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,filter_dxf_test))
$(eval $(call gb_CppunitTest_use_ure,filter_dxf_test))
$(eval $(call gb_CppunitTest_use_vcl,filter_dxf_test))
diff --git a/filter/CppunitTest_filter_eps_test.mk b/filter/CppunitTest_filter_eps_test.mk
index 300f9a707838..d49f10e05aeb 100644
--- a/filter/CppunitTest_filter_eps_test.mk
+++ b/filter/CppunitTest_filter_eps_test.mk
@@ -25,10 +25,7 @@ $(eval $(call gb_CppunitTest_use_libraries,filter_eps_test, \
$(gb_UWINAPI) \
))
-$(eval $(call gb_CppunitTest_use_api,filter_eps_test,\
- udkapi \
- offapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,filter_eps_test))
$(eval $(call gb_CppunitTest_use_ure,filter_eps_test))
$(eval $(call gb_CppunitTest_use_vcl,filter_eps_test))
diff --git a/filter/CppunitTest_filter_met_test.mk b/filter/CppunitTest_filter_met_test.mk
index 64bbeb63782e..4a0027fdde36 100644
--- a/filter/CppunitTest_filter_met_test.mk
+++ b/filter/CppunitTest_filter_met_test.mk
@@ -25,10 +25,7 @@ $(eval $(call gb_CppunitTest_use_libraries,filter_met_test, \
$(gb_UWINAPI) \
))
-$(eval $(call gb_CppunitTest_use_api,filter_met_test,\
- udkapi \
- offapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,filter_met_test))
$(eval $(call gb_CppunitTest_use_ure,filter_met_test))
$(eval $(call gb_CppunitTest_use_vcl,filter_met_test))
diff --git a/filter/CppunitTest_filter_pcd_test.mk b/filter/CppunitTest_filter_pcd_test.mk
index 2603d4800bbd..4d6406956aba 100644
--- a/filter/CppunitTest_filter_pcd_test.mk
+++ b/filter/CppunitTest_filter_pcd_test.mk
@@ -25,10 +25,7 @@ $(eval $(call gb_CppunitTest_use_libraries,filter_pcd_test, \
$(gb_UWINAPI) \
))
-$(eval $(call gb_CppunitTest_use_api,filter_pcd_test,\
- udkapi \
- offapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,filter_pcd_test))
$(eval $(call gb_CppunitTest_use_ure,filter_pcd_test))
$(eval $(call gb_CppunitTest_use_vcl,filter_pcd_test))
diff --git a/filter/CppunitTest_filter_pcx_test.mk b/filter/CppunitTest_filter_pcx_test.mk
index b44062aa0785..4a31c51f2d8c 100644
--- a/filter/CppunitTest_filter_pcx_test.mk
+++ b/filter/CppunitTest_filter_pcx_test.mk
@@ -25,10 +25,7 @@ $(eval $(call gb_CppunitTest_use_libraries,filter_pcx_test, \
$(gb_UWINAPI) \
))
-$(eval $(call gb_CppunitTest_use_api,filter_pcx_test,\
- udkapi \
- offapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,filter_pcx_test))
$(eval $(call gb_CppunitTest_use_ure,filter_pcx_test))
$(eval $(call gb_CppunitTest_use_vcl,filter_pcx_test))
diff --git a/filter/CppunitTest_filter_pict_test.mk b/filter/CppunitTest_filter_pict_test.mk
index fde0f54d8e82..7da6023b3850 100644
--- a/filter/CppunitTest_filter_pict_test.mk
+++ b/filter/CppunitTest_filter_pict_test.mk
@@ -35,10 +35,7 @@ $(eval $(call gb_CppunitTest_use_library_objects,filter_pict_test, \
gie \
))
-$(eval $(call gb_CppunitTest_use_api,filter_pict_test,\
- udkapi \
- offapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,filter_pict_test))
$(eval $(call gb_CppunitTest_use_ure,filter_pict_test))
$(eval $(call gb_CppunitTest_use_vcl,filter_pict_test))
diff --git a/filter/CppunitTest_filter_ppm_test.mk b/filter/CppunitTest_filter_ppm_test.mk
index e7879cad1cc9..5ccbde7df3de 100644
--- a/filter/CppunitTest_filter_ppm_test.mk
+++ b/filter/CppunitTest_filter_ppm_test.mk
@@ -25,10 +25,7 @@ $(eval $(call gb_CppunitTest_use_libraries,filter_ppm_test, \
$(gb_UWINAPI) \
))
-$(eval $(call gb_CppunitTest_use_api,filter_ppm_test,\
- udkapi \
- offapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,filter_ppm_test))
$(eval $(call gb_CppunitTest_use_ure,filter_ppm_test))
$(eval $(call gb_CppunitTest_use_vcl,filter_ppm_test))
diff --git a/filter/CppunitTest_filter_psd_test.mk b/filter/CppunitTest_filter_psd_test.mk
index 2e4b03897f8f..503d1006e4e7 100644
--- a/filter/CppunitTest_filter_psd_test.mk
+++ b/filter/CppunitTest_filter_psd_test.mk
@@ -25,10 +25,7 @@ $(eval $(call gb_CppunitTest_use_libraries,filter_psd_test, \
$(gb_UWINAPI) \
))
-$(eval $(call gb_CppunitTest_use_api,filter_psd_test,\
- udkapi \
- offapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,filter_psd_test))
$(eval $(call gb_CppunitTest_use_ure,filter_psd_test))
$(eval $(call gb_CppunitTest_use_vcl,filter_psd_test))
diff --git a/filter/CppunitTest_filter_ras_test.mk b/filter/CppunitTest_filter_ras_test.mk
index f6e5810b7f39..9265db9857ec 100644
--- a/filter/CppunitTest_filter_ras_test.mk
+++ b/filter/CppunitTest_filter_ras_test.mk
@@ -25,10 +25,7 @@ $(eval $(call gb_CppunitTest_use_libraries,filter_ras_test, \
$(gb_UWINAPI) \
))
-$(eval $(call gb_CppunitTest_use_api,filter_ras_test,\
- udkapi \
- offapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,filter_ras_test))
$(eval $(call gb_CppunitTest_use_ure,filter_ras_test))
$(eval $(call gb_CppunitTest_use_vcl,filter_ras_test))
diff --git a/filter/CppunitTest_filter_tga_test.mk b/filter/CppunitTest_filter_tga_test.mk
index 51f17d3a6124..d62addca5bdd 100644
--- a/filter/CppunitTest_filter_tga_test.mk
+++ b/filter/CppunitTest_filter_tga_test.mk
@@ -25,10 +25,7 @@ $(eval $(call gb_CppunitTest_use_libraries,filter_tga_test, \
$(gb_UWINAPI) \
))
-$(eval $(call gb_CppunitTest_use_api,filter_tga_test,\
- udkapi \
- offapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,filter_tga_test))
$(eval $(call gb_CppunitTest_use_ure,filter_tga_test))
$(eval $(call gb_CppunitTest_use_vcl,filter_tga_test))
diff --git a/filter/CppunitTest_filter_tiff_test.mk b/filter/CppunitTest_filter_tiff_test.mk
index 2aa9b806d499..d3dfdae4a7a5 100644
--- a/filter/CppunitTest_filter_tiff_test.mk
+++ b/filter/CppunitTest_filter_tiff_test.mk
@@ -25,10 +25,7 @@ $(eval $(call gb_CppunitTest_use_libraries,filter_tiff_test, \
$(gb_UWINAPI) \
))
-$(eval $(call gb_CppunitTest_use_api,filter_tiff_test,\
- udkapi \
- offapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,filter_tiff_test))
$(eval $(call gb_CppunitTest_use_ure,filter_tiff_test))
$(eval $(call gb_CppunitTest_use_vcl,filter_tiff_test))
diff --git a/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk b/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk
index f205d80becb0..be1a8046dbb2 100644
--- a/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk
+++ b/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk
@@ -26,10 +26,7 @@ $(eval $(call gb_CppunitTest_use_libraries,hwpfilter_test_hwpfilter, \
$(gb_UWINAPI) \
))
-$(eval $(call gb_CppunitTest_use_api,hwpfilter_test_hwpfilter,\
- offapi \
- udkapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,hwpfilter_test_hwpfilter))
$(eval $(call gb_CppunitTest_use_ure,hwpfilter_test_hwpfilter))
$(eval $(call gb_CppunitTest_use_vcl,hwpfilter_test_hwpfilter))
diff --git a/i18nlangtag/CppunitTest_i18nlangtag_test_languagetag.mk b/i18nlangtag/CppunitTest_i18nlangtag_test_languagetag.mk
index 076f59d51437..41993f9515b2 100644
--- a/i18nlangtag/CppunitTest_i18nlangtag_test_languagetag.mk
+++ b/i18nlangtag/CppunitTest_i18nlangtag_test_languagetag.mk
@@ -11,10 +11,7 @@ $(eval $(call gb_CppunitTest_CppunitTest,i18nlangtag_test_languagetag))
$(eval $(call gb_CppunitTest_use_external,i18nlangtag_test_languagetag,boost_headers))
-$(eval $(call gb_CppunitTest_use_api,i18nlangtag_test_languagetag,\
- udkapi \
- offapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,i18nlangtag_test_languagetag))
$(eval $(call gb_CppunitTest_use_libraries,i18nlangtag_test_languagetag,\
i18nlangtag \
diff --git a/i18npool/CppunitTest_i18npool_test_breakiterator.mk b/i18npool/CppunitTest_i18npool_test_breakiterator.mk
index f264bc3e1744..3c91d25e6dab 100644
--- a/i18npool/CppunitTest_i18npool_test_breakiterator.mk
+++ b/i18npool/CppunitTest_i18npool_test_breakiterator.mk
@@ -11,10 +11,7 @@ $(eval $(call gb_CppunitTest_CppunitTest,i18npool_test_breakiterator))
$(eval $(call gb_CppunitTest_use_external,i18npool_test_breakiterator,icu_headers))
-$(eval $(call gb_CppunitTest_use_api,i18npool_test_breakiterator,\
- udkapi \
- offapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,i18npool_test_breakiterator))
$(eval $(call gb_CppunitTest_use_libraries,i18npool_test_breakiterator,\
cppu \
diff --git a/i18npool/CppunitTest_i18npool_test_characterclassification.mk b/i18npool/CppunitTest_i18npool_test_characterclassification.mk
index 997ed6710b14..be3b1eea60cb 100644
--- a/i18npool/CppunitTest_i18npool_test_characterclassification.mk
+++ b/i18npool/CppunitTest_i18npool_test_characterclassification.mk
@@ -9,10 +9,7 @@
$(eval $(call gb_CppunitTest_CppunitTest,i18npool_test_characterclassification))
-$(eval $(call gb_CppunitTest_use_api,i18npool_test_characterclassification,\
- udkapi \
- offapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,i18npool_test_characterclassification))
$(eval $(call gb_CppunitTest_use_libraries,i18npool_test_characterclassification,\
cppu \
diff --git a/i18npool/CppunitTest_i18npool_test_ordinalsuffix.mk b/i18npool/CppunitTest_i18npool_test_ordinalsuffix.mk
index c9236da6a47c..74d3462174db 100644
--- a/i18npool/CppunitTest_i18npool_test_ordinalsuffix.mk
+++ b/i18npool/CppunitTest_i18npool_test_ordinalsuffix.mk
@@ -9,10 +9,7 @@
$(eval $(call gb_CppunitTest_CppunitTest,i18npool_test_ordinalsuffix))
-$(eval $(call gb_CppunitTest_use_api,i18npool_test_ordinalsuffix,\
- udkapi \
- offapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,i18npool_test_ordinalsuffix))
$(eval $(call gb_CppunitTest_use_libraries,i18npool_test_ordinalsuffix,\
cppu \
diff --git a/i18npool/CppunitTest_i18npool_test_textsearch.mk b/i18npool/CppunitTest_i18npool_test_textsearch.mk
index d6ef88e5c75b..2bca0171bb70 100644
--- a/i18npool/CppunitTest_i18npool_test_textsearch.mk
+++ b/i18npool/CppunitTest_i18npool_test_textsearch.mk
@@ -9,10 +9,7 @@
$(eval $(call gb_CppunitTest_CppunitTest,i18npool_test_textsearch))
-$(eval $(call gb_CppunitTest_use_api,i18npool_test_textsearch,\
- udkapi \
- offapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,i18npool_test_textsearch))
$(eval $(call gb_CppunitTest_use_ure,i18npool_test_textsearch))
diff --git a/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk b/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk
index 74d0a6fb134c..1a2bf5f7a4dd 100644
--- a/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk
+++ b/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk
@@ -26,10 +26,7 @@ $(eval $(call gb_CppunitTest_use_libraries,lotuswordpro_test_lotuswordpro, \
$(gb_UWINAPI) \
))
-$(eval $(call gb_CppunitTest_use_api,lotuswordpro_test_lotuswordpro,\
- offapi \
- udkapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,lotuswordpro_test_lotuswordpro))
$(eval $(call gb_CppunitTest_use_ure,lotuswordpro_test_lotuswordpro))
$(eval $(call gb_CppunitTest_use_vcl,lotuswordpro_test_lotuswordpro))
diff --git a/oox/CppunitTest_oox_tokenmap.mk b/oox/CppunitTest_oox_tokenmap.mk
index 9eac2a544bff..1e903a25a368 100644
--- a/oox/CppunitTest_oox_tokenmap.mk
+++ b/oox/CppunitTest_oox_tokenmap.mk
@@ -16,10 +16,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,oox_tokenmap,\
$(eval $(call gb_CppunitTest_use_custom_headers,oox_tokenmap,oox/generated))
-$(eval $(call gb_CppunitTest_use_api,oox_tokenmap,\
- offapi \
- udkapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,oox_tokenmap))
$(eval $(call gb_CppunitTest_use_library_objects,oox_tokenmap,oox))
diff --git a/oox/CppunitTest_oox_vba_compression.mk b/oox/CppunitTest_oox_vba_compression.mk
index bb87cb4685b2..35d1d1510af2 100644
--- a/oox/CppunitTest_oox_vba_compression.mk
+++ b/oox/CppunitTest_oox_vba_compression.mk
@@ -14,10 +14,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,oox_vba_compression,\
oox/qa/unit/vba_compression \
))
-$(eval $(call gb_CppunitTest_use_api,oox_vba_compression,\
- offapi \
- udkapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,oox_vba_compression))
$(eval $(call gb_CppunitTest_use_libraries,oox_vba_compression,\
basegfx \
diff --git a/oox/CppunitTest_oox_vba_encryption.mk b/oox/CppunitTest_oox_vba_encryption.mk
index 1f8bb5ceb814..1a588830a09e 100644
--- a/oox/CppunitTest_oox_vba_encryption.mk
+++ b/oox/CppunitTest_oox_vba_encryption.mk
@@ -14,10 +14,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,oox_vba_encryption,\
oox/qa/unit/vba_encryption \
))
-$(eval $(call gb_CppunitTest_use_api,oox_vba_encryption,\
- offapi \
- udkapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,oox_vba_encryption))
$(eval $(call gb_CppunitTest_use_libraries,oox_vba_encryption,\
basegfx \
diff --git a/package/CppunitTest_package2_test.mk b/package/CppunitTest_package2_test.mk
index bf4839a780e1..4a9bff5fd853 100644
--- a/package/CppunitTest_package2_test.mk
+++ b/package/CppunitTest_package2_test.mk
@@ -25,10 +25,7 @@ $(eval $(call gb_CppunitTest_use_libraries,package2_test, \
$(gb_UWINAPI) \
))
-$(eval $(call gb_CppunitTest_use_api,package2_test,\
- offapi \
- udkapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,package2_test))
$(eval $(call gb_CppunitTest_use_components,package2_test,\
configmgr/source/configmgr \
diff --git a/sax/CppunitTest_sax.mk b/sax/CppunitTest_sax.mk
index 951386b9e1c4..d3108d59af9f 100644
--- a/sax/CppunitTest_sax.mk
+++ b/sax/CppunitTest_sax.mk
@@ -9,10 +9,7 @@
$(eval $(call gb_CppunitTest_CppunitTest,sax))
-$(eval $(call gb_CppunitTest_use_api,sax,\
- offapi \
- udkapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,sax))
$(eval $(call gb_CppunitTest_use_external,sax,boost_headers))
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 \
diff --git a/sccomp/CppunitTest_sccomp_lpsolver.mk b/sccomp/CppunitTest_sccomp_lpsolver.mk
index 5c89fb27d7bb..c86cd22ffe39 100644
--- a/sccomp/CppunitTest_sccomp_lpsolver.mk
+++ b/sccomp/CppunitTest_sccomp_lpsolver.mk
@@ -35,10 +35,7 @@ $(eval $(call gb_CppunitTest_set_include,sccomp_lpsolver,\
))
-$(eval $(call gb_CppunitTest_use_api,sccomp_lpsolver,\
- offapi \
- udkapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,sccomp_lpsolver))
$(eval $(call gb_CppunitTest_use_ure,sccomp_lpsolver))
$(eval $(call gb_CppunitTest_use_vcl,sccomp_lpsolver))
diff --git a/sd/CppunitTest_sd_export_tests.mk b/sd/CppunitTest_sd_export_tests.mk
index 5e5bafd99055..dc0573eb07d0 100644
--- a/sd/CppunitTest_sd_export_tests.mk
+++ b/sd/CppunitTest_sd_export_tests.mk
@@ -60,10 +60,7 @@ $(eval $(call gb_CppunitTest_set_include,sd_export_tests,\
$$(INCLUDE) \
))
-$(eval $(call gb_CppunitTest_use_api,sd_export_tests,\
- offapi \
- udkapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,sd_export_tests))
$(eval $(call gb_CppunitTest_use_ure,sd_export_tests))
$(eval $(call gb_CppunitTest_use_vcl,sd_export_tests))
diff --git a/sd/CppunitTest_sd_filters_test.mk b/sd/CppunitTest_sd_filters_test.mk
index 083108032cbb..0387424e8a58 100644
--- a/sd/CppunitTest_sd_filters_test.mk
+++ b/sd/CppunitTest_sd_filters_test.mk
@@ -61,10 +61,7 @@ $(eval $(call gb_CppunitTest_set_include,sd_filters_test,\
$$(INCLUDE) \
))
-$(eval $(call gb_CppunitTest_use_api,sd_filters_test,\
- offapi \
- udkapi \
-))
+$(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))
diff --git a/sd/CppunitTest_sd_html_export_tests.mk b/sd/CppunitTest_sd_html_export_tests.mk
index 02908d8c7ac7..c527a6cabd90 100644
--- a/sd/CppunitTest_sd_html_export_tests.mk
+++ b/sd/CppunitTest_sd_html_export_tests.mk
@@ -59,10 +59,7 @@ $(eval $(call gb_CppunitTest_set_include,sd_html_export_tests,\
$$(INCLUDE) \
))
-$(eval $(call gb_CppunitTest_use_api,sd_html_export_tests,\
- offapi \
- udkapi \
-))
+$(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))
diff --git a/sd/CppunitTest_sd_import_tests.mk b/sd/CppunitTest_sd_import_tests.mk
index 33a7ad28d463..a2a295651132 100644
--- a/sd/CppunitTest_sd_import_tests.mk
+++ b/sd/CppunitTest_sd_import_tests.mk
@@ -57,10 +57,7 @@ $(eval $(call gb_CppunitTest_set_include,sd_import_tests,\
$$(INCLUDE) \
))
-$(eval $(call gb_CppunitTest_use_api,sd_import_tests,\
- offapi \
- udkapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,sd_import_tests))
$(eval $(call gb_CppunitTest_use_ure,sd_import_tests))
$(eval $(call gb_CppunitTest_use_vcl,sd_import_tests))
diff --git a/sd/CppunitTest_sd_misc_tests.mk b/sd/CppunitTest_sd_misc_tests.mk
index f95801ca7550..8c9cfa631c3c 100644
--- a/sd/CppunitTest_sd_misc_tests.mk
+++ b/sd/CppunitTest_sd_misc_tests.mk
@@ -62,10 +62,7 @@ $(eval $(call gb_CppunitTest_set_include,sd_misc_tests,\
$$(INCLUDE) \
))
-$(eval $(call gb_CppunitTest_use_api,sd_misc_tests,\
- offapi \
- udkapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,sd_misc_tests))
$(eval $(call gb_CppunitTest_use_externals,sd_misc_tests,\
boost_headers \
diff --git a/sd/CppunitTest_sd_svg_export_tests.mk b/sd/CppunitTest_sd_svg_export_tests.mk
index 36f64ea6f8a1..0221ab0e07b6 100644
--- a/sd/CppunitTest_sd_svg_export_tests.mk
+++ b/sd/CppunitTest_sd_svg_export_tests.mk
@@ -59,10 +59,7 @@ $(eval $(call gb_CppunitTest_set_include,sd_svg_export_tests,\
$$(INCLUDE) \
))
-$(eval $(call gb_CppunitTest_use_api,sd_svg_export_tests,\
- offapi \
- udkapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,sd_svg_export_tests))
$(eval $(call gb_CppunitTest_use_ure,sd_svg_export_tests))
$(eval $(call gb_CppunitTest_use_vcl,sd_svg_export_tests))
diff --git a/sd/CppunitTest_sd_tiledrendering.mk b/sd/CppunitTest_sd_tiledrendering.mk
index 2a3f29ce5957..60790c4fa19a 100644
--- a/sd/CppunitTest_sd_tiledrendering.mk
+++ b/sd/CppunitTest_sd_tiledrendering.mk
@@ -46,10 +46,7 @@ $(eval $(call gb_CppunitTest_set_include,sd_tiledrendering,\
$$(INCLUDE) \
))
-$(eval $(call gb_CppunitTest_use_api,sd_tiledrendering,\
- offapi \
- udkapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,sd_tiledrendering))
$(eval $(call gb_CppunitTest_use_ure,sd_tiledrendering))
$(eval $(call gb_CppunitTest_use_vcl,sd_tiledrendering))
diff --git a/sd/CppunitTest_sd_uimpress.mk b/sd/CppunitTest_sd_uimpress.mk
index 78e9f908a7cf..b17e71c81e43 100644
--- a/sd/CppunitTest_sd_uimpress.mk
+++ b/sd/CppunitTest_sd_uimpress.mk
@@ -14,10 +14,7 @@ $(eval $(call gb_CppunitTest_set_include,sd_uimpress,\
-I$(SRCDIR)/sd/inc \
))
-$(eval $(call gb_CppunitTest_use_api,sd_uimpress,\
- offapi \
- udkapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,sd_uimpress))
$(eval $(call gb_CppunitTest_use_library_objects,sd_uimpress,sd))
diff --git a/sdext/CppunitTest_sdext_pdfimport.mk b/sdext/CppunitTest_sdext_pdfimport.mk
index d218b361654b..2642786e0385 100644
--- a/sdext/CppunitTest_sdext_pdfimport.mk
+++ b/sdext/CppunitTest_sdext_pdfimport.mk
@@ -9,10 +9,7 @@
$(eval $(call gb_CppunitTest_CppunitTest,sdext_pdfimport))
-$(eval $(call gb_CppunitTest_use_api,sdext_pdfimport,\
- offapi \
- udkapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,sdext_pdfimport))
$(eval $(call gb_CppunitTest_set_include,sdext_pdfimport,\
-I$(SRCDIR)/sdext/source/pdfimport/inc \
diff --git a/slideshow/CppunitTest_slideshow.mk b/slideshow/CppunitTest_slideshow.mk
index c95793003f6c..8200eb601c5b 100644
--- a/slideshow/CppunitTest_slideshow.mk
+++ b/slideshow/CppunitTest_slideshow.mk
@@ -27,10 +27,7 @@ $(eval $(call gb_CppunitTest_set_defs,slideshow,\
))
endif
-$(eval $(call gb_CppunitTest_use_api,slideshow,\
- offapi \
- udkapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,slideshow))
$(eval $(call gb_CppunitTest_use_library_objects,slideshow,slideshow))
diff --git a/smoketest/CppunitTest_smoketest.mk b/smoketest/CppunitTest_smoketest.mk
index d245290cc6a6..0a062ffa7c6f 100644
--- a/smoketest/CppunitTest_smoketest.mk
+++ b/smoketest/CppunitTest_smoketest.mk
@@ -16,10 +16,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,smoketest,\
$(eval $(call gb_CppunitTest_use_external,smoketest,boost_headers))
-$(eval $(call gb_CppunitTest_use_api,smoketest,\
- offapi \
- udkapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,smoketest))
$(eval $(call gb_CppunitTest_use_libraries,smoketest,\
cppu \
diff --git a/sot/CppunitTest_sot_test_sot.mk b/sot/CppunitTest_sot_test_sot.mk
index b72fe295b6c1..c2e26e7b40fa 100644
--- a/sot/CppunitTest_sot_test_sot.mk
+++ b/sot/CppunitTest_sot_test_sot.mk
@@ -26,10 +26,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sot_test_sot, \
$(gb_UWINAPI) \
))
-$(eval $(call gb_CppunitTest_use_api,sot_test_sot,\
- offapi \
- udkapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,sot_test_sot,))
$(eval $(call gb_CppunitTest_use_ure,sot_test_sot))
diff --git a/starmath/CppunitTest_starmath_import.mk b/starmath/CppunitTest_starmath_import.mk
index 17a9f716f500..b981be0cc388 100644
--- a/starmath/CppunitTest_starmath_import.mk
+++ b/starmath/CppunitTest_starmath_import.mk
@@ -16,10 +16,7 @@ $(eval $(call gb_CppunitTest_set_include,starmath_import,\
$(eval $(call gb_CppunitTest_use_external,starmath_import,boost_headers))
-$(eval $(call gb_CppunitTest_use_api,starmath_import,\
- offapi \
- udkapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,starmath_import))
$(eval $(call gb_CppunitTest_add_exception_objects,starmath_import,\
starmath/qa/extras/mmlimport-test \
diff --git a/starmath/CppunitTest_starmath_qa_cppunit.mk b/starmath/CppunitTest_starmath_qa_cppunit.mk
index efaa7b39aeff..88e14b71782d 100644
--- a/starmath/CppunitTest_starmath_qa_cppunit.mk
+++ b/starmath/CppunitTest_starmath_qa_cppunit.mk
@@ -16,10 +16,7 @@ $(eval $(call gb_CppunitTest_set_include,starmath_qa_cppunit,\
$(eval $(call gb_CppunitTest_use_external,starmath_qa_cppunit,boost_headers))
-$(eval $(call gb_CppunitTest_use_api,starmath_qa_cppunit,\
- offapi \
- udkapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,starmath_qa_cppunit))
$(eval $(call gb_CppunitTest_use_library_objects,starmath_qa_cppunit,\
sm \
diff --git a/svgio/CppunitTest_svgio.mk b/svgio/CppunitTest_svgio.mk
index 66b69d86147d..51948b23a746 100644
--- a/svgio/CppunitTest_svgio.mk
+++ b/svgio/CppunitTest_svgio.mk
@@ -21,10 +21,7 @@ $(eval $(call gb_CppunitTest_use_externals,svgio,\
libxml2 \
))
-$(eval $(call gb_CppunitTest_use_api,svgio,\
- offapi \
- udkapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,svgio))
$(eval $(call gb_CppunitTest_use_library_objects,svgio,\
svgio \
diff --git a/svl/CppunitTest_svl_itempool.mk b/svl/CppunitTest_svl_itempool.mk
index 4b594989f855..63745dd4312a 100644
--- a/svl/CppunitTest_svl_itempool.mk
+++ b/svl/CppunitTest_svl_itempool.mk
@@ -11,10 +11,7 @@ $(eval $(call gb_CppunitTest_CppunitTest,svl_itempool))
$(eval $(call gb_CppunitTest_use_external,svl_itempool,boost_headers))
-$(eval $(call gb_CppunitTest_use_api,svl_itempool, \
- offapi \
- udkapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,svl_itempool))
$(eval $(call gb_CppunitTest_add_exception_objects,svl_itempool, \
svl/qa/unit/items/test_itempool \
diff --git a/svl/CppunitTest_svl_items.mk b/svl/CppunitTest_svl_items.mk
index 501c91ae14f7..c8e5e0699635 100644
--- a/svl/CppunitTest_svl_items.mk
+++ b/svl/CppunitTest_svl_items.mk
@@ -11,10 +11,7 @@ $(eval $(call gb_CppunitTest_CppunitTest,svl_items))
$(eval $(call gb_CppunitTest_use_external,svl_items,boost_headers))
-$(eval $(call gb_CppunitTest_use_api,svl_items, \
- offapi \
- udkapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,svl_items))
$(eval $(call gb_CppunitTest_add_exception_objects,svl_items, \
svl/qa/unit/items/test_IndexedStyleSheets \
diff --git a/svl/CppunitTest_svl_notify.mk b/svl/CppunitTest_svl_notify.mk
index ff1dbe7cfb8c..201a9cf22cdf 100644
--- a/svl/CppunitTest_svl_notify.mk
+++ b/svl/CppunitTest_svl_notify.mk
@@ -11,10 +11,7 @@ $(eval $(call gb_CppunitTest_CppunitTest,svl_notify))
$(eval $(call gb_CppunitTest_use_external,svl_notify,boost_headers))
-$(eval $(call gb_CppunitTest_use_api,svl_notify, \
- offapi \
- udkapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,svl_notify))
$(eval $(call gb_CppunitTest_add_exception_objects,svl_notify, \
svl/qa/unit/notify/test_SfxBroadcaster \
diff --git a/svl/CppunitTest_svl_qa_cppunit.mk b/svl/CppunitTest_svl_qa_cppunit.mk
index f5cd6f718750..65be44e40b6f 100644
--- a/svl/CppunitTest_svl_qa_cppunit.mk
+++ b/svl/CppunitTest_svl_qa_cppunit.mk
@@ -18,10 +18,7 @@
$(eval $(call gb_CppunitTest_CppunitTest,svl_qa_cppunit))
-$(eval $(call gb_CppunitTest_use_api,svl_qa_cppunit, \
- offapi \
- udkapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,svl_qa_cppunit))
$(eval $(call gb_CppunitTest_use_externals,svl_qa_cppunit, \
boost_headers \
diff --git a/svl/CppunitTest_svl_urihelper.mk b/svl/CppunitTest_svl_urihelper.mk
index 7b0f5ee90660..d7e10fc0aa56 100644
--- a/svl/CppunitTest_svl_urihelper.mk
+++ b/svl/CppunitTest_svl_urihelper.mk
@@ -11,10 +11,7 @@ $(eval $(call gb_CppunitTest_CppunitTest,svl_urihelper))
$(eval $(call gb_CppunitTest_use_external,svl_urihelper,boost_headers))
-$(eval $(call gb_CppunitTest_use_api,svl_urihelper, \
- offapi \
- udkapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,svl_urihelper))
$(eval $(call gb_CppunitTest_use_components,svl_urihelper, \
ucb/source/core/ucb1 \
diff --git a/svtools/CppunitTest_svtools_graphic.mk b/svtools/CppunitTest_svtools_graphic.mk
index 6036afbba01e..9636c7dc33c7 100644
--- a/svtools/CppunitTest_svtools_graphic.mk
+++ b/svtools/CppunitTest_svtools_graphic.mk
@@ -14,10 +14,7 @@ $(eval $(call gb_CppunitTest_use_externals,svtools_graphic,\
libxml2 \
))
-$(eval $(call gb_CppunitTest_use_api,svtools_graphic, \
- offapi \
- udkapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,svtools_graphic))
$(eval $(call gb_CppunitTest_use_ure,svtools_graphic))
diff --git a/svtools/CppunitTest_svtools_html.mk b/svtools/CppunitTest_svtools_html.mk
index e436b6d0895f..ebc6e3b6d30d 100644
--- a/svtools/CppunitTest_svtools_html.mk
+++ b/svtools/CppunitTest_svtools_html.mk
@@ -11,10 +11,7 @@ $(eval $(call gb_CppunitTest_CppunitTest,svtools_html))
$(eval $(call gb_CppunitTest_use_external,svtools_html,boost_headers))
-$(eval $(call gb_CppunitTest_use_api,svtools_html, \
- offapi \
- udkapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,svtools_html))
$(eval $(call gb_CppunitTest_add_exception_objects,svtools_html, \
svtools/qa/unit/testHtmlWriter \
diff --git a/svx/CppunitTest_svx_unit.mk b/svx/CppunitTest_svx_unit.mk
index 82d9cd48a4b2..0e9fea3591a4 100644
--- a/svx/CppunitTest_svx_unit.mk
+++ b/svx/CppunitTest_svx_unit.mk
@@ -11,10 +11,7 @@ $(eval $(call gb_CppunitTest_CppunitTest,svx_unit))
$(eval $(call gb_CppunitTest_use_external,svx_unit,boost_headers))
-$(eval $(call gb_CppunitTest_use_api,svx_unit, \
- offapi \
- udkapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,svx_unit))
$(eval $(call gb_CppunitTest_set_include,svx_unit,\
$$(INCLUDE) \
diff --git a/sw/CppunitTest_sw_docbookexport.mk b/sw/CppunitTest_sw_docbookexport.mk
index 9bed3e131169..f8e080a1de74 100644
--- a/sw/CppunitTest_sw_docbookexport.mk
+++ b/sw/CppunitTest_sw_docbookexport.mk
@@ -43,10 +43,7 @@ $(eval $(call gb_CppunitTest_set_include,sw_docbookexport,\
$$(INCLUDE) \
))
-$(eval $(call gb_CppunitTest_use_api,sw_docbookexport,\
- offapi \
- udkapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,sw_docbookexport))
$(eval $(call gb_CppunitTest_use_ure,sw_docbookexport))
$(eval $(call gb_CppunitTest_use_vcl,sw_docbookexport))
diff --git a/sw/CppunitTest_sw_filters_test.mk b/sw/CppunitTest_sw_filters_test.mk
index 80d9fce30b02..d3cf68be3ec1 100644
--- a/sw/CppunitTest_sw_filters_test.mk
+++ b/sw/CppunitTest_sw_filters_test.mk
@@ -45,10 +45,7 @@ $(eval $(call gb_CppunitTest_set_include,sw_filters_test,\
$$(INCLUDE) \
))
-$(eval $(call gb_CppunitTest_use_api,sw_filters_test,\
- offapi \
- udkapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,sw_filters_test))
$(eval $(call gb_CppunitTest_use_ure,sw_filters_test))
$(eval $(call gb_CppunitTest_use_vcl,sw_filters_test))
diff --git a/sw/CppunitTest_sw_globalfilter.mk b/sw/CppunitTest_sw_globalfilter.mk
index 8c48b4961c25..cb12badd22e4 100644
--- a/sw/CppunitTest_sw_globalfilter.mk
+++ b/sw/CppunitTest_sw_globalfilter.mk
@@ -42,10 +42,7 @@ $(eval $(call gb_CppunitTest_set_include,sw_globalfilter,\
$$(INCLUDE) \
))
-$(eval $(call gb_CppunitTest_use_api,sw_globalfilter,\
- offapi \
- udkapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,sw_globalfilter))
$(eval $(call gb_CppunitTest_use_ure,sw_globalfilter))
$(eval $(call gb_CppunitTest_use_vcl,sw_globalfilter))
diff --git a/sw/CppunitTest_sw_htmlexport.mk b/sw/CppunitTest_sw_htmlexport.mk
index 6d8b9fd01e0d..a0dc5c118f43 100644
--- a/sw/CppunitTest_sw_htmlexport.mk
+++ b/sw/CppunitTest_sw_htmlexport.mk
@@ -43,10 +43,7 @@ $(eval $(call gb_CppunitTest_set_include,sw_htmlexport,\
$$(INCLUDE) \
))
-$(eval $(call gb_CppunitTest_use_api,sw_htmlexport,\
- offapi \
- udkapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,sw_htmlexport))
$(eval $(call gb_CppunitTest_use_ure,sw_htmlexport))
$(eval $(call gb_CppunitTest_use_vcl,sw_htmlexport))
diff --git a/sw/CppunitTest_sw_mailmerge.mk b/sw/CppunitTest_sw_mailmerge.mk
index d948b892c761..131fc81094a9 100644
--- a/sw/CppunitTest_sw_mailmerge.mk
+++ b/sw/CppunitTest_sw_mailmerge.mk
@@ -30,10 +30,7 @@ $(eval $(call gb_CppunitTest_use_externals,sw_mailmerge, \
libxml2 \
))
-$(eval $(call gb_CppunitTest_use_api,sw_mailmerge,\
- offapi \
- udkapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,sw_mailmerge))
$(eval $(call gb_CppunitTest_use_components,sw_mailmerge, \
basic/util/sb \
diff --git a/sw/CppunitTest_sw_odfexport.mk b/sw/CppunitTest_sw_odfexport.mk
index 3757e015ec19..3dae6ac59fa8 100644
--- a/sw/CppunitTest_sw_odfexport.mk
+++ b/sw/CppunitTest_sw_odfexport.mk
@@ -41,10 +41,7 @@ $(eval $(call gb_CppunitTest_set_include,sw_odfexport,\
$$(INCLUDE) \
))
-$(eval $(call gb_CppunitTest_use_api,sw_odfexport,\
- offapi \
- udkapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,sw_odfexport))
$(eval $(call gb_CppunitTest_use_ure,sw_odfexport))
$(eval $(call gb_CppunitTest_use_vcl,sw_odfexport))
diff --git a/sw/CppunitTest_sw_odfimport.mk b/sw/CppunitTest_sw_odfimport.mk
index eaa3542993d4..4c249d5d6168 100644
--- a/sw/CppunitTest_sw_odfimport.mk
+++ b/sw/CppunitTest_sw_odfimport.mk
@@ -43,10 +43,7 @@ $(eval $(call gb_CppunitTest_set_include,sw_odfimport,\
$$(INCLUDE) \
))
-$(eval $(call gb_CppunitTest_use_api,sw_odfimport,\
- offapi \
- udkapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,sw_odfimport))
$(eval $(call gb_CppunitTest_use_ure,sw_odfimport))
$(eval $(call gb_CppunitTest_use_vcl,sw_odfimport))
diff --git a/sw/CppunitTest_sw_ooxmlfieldexport.mk b/sw/CppunitTest_sw_ooxmlfieldexport.mk
index ae67c2087438..abd0653f6449 100644
--- a/sw/CppunitTest_sw_ooxmlfieldexport.mk
+++ b/sw/CppunitTest_sw_ooxmlfieldexport.mk
@@ -33,10 +33,7 @@ $(eval $(call gb_CppunitTest_set_include,sw_ooxmlfieldexport,\
$$(INCLUDE) \
))
-$(eval $(call gb_CppunitTest_use_api,sw_ooxmlfieldexport,\
- offapi \
- udkapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,sw_ooxmlfieldexport))
$(eval $(call gb_CppunitTest_use_ure,sw_ooxmlfieldexport))
$(eval $(call gb_CppunitTest_use_vcl,sw_ooxmlfieldexport))
diff --git a/sw/CppunitTest_sw_ooxmlimport.mk b/sw/CppunitTest_sw_ooxmlimport.mk
index dbcead9598c3..05da70bfacff 100644
--- a/sw/CppunitTest_sw_ooxmlimport.mk
+++ b/sw/CppunitTest_sw_ooxmlimport.mk
@@ -55,10 +55,7 @@ $(eval $(call gb_CppunitTest_use_system_darwin_frameworks,sw_ooxmlimport,\
endif
-$(eval $(call gb_CppunitTest_use_api,sw_ooxmlimport,\
- offapi \
- udkapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,sw_ooxmlimport))
$(eval $(call gb_CppunitTest_use_ure,sw_ooxmlimport))
$(eval $(call gb_CppunitTest_use_vcl,sw_ooxmlimport))
diff --git a/sw/CppunitTest_sw_ooxmlw14export.mk b/sw/CppunitTest_sw_ooxmlw14export.mk
index 5958019b8820..d54d3c12ca17 100644
--- a/sw/CppunitTest_sw_ooxmlw14export.mk
+++ b/sw/CppunitTest_sw_ooxmlw14export.mk
@@ -33,10 +33,7 @@ $(eval $(call gb_CppunitTest_set_include,sw_ooxmlw14export,\
$$(INCLUDE) \
))
-$(eval $(call gb_CppunitTest_use_api,sw_ooxmlw14export,\
- offapi \
- udkapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,sw_ooxmlw14export))
$(eval $(call gb_CppunitTest_use_ure,sw_ooxmlw14export))
$(eval $(call gb_CppunitTest_use_vcl,sw_ooxmlw14export))
diff --git a/sw/CppunitTest_sw_rtfexport.mk b/sw/CppunitTest_sw_rtfexport.mk
index b47c9068a705..9e05e6fa3bfa 100644
--- a/sw/CppunitTest_sw_rtfexport.mk
+++ b/sw/CppunitTest_sw_rtfexport.mk
@@ -40,10 +40,7 @@ $(eval $(call gb_CppunitTest_set_include,sw_rtfexport,\
$$(INCLUDE) \
))
-$(eval $(call gb_CppunitTest_use_api,sw_rtfexport,\
- offapi \
- udkapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,sw_rtfexport))
$(eval $(call gb_CppunitTest_use_ure,sw_rtfexport))
$(eval $(call gb_CppunitTest_use_vcl,sw_rtfexport))
diff --git a/sw/CppunitTest_sw_rtfimport.mk b/sw/CppunitTest_sw_rtfimport.mk
index 3eafcea38e58..537a211d93ad 100644
--- a/sw/CppunitTest_sw_rtfimport.mk
+++ b/sw/CppunitTest_sw_rtfimport.mk
@@ -42,10 +42,7 @@ $(eval $(call gb_CppunitTest_set_include,sw_rtfimport,\
$$(INCLUDE) \
))
-$(eval $(call gb_CppunitTest_use_api,sw_rtfimport,\
- offapi \
- udkapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,sw_rtfimport))
$(eval $(call gb_CppunitTest_use_ure,sw_rtfimport))
$(eval $(call gb_CppunitTest_use_vcl,sw_rtfimport))
diff --git a/sw/CppunitTest_sw_tiledrendering.mk b/sw/CppunitTest_sw_tiledrendering.mk
index be7986b6e509..250609721e5c 100644
--- a/sw/CppunitTest_sw_tiledrendering.mk
+++ b/sw/CppunitTest_sw_tiledrendering.mk
@@ -47,10 +47,7 @@ $(eval $(call gb_CppunitTest_set_include,sw_tiledrendering,\
$$(INCLUDE) \
))
-$(eval $(call gb_CppunitTest_use_api,sw_tiledrendering,\
- offapi \
- udkapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,sw_tiledrendering))
$(eval $(call gb_CppunitTest_use_ure,sw_tiledrendering))
$(eval $(call gb_CppunitTest_use_vcl,sw_tiledrendering))
diff --git a/sw/CppunitTest_sw_uiwriter.mk b/sw/CppunitTest_sw_uiwriter.mk
index a0b7a5844d3b..e048fae7e2c9 100644
--- a/sw/CppunitTest_sw_uiwriter.mk
+++ b/sw/CppunitTest_sw_uiwriter.mk
@@ -50,10 +50,7 @@ $(eval $(call gb_CppunitTest_set_include,sw_uiwriter,\
$$(INCLUDE) \
))
-$(eval $(call gb_CppunitTest_use_api,sw_uiwriter,\
- offapi \
- udkapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,sw_uiwriter))
$(eval $(call gb_CppunitTest_use_ure,sw_uiwriter))
$(eval $(call gb_CppunitTest_use_vcl,sw_uiwriter))
diff --git a/sw/CppunitTest_sw_uwriter.mk b/sw/CppunitTest_sw_uwriter.mk
index f690515bef08..465aac53c3d4 100644
--- a/sw/CppunitTest_sw_uwriter.mk
+++ b/sw/CppunitTest_sw_uwriter.mk
@@ -70,10 +70,7 @@ $(eval $(call gb_CppunitTest_set_include,sw_uwriter,\
$$(INCLUDE) \
))
-$(eval $(call gb_CppunitTest_use_api,sw_uwriter,\
- offapi \
- udkapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,sw_uwriter))
$(eval $(call gb_CppunitTest_use_ure,sw_uwriter))
$(eval $(call gb_CppunitTest_use_vcl,sw_uwriter))
diff --git a/sw/CppunitTest_sw_ww8export.mk b/sw/CppunitTest_sw_ww8export.mk
index fc1ef6b7ee7e..fa0f33e9b2a7 100644
--- a/sw/CppunitTest_sw_ww8export.mk
+++ b/sw/CppunitTest_sw_ww8export.mk
@@ -44,10 +44,7 @@ $(eval $(call gb_CppunitTest_set_include,sw_ww8export,\
$$(INCLUDE) \
))
-$(eval $(call gb_CppunitTest_use_api,sw_ww8export,\
- offapi \
- udkapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,sw_ww8export))
$(eval $(call gb_CppunitTest_use_ure,sw_ww8export))
$(eval $(call gb_CppunitTest_use_vcl,sw_ww8export))
diff --git a/sw/CppunitTest_sw_ww8import.mk b/sw/CppunitTest_sw_ww8import.mk
index ed28ae9d641c..21d9a74aa930 100644
--- a/sw/CppunitTest_sw_ww8import.mk
+++ b/sw/CppunitTest_sw_ww8import.mk
@@ -39,10 +39,7 @@ $(eval $(call gb_CppunitTest_set_include,sw_ww8import,\
$$(INCLUDE) \
))
-$(eval $(call gb_CppunitTest_use_api,sw_ww8import,\
- offapi \
- udkapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,sw_ww8import))
$(eval $(call gb_CppunitTest_use_ure,sw_ww8import))
$(eval $(call gb_CppunitTest_use_vcl,sw_ww8import))
diff --git a/sw/ooxmlexport_setup.mk b/sw/ooxmlexport_setup.mk
index 84a9d0dc3588..da06f1a37bf0 100644
--- a/sw/ooxmlexport_setup.mk
+++ b/sw/ooxmlexport_setup.mk
@@ -101,10 +101,7 @@ $(eval $(call gb_CppunitTest_set_include,sw_ooxmlexport$(1),\
$$(INCLUDE) \
))
-$(eval $(call gb_CppunitTest_use_api,sw_ooxmlexport$(1),\
- offapi \
- udkapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,sw_ooxmlexport$(1),))
$(eval $(call gb_CppunitTest_use_ure,sw_ooxmlexport$(1)))
$(eval $(call gb_CppunitTest_use_vcl,sw_ooxmlexport$(1)))
diff --git a/tools/CppunitTest_tools_test.mk b/tools/CppunitTest_tools_test.mk
index fd8b2b4721d5..e90b52457244 100644
--- a/tools/CppunitTest_tools_test.mk
+++ b/tools/CppunitTest_tools_test.mk
@@ -25,10 +25,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,tools_test, \
tools/qa/cppunit/test_rectangle \
))
-$(eval $(call gb_CppunitTest_use_api,tools_test, \
- udkapi \
- offapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,tools_test))
$(eval $(call gb_CppunitTest_use_libraries,tools_test, \
sal \
diff --git a/ucb/CppunitTest_ucb_webdav_local_neon.mk b/ucb/CppunitTest_ucb_webdav_local_neon.mk
index 20e827b6868a..df16e36409bd 100644
--- a/ucb/CppunitTest_ucb_webdav_local_neon.mk
+++ b/ucb/CppunitTest_ucb_webdav_local_neon.mk
@@ -11,10 +11,7 @@
$(eval $(call gb_CppunitTest_CppunitTest,ucb_webdav_local_neon))
-$(eval $(call gb_CppunitTest_use_api,ucb_webdav_local_neon, \
- offapi \
- udkapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,ucb_webdav_local_neon))
$(eval $(call gb_CppunitTest_use_libraries,ucb_webdav_local_neon, \
comphelper \
diff --git a/unotools/CppunitTest_unotools_fontdefs.mk b/unotools/CppunitTest_unotools_fontdefs.mk
index c96385c22fb8..38e51b03bed4 100644
--- a/unotools/CppunitTest_unotools_fontdefs.mk
+++ b/unotools/CppunitTest_unotools_fontdefs.mk
@@ -11,10 +11,7 @@ $(eval $(call gb_CppunitTest_CppunitTest,unotools_fontdefs))
$(eval $(call gb_CppunitTest_use_external,unotools_fontdefs,boost_headers))
-$(eval $(call gb_CppunitTest_use_api,unotools_fontdefs, \
- offapi \
- udkapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,unotools_fontdefs))
$(eval $(call gb_CppunitTest_add_exception_objects,unotools_fontdefs, \
unotools/qa/unit/testGetEnglishSearchName \
diff --git a/unoxml/CppunitTest_unoxml_domtest.mk b/unoxml/CppunitTest_unoxml_domtest.mk
index 127a76776ef4..530624b0cb41 100644
--- a/unoxml/CppunitTest_unoxml_domtest.mk
+++ b/unoxml/CppunitTest_unoxml_domtest.mk
@@ -13,10 +13,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,unoxml_domtest, \
unoxml/qa/unit/domtest \
))
-$(eval $(call gb_CppunitTest_use_api,unoxml_domtest,\
- offapi \
- udkapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,unoxml_domtest))
$(eval $(call gb_CppunitTest_use_components,unoxml_domtest,\
configmgr/source/configmgr \
diff --git a/vcl/CppunitTest_vcl_bitmap_test.mk b/vcl/CppunitTest_vcl_bitmap_test.mk
index 110418126298..514a8463c1ea 100644
--- a/vcl/CppunitTest_vcl_bitmap_test.mk
+++ b/vcl/CppunitTest_vcl_bitmap_test.mk
@@ -42,10 +42,7 @@ $(eval $(call gb_CppunitTest_use_libraries,vcl_bitmap_test, \
$(gb_UWINAPI) \
))
-$(eval $(call gb_CppunitTest_use_api,vcl_bitmap_test,\
- udkapi \
- offapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,vcl_bitmap_test))
$(eval $(call gb_CppunitTest_use_ure,vcl_bitmap_test))
$(eval $(call gb_CppunitTest_use_vcl,vcl_bitmap_test))
diff --git a/vcl/CppunitTest_vcl_blocklistparser_test.mk b/vcl/CppunitTest_vcl_blocklistparser_test.mk
index 95b75076b32b..8cc3adde8c9d 100644
--- a/vcl/CppunitTest_vcl_blocklistparser_test.mk
+++ b/vcl/CppunitTest_vcl_blocklistparser_test.mk
@@ -30,10 +30,7 @@ $(eval $(call gb_CppunitTest_use_libraries,vcl_blocklistparser_test, \
$(gb_UWINAPI) \
))
-$(eval $(call gb_CppunitTest_use_api,vcl_blocklistparser_test,\
- udkapi \
- offapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,vcl_blocklistparser_test))
$(eval $(call gb_CppunitTest_use_ure,vcl_blocklistparser_test))
$(eval $(call gb_CppunitTest_use_vcl,vcl_blocklistparser_test))
diff --git a/vcl/CppunitTest_vcl_complextext.mk b/vcl/CppunitTest_vcl_complextext.mk
index 60011a541a9e..0e5b5093a899 100644
--- a/vcl/CppunitTest_vcl_complextext.mk
+++ b/vcl/CppunitTest_vcl_complextext.mk
@@ -34,10 +34,7 @@ $(eval $(call gb_CppunitTest_use_libraries,vcl_complextext, \
$(gb_UWINAPI) \
))
-$(eval $(call gb_CppunitTest_use_api,vcl_complextext,\
- udkapi \
- offapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,vcl_complextext))
$(eval $(call gb_CppunitTest_use_ure,vcl_complextext))
$(eval $(call gb_CppunitTest_use_vcl,vcl_complextext))
diff --git a/vcl/CppunitTest_vcl_filters_test.mk b/vcl/CppunitTest_vcl_filters_test.mk
index 1f498ebe13b5..e1c30dfd5542 100644
--- a/vcl/CppunitTest_vcl_filters_test.mk
+++ b/vcl/CppunitTest_vcl_filters_test.mk
@@ -34,10 +34,7 @@ $(eval $(call gb_CppunitTest_use_libraries,vcl_filters_test, \
$(gb_UWINAPI) \
))
-$(eval $(call gb_CppunitTest_use_api,vcl_filters_test,\
- udkapi \
- offapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,vcl_filters_test))
$(eval $(call gb_CppunitTest_use_ure,vcl_filters_test))
$(eval $(call gb_CppunitTest_use_vcl,vcl_filters_test))
diff --git a/vcl/CppunitTest_vcl_font.mk b/vcl/CppunitTest_vcl_font.mk
index 910f540cbd7e..55560bd7c85d 100644
--- a/vcl/CppunitTest_vcl_font.mk
+++ b/vcl/CppunitTest_vcl_font.mk
@@ -34,10 +34,7 @@ $(eval $(call gb_CppunitTest_use_libraries,vcl_font, \
$(gb_UWINAPI) \
))
-$(eval $(call gb_CppunitTest_use_api,vcl_font,\
- udkapi \
- offapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,vcl_font))
$(eval $(call gb_CppunitTest_use_ure,vcl_font))
$(eval $(call gb_CppunitTest_use_vcl,vcl_font))
diff --git a/vcl/CppunitTest_vcl_fontcharmap.mk b/vcl/CppunitTest_vcl_fontcharmap.mk
index 0a89f411a2e0..46cb1175bbfe 100644
--- a/vcl/CppunitTest_vcl_fontcharmap.mk
+++ b/vcl/CppunitTest_vcl_fontcharmap.mk
@@ -34,10 +34,7 @@ $(eval $(call gb_CppunitTest_use_libraries,vcl_fontcharmap, \
$(gb_UWINAPI) \
))
-$(eval $(call gb_CppunitTest_use_api,vcl_fontcharmap,\
- udkapi \
- offapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,vcl_fontcharmap))
$(eval $(call gb_CppunitTest_use_ure,vcl_fontcharmap))
$(eval $(call gb_CppunitTest_use_vcl,vcl_fontcharmap))
diff --git a/vcl/CppunitTest_vcl_fontmetric.mk b/vcl/CppunitTest_vcl_fontmetric.mk
index 5206db23d20b..138c9df10289 100644
--- a/vcl/CppunitTest_vcl_fontmetric.mk
+++ b/vcl/CppunitTest_vcl_fontmetric.mk
@@ -34,10 +34,7 @@ $(eval $(call gb_CppunitTest_use_libraries,vcl_fontmetric, \
$(gb_UWINAPI) \
))
-$(eval $(call gb_CppunitTest_use_api,vcl_fontmetric,\
- udkapi \
- offapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,vcl_fontmetric))
$(eval $(call gb_CppunitTest_use_ure,vcl_fontmetric))
$(eval $(call gb_CppunitTest_use_vcl,vcl_fontmetric))
diff --git a/vcl/CppunitTest_vcl_lifecycle.mk b/vcl/CppunitTest_vcl_lifecycle.mk
index 75b133eae394..cf874faea160 100644
--- a/vcl/CppunitTest_vcl_lifecycle.mk
+++ b/vcl/CppunitTest_vcl_lifecycle.mk
@@ -34,10 +34,7 @@ $(eval $(call gb_CppunitTest_use_libraries,vcl_lifecycle, \
$(gb_UWINAPI) \
))
-$(eval $(call gb_CppunitTest_use_api,vcl_lifecycle,\
- udkapi \
- offapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,vcl_lifecycle))
$(eval $(call gb_CppunitTest_use_ure,vcl_lifecycle))
$(eval $(call gb_CppunitTest_use_vcl,vcl_lifecycle))
diff --git a/vcl/CppunitTest_vcl_mapmode.mk b/vcl/CppunitTest_vcl_mapmode.mk
index daee48078e31..a11e0153a2a1 100644
--- a/vcl/CppunitTest_vcl_mapmode.mk
+++ b/vcl/CppunitTest_vcl_mapmode.mk
@@ -34,10 +34,7 @@ $(eval $(call gb_CppunitTest_use_libraries,vcl_mapmode, \
$(gb_UWINAPI) \
))
-$(eval $(call gb_CppunitTest_use_api,vcl_mapmode,\
- udkapi \
- offapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,vcl_mapmode))
$(eval $(call gb_CppunitTest_use_ure,vcl_mapmode))
$(eval $(call gb_CppunitTest_use_vcl,vcl_mapmode))
diff --git a/vcl/CppunitTest_vcl_outdev.mk b/vcl/CppunitTest_vcl_outdev.mk
index a5adcee81e26..b77c4dcbe671 100644
--- a/vcl/CppunitTest_vcl_outdev.mk
+++ b/vcl/CppunitTest_vcl_outdev.mk
@@ -33,10 +33,7 @@ $(eval $(call gb_CppunitTest_use_libraries,vcl_outdev, \
$(gb_UWINAPI) \
))
-$(eval $(call gb_CppunitTest_use_api,vcl_outdev,\
- udkapi \
- offapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,vcl_outdev))
$(eval $(call gb_CppunitTest_use_ure,vcl_outdev))
$(eval $(call gb_CppunitTest_use_vcl,vcl_outdev))
diff --git a/vcl/CppunitTest_vcl_timer.mk b/vcl/CppunitTest_vcl_timer.mk
index c1abf2f109e5..eef6eb90b17b 100644
--- a/vcl/CppunitTest_vcl_timer.mk
+++ b/vcl/CppunitTest_vcl_timer.mk
@@ -32,10 +32,7 @@ $(eval $(call gb_CppunitTest_use_libraries,vcl_timer, \
$(gb_UWINAPI) \
))
-$(eval $(call gb_CppunitTest_use_api,vcl_timer,\
- udkapi \
- offapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,vcl_timer))
$(eval $(call gb_CppunitTest_use_ure,vcl_timer))
$(eval $(call gb_CppunitTest_use_vcl,vcl_timer))
diff --git a/vcl/CppunitTest_vcl_wmf_test.mk b/vcl/CppunitTest_vcl_wmf_test.mk
index 5fb4e72acea6..56136c83f3ec 100644
--- a/vcl/CppunitTest_vcl_wmf_test.mk
+++ b/vcl/CppunitTest_vcl_wmf_test.mk
@@ -38,10 +38,7 @@ $(eval $(call gb_CppunitTest_use_libraries,vcl_wmf_test, \
$(gb_UWINAPI) \
))
-$(eval $(call gb_CppunitTest_use_api,vcl_wmf_test,\
- udkapi \
- offapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,vcl_wmf_test))
$(eval $(call gb_CppunitTest_use_ure,vcl_wmf_test))
$(eval $(call gb_CppunitTest_use_vcl,vcl_wmf_test))
diff --git a/writerfilter/CppunitTest_writerfilter_misc.mk b/writerfilter/CppunitTest_writerfilter_misc.mk
index f563c7a58977..741a48e1d9a2 100644
--- a/writerfilter/CppunitTest_writerfilter_misc.mk
+++ b/writerfilter/CppunitTest_writerfilter_misc.mk
@@ -9,10 +9,7 @@
$(eval $(call gb_CppunitTest_CppunitTest,writerfilter_misc))
-$(eval $(call gb_CppunitTest_use_api,writerfilter_misc,\
- offapi \
- udkapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,writerfilter_misc))
$(eval $(call gb_CppunitTest_use_custom_headers,writerfilter_misc,\
writerfilter/source \
diff --git a/writerfilter/CppunitTest_writerfilter_rtftok.mk b/writerfilter/CppunitTest_writerfilter_rtftok.mk
index 1bdeba79ed44..1fa6afcb82d1 100644
--- a/writerfilter/CppunitTest_writerfilter_rtftok.mk
+++ b/writerfilter/CppunitTest_writerfilter_rtftok.mk
@@ -35,10 +35,7 @@ $(eval $(call gb_CppunitTest_use_libraries,writerfilter_rtftok, \
$(gb_UWINAPI) \
))
-$(eval $(call gb_CppunitTest_use_api,writerfilter_rtftok,\
- offapi \
- udkapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,writerfilter_rtftok))
$(eval $(call gb_CppunitTest_use_ure,writerfilter_rtftok))
$(eval $(call gb_CppunitTest_use_vcl,writerfilter_rtftok))
diff --git a/writerperfect/CppunitTest_writerperfect_calc.mk b/writerperfect/CppunitTest_writerperfect_calc.mk
index db0212a34465..04c8a2e54087 100644
--- a/writerperfect/CppunitTest_writerperfect_calc.mk
+++ b/writerperfect/CppunitTest_writerperfect_calc.mk
@@ -13,10 +13,7 @@ $(eval $(call gb_CppunitTest_use_externals,writerperfect_calc,\
boost_headers \
))
-$(eval $(call gb_CppunitTest_use_api,writerperfect_calc,\
- offapi \
- udkapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,writerperfect_calc))
$(eval $(call gb_CppunitTest_use_libraries,writerperfect_calc,\
comphelper \
diff --git a/writerperfect/CppunitTest_writerperfect_draw.mk b/writerperfect/CppunitTest_writerperfect_draw.mk
index 232ef3451d40..442fef4fa174 100644
--- a/writerperfect/CppunitTest_writerperfect_draw.mk
+++ b/writerperfect/CppunitTest_writerperfect_draw.mk
@@ -13,10 +13,7 @@ $(eval $(call gb_CppunitTest_use_externals,writerperfect_draw,\
boost_headers \
))
-$(eval $(call gb_CppunitTest_use_api,writerperfect_draw,\
- offapi \
- udkapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,writerperfect_draw))
$(eval $(call gb_CppunitTest_use_libraries,writerperfect_draw,\
comphelper \
diff --git a/writerperfect/CppunitTest_writerperfect_impress.mk b/writerperfect/CppunitTest_writerperfect_impress.mk
index 1a84d174158b..9e8574790d1e 100644
--- a/writerperfect/CppunitTest_writerperfect_impress.mk
+++ b/writerperfect/CppunitTest_writerperfect_impress.mk
@@ -13,10 +13,7 @@ $(eval $(call gb_CppunitTest_use_externals,writerperfect_impress,\
boost_headers \
))
-$(eval $(call gb_CppunitTest_use_api,writerperfect_impress,\
- offapi \
- udkapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,writerperfect_impress))
$(eval $(call gb_CppunitTest_use_libraries,writerperfect_impress,\
comphelper \
diff --git a/writerperfect/CppunitTest_writerperfect_stream.mk b/writerperfect/CppunitTest_writerperfect_stream.mk
index 5bb0c4bb4c28..e1e6375312b0 100644
--- a/writerperfect/CppunitTest_writerperfect_stream.mk
+++ b/writerperfect/CppunitTest_writerperfect_stream.mk
@@ -15,10 +15,7 @@ $(eval $(call gb_CppunitTest_set_include,writerperfect_stream,\
$$(INCLUDE) \
))
-$(eval $(call gb_CppunitTest_use_api,writerperfect_stream,\
- offapi \
- udkapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,writerperfect_stream))
$(eval $(call gb_CppunitTest_use_ure,writerperfect_stream))
$(eval $(call gb_CppunitTest_use_vcl,writerperfect_stream))
diff --git a/writerperfect/CppunitTest_writerperfect_writer.mk b/writerperfect/CppunitTest_writerperfect_writer.mk
index ca0ee0a72b8d..e9337009111f 100644
--- a/writerperfect/CppunitTest_writerperfect_writer.mk
+++ b/writerperfect/CppunitTest_writerperfect_writer.mk
@@ -13,10 +13,7 @@ $(eval $(call gb_CppunitTest_use_externals,writerperfect_writer,\
boost_headers \
))
-$(eval $(call gb_CppunitTest_use_api,writerperfect_writer,\
- offapi \
- udkapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,writerperfect_writer))
$(eval $(call gb_CppunitTest_use_libraries,writerperfect_writer,\
comphelper \
diff --git a/xmloff/CppunitTest_xmloff_uxmloff.mk b/xmloff/CppunitTest_xmloff_uxmloff.mk
index 1fa4ca473b72..cf2b0c693adf 100644
--- a/xmloff/CppunitTest_xmloff_uxmloff.mk
+++ b/xmloff/CppunitTest_xmloff_uxmloff.mk
@@ -21,10 +21,7 @@ $(eval $(call gb_CppunitTest_set_include,xmloff_uxmloff,\
$$(INCLUDE) \
))
-$(eval $(call gb_CppunitTest_use_api,xmloff_uxmloff,\
- offapi \
- udkapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,xmloff_uxmloff))
$(eval $(call gb_CppunitTest_use_ure,xmloff_uxmloff))
$(eval $(call gb_CppunitTest_use_vcl,xmloff_uxmloff))
diff --git a/xmlsecurity/CppunitTest_qa_certext.mk b/xmlsecurity/CppunitTest_qa_certext.mk
index d4b555c1c4cd..855f9807e614 100644
--- a/xmlsecurity/CppunitTest_qa_certext.mk
+++ b/xmlsecurity/CppunitTest_qa_certext.mk
@@ -9,10 +9,7 @@
$(eval $(call gb_CppunitTest_CppunitTest,xmlsecurity_qa_certext))
-$(eval $(call gb_CppunitTest_use_api,xmlsecurity_qa_certext,\
- offapi \
- udkapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,xmlsecurity_qa_certext))
$(eval $(call gb_CppunitTest_use_libraries,xmlsecurity_qa_certext,\
cppu \