targetted improvement of UNO API includes / usage

extensions/Executable_nsplugin.mk

@@ -30,10 +30,7 @@
 
 $(eval $(call gb_Executable_Executable,nsplugin))
 
-$(eval $(call gb_Executable_use_api,nsplugin,\
-	offapi \
-	udkapi \
-))
+$(eval $(call gb_Executable_use_sdk_api,nsplugin))
 
 $(eval $(call gb_Executable_add_exception_objects,nsplugin,\
 	extensions/source/nsplugin/source/so_closelistener \

extensions/Executable_pluginapp.bin.mk

@@ -39,10 +39,7 @@ $(eval $(call gb_Executable_set_include,pluginapp.bin,\
 	-I$(SRCDIR)/extensions/source/plugin/inc \
 ))
 
-$(eval $(call gb_Executable_use_api,pluginapp.bin,\
-	offapi \
-	udkapi \
-))
+$(eval $(call gb_Executable_use_sdk_api,pluginapp.bin))
 
 $(eval $(call gb_Executable_add_exception_objects,pluginapp.bin,\
 	extensions/source/plugin/unx/npwrap \

filter/Executable_svg2odf.mk

@@ -29,10 +29,7 @@ $(eval $(call gb_Executable_Executable,svg2odf))
 
 $(eval $(call gb_Executable_set_targettype_gui,svg2odf,YES))
 
-$(eval $(call gb_Executable_use_api,svg2odf,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_Executable_use_sdk_api,svg2odf))
 
 $(eval $(call gb_Executable_set_include,svg2odf,\
     $$(INCLUDE) \

i18npool/Executable_saxparser.mk

@@ -32,10 +32,7 @@ $(eval $(call gb_Executable_set_include,saxparser,\
 	$$(INCLUDE) \
 ))
 
-$(eval $(call gb_Executable_use_api,saxparser,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Executable_use_sdk_api,saxparser))
 
 $(eval $(call gb_Executable_use_libraries,saxparser,\
 	cppu \

idl/Executable_svidl.mk

@@ -33,10 +33,7 @@ $(eval $(call gb_Executable_set_include,svidl,\
 	-I$(SRCDIR)/idl/inc \
 ))
 
-$(eval $(call gb_Executable_use_api,svidl,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_Executable_use_sdk_api,svidl))
 
 $(eval $(call gb_Executable_use_libraries,svidl,\
 	tl \

padmin/Executable_spadmin.bin.mk

@@ -36,10 +36,7 @@ $(eval $(call gb_Executable_use_static_libraries,spadmin.bin,\
     vclmain \
 ))
 
-$(eval $(call gb_Executable_use_api,spadmin.bin,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Executable_use_sdk_api,spadmin.bin))
 
 $(eval $(call gb_Executable_use_libraries,spadmin.bin,\
     spa \

rsc/Executable_rsc.mk

@@ -33,10 +33,7 @@ $(eval $(call gb_Executable_set_include,rsc,\
 	-I$(SRCDIR)/rsc/inc \
 ))
 
-$(eval $(call gb_Executable_use_api,rsc,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Executable_use_sdk_api,rsc))
 
 $(eval $(call gb_Executable_add_defs,rsc,\
 	-DSOLAR \

sdext/Executable_pdf2xml.mk

@@ -27,10 +27,7 @@
 
 $(eval $(call gb_Executable_Executable,pdf2xml))
 
-$(eval $(call gb_Executable_use_api,pdf2xml,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_Executable_use_sdk_api,pdf2xml))
 
 $(eval $(call gb_Executable_use_externals,pdf2xml,\
     zlib \

sdext/Executable_pdfunzip.mk

@@ -27,10 +27,7 @@
 
 $(eval $(call gb_Executable_Executable,pdfunzip))
 
-$(eval $(call gb_Executable_use_api,pdfunzip,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_Executable_use_sdk_api,pdfunzip))
 
 $(eval $(call gb_Executable_use_externals,pdfunzip,\
     zlib \

shell/Executable_lngconvex.mk

@@ -31,10 +31,7 @@ $(eval $(call gb_Executable_add_defs,lngconvex,\
 	-D_NTSDK \
 ))
 
-$(eval $(call gb_Executable_use_api,lngconvex,\
-	offapi \
-	udkapi \
-))
+$(eval $(call gb_Executable_use_sdk_api,lngconvex))
 
 $(eval $(call gb_Executable_use_libraries,lngconvex,\
 	comphelper \

svtools/Executable_bmp.mk

@@ -35,10 +35,7 @@ $(eval $(call gb_Executable_set_include,bmp,\
     -I$(SRCDIR)/svtools/source/inc \
 ))
 
-$(eval $(call gb_Executable_use_api,bmp,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Executable_use_sdk_api,bmp))
 
 $(eval $(call gb_Executable_use_libraries,bmp,\
     sal \

svtools/Executable_bmpsum.mk

@@ -34,10 +34,7 @@ $(eval $(call gb_Executable_set_include,bmpsum,\
     -I$(SRCDIR)/svtools/inc/svtools \
 ))
 
-$(eval $(call gb_Executable_use_api,bmpsum,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Executable_use_sdk_api,bmpsum))
 
 $(eval $(call gb_Executable_use_libraries,bmpsum,\
     sal \

svtools/Executable_g2g.mk

@@ -34,10 +34,7 @@ $(eval $(call gb_Executable_set_include,g2g,\
     -I$(SRCDIR)/svtools/inc/svtools \
 ))
 
-$(eval $(call gb_Executable_use_api,g2g,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Executable_use_sdk_api,g2g))
 
 $(eval $(call gb_Executable_use_libraries,g2g,\
     jvmfwk \

svtools/Executable_langsupport.mk

@@ -36,10 +36,7 @@ $(eval $(call gb_Executable_set_include,langsupport,\
     -I$(SRCDIR)/svtools/source/inc \
 ))
 
-$(eval $(call gb_Executable_use_api,langsupport,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Executable_use_sdk_api,langsupport))
 
 $(eval $(call gb_Executable_use_libraries,langsupport,\
     comphelper \

tools/Executable_rscdep.mk

@@ -45,10 +45,7 @@ $(eval $(call gb_Executable_use_libraries,rscdep,\
     $(gb_STDLIBS) \
 ))
 
-$(eval $(call gb_Executable_use_api,rscdep,\
-    udkapi \
-    offapi \
-))
+$(eval $(call gb_Executable_use_sdk_api,rscdep))
 
 $(eval $(call gb_Executable_add_exception_objects,rscdep,\
     tools/bootstrp/rscdep \