targetted improvement of UNO API includes / usage

37 files changed, 37 insertions, 148 deletions

diff --git a/filter/Library_PptImporter.mk b/filter/Library_PptImporter.mk
index f62f77b3c0d4..abd5af774dc4 100644
--- a/filter/Library_PptImporter.mk
+++ b/filter/Library_PptImporter.mk
@@ -18,10 +18,7 @@
 
 $(eval $(call gb_Library_Library,PptImporter))
 
-$(eval $(call gb_Library_use_api,PptImporter,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,PptImporter))
 
 $(eval $(call gb_Library_set_include,PptImporter,\
 	$$(INCLUDE) \
diff --git a/filter/Library_egi.mk b/filter/Library_egi.mk
index 5e04dc4d07bb..d7537892529c 100644
--- a/filter/Library_egi.mk
+++ b/filter/Library_egi.mk
@@ -18,10 +18,7 @@
 
 $(eval $(call gb_Library_Library,egi))
 
-$(eval $(call gb_Library_use_api,egi,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,egi))
 
 $(eval $(call gb_Library_set_include,egi,\
 	$$(INCLUDE) \
diff --git a/filter/Library_eme.mk b/filter/Library_eme.mk
index 0a7bf20fe5e3..efd589924959 100644
--- a/filter/Library_eme.mk
+++ b/filter/Library_eme.mk
@@ -18,10 +18,7 @@
 
 $(eval $(call gb_Library_Library,eme))
 
-$(eval $(call gb_Library_use_api,eme,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,eme))
 
 $(eval $(call gb_Library_set_include,eme,\
 	$$(INCLUDE) \
diff --git a/filter/Library_epb.mk b/filter/Library_epb.mk
index eb38ca4f000e..63f630c3c1df 100644
--- a/filter/Library_epb.mk
+++ b/filter/Library_epb.mk
@@ -18,10 +18,7 @@
 
 $(eval $(call gb_Library_Library,epb))
 
-$(eval $(call gb_Library_use_api,epb,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,epb))
 
 $(eval $(call gb_Library_set_include,epb,\
 	$$(INCLUDE) \
diff --git a/filter/Library_epg.mk b/filter/Library_epg.mk
index 935ab824e0fd..51666771c8f9 100644
--- a/filter/Library_epg.mk
+++ b/filter/Library_epg.mk
@@ -18,10 +18,7 @@
 
 $(eval $(call gb_Library_Library,epg))
 
-$(eval $(call gb_Library_use_api,epg,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,epg))
 
 $(eval $(call gb_Library_set_include,epg,\
 	$$(INCLUDE) \
diff --git a/filter/Library_epp.mk b/filter/Library_epp.mk
index 385a6763314f..83469263cd83 100644
--- a/filter/Library_epp.mk
+++ b/filter/Library_epp.mk
@@ -18,10 +18,7 @@
 
 $(eval $(call gb_Library_Library,epp))
 
-$(eval $(call gb_Library_use_api,epp,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,epp))
 
 $(eval $(call gb_Library_set_include,epp,\
 	$$(INCLUDE) \
diff --git a/filter/Library_eps.mk b/filter/Library_eps.mk
index 285533421a35..2ba9b40a7051 100644
--- a/filter/Library_eps.mk
+++ b/filter/Library_eps.mk
@@ -18,10 +18,7 @@
 
 $(eval $(call gb_Library_Library,eps))
 
-$(eval $(call gb_Library_use_api,eps,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,eps))
 
 $(eval $(call gb_Library_set_include,eps,\
 	$$(INCLUDE) \
diff --git a/filter/Library_ept.mk b/filter/Library_ept.mk
index 1ebfe322252b..c1d9267ec555 100644
--- a/filter/Library_ept.mk
+++ b/filter/Library_ept.mk
@@ -18,10 +18,7 @@
 
 $(eval $(call gb_Library_Library,ept))
 
-$(eval $(call gb_Library_use_api,ept,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,ept))
 
 $(eval $(call gb_Library_set_include,ept,\
 	$$(INCLUDE) \
diff --git a/filter/Library_era.mk b/filter/Library_era.mk
index a647f9364b70..5035ab350a7f 100644
--- a/filter/Library_era.mk
+++ b/filter/Library_era.mk
@@ -18,10 +18,7 @@
 
 $(eval $(call gb_Library_Library,era))
 
-$(eval $(call gb_Library_use_api,era,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,era))
 
 $(eval $(call gb_Library_set_include,era,\
 	$$(INCLUDE) \
diff --git a/filter/Library_eti.mk b/filter/Library_eti.mk
index 00c1e42db7e1..3d634045ecf1 100644
--- a/filter/Library_eti.mk
+++ b/filter/Library_eti.mk
@@ -18,10 +18,7 @@
 
 $(eval $(call gb_Library_Library,eti))
 
-$(eval $(call gb_Library_use_api,eti,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,eti))
 
 $(eval $(call gb_Library_set_include,eti,\
 	$$(INCLUDE) \
diff --git a/filter/Library_exp.mk b/filter/Library_exp.mk
index 67d3937b4f14..b447fdbf4134 100644
--- a/filter/Library_exp.mk
+++ b/filter/Library_exp.mk
@@ -18,10 +18,7 @@
 
 $(eval $(call gb_Library_Library,exp))
 
-$(eval $(call gb_Library_use_api,exp,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,exp))
 
 $(eval $(call gb_Library_set_include,exp,\
 	$$(INCLUDE) \
diff --git a/filter/Library_filterconfig.mk b/filter/Library_filterconfig.mk
index 627b186d2893..3dd322a7ad69 100644
--- a/filter/Library_filterconfig.mk
+++ b/filter/Library_filterconfig.mk
@@ -20,10 +20,7 @@ $(eval $(call gb_Library_Library,filterconfig))
 
 $(eval $(call gb_Library_set_componentfile,filterconfig,filter/source/config/cache/filterconfig1))
 
-$(eval $(call gb_Library_use_api,filterconfig,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,filterconfig))
 
 $(eval $(call gb_Library_set_include,filterconfig,\
 	$$(INCLUDE) \
diff --git a/filter/Library_filtertracer.mk b/filter/Library_filtertracer.mk
index 72d83430bbd8..efd029a6c765 100644
--- a/filter/Library_filtertracer.mk
+++ b/filter/Library_filtertracer.mk
@@ -18,10 +18,7 @@
 
 $(eval $(call gb_Library_Library,filtertracer))
 
-$(eval $(call gb_Library_use_api,filtertracer,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,filtertracer))
 
 $(eval $(call gb_Library_set_include,filtertracer,\
 	$$(INCLUDE) \
diff --git a/filter/Library_flash.mk b/filter/Library_flash.mk
index 80b2b3e4d877..77668e02bd38 100644
--- a/filter/Library_flash.mk
+++ b/filter/Library_flash.mk
@@ -20,10 +20,7 @@ $(eval $(call gb_Library_Library,flash))
 
 $(eval $(call gb_Library_set_componentfile,flash,filter/source/flash/flash))
 
-$(eval $(call gb_Library_use_api,flash,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,flash))
 
 $(eval $(call gb_Library_set_include,flash,\
 	$$(INCLUDE) \
diff --git a/filter/Library_icd.mk b/filter/Library_icd.mk
index fbfa2ac1fa34..e38f7451fbf7 100644
--- a/filter/Library_icd.mk
+++ b/filter/Library_icd.mk
@@ -18,10 +18,7 @@
 
 $(eval $(call gb_Library_Library,icd))
 
-$(eval $(call gb_Library_use_api,icd,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,icd))
 
 $(eval $(call gb_Library_set_include,icd,\
 	$$(INCLUDE) \
diff --git a/filter/Library_icg.mk b/filter/Library_icg.mk
index 5d90f0e85f48..0e319abf9ec3 100644
--- a/filter/Library_icg.mk
+++ b/filter/Library_icg.mk
@@ -18,10 +18,7 @@
 
 $(eval $(call gb_Library_Library,icg))
 
-$(eval $(call gb_Library_use_api,icg,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,icg))
 
 $(eval $(call gb_Library_set_include,icg,\
 	$$(INCLUDE) \
diff --git a/filter/Library_idx.mk b/filter/Library_idx.mk
index f610be588284..62fb96d71d40 100644
--- a/filter/Library_idx.mk
+++ b/filter/Library_idx.mk
@@ -18,10 +18,7 @@
 
 $(eval $(call gb_Library_Library,idx))
 
-$(eval $(call gb_Library_use_api,idx,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,idx))
 
 $(eval $(call gb_Library_set_include,idx,\
 	$$(INCLUDE) \
diff --git a/filter/Library_ime.mk b/filter/Library_ime.mk
index b5662c5afeaf..65927bb255b2 100644
--- a/filter/Library_ime.mk
+++ b/filter/Library_ime.mk
@@ -18,10 +18,7 @@
 
 $(eval $(call gb_Library_Library,ime))
 
-$(eval $(call gb_Library_use_api,ime,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,ime))
 
 $(eval $(call gb_Library_set_include,ime,\
 	$$(INCLUDE) \
diff --git a/filter/Library_ipb.mk b/filter/Library_ipb.mk
index 00581826f719..281d832bfa08 100644
--- a/filter/Library_ipb.mk
+++ b/filter/Library_ipb.mk
@@ -18,10 +18,7 @@
 
 $(eval $(call gb_Library_Library,ipb))
 
-$(eval $(call gb_Library_use_api,ipb,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,ipb))
 
 $(eval $(call gb_Library_set_include,ipb,\
 	$$(INCLUDE) \
diff --git a/filter/Library_ipd.mk b/filter/Library_ipd.mk
index 1b37d127babf..c81aeb264354 100644
--- a/filter/Library_ipd.mk
+++ b/filter/Library_ipd.mk
@@ -18,10 +18,7 @@
 
 $(eval $(call gb_Library_Library,ipd))
 
-$(eval $(call gb_Library_use_api,ipd,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,ipd))
 
 $(eval $(call gb_Library_set_include,ipd,\
 	$$(INCLUDE) \
diff --git a/filter/Library_ips.mk b/filter/Library_ips.mk
index 74bee0b4c238..19a908e0f1a1 100644
--- a/filter/Library_ips.mk
+++ b/filter/Library_ips.mk
@@ -18,10 +18,7 @@
 
 $(eval $(call gb_Library_Library,ips))
 
-$(eval $(call gb_Library_use_api,ips,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,ips))
 
 $(eval $(call gb_Library_set_include,ips,\
 	$$(INCLUDE) \
diff --git a/filter/Library_ipt.mk b/filter/Library_ipt.mk
index 7f73f83cccda..5924518751b2 100644
--- a/filter/Library_ipt.mk
+++ b/filter/Library_ipt.mk
@@ -18,10 +18,7 @@
 
 $(eval $(call gb_Library_Library,ipt))
 
-$(eval $(call gb_Library_use_api,ipt,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,ipt))
 
 $(eval $(call gb_Library_set_include,ipt,\
 	$$(INCLUDE) \
diff --git a/filter/Library_ipx.mk b/filter/Library_ipx.mk
index ea377a33525a..8382b1aec39d 100644
--- a/filter/Library_ipx.mk
+++ b/filter/Library_ipx.mk
@@ -18,10 +18,7 @@
 
 $(eval $(call gb_Library_Library,ipx))
 
-$(eval $(call gb_Library_use_api,ipx,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,ipx))
 
 $(eval $(call gb_Library_set_include,ipx,\
 	$$(INCLUDE) \
diff --git a/filter/Library_ira.mk b/filter/Library_ira.mk
index 3729daf6ae08..31d689cda70c 100644
--- a/filter/Library_ira.mk
+++ b/filter/Library_ira.mk
@@ -18,10 +18,7 @@
 
 $(eval $(call gb_Library_Library,ira))
 
-$(eval $(call gb_Library_use_api,ira,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,ira))
 
 $(eval $(call gb_Library_set_include,ira,\
 	$$(INCLUDE) \
diff --git a/filter/Library_itg.mk b/filter/Library_itg.mk
index 3362d63c8f8c..5ce1c045892a 100644
--- a/filter/Library_itg.mk
+++ b/filter/Library_itg.mk
@@ -18,10 +18,7 @@
 
 $(eval $(call gb_Library_Library,itg))
 
-$(eval $(call gb_Library_use_api,itg,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,itg))
 
 $(eval $(call gb_Library_set_include,itg,\
 	$$(INCLUDE) \
diff --git a/filter/Library_iti.mk b/filter/Library_iti.mk
index c02894d87a01..85a4ac75354d 100644
--- a/filter/Library_iti.mk
+++ b/filter/Library_iti.mk
@@ -18,10 +18,7 @@
 
 $(eval $(call gb_Library_Library,iti))
 
-$(eval $(call gb_Library_use_api,iti,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,iti))
 
 $(eval $(call gb_Library_set_include,iti,\
 	$$(INCLUDE) \
diff --git a/filter/Library_msfilter.mk b/filter/Library_msfilter.mk
index 339f5c4226dc..ceb7d0a1f5d9 100644
--- a/filter/Library_msfilter.mk
+++ b/filter/Library_msfilter.mk
@@ -22,10 +22,7 @@ $(eval $(call gb_Library_use_package,msfilter,filter_inc))
 
 $(eval $(call gb_Library_set_componentfile,msfilter,filter/source/msfilter/msfilter))
 
-$(eval $(call gb_Library_use_api,msfilter,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,msfilter))
 
 $(eval $(call gb_Library_set_include,msfilter,\
 	$$(INCLUDE) \
diff --git a/filter/Library_odfflatxml.mk b/filter/Library_odfflatxml.mk
index 2e2d03b35168..a3d28afe39e2 100644
--- a/filter/Library_odfflatxml.mk
+++ b/filter/Library_odfflatxml.mk
@@ -29,10 +29,7 @@ $(eval $(call gb_Library_Library,odfflatxml))
 
 $(eval $(call gb_Library_set_componentfile,odfflatxml,filter/source/odfflatxml/odfflatxml))
 
-$(eval $(call gb_Library_use_api,odfflatxml,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,odfflatxml))
 
 $(eval $(call gb_Library_set_include,odfflatxml,\
 	$$(INCLUDE) \
diff --git a/filter/Library_pdffilter.mk b/filter/Library_pdffilter.mk
index c3c9e2c99866..46e9973c4e4e 100644
--- a/filter/Library_pdffilter.mk
+++ b/filter/Library_pdffilter.mk
@@ -20,10 +20,7 @@ $(eval $(call gb_Library_Library,pdffilter))
 
 $(eval $(call gb_Library_set_componentfile,pdffilter,filter/source/pdf/pdffilter))
 
-$(eval $(call gb_Library_use_api,pdffilter,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,pdffilter))
 
 $(eval $(call gb_Library_set_include,pdffilter,\
 	-I$(SRCDIR)/filter/inc \
diff --git a/filter/Library_placeware.mk b/filter/Library_placeware.mk
index 1cc69aca9379..4bb4ef1d29d3 100644
--- a/filter/Library_placeware.mk
+++ b/filter/Library_placeware.mk
@@ -20,10 +20,7 @@ $(eval $(call gb_Library_Library,placeware))
 
 $(eval $(call gb_Library_set_componentfile,placeware,filter/source/placeware/placeware))
 
-$(eval $(call gb_Library_use_api,placeware,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,placeware))
 
 $(eval $(call gb_Library_set_include,placeware,\
 	$$(INCLUDE) \
diff --git a/filter/Library_svgfilter.mk b/filter/Library_svgfilter.mk
index af281e2389c4..f2927556848f 100644
--- a/filter/Library_svgfilter.mk
+++ b/filter/Library_svgfilter.mk
@@ -32,10 +32,7 @@ $(eval $(call gb_Library_set_include,svgfilter,\
     -I$(SRCDIR)/filter/inc \
 ))
 
-$(eval $(call gb_Library_use_api,svgfilter,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,svgfilter))
 
 $(eval $(call gb_Library_use_libraries,svgfilter,\
 	svxcore \
diff --git a/filter/Library_t602filter.mk b/filter/Library_t602filter.mk
index a866b25fa76b..8bf24468a019 100644
--- a/filter/Library_t602filter.mk
+++ b/filter/Library_t602filter.mk
@@ -20,10 +20,7 @@ $(eval $(call gb_Library_Library,t602filter))
 
 $(eval $(call gb_Library_set_componentfile,t602filter,filter/source/t602/t602filter))
 
-$(eval $(call gb_Library_use_api,t602filter,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,t602filter))
 
 $(eval $(call gb_Library_set_include,t602filter,\
 	$$(INCLUDE) \
diff --git a/filter/Library_textfd.mk b/filter/Library_textfd.mk
index ac7303aa1905..9ab5a7c45572 100644
--- a/filter/Library_textfd.mk
+++ b/filter/Library_textfd.mk
@@ -32,10 +32,7 @@ $(eval $(call gb_Library_Library,textfd))
 
 $(eval $(call gb_Library_set_componentfile,textfd,filter/source/textfilterdetect/textfd))
 
-$(eval $(call gb_Library_use_api,textfd,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,textfd))
 
 $(eval $(call gb_Library_set_include,textfd,\
 	$$(INCLUDE) \
diff --git a/filter/Library_xmlfa.mk b/filter/Library_xmlfa.mk
index 7dd33643ab6a..f9260d57f8c2 100644
--- a/filter/Library_xmlfa.mk
+++ b/filter/Library_xmlfa.mk
@@ -20,10 +20,7 @@ $(eval $(call gb_Library_Library,xmlfa))
 
 $(eval $(call gb_Library_set_componentfile,xmlfa,filter/source/xmlfilteradaptor/xmlfa))
 
-$(eval $(call gb_Library_use_api,xmlfa,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,xmlfa))
 
 $(eval $(call gb_Library_set_include,xmlfa,\
 	$$(INCLUDE) \
diff --git a/filter/Library_xmlfd.mk b/filter/Library_xmlfd.mk
index faa5e81af97b..19f0509f44fa 100644
--- a/filter/Library_xmlfd.mk
+++ b/filter/Library_xmlfd.mk
@@ -20,10 +20,7 @@ $(eval $(call gb_Library_Library,xmlfd))
 
 $(eval $(call gb_Library_set_componentfile,xmlfd,filter/source/xmlfilterdetect/xmlfd))
 
-$(eval $(call gb_Library_use_api,xmlfd,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,xmlfd))
 
 $(eval $(call gb_Library_set_include,xmlfd,\
 	$$(INCLUDE) \
diff --git a/filter/Library_xsltdlg.mk b/filter/Library_xsltdlg.mk
index c85f046ef06b..ba4f0435ea5b 100644
--- a/filter/Library_xsltdlg.mk
+++ b/filter/Library_xsltdlg.mk
@@ -20,10 +20,7 @@ $(eval $(call gb_Library_Library,xsltdlg))
 
 $(eval $(call gb_Library_set_componentfile,xsltdlg,filter/source/xsltdialog/xsltdlg))
 
-$(eval $(call gb_Library_use_api,xsltdlg,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,xsltdlg))
 
 $(eval $(call gb_Library_set_include,xsltdlg,\
 	$$(INCLUDE) \
diff --git a/filter/Library_xsltfilter.mk b/filter/Library_xsltfilter.mk
index 36c68147fdd4..9688d59c79d8 100644
--- a/filter/Library_xsltfilter.mk
+++ b/filter/Library_xsltfilter.mk
@@ -20,10 +20,7 @@ $(eval $(call gb_Library_Library,xsltfilter))
 
 $(eval $(call gb_Library_set_componentfile,xsltfilter,filter/source/xsltfilter/xsltfilter))
 
-$(eval $(call gb_Library_use_api,xsltfilter,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_Library_use_sdk_api,xsltfilter))
 
 $(eval $(call gb_Library_set_include,xsltfilter,\
 	$$(INCLUDE) \