targetted improvement of UNO API includes / usage

16 files changed, 16 insertions, 64 deletions

diff --git a/extensions/Library_abp.mk b/extensions/Library_abp.mk
index d327c0769c26..92f0848491cb 100644
--- a/extensions/Library_abp.mk
+++ b/extensions/Library_abp.mk
@@ -51,10 +51,7 @@ $(eval $(call gb_Library_add_defs,abp,\
 	-DCOMPMOD_RESPREFIX=abp \
 ))
 
-$(eval $(call gb_Library_use_api,abp,\
-	offapi \
-	udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,abp))
 
 $(eval $(call gb_Library_add_exception_objects,abp,\
 	extensions/source/abpilot/abpfinalpage \
diff --git a/extensions/Library_bib.mk b/extensions/Library_bib.mk
index e31a42984562..5ce36cddc0de 100644
--- a/extensions/Library_bib.mk
+++ b/extensions/Library_bib.mk
@@ -37,10 +37,7 @@ $(eval $(call gb_Library_set_include,bib,\
 	-I$(SRCDIR)/extensions/inc \
 ))
 
-$(eval $(call gb_Library_use_api,bib,\
-	offapi \
-	udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,bib))
 
 $(eval $(call gb_Library_add_exception_objects,bib,\
 	extensions/source/bibliography/bibbeam \
diff --git a/extensions/Library_dbp.mk b/extensions/Library_dbp.mk
index 988464dd8d90..cb52f4d32e6f 100644
--- a/extensions/Library_dbp.mk
+++ b/extensions/Library_dbp.mk
@@ -42,10 +42,7 @@ $(eval $(call gb_Library_add_defs,dbp,\
 	-DCOMPMOD_NAMESPACE=dbp \
 ))
 
-$(eval $(call gb_Library_use_api,dbp,\
-	offapi \
-	udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,dbp))
 
 $(eval $(call gb_Library_add_exception_objects,dbp,\
 	extensions/source/dbpilots/commonpagesdbp \
diff --git a/extensions/Library_ldapbe2.mk b/extensions/Library_ldapbe2.mk
index 37442a80b257..4dd04a45fef2 100644
--- a/extensions/Library_ldapbe2.mk
+++ b/extensions/Library_ldapbe2.mk
@@ -32,10 +32,7 @@ $(eval $(call gb_Library_Library,ldapbe2))
 
 $(eval $(call gb_Library_set_componentfile,ldapbe2,extensions/source/config/ldap/ldapbe2))
 
-$(eval $(call gb_Library_use_api,ldapbe2,\
-	offapi \
-	udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,ldapbe2))
 
 ifeq ($(LDAPSDKINCLUDES),)
 ifneq ($(WITH_OPENLDAP),YES)
diff --git a/extensions/Library_log.mk b/extensions/Library_log.mk
index 247deb3f467a..4e7e0d0f6be3 100644
--- a/extensions/Library_log.mk
+++ b/extensions/Library_log.mk
@@ -32,10 +32,7 @@ $(eval $(call gb_Library_Library,log))
 
 $(eval $(call gb_Library_set_componentfile,log,extensions/source/logging/log))
 
-$(eval $(call gb_Library_use_api,log,\
-	offapi \
-	udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,log))
 
 $(eval $(call gb_Library_add_exception_objects,log,\
 	extensions/source/logging/consolehandler \
diff --git a/extensions/Library_oleautobridge.mk b/extensions/Library_oleautobridge.mk
index 668e9167ea4d..e02f65d0e428 100644
--- a/extensions/Library_oleautobridge.mk
+++ b/extensions/Library_oleautobridge.mk
@@ -31,10 +31,7 @@ $(eval $(call gb_Library_Library,oleautobridge))
 
 $(eval $(call gb_Library_set_componentfile,oleautobridge,extensions/source/ole/oleautobridge))
 
-$(eval $(call gb_Library_use_api,oleautobridge,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,oleautobridge))
 
 $(eval $(call gb_Library_set_include,oleautobridge,\
 	$(foreach inc,$(ATL_INCLUDE),-I$(inc)) \
diff --git a/extensions/Library_oleautobridge2.mk b/extensions/Library_oleautobridge2.mk
index 697818e04718..5bbc832668cf 100644
--- a/extensions/Library_oleautobridge2.mk
+++ b/extensions/Library_oleautobridge2.mk
@@ -34,10 +34,7 @@ $(eval $(call gb_Library_add_defs,oleautobridge2,\
 	 -DOWNGUID \
 ))
 
-$(eval $(call gb_Library_use_api,oleautobridge2,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,oleautobridge2))
 
 $(eval $(call gb_Library_set_include,oleautobridge2,\
 	-I$(SRCDIR)/extensions/source/ole \
diff --git a/extensions/Library_pcr.mk b/extensions/Library_pcr.mk
index 0221489e8540..3504126847ef 100644
--- a/extensions/Library_pcr.mk
+++ b/extensions/Library_pcr.mk
@@ -30,10 +30,7 @@ $(eval $(call gb_Library_Library,pcr))
 
 $(eval $(call gb_Library_set_componentfile,pcr,extensions/source/propctrlr/pcr))
 
-$(eval $(call gb_Library_use_api,pcr,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,pcr))
 
 $(eval $(call gb_Library_set_include,pcr,\
 	-I$(SRCDIR)/extensions/inc \
diff --git a/extensions/Library_pl.mk b/extensions/Library_pl.mk
index cbcfc795e233..c1451f8c3519 100644
--- a/extensions/Library_pl.mk
+++ b/extensions/Library_pl.mk
@@ -41,10 +41,7 @@ $(eval $(call gb_Library_set_include,pl,\
 	-I$(SRCDIR)/extensions/source/plugin/inc \
 ))
 
-$(eval $(call gb_Library_use_api,pl,\
-	offapi \
-	udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,pl))
 
 ifeq ($(SOLAR_JAVA),TRUE)
 $(eval $(call gb_Library_add_defs,pl,\
diff --git a/extensions/Library_res.mk b/extensions/Library_res.mk
index 2e03681243ef..bc3de6021b89 100644
--- a/extensions/Library_res.mk
+++ b/extensions/Library_res.mk
@@ -32,10 +32,7 @@ $(eval $(call gb_Library_Library,res))
 
 $(eval $(call gb_Library_set_componentfile,res,extensions/source/resource/res))
 
-$(eval $(call gb_Library_use_api,res,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,res))
 
 $(eval $(call gb_Library_use_libraries,res,\
 	vcl \
diff --git a/extensions/Library_scn.mk b/extensions/Library_scn.mk
index 83a0b6d74d73..4dd0044941c8 100644
--- a/extensions/Library_scn.mk
+++ b/extensions/Library_scn.mk
@@ -30,10 +30,7 @@ $(eval $(call gb_Library_Library,scn))
 
 $(eval $(call gb_Library_set_componentfile,scn,extensions/source/scanner/scn))
 
-$(eval $(call gb_Library_use_api,scn,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,scn))
 
 $(eval $(call gb_Library_use_libraries,scn,\
 	svt \
diff --git a/extensions/Library_so_activex.mk b/extensions/Library_so_activex.mk
index 899745b9e713..33cccab682fd 100644
--- a/extensions/Library_so_activex.mk
+++ b/extensions/Library_so_activex.mk
@@ -37,10 +37,7 @@ $(eval $(call gb_Library_set_include,so_activex,\
 	$(foreach i,$(ATL_INCLUDE), -I$(i)) \
 ))
 
-$(eval $(call gb_Library_use_api,so_activex,\
-	offapi \
-	udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,so_activex))
 
 $(eval $(call gb_Library_add_nativeres,so_activex,activex_res))
 
diff --git a/extensions/Library_so_activex_x64.mk b/extensions/Library_so_activex_x64.mk
index ea01b58520f5..7bcf286cb4f0 100644
--- a/extensions/Library_so_activex_x64.mk
+++ b/extensions/Library_so_activex_x64.mk
@@ -40,10 +40,7 @@ $(eval $(call gb_Library_set_include,so_activex_x64,\
 	$(foreach i,$(ATL_INCLUDE), -I$(i)) \
 ))
 
-$(eval $(call gb_Library_use_api,so_activex_x64,\
-	offapi \
-	udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,so_activex_x64))
 
 $(eval $(call gb_Library_add_nativeres,so_activex_x64,activex_res))
 
diff --git a/extensions/Library_updatecheckui.mk b/extensions/Library_updatecheckui.mk
index 196fe7f3d314..75ac53f00829 100644
--- a/extensions/Library_updatecheckui.mk
+++ b/extensions/Library_updatecheckui.mk
@@ -30,10 +30,7 @@ $(eval $(call gb_Library_Library,updatecheckui))
 
 $(eval $(call gb_Library_set_componentfile,updatecheckui,extensions/source/update/ui/updchk))
 
-$(eval $(call gb_Library_use_api,updatecheckui,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,updatecheckui))
 
 $(eval $(call gb_Library_use_libraries,updatecheckui,\
 	vcl \
diff --git a/extensions/Library_updatefeed.mk b/extensions/Library_updatefeed.mk
index cd1b581e7830..354834d7205f 100644
--- a/extensions/Library_updatefeed.mk
+++ b/extensions/Library_updatefeed.mk
@@ -30,10 +30,7 @@ $(eval $(call gb_Library_Library,updatefeed))
 
 $(eval $(call gb_Library_set_componentfile,updatefeed,extensions/source/update/feed/updatefeed))
 
-$(eval $(call gb_Library_use_api,updatefeed,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,updatefeed))
 
 $(eval $(call gb_Library_use_libraries,updatefeed,\
 	cppuhelper \
diff --git a/extensions/Library_updchk.mk b/extensions/Library_updchk.mk
index 98577ee3941a..cd291c8b695d 100644
--- a/extensions/Library_updchk.mk
+++ b/extensions/Library_updchk.mk
@@ -36,10 +36,7 @@ $(eval $(call gb_Library_set_include,updchk,\
 	-I$(SRCDIR)/extensions/inc \
 ))
 
-$(eval $(call gb_Library_use_api,updchk,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,updchk))
 
 $(eval $(call gb_Library_use_libraries,updchk,\
 	cppuhelper \