targetted improvement of UNO API includes / usage

9 files changed, 9 insertions, 36 deletions

diff --git a/vcl/Library_desktop_detector.mk b/vcl/Library_desktop_detector.mk
index 4aa4609931be..91438e9c2d54 100644
--- a/vcl/Library_desktop_detector.mk
+++ b/vcl/Library_desktop_detector.mk
@@ -39,10 +39,7 @@ $(eval $(call gb_Library_add_defs,desktop_detector,\
     -DDESKTOP_DETECTOR_IMPLEMENTATION \
 ))
 
-$(eval $(call gb_Library_use_api,desktop_detector,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,desktop_detector))
 
 $(eval $(call gb_Library_use_libraries,desktop_detector,\
     vcl \
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 451c15b4f709..4079e3a697c6 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -65,10 +65,7 @@ $(eval $(call gb_Library_add_defs,vcl,\
     -DDLLPOSTFIX=$(gb_Library_DLLPOSTFIX) \
 ))
 
-$(eval $(call gb_Library_use_api,vcl,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,vcl))
 
 $(eval $(call gb_Library_use_libraries,vcl,\
     tl \
diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk
index c018a9d1c728..845c568bfdb1 100644
--- a/vcl/Library_vclplug_gen.mk
+++ b/vcl/Library_vclplug_gen.mk
@@ -33,10 +33,7 @@ $(eval $(call gb_Library_set_include,vclplug_gen,\
     -I$(SRCDIR)/vcl/inc \
 ))
 
-$(eval $(call gb_Library_use_api,vclplug_gen,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,vclplug_gen))
 
 $(eval $(call gb_Library_use_libraries,vclplug_gen,\
     vcl \
diff --git a/vcl/Library_vclplug_gtk.mk b/vcl/Library_vclplug_gtk.mk
index e816fcf1758b..4684aa18f474 100644
--- a/vcl/Library_vclplug_gtk.mk
+++ b/vcl/Library_vclplug_gtk.mk
@@ -40,10 +40,7 @@ $(eval $(call gb_Library_add_defs,vclplug_gtk,\
     -DLIBO_VERSION=\"$(UPD)$(LAST_MINOR)\" \
 ))
 
-$(eval $(call gb_Library_use_api,vclplug_gtk,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,vclplug_gtk))
 
 $(eval $(call gb_Library_use_libraries,vclplug_gtk,\
     vclplug_gen \
diff --git a/vcl/Library_vclplug_gtk3.mk b/vcl/Library_vclplug_gtk3.mk
index 120199c310aa..187773c6b719 100644
--- a/vcl/Library_vclplug_gtk3.mk
+++ b/vcl/Library_vclplug_gtk3.mk
@@ -47,10 +47,7 @@ $(eval $(call gb_Library_add_defs,vclplug_gtk3,\
     -DLIBO_VERSION=\"$(UPD)$(LAST_MINOR)\" \
 ))
 
-$(eval $(call gb_Library_use_api,vclplug_gtk3,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,vclplug_gtk3))
 
 $(eval $(call gb_Library_add_libs,vclplug_gtk3,\
     $$(GTK3_LIBS) \
diff --git a/vcl/Library_vclplug_kde.mk b/vcl/Library_vclplug_kde.mk
index 95cd1c32ac69..5f405cc6f47a 100644
--- a/vcl/Library_vclplug_kde.mk
+++ b/vcl/Library_vclplug_kde.mk
@@ -41,10 +41,7 @@ $(eval $(call gb_Library_add_defs,vclplug_kde,\
     -DVCLPLUG_KDE_IMPLEMENTATION \
 ))
 
-$(eval $(call gb_Library_use_api,vclplug_kde,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,vclplug_kde))
 
 $(eval $(call gb_Library_use_libraries,vclplug_kde,\
     vclplug_gen \
diff --git a/vcl/Library_vclplug_kde4.mk b/vcl/Library_vclplug_kde4.mk
index 256d2eecfdaa..057ea274354a 100644
--- a/vcl/Library_vclplug_kde4.mk
+++ b/vcl/Library_vclplug_kde4.mk
@@ -39,10 +39,7 @@ $(eval $(call gb_Library_add_defs,vclplug_kde4,\
     -DVCLPLUG_KDE4_IMPLEMENTATION \
 ))
 
-$(eval $(call gb_Library_use_api,vclplug_kde4,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,vclplug_kde4))
 
 $(eval $(call gb_Library_use_libraries,vclplug_kde4,\
     vclplug_gen \
diff --git a/vcl/Library_vclplug_svp.mk b/vcl/Library_vclplug_svp.mk
index ba0831ff9498..f859b1ef4104 100644
--- a/vcl/Library_vclplug_svp.mk
+++ b/vcl/Library_vclplug_svp.mk
@@ -41,10 +41,7 @@ $(eval $(call gb_Library_add_defs,vclplug_svp,\
     -DVCLPLUG_SVP_IMPLEMENTATION \
 ))
 
-$(eval $(call gb_Library_use_api,vclplug_svp,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,vclplug_svp))
 
 $(eval $(call gb_Library_use_libraries,vclplug_svp,\
     vcl \
diff --git a/vcl/Library_vclplug_tde.mk b/vcl/Library_vclplug_tde.mk
index d4bf1efd5d41..b698cb45552f 100644
--- a/vcl/Library_vclplug_tde.mk
+++ b/vcl/Library_vclplug_tde.mk
@@ -42,10 +42,7 @@ $(eval $(call gb_Library_add_defs,vclplug_tde,\
     -DVCLPLUG_TDE_IMPLEMENTATION \
 ))
 
-$(eval $(call gb_Library_use_api,vclplug_tde,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,vclplug_tde))
 
 $(eval $(call gb_Library_add_libs,vclplug_tde,\
     $$(TDE_LIBS) \