targetted improvement of UNO API includes / usage

10 files changed, 10 insertions, 40 deletions

diff --git a/desktop/Library_deployment.mk b/desktop/Library_deployment.mk
index 3314c2e14ab9..2cde4bae0ce9 100644
--- a/desktop/Library_deployment.mk
+++ b/desktop/Library_deployment.mk
@@ -34,10 +34,7 @@ $(eval $(call gb_Library_set_include,deployment,\
     -I$(SRCDIR)/desktop/source/deployment/registry/inc \
 ))
 
-$(eval $(call gb_Library_use_api,deployment,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,deployment))
 
 $(eval $(call gb_Library_use_libraries,deployment,\
     comphelper \
diff --git a/desktop/Library_deploymentgui.mk b/desktop/Library_deploymentgui.mk
index c27c07752ae2..f5f48e47d118 100644
--- a/desktop/Library_deploymentgui.mk
+++ b/desktop/Library_deploymentgui.mk
@@ -34,10 +34,7 @@ $(eval $(call gb_Library_set_include,deploymentgui,\
     -I$(SRCDIR)/desktop/source/inc \
 ))
 
-$(eval $(call gb_Library_use_api,deploymentgui,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,deploymentgui))
 
 $(eval $(call gb_Library_use_libraries,deploymentgui,\
     comphelper \
diff --git a/desktop/Library_deploymentmisc.mk b/desktop/Library_deploymentmisc.mk
index c03017759228..551c6392c918 100644
--- a/desktop/Library_deploymentmisc.mk
+++ b/desktop/Library_deploymentmisc.mk
@@ -33,10 +33,7 @@ $(eval $(call gb_Library_set_include,deploymentmisc,\
     -I$(SRCDIR)/desktop/source/deployment/inc \
 ))
 
-$(eval $(call gb_Library_use_api,deploymentmisc,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,deploymentmisc))
 
 $(eval $(call gb_Library_add_defs,deploymentmisc,\
     -DDESKTOP_DEPLOYMENTMISC_DLLIMPLEMENTATION \
diff --git a/desktop/Library_migrationoo2.mk b/desktop/Library_migrationoo2.mk
index 4c1d51d7fd68..838b475da267 100644
--- a/desktop/Library_migrationoo2.mk
+++ b/desktop/Library_migrationoo2.mk
@@ -31,10 +31,7 @@ $(eval $(call gb_Library_set_include,migrationoo2,\
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_Library_use_api,migrationoo2,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,migrationoo2))
 
 $(eval $(call gb_Library_use_libraries,migrationoo2,\
     cppu \
diff --git a/desktop/Library_migrationoo3.mk b/desktop/Library_migrationoo3.mk
index 9689749e50b4..d39497e32ea3 100644
--- a/desktop/Library_migrationoo3.mk
+++ b/desktop/Library_migrationoo3.mk
@@ -31,10 +31,7 @@ $(eval $(call gb_Library_set_include,migrationoo3,\
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_Library_use_api,migrationoo3,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,migrationoo3))
 
 $(eval $(call gb_Library_use_libraries,migrationoo3,\
     cppu \
diff --git a/desktop/Library_offacc.mk b/desktop/Library_offacc.mk
index cb088c026b73..f75728dab7bc 100644
--- a/desktop/Library_offacc.mk
+++ b/desktop/Library_offacc.mk
@@ -31,10 +31,7 @@ $(eval $(call gb_Library_set_include,offacc,\
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_Library_use_api,offacc,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,offacc))
 
 $(eval $(call gb_Library_use_libraries,offacc,\
     cppu \
diff --git a/desktop/Library_sofficeapp.mk b/desktop/Library_sofficeapp.mk
index 4ed40fd0d5b3..94958838e9de 100644
--- a/desktop/Library_sofficeapp.mk
+++ b/desktop/Library_sofficeapp.mk
@@ -34,10 +34,7 @@ $(eval $(call gb_Library_set_include,sofficeapp,\
     -I$(SRCDIR)/desktop/source/deployment/inc \
 ))
 
-$(eval $(call gb_Library_use_api,sofficeapp,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,sofficeapp))
 
 $(eval $(call gb_Library_add_defs,sofficeapp,\
     -DDESKTOP_DLLIMPLEMENTATION \
diff --git a/desktop/Library_spl.mk b/desktop/Library_spl.mk
index 35529052813c..0d45c5991078 100644
--- a/desktop/Library_spl.mk
+++ b/desktop/Library_spl.mk
@@ -32,10 +32,7 @@ $(eval $(call gb_Library_set_include,spl,\
     -I$(SRCDIR)/desktop/inc \
 ))
 
-$(eval $(call gb_Library_use_api,spl,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,spl))
 
 $(eval $(call gb_Library_use_libraries,spl,\
     comphelper \
diff --git a/desktop/Library_spl_unx.mk b/desktop/Library_spl_unx.mk
index 9fd065cb2b44..08412d5ac192 100644
--- a/desktop/Library_spl_unx.mk
+++ b/desktop/Library_spl_unx.mk
@@ -27,10 +27,7 @@
 
 $(eval $(call gb_Library_Library,spl_unx))
 
-$(eval $(call gb_Library_use_api,spl_unx,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,spl_unx))
 
 $(eval $(call gb_Library_use_libraries,spl_unx,\
     cppu \
diff --git a/desktop/Library_unopkgapp.mk b/desktop/Library_unopkgapp.mk
index 93ca09b87ff2..081fee923a33 100644
--- a/desktop/Library_unopkgapp.mk
+++ b/desktop/Library_unopkgapp.mk
@@ -34,10 +34,7 @@ $(eval $(call gb_Library_set_include,unopkgapp,\
     -I$(SRCDIR)/desktop/source/inc \
 ))
 
-$(eval $(call gb_Library_use_api,unopkgapp,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_Library_use_sdk_api,unopkgapp))
 
 $(eval $(call gb_Library_add_defs,unopkgapp,\
     -DDESKTOP_DLLIMPLEMENTATION \