[Libreoffice-commits] core.git: basegfx/CppunitTest_basegfx.mk chart2/CppunitTest_chart2_common_functors.mk chart2/CppunitTest_chart2_export.mk chart2/CppunitTest_chart2_import.mk chart2/CppunitTest_chart2_trendcalculators.mk chart2/CppunitTest_chart2_xshape.mk comphelper/CppunitTest_comphelper_syntaxhighlight_test.mk comphelper/CppunitTest_comphelper_test.mk comphelper/CppunitTest_comphelper_variadictemplates_test.mk connectivity/CppunitTest_connectivity_ado.mk connectivity/CppunitTest_connectivity_mork.mk cppcanvas/CppunitTest_cppcanvas_emfplus.mk cppcanvas/CppunitTest_cppcanvas_test.mk desktop/CppunitTest_desktop_lib.mk editeng/CppunitTest_editeng_borderline.mk editeng/CppunitTest_editeng_core.mk editeng/CppunitTest_editeng_lookuptree.mk extensions/CppunitTest_extensions_test_update.mk filter/CppunitTest_filter_dxf_test.mk filter/CppunitTest_filter_eps_test.mk filter/CppunitTest_filter_met_test.mk filter/CppunitTest_filter_pcd_test.mk filter/CppunitTest_filter_pcx_test.mk filter/CppunitTest_fi lter_pict_test.mk filter/CppunitTest_filter_ppm_test.mk filter/CppunitTest_filter_psd_test.mk filter/CppunitTest_filter_ras_test.mk filter/CppunitTest_filter_tga_test.mk filter/CppunitTest_filter_tiff_test.mk hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk i18nlangtag/CppunitTest_i18nlangtag_test_languagetag.mk i18npool/CppunitTest_i18npool_test_breakiterator.mk i18npool/CppunitTest_i18npool_test_characterclassification.mk i18npool/CppunitTest_i18npool_test_ordinalsuffix.mk i18npool/CppunitTest_i18npool_test_textsearch.mk lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk oox/CppunitTest_oox_tokenmap.mk oox/CppunitTest_oox_vba_compression.mk oox/CppunitTest_oox_vba_encryption.mk package/CppunitTest_package2_test.mk sax/CppunitTest_sax.mk sccomp/CppunitTest_sccomp_lpsolver.mk sc/CppunitTest_sc_annotationobj.mk sc/CppunitTest_sc_annotationshapeobj.mk sc/CppunitTest_sc_annotationsobj.mk sc/CppunitTest_sc_bugfix_test.mk sc/CppunitTest_sc_cellrangeobj.mk sc/CppunitTest_sc_check _xcell_ranges_query.mk sc/CppunitTest_sc_condformats.mk sc/CppunitTest_sc_copypaste.mk sc/CppunitTest_sc_core.mk sc/CppunitTest_sc_databaserangeobj.mk sc/CppunitTest_sc_datapilotfieldobj.mk sc/CppunitTest_sc_datapilottableobj.mk sc/CppunitTest_sc_editfieldobj_cell.mk sc/CppunitTest_sc_editfieldobj_header.mk sc/CppunitTest_sc_filters_test.mk sc/CppunitTest_sc_html_export_test.mk sc/CppunitTest_sc_modelobj.mk sc/CppunitTest_sc_namedrangeobj.mk sc/CppunitTest_sc_namedrangesobj.mk sc/CppunitTest_sc_new_cond_format_api.mk sc/CppunitTest_sc_opencl_test.mk sc/CppunitTest_sc_outlineobj.mk sc/CppunitTest_sc_perfobj.mk sc/CppunitTest_sc_recordchanges.mk sc/CppunitTest_sc_styleloaderobj.mk sc/CppunitTest_sc_subsequent_export_test.mk sc/CppunitTest_sc_subsequent_filters_test.mk sc/CppunitTest_sc_tablesheetobj.mk sc/CppunitTest_sc_tablesheetsobj.mk sc/CppunitTest_sc_tiledrendering.mk sc/CppunitTest_sc_ucalc.mk sd/CppunitTest_sd_export_tests.mk sd/CppunitTest_sd_filters_test.mk sd/CppunitTest_sd_ html_export_tests.mk sd/CppunitTest_sd_import_tests.mk sd/CppunitTest_sd_misc_tests.mk sd/CppunitTest_sd_svg_export_tests.mk sd/CppunitTest_sd_tiledrendering.mk sd/CppunitTest_sd_uimpress.mk sdext/CppunitTest_sdext_pdfimport.mk slideshow/CppunitTest_slideshow.mk smoketest/CppunitTest_smoketest.mk sot/CppunitTest_sot_test_sot.mk starmath/CppunitTest_starmath_import.mk starmath/CppunitTest_starmath_qa_cppunit.mk svgio/CppunitTest_svgio.mk svl/CppunitTest_svl_itempool.mk svl/CppunitTest_svl_items.mk svl/CppunitTest_svl_notify.mk svl/CppunitTest_svl_qa_cppunit.mk svl/CppunitTest_svl_urihelper.mk svtools/CppunitTest_svtools_graphic.mk svtools/CppunitTest_svtools_html.mk svx/CppunitTest_svx_unit.mk sw/CppunitTest_sw_docbookexport.mk sw/CppunitTest_sw_filters_test.mk sw/CppunitTest_sw_globalfilter.mk sw/CppunitTest_sw_htmlexport.mk sw/CppunitTest_sw_mailmerge.mk sw/CppunitTest_sw_odfexport.mk sw/CppunitTest_sw_odfimport.mk sw/CppunitTest_sw_ooxmlfieldexport.mk sw/CppunitTest_sw_ooxmlimport .mk sw/CppunitTest_sw_ooxmlw14export.mk sw/CppunitTest_sw_rtfexport.mk sw/CppunitTest_sw_rtfimport.mk sw/CppunitTest_sw_tiledrendering.mk sw/CppunitTest_sw_uiwriter.mk sw/CppunitTest_sw_uwriter.mk sw/CppunitTest_sw_ww8export.mk sw/CppunitTest_sw_ww8import.mk sw/ooxmlexport_setup.mk tools/CppunitTest_tools_test.mk ucb/CppunitTest_ucb_webdav_local_neon.mk unotools/CppunitTest_unotools_fontdefs.mk unoxml/CppunitTest_unoxml_domtest.mk vcl/CppunitTest_vcl_bitmap_test.mk vcl/CppunitTest_vcl_blocklistparser_test.mk vcl/CppunitTest_vcl_complextext.mk vcl/CppunitTest_vcl_filters_test.mk vcl/CppunitTest_vcl_fontcharmap.mk vcl/CppunitTest_vcl_fontmetric.mk vcl/CppunitTest_vcl_font.mk vcl/CppunitTest_vcl_lifecycle.mk vcl/CppunitTest_vcl_mapmode.mk vcl/CppunitTest_vcl_outdev.mk vcl/CppunitTest_vcl_timer.mk vcl/CppunitTest_vcl_wmf_test.mk writerfilter/CppunitTest_writerfilter_misc.mk writerfilter/CppunitTest_writerfilter_rtftok.mk writerperfect/CppunitTest_writerperfect_calc.mk writerperfect/Cppu nitTest_writerperfect_draw.mk writerperfect/CppunitTest_writerperfect_impress.mk writerperfect/CppunitTest_writerperfect_stream.mk writerperfect/CppunitTest_writerperfect_writer.mk xmloff/CppunitTest_xmloff_uxmloff.mk xmlsecurity/CppunitTest_qa_certext.mk

