targetted improvement of UNO API includes / usage

25 files changed, 25 insertions, 100 deletions

diff --git a/connectivity/Library_ado.mk b/connectivity/Library_ado.mk
index a4f2f41d5431..d9d120f88594 100644
--- a/connectivity/Library_ado.mk
+++ b/connectivity/Library_ado.mk
@@ -34,10 +34,7 @@ $(eval $(call gb_Library_set_include,ado,\
 	$$(INCLUDE) \
 ))
 
-$(eval $(call gb_Library_use_api,ado,\
-	offapi \
-	udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,ado))
 
 ifeq ($(COM),GCC)
 $(eval $(call gb_Library_add_cxxflags,ado,\
diff --git a/connectivity/Library_calc.mk b/connectivity/Library_calc.mk
index c9a83d123405..93431fcf3b4b 100644
--- a/connectivity/Library_calc.mk
+++ b/connectivity/Library_calc.mk
@@ -29,10 +29,7 @@ $(eval $(call gb_Library_Library,calc))
 
 $(eval $(call gb_Library_set_componentfile,calc,connectivity/source/drivers/calc/calc))
 
-$(eval $(call gb_Library_use_api,calc,\
-	offapi \
-	udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,calc))
 
 $(eval $(call gb_Library_set_include,calc,\
 	$$(INCLUDE) \
diff --git a/connectivity/Library_dbase.mk b/connectivity/Library_dbase.mk
index d26cc3b6ca27..5dd69321af53 100644
--- a/connectivity/Library_dbase.mk
+++ b/connectivity/Library_dbase.mk
@@ -29,10 +29,7 @@ $(eval $(call gb_Library_Library,dbase))
 
 $(eval $(call gb_Library_set_componentfile,dbase,connectivity/source/drivers/dbase/dbase))
 
-$(eval $(call gb_Library_use_api,dbase,\
-	offapi \
-	udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,dbase))
 
 $(eval $(call gb_Library_set_include,dbase,\
 	$$(INCLUDE) \
diff --git a/connectivity/Library_dbpool2.mk b/connectivity/Library_dbpool2.mk
index 008a6581e802..127a3e7cfad9 100644
--- a/connectivity/Library_dbpool2.mk
+++ b/connectivity/Library_dbpool2.mk
@@ -35,10 +35,7 @@ $(eval $(call gb_Library_set_include,dbpool2,\
 	-I$(SRCDIR)/connectivity/source/inc \
 ))
 
-$(eval $(call gb_Library_use_api,dbpool2,\
-	offapi \
-	udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,dbpool2))
 
 $(eval $(call gb_Library_use_libraries,dbpool2,\
 	comphelper \
diff --git a/connectivity/Library_dbtools.mk b/connectivity/Library_dbtools.mk
index 93539deb6f33..442eb1be68a4 100644
--- a/connectivity/Library_dbtools.mk
+++ b/connectivity/Library_dbtools.mk
@@ -47,10 +47,7 @@ $(eval $(call gb_Library_set_include,dbtools,\
 	-I$(dir $(call gb_YaccTarget_get_target,connectivity/source/parse/sqlbison)) \
 ))
 
-$(eval $(call gb_Library_use_api,dbtools,\
-	offapi \
-	udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,dbtools))
 
 $(eval $(call gb_Library_use_libraries,dbtools,\
 	cppu \
diff --git a/connectivity/Library_evoab.mk b/connectivity/Library_evoab.mk
index 852685d910ae..882cdb0da054 100644
--- a/connectivity/Library_evoab.mk
+++ b/connectivity/Library_evoab.mk
@@ -39,10 +39,7 @@ $(eval $(call gb_Library_use_externals,evoab,\
 
 $(eval $(call gb_Library_set_componentfile,evoab,connectivity/source/drivers/evoab2/evoab))
 
-$(eval $(call gb_Library_use_api,evoab,\
-	offapi \
-	udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,evoab))
 
 $(eval $(call gb_Library_use_libraries,evoab,\
 	comphelper \
diff --git a/connectivity/Library_file.mk b/connectivity/Library_file.mk
index b1757c146921..08754335d78b 100644
--- a/connectivity/Library_file.mk
+++ b/connectivity/Library_file.mk
@@ -37,10 +37,7 @@ $(eval $(call gb_Library_set_include,file,\
 	-I$(SRCDIR)/connectivity/source/inc \
 ))
 
-$(eval $(call gb_Library_use_api,file,\
-	offapi \
-	udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,file))
 
 $(eval $(call gb_Library_use_libraries,file,\
 	cppu \
diff --git a/connectivity/Library_flat.mk b/connectivity/Library_flat.mk
index 82885ceb2e90..a69d0f221ae9 100644
--- a/connectivity/Library_flat.mk
+++ b/connectivity/Library_flat.mk
@@ -29,10 +29,7 @@ $(eval $(call gb_Library_Library,flat))
 
 $(eval $(call gb_Library_set_componentfile,flat,connectivity/source/drivers/flat/flat))
 
-$(eval $(call gb_Library_use_api,flat,\
-	offapi \
-	udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,flat))
 
 $(eval $(call gb_Library_set_include,flat,\
 	$$(INCLUDE) \
diff --git a/connectivity/Library_hsqldb.mk b/connectivity/Library_hsqldb.mk
index 8421818195d9..a3aef6d8906f 100644
--- a/connectivity/Library_hsqldb.mk
+++ b/connectivity/Library_hsqldb.mk
@@ -36,10 +36,7 @@ $(eval $(call gb_Library_use_externals,hsqldb,\
 	hsqldb \
 ))
 
-$(eval $(call gb_Library_use_api,hsqldb,\
-	offapi \
-	udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,hsqldb))
 
 $(eval $(call gb_Library_use_libraries,hsqldb,\
 	comphelper \
diff --git a/connectivity/Library_jdbc.mk b/connectivity/Library_jdbc.mk
index 470c19f6b6f3..70e553d0d3b8 100644
--- a/connectivity/Library_jdbc.mk
+++ b/connectivity/Library_jdbc.mk
@@ -29,10 +29,7 @@ $(eval $(call gb_Library_Library,jdbc))
 
 $(eval $(call gb_Library_set_componentfile,jdbc,connectivity/source/drivers/jdbc/jdbc))
 
-$(eval $(call gb_Library_use_api,jdbc,\
-	offapi \
-	udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,jdbc))
 
 $(eval $(call gb_Library_set_include,jdbc,\
 	$$(INCLUDE) \
diff --git a/connectivity/Library_kab1.mk b/connectivity/Library_kab1.mk
index 7480d29c05ab..86f713d15ef9 100644
--- a/connectivity/Library_kab1.mk
+++ b/connectivity/Library_kab1.mk
@@ -31,10 +31,7 @@ $(eval $(call gb_Library_use_externals,kab1,kde))
 
 $(eval $(call gb_Library_set_componentfile,kab1,connectivity/source/drivers/kab/kab1))
 
-$(eval $(call gb_Library_use_api,kab1,\
-	offapi \
-	udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,kab1))
 
 $(eval $(call gb_Library_set_include,kab1,\
 	-I$(SRCDIR)/connectivity/source/inc \
diff --git a/connectivity/Library_kabdrv1.mk b/connectivity/Library_kabdrv1.mk
index e5a1673d22f3..6a0f16c427f0 100644
--- a/connectivity/Library_kabdrv1.mk
+++ b/connectivity/Library_kabdrv1.mk
@@ -31,10 +31,7 @@ $(eval $(call gb_Library_use_packages,kabdrv1,\
 	shell_inc \
 ))
 
-$(eval $(call gb_Library_use_api,kabdrv1,\
-	offapi \
-	udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,kabdrv1))
 
 $(eval $(call gb_Library_use_externals,kabdrv1,\
 	kde \
diff --git a/connectivity/Library_macab1.mk b/connectivity/Library_macab1.mk
index cf5168c87213..842394c40bfa 100644
--- a/connectivity/Library_macab1.mk
+++ b/connectivity/Library_macab1.mk
@@ -29,10 +29,7 @@ $(eval $(call gb_Library_Library,macab1))
 
 $(eval $(call gb_Library_set_componentfile,macab1,connectivity/source/drivers/macab/macab1))
 
-$(eval $(call gb_Library_use_api,macab1,\
-	offapi \
-	udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,macab1))
 
 $(eval $(call gb_Library_use_libraries,macab1,\
 	cppu \
diff --git a/connectivity/Library_macabdrv1.mk b/connectivity/Library_macabdrv1.mk
index 0f15bb4c0c04..471c6c777ff3 100644
--- a/connectivity/Library_macabdrv1.mk
+++ b/connectivity/Library_macabdrv1.mk
@@ -27,10 +27,7 @@
 
 $(eval $(call gb_Library_Library,macabdrv1))
 
-$(eval $(call gb_Library_use_api,macabdrv1,\
-	offapi \
-	udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,macabdrv1))
 
 $(eval $(call gb_Library_add_libs,macabdrv1,\
 	-framework Carbon \
diff --git a/connectivity/Library_mozab.mk b/connectivity/Library_mozab.mk
index 4339ebac3728..afde265bf630 100644
--- a/connectivity/Library_mozab.mk
+++ b/connectivity/Library_mozab.mk
@@ -34,10 +34,7 @@ $(eval $(call gb_Library_set_include,mozab2,\
 	$$(INCLUDE) \
 ))
 
-$(eval $(call gb_Library_use_api,mozab2,\
-	offapi \
-	udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,mozab2))
 
 $(eval $(call gb_Library_use_libraries,mozab2,\
 	cppu \
diff --git a/connectivity/Library_mozabdrv.mk b/connectivity/Library_mozabdrv.mk
index 14dd78783a82..b1c29ee0f811 100644
--- a/connectivity/Library_mozabdrv.mk
+++ b/connectivity/Library_mozabdrv.mk
@@ -33,10 +33,7 @@ $(eval $(call gb_Library_set_include,mozabdrv,\
 	$$(INCLUDE) \
 ))
 
-$(eval $(call gb_Library_use_api,mozabdrv,\
-	offapi \
-	udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,mozabdrv))
 
 $(eval $(call gb_Library_use_libraries,mozabdrv,\
 	comphelper \
diff --git a/connectivity/Library_mozbootstrap.mk b/connectivity/Library_mozbootstrap.mk
index 36c7486df15a..aab40dcc030b 100644
--- a/connectivity/Library_mozbootstrap.mk
+++ b/connectivity/Library_mozbootstrap.mk
@@ -38,10 +38,7 @@ $(eval $(call gb_Library_set_include,mozbootstrap,\
 	$$(INCLUDE) \
 ))
 
-$(eval $(call gb_Library_use_api,mozbootstrap,\
-	offapi \
-	udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,mozbootstrap))
 
 $(eval $(call gb_Library_use_libraries,mozbootstrap,\
 	comphelper \
diff --git a/connectivity/Library_mysql.mk b/connectivity/Library_mysql.mk
index 73de22f1181c..5e17042fd5e0 100644
--- a/connectivity/Library_mysql.mk
+++ b/connectivity/Library_mysql.mk
@@ -29,10 +29,7 @@ $(eval $(call gb_Library_Library,mysql))
 
 $(eval $(call gb_Library_set_componentfile,mysql,connectivity/source/drivers/mysql/mysql))
 
-$(eval $(call gb_Library_use_api,mysql,\
-	offapi \
-	udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,mysql))
 
 $(eval $(call gb_Library_set_include,mysql,\
 	$$(INCLUDE) \
diff --git a/connectivity/Library_odbc.mk b/connectivity/Library_odbc.mk
index 797c1e7ddb50..d6c3dc547cf6 100644
--- a/connectivity/Library_odbc.mk
+++ b/connectivity/Library_odbc.mk
@@ -31,10 +31,7 @@ $(eval $(call gb_Library_set_warnings_not_errors,odbc))
 
 $(eval $(call gb_Library_set_componentfile,odbc,connectivity/source/drivers/odbc/odbc))
 
-$(eval $(call gb_Library_use_api,odbc,\
-	offapi \
-	udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,odbc))
 
 $(eval $(call gb_Library_set_include,odbc,\
 	$$(INCLUDE) \
diff --git a/connectivity/Library_odbcbase.mk b/connectivity/Library_odbcbase.mk
index 5336326180ba..4d25b1c9fdd4 100644
--- a/connectivity/Library_odbcbase.mk
+++ b/connectivity/Library_odbcbase.mk
@@ -29,10 +29,7 @@ $(eval $(call gb_Library_Library,odbcbase))
 
 $(eval $(call gb_Library_set_warnings_not_errors,odbcbase))
 
-$(eval $(call gb_Library_use_api,odbcbase,\
-	offapi \
-	udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,odbcbase))
 
 $(eval $(call gb_Library_set_include,odbcbase,\
 	$$(INCLUDE) \
diff --git a/connectivity/Library_postgresql-sdbc-impl.mk b/connectivity/Library_postgresql-sdbc-impl.mk
index da6fe98d480c..979d166c3e9a 100644
--- a/connectivity/Library_postgresql-sdbc-impl.mk
+++ b/connectivity/Library_postgresql-sdbc-impl.mk
@@ -33,10 +33,7 @@ $(eval $(call gb_Library_add_defs,postgresql-sdbc-impl,\
 	-DPQ_SDBC_MICRO=2 \
 ))
 
-$(eval $(call gb_Library_use_api,postgresql-sdbc-impl,\
-	offapi \
-	udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,postgresql-sdbc-impl))
 
 $(eval $(call gb_Library_use_libraries,postgresql-sdbc-impl,\
 	cppu \
diff --git a/connectivity/Library_postgresql-sdbc.mk b/connectivity/Library_postgresql-sdbc.mk
index 292db43d84f2..202614dd52ff 100644
--- a/connectivity/Library_postgresql-sdbc.mk
+++ b/connectivity/Library_postgresql-sdbc.mk
@@ -33,10 +33,7 @@ $(eval $(call gb_Library_add_defs,postgresql-sdbc,\
 	-DPQ_SDBC_MICRO=2 \
 ))
 
-$(eval $(call gb_Library_use_api,postgresql-sdbc,\
-	offapi \
-	udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,postgresql-sdbc))
 
 $(eval $(call gb_Library_use_libraries,postgresql-sdbc,\
 	cppu \
diff --git a/connectivity/Library_sdbc2.mk b/connectivity/Library_sdbc2.mk
index cb43941c5f51..eb8789caacd6 100644
--- a/connectivity/Library_sdbc2.mk
+++ b/connectivity/Library_sdbc2.mk
@@ -30,10 +30,7 @@ $(eval $(call gb_Library_Library,sdbc2))
 $(eval $(call gb_Library_set_componentfile,sdbc2,connectivity/source/manager/sdbc2))
 
 
-$(eval $(call gb_Library_use_api,sdbc2,\
-	offapi \
-	udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,sdbc2))
 
 $(eval $(call gb_Library_set_include,sdbc2,\
 	$$(INCLUDE) \
diff --git a/connectivity/Library_tdeab1.mk b/connectivity/Library_tdeab1.mk
index 63602f490306..eb6c10242bb3 100644
--- a/connectivity/Library_tdeab1.mk
+++ b/connectivity/Library_tdeab1.mk
@@ -33,10 +33,7 @@ $(eval $(call gb_Library_use_externals,tdeab1,\
 
 $(eval $(call gb_Library_set_componentfile,tdeab1,connectivity/source/drivers/kab/tdeab1))
 
-$(eval $(call gb_Library_use_api,tdeab1,\
-	offapi \
-	udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,tdeab1))
 
 $(eval $(call gb_Library_use_libraries,tdeab1,\
 	comphelper \
diff --git a/connectivity/Library_tdeabdrv1.mk b/connectivity/Library_tdeabdrv1.mk
index 1f3a8ea80f9f..fbbd57d6c149 100644
--- a/connectivity/Library_tdeabdrv1.mk
+++ b/connectivity/Library_tdeabdrv1.mk
@@ -27,10 +27,7 @@
 
 $(eval $(call gb_Library_Library,tdeabdrv1))
 
-$(eval $(call gb_Library_use_api,tdeabdrv1,\
-	offapi \
-	udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,tdeabdrv1))
 
 $(eval $(call gb_Library_add_libs,tdeabdrv1,\
 	-lkabc \