tdf#94698 cleanup Makefiles. Get rid of udkapi and offapi

This patch changes occurences in makefiles
from
$(eval $(call gb_CppunitTest_use_api,comphelper_test_config, \
	udkapi \
	offapi \
))

to
$(eval $(call gb_CppunitTest_use_sdk_api,comphelper_test_config))

(corrected instead of abandon, jani)

Change-Id: Ic96ec65d82d7452e288f05a8b6d576ef543b068e
Reviewed-on: https://gerrit.libreoffice.org/23426
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: jan iversen <jani@documentfoundation.org>
Tested-by: jan iversen <jani@documentfoundation.org>

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 \

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))
 

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))

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))

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))

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))

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 \

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 \

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 \

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))

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))

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))

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))

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))
 

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:

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))

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:

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))

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))

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))

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))

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))

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))

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))

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))

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))

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))

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))

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))

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))

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 \

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 \

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 \

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 \

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))
 

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))

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))
 

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 \

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 \

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 \

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))
 

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))

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))

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))

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))

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))

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:
+# vim: set noet sw=4 ts=4:

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))

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))

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 \

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))

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))

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))

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))

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))

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))

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))

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))

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))

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))

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))

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))

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))

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))

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))

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))

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))

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))

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))

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))

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))

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 \

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))

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))

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))

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))

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))

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 \

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))

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))

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))
 

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 \

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))
 

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 \

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))
 

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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))
 

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 \

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) \

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))

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))

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))

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))