targetted improvement of UNO API includes / usage

15 files changed, 15 insertions, 60 deletions

diff --git a/extensions/Executable_nsplugin.mk b/extensions/Executable_nsplugin.mk
index 157842ec0e0f..da860e821e7c 100644
--- a/extensions/Executable_nsplugin.mk
+++ b/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 \
diff --git a/extensions/Executable_pluginapp.bin.mk b/extensions/Executable_pluginapp.bin.mk
index 4fd84f0f8cc3..ae25c2e98996 100644
--- a/extensions/Executable_pluginapp.bin.mk
+++ b/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 \
diff --git a/filter/Executable_svg2odf.mk b/filter/Executable_svg2odf.mk
index aa4e44cef458..8f1fb73e6782 100644
--- a/filter/Executable_svg2odf.mk
+++ b/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) \
diff --git a/i18npool/Executable_saxparser.mk b/i18npool/Executable_saxparser.mk
index cbd01f8c07d1..5e61b3280270 100644
--- a/i18npool/Executable_saxparser.mk
+++ b/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 \
diff --git a/idl/Executable_svidl.mk b/idl/Executable_svidl.mk
index c41f1386764b..4eb371c60c88 100644
--- a/idl/Executable_svidl.mk
+++ b/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 \
diff --git a/padmin/Executable_spadmin.bin.mk b/padmin/Executable_spadmin.bin.mk
index 9aca32b3508e..bd26a4aa9de9 100644
--- a/padmin/Executable_spadmin.bin.mk
+++ b/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 \
diff --git a/rsc/Executable_rsc.mk b/rsc/Executable_rsc.mk
index c9a1360c6ce9..6382f8545a4b 100644
--- a/rsc/Executable_rsc.mk
+++ b/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 \
diff --git a/sdext/Executable_pdf2xml.mk b/sdext/Executable_pdf2xml.mk
index dbca4d98dc50..a73135b97514 100644
--- a/sdext/Executable_pdf2xml.mk
+++ b/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 \
diff --git a/sdext/Executable_pdfunzip.mk b/sdext/Executable_pdfunzip.mk
index 5bb90b5e0206..79fedde28a2f 100644
--- a/sdext/Executable_pdfunzip.mk
+++ b/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 \
diff --git a/shell/Executable_lngconvex.mk b/shell/Executable_lngconvex.mk
index eb583c62ac9d..edc88da25dbf 100644
--- a/shell/Executable_lngconvex.mk
+++ b/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 \
diff --git a/svtools/Executable_bmp.mk b/svtools/Executable_bmp.mk
index e664c2c257cc..4a4ccb8bf8f4 100644
--- a/svtools/Executable_bmp.mk
+++ b/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 \
diff --git a/svtools/Executable_bmpsum.mk b/svtools/Executable_bmpsum.mk
index 8d03b5768d9d..c341d4730ca9 100644
--- a/svtools/Executable_bmpsum.mk
+++ b/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 \
diff --git a/svtools/Executable_g2g.mk b/svtools/Executable_g2g.mk
index 7c2193f5538a..d3c5bd024d2f 100644
--- a/svtools/Executable_g2g.mk
+++ b/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 \
diff --git a/svtools/Executable_langsupport.mk b/svtools/Executable_langsupport.mk
index 5e3f11c7fb82..a16e12cda2eb 100644
--- a/svtools/Executable_langsupport.mk
+++ b/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 \
diff --git a/tools/Executable_rscdep.mk b/tools/Executable_rscdep.mk
index a353b8db0546..0658ef49309a 100644
--- a/tools/Executable_rscdep.mk
+++ b/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 \