• Previous message: [Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2c/0ab85572965aa49e6c8645c00578ee317411e9
• Next message: [Libreoffice-commits] core.git: officecfg/registry oox/source sd/qa sd/source sd/xml slideshow/source
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

 basegfx/CppunitTest_basegfx.mk                                |    5 +----
 chart2/CppunitTest_chart2_common_functors.mk                  |    5 +----
 chart2/CppunitTest_chart2_export.mk                           |    5 +----
 chart2/CppunitTest_chart2_import.mk                           |    5 +----
 chart2/CppunitTest_chart2_trendcalculators.mk                 |    5 +----
 chart2/CppunitTest_chart2_xshape.mk                           |    5 +----
 comphelper/CppunitTest_comphelper_syntaxhighlight_test.mk     |    5 +----
 comphelper/CppunitTest_comphelper_test.mk                     |    5 +----
 comphelper/CppunitTest_comphelper_variadictemplates_test.mk   |    5 +----
 connectivity/CppunitTest_connectivity_ado.mk                  |    5 +----
 connectivity/CppunitTest_connectivity_mork.mk                 |    5 +----
 cppcanvas/CppunitTest_cppcanvas_emfplus.mk                    |    5 +----
 cppcanvas/CppunitTest_cppcanvas_test.mk                       |    5 +----
 desktop/CppunitTest_desktop_lib.mk                            |    5 +----
 editeng/CppunitTest_editeng_borderline.mk                     |    5 +----
 editeng/CppunitTest_editeng_core.mk                           |    5 +----
 editeng/CppunitTest_editeng_lookuptree.mk                     |    5 +----
 extensions/CppunitTest_extensions_test_update.mk              |    5 +----
 filter/CppunitTest_filter_dxf_test.mk                         |    5 +----
 filter/CppunitTest_filter_eps_test.mk                         |    5 +----
 filter/CppunitTest_filter_met_test.mk                         |    5 +----
 filter/CppunitTest_filter_pcd_test.mk                         |    5 +----
 filter/CppunitTest_filter_pcx_test.mk                         |    5 +----
 filter/CppunitTest_filter_pict_test.mk                        |    5 +----
 filter/CppunitTest_filter_ppm_test.mk                         |    5 +----
 filter/CppunitTest_filter_psd_test.mk                         |    5 +----
 filter/CppunitTest_filter_ras_test.mk                         |    5 +----
 filter/CppunitTest_filter_tga_test.mk                         |    5 +----
 filter/CppunitTest_filter_tiff_test.mk                        |    5 +----
 hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk             |    5 +----
 i18nlangtag/CppunitTest_i18nlangtag_test_languagetag.mk       |    5 +----
 i18npool/CppunitTest_i18npool_test_breakiterator.mk           |    5 +----
 i18npool/CppunitTest_i18npool_test_characterclassification.mk |    5 +----
 i18npool/CppunitTest_i18npool_test_ordinalsuffix.mk           |    5 +----
 i18npool/CppunitTest_i18npool_test_textsearch.mk              |    5 +----
 lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk    |    5 +----
 oox/CppunitTest_oox_tokenmap.mk                               |    5 +----
 oox/CppunitTest_oox_vba_compression.mk                        |    5 +----
 oox/CppunitTest_oox_vba_encryption.mk                         |    5 +----
 package/CppunitTest_package2_test.mk                          |    5 +----
 sax/CppunitTest_sax.mk                                        |    5 +----
 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 +----
 sccomp/CppunitTest_sccomp_lpsolver.mk                         |    5 +----
 sd/CppunitTest_sd_export_tests.mk                             |    5 +----
 sd/CppunitTest_sd_filters_test.mk                             |    5 +----
 sd/CppunitTest_sd_html_export_tests.mk                        |    5 +----
 sd/CppunitTest_sd_import_tests.mk                             |    5 +----
 sd/CppunitTest_sd_misc_tests.mk                               |    5 +----
 sd/CppunitTest_sd_svg_export_tests.mk                         |    5 +----
 sd/CppunitTest_sd_tiledrendering.mk                           |    5 +----
 sd/CppunitTest_sd_uimpress.mk                                 |    5 +----
 sdext/CppunitTest_sdext_pdfimport.mk                          |    5 +----
 slideshow/CppunitTest_slideshow.mk                            |    5 +----
 smoketest/CppunitTest_smoketest.mk                            |    5 +----
 sot/CppunitTest_sot_test_sot.mk                               |    5 +----
 starmath/CppunitTest_starmath_import.mk                       |    5 +----
 starmath/CppunitTest_starmath_qa_cppunit.mk                   |    5 +----
 svgio/CppunitTest_svgio.mk                                    |    5 +----
 svl/CppunitTest_svl_itempool.mk                               |    5 +----
 svl/CppunitTest_svl_items.mk                                  |    5 +----
 svl/CppunitTest_svl_notify.mk                                 |    5 +----
 svl/CppunitTest_svl_qa_cppunit.mk                             |    5 +----
 svl/CppunitTest_svl_urihelper.mk                              |    5 +----
 svtools/CppunitTest_svtools_graphic.mk                        |    5 +----
 svtools/CppunitTest_svtools_html.mk                           |    5 +----
 svx/CppunitTest_svx_unit.mk                                   |    5 +----
 sw/CppunitTest_sw_docbookexport.mk                            |    5 +----
 sw/CppunitTest_sw_filters_test.mk                             |    5 +----
 sw/CppunitTest_sw_globalfilter.mk                             |    5 +----
 sw/CppunitTest_sw_htmlexport.mk                               |    5 +----
 sw/CppunitTest_sw_mailmerge.mk                                |    5 +----
 sw/CppunitTest_sw_odfexport.mk                                |    5 +----
 sw/CppunitTest_sw_odfimport.mk                                |    5 +----
 sw/CppunitTest_sw_ooxmlfieldexport.mk                         |    5 +----
 sw/CppunitTest_sw_ooxmlimport.mk                              |    5 +----
 sw/CppunitTest_sw_ooxmlw14export.mk                           |    5 +----
 sw/CppunitTest_sw_rtfexport.mk                                |    5 +----
 sw/CppunitTest_sw_rtfimport.mk                                |    5 +----
 sw/CppunitTest_sw_tiledrendering.mk                           |    5 +----
 sw/CppunitTest_sw_uiwriter.mk                                 |    5 +----
 sw/CppunitTest_sw_uwriter.mk                                  |    5 +----
 sw/CppunitTest_sw_ww8export.mk                                |    5 +----
 sw/CppunitTest_sw_ww8import.mk                                |    5 +----
 sw/ooxmlexport_setup.mk                                       |    5 +----
 tools/CppunitTest_tools_test.mk                               |    5 +----
 ucb/CppunitTest_ucb_webdav_local_neon.mk                      |    5 +----
 unotools/CppunitTest_unotools_fontdefs.mk                     |    5 +----
 unoxml/CppunitTest_unoxml_domtest.mk                          |    5 +----
 vcl/CppunitTest_vcl_bitmap_test.mk                            |    5 +----
 vcl/CppunitTest_vcl_blocklistparser_test.mk                   |    5 +----
 vcl/CppunitTest_vcl_complextext.mk                            |    5 +----
 vcl/CppunitTest_vcl_filters_test.mk                           |    5 +----
 vcl/CppunitTest_vcl_font.mk                                   |    5 +----
 vcl/CppunitTest_vcl_fontcharmap.mk                            |    5 +----
 vcl/CppunitTest_vcl_fontmetric.mk                             |    5 +----
 vcl/CppunitTest_vcl_lifecycle.mk                              |    5 +----
 vcl/CppunitTest_vcl_mapmode.mk                                |    5 +----
 vcl/CppunitTest_vcl_outdev.mk                                 |    5 +----
 vcl/CppunitTest_vcl_timer.mk                                  |    5 +----
 vcl/CppunitTest_vcl_wmf_test.mk                               |    5 +----
 writerfilter/CppunitTest_writerfilter_misc.mk                 |    5 +----
 writerfilter/CppunitTest_writerfilter_rtftok.mk               |    5 +----
 writerperfect/CppunitTest_writerperfect_calc.mk               |    5 +----
 writerperfect/CppunitTest_writerperfect_draw.mk               |    5 +----
 writerperfect/CppunitTest_writerperfect_impress.mk            |    5 +----
 writerperfect/CppunitTest_writerperfect_stream.mk             |    5 +----
 writerperfect/CppunitTest_writerperfect_writer.mk             |    5 +----
 xmloff/CppunitTest_xmloff_uxmloff.mk                          |    5 +----
 xmlsecurity/CppunitTest_qa_certext.mk                         |    5 +----
 139 files changed, 140 insertions(+), 557 deletions(-)

New commits:
commit a97b392879c96145701b2454b26dc0c4f6aa4bb2
Author: Gleb Mishchenko <gleb.mishchenko.96 at gmail.com>
Date:   Tue Mar 22 10:43:56 2016 +0300

    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 at libreoffice.org>
    Reviewed-by: jan iversen <jani at documentfoundation.org>
    Tested-by: jan iversen <jani at documentfoundation.org>

diff --git a/basegfx/CppunitTest_basegfx.mk b/basegfx/CppunitTest_basegfx.mk
index fdffba3..3941a3e 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 46e58bc..203de1d 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 51ce6b6..50780b1 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 e101993..a2263a8 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 5187298..9e6e275 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 bb50d5b5..92c2644 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 73ab199..9dade8b 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 47843c6..f67601e 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 21e8753..58d490a 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 3160314..ce2e2c2 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 f076014..be3b041 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 d4cc7c1..e545e34 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 64f222c..2e37842 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 9ce2a03..aed16db 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 354b9cf..121f495 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 ea7f689..36fb35b 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 eafde65..0a1422d 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 b6149b0..1d80252 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 e8afc39..362c89b 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 300f9a7..d49f10e 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 64bbeb6..4a0027f 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 2603d48..4d64069 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 b44062a..4a31c51 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 fde0f54..7da6023 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 e7879ca..5ccbde7 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 2e4b038..503d100 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 f6e5810..9265db9 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 51f17d3..d62addc 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 2aa9b80..d3dfdae 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 f205d80..be1a804 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 076f59d..41993f9 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 f264bc3..3c91d25 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 997ed67..be3b1ee 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 c9236da..74d3462 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 d6ef88e..2bca017 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 74d0a6f..1a2bf5f 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 9eac2a5..1e903a2 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 bb87cb4..35d1d15 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 1f8bb5c..1a58883 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 bf4839a..4a9bff5 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 951386b..d3108d5 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 92d0ebf..b52e8de 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 501d52d..382614f 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 148cf18..f6bdf5e 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 712f444..5cab2c0 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 c590115..d6f6cdd 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 5ca88d9..aee68d9 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 799306a..775d81c 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 641709c..ece6209 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 1247e94..b37f764 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 90e3ece..ff52b2a 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 3c5cb55..073dfe8 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 8a1f3ae..5562706 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 d1e8ce8..bca3a58 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 90fb12e..78930d7 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 db445f53..946799b 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 6a69a67..2b7f530 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 ece6f5a..0a3b627 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 ba2f9b5..cf8b4f6 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 cca0de7..36a65cb 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 c0558d1..7916363 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 60ab72b..ee1d050 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 2356032..a7ee2e4 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 285991a..c3e02686 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 225ac2c..1f26021 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 3769fe9..a07518e 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 6c2c9e5..5dae44c 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 845206b..bd0a06b 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 107012d..9215f19 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 a6506e4..8da2cc3 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 d1200b1..fb86e25 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 51ac410..207cfba 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 5c89fb2..c86cd22 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 5e5bafd..dc0573e 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 0831080..0387424 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 02908d8..c527a6c 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 33a7ad2..a2a2956 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 f95801c..8c9cfa6 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 36f64ea..0221ab0 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 2a3f29c..60790c4 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 78e9f90..b17e71c 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 d218b36..2642786 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 c957930..8200eb6 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 d245290..0a062ff 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 b72fe29..c2e26e7 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 17a9f71..b981be0 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 efaa7b3..88e14b7 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 66b69d8..51948b2 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 4b59498..63745dd 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 501c91a..c8e5e06 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 ff1dbe7..201a9cf 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 f5cd6f7..65be44e 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 7b0f5ee..d7e10fc 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 6036afb..9636c7d 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 e436b6d..ebc6e3b 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 82d9cd4..0e9fea3 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 9bed3e13..f8e080a 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 80d9fce..d3cf68b 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 8c48b49..cb12bad 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 6d8b9fd..a0dc5c1 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 d948b89..131fc81 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 3757e01..3dae6ac 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 eaa3542..4c249d5 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 ae67c20..abd0653 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 dbcead9..05da70b 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 5958019..d54d3c1 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 b47c906..9e05e6f 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 3eafcea..537a211 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 be7986b..2506097 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 a0b7a58..e048fae 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 f690515..465aac5 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 fc1ef6b..fa0f33e 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 ed28ae9..21d9a74 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 84a9d0d..da06f1a 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 fd8b2b4..e90b524 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 20e827b..df16e36 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 c96385c..38e51b0 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 127a767..530624b 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 1104181..514a846 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 95b7507..8cc3add 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 60011a5..0e5b5093 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 1f498eb..e1c30df 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 910f540..55560bd 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 0a89f41..46cb117 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 5206db2..138c9df 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 75b133e..cf874fa 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 daee480..a11e015 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 a5adcee..b77c4dc 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 c1abf2f..eef6eb9 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 5fb4e72..56136c8 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 f563c7a..741a48e 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 1bdeba7..1fa6afc 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 db0212a..04c8a2e 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 232ef34..442fef4 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 1a84d1741..9e85747 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 5bb0c4b..e1e6375 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 ca0ee0a..e933700 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 1fa4ca4..cf2b0c6 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 d4b555c..855f980 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 \

• Previous message: [Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2c/0ab85572965aa49e6c8645c00578ee317411e9
• Next message: [Libreoffice-commits] core.git: officecfg/registry oox/source sd/qa sd/source sd/xml slideshow/source
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]