extract common components to one place for sc unoapi tests

The declared components in a test of uno api don't change much
or at all, so instead of duplicating this in every test, define
it in a common file use when needed. Some more common things
could be extracted in a similar way.

Change-Id: I07ae641afca55ffaf3c5c93624bfaa2143590886
Reviewed-on: https://gerrit.libreoffice.org/51079
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>

52 files changed, 103 insertions, 1728 deletions

diff --git a/sc/CppunitTest_sc_anchor_test.mk b/sc/CppunitTest_sc_anchor_test.mk
index 480149c7ecd5..d7942c19d8f6 100644
--- a/sc/CppunitTest_sc_anchor_test.mk
+++ b/sc/CppunitTest_sc_anchor_test.mk
@@ -65,41 +65,7 @@ $(eval $(call gb_CppunitTest_use_ure,sc_anchor_test))
 $(eval $(call gb_CppunitTest_use_vcl,sc_anchor_test))
 
 $(eval $(call gb_CppunitTest_use_components,sc_anchor_test,\
-	basic/util/sb \
-	comphelper/util/comphelp \
-	configmgr/source/configmgr \
-	dbaccess/util/dba \
-	filter/source/config/cache/filterconfig1 \
-	filter/source/storagefilterdetect/storagefd \
-	forms/util/frm \
-	framework/util/fwk \
-	i18npool/util/i18npool \
-	linguistic/source/lng \
-	oox/util/oox \
-	package/source/xstor/xstor \
-	package/util/package2 \
-	sax/source/expatwrap/expwrap \
-	scripting/source/basprov/basprov \
-	scripting/util/scriptframe \
-	sc/util/sc \
-	sc/util/scd \
-	sc/util/scfilt \
-	$(call gb_Helper_optional,SCRIPTING, \
-		sc/util/vbaobj) \
-	sfx2/util/sfx \
-	sot/util/sot \
-	svl/source/fsstor/fsstorage \
-	toolkit/util/tk \
-	ucb/source/core/ucb1 \
-	ucb/source/ucp/file/ucpfile1 \
-	ucb/source/ucp/tdoc/ucptdoc1 \
-	unotools/util/utl \
-	unoxml/source/rdf/unordf \
-	unoxml/source/service/unoxml \
-	uui/util/uui \
-	vcl/vcl.common \
-	xmloff/util/xo \
-	svtools/util/svt \
+    $(sc_unoapi_common_components) \
 ))
 
 $(eval $(call gb_CppunitTest_use_configuration,sc_anchor_test))
diff --git a/sc/CppunitTest_sc_annotationobj.mk b/sc/CppunitTest_sc_annotationobj.mk
index a04c1cc104bb..f43a8c8bc8b4 100644
--- a/sc/CppunitTest_sc_annotationobj.mk
+++ b/sc/CppunitTest_sc_annotationobj.mk
@@ -64,41 +64,7 @@ $(eval $(call gb_CppunitTest_use_ure,sc_annotationobj))
 $(eval $(call gb_CppunitTest_use_vcl,sc_annotationobj))
 
 $(eval $(call gb_CppunitTest_use_components,sc_annotationobj,\
-    basic/util/sb \
-    comphelper/util/comphelp \
-    configmgr/source/configmgr \
-    dbaccess/util/dba \
-    filter/source/config/cache/filterconfig1 \
-    filter/source/storagefilterdetect/storagefd \
-    forms/util/frm \
-    framework/util/fwk \
-    i18npool/util/i18npool \
-	linguistic/source/lng \
-    oox/util/oox \
-    package/source/xstor/xstor \
-    package/util/package2 \
-    sax/source/expatwrap/expwrap \
-    scripting/source/basprov/basprov \
-    scripting/util/scriptframe \
-    sc/util/sc \
-    sc/util/scd \
-    sc/util/scfilt \
-    $(call gb_Helper_optional,SCRIPTING, \
-	    sc/util/vbaobj) \
-    sfx2/util/sfx \
-    sot/util/sot \
-    svl/source/fsstor/fsstorage \
-    toolkit/util/tk \
-    ucb/source/core/ucb1 \
-    ucb/source/ucp/file/ucpfile1 \
-    ucb/source/ucp/tdoc/ucptdoc1 \
-    unotools/util/utl \
-    unoxml/source/rdf/unordf \
-    unoxml/source/service/unoxml \
-    uui/util/uui \
-    vcl/vcl.common \
-    xmloff/util/xo \
-	svtools/util/svt \
+    $(sc_unoapi_common_components) \
 ))
 
 $(eval $(call gb_CppunitTest_use_configuration,sc_annotationobj))
diff --git a/sc/CppunitTest_sc_annotationshapeobj.mk b/sc/CppunitTest_sc_annotationshapeobj.mk
index dc59ebb9481c..af97eab84f79 100644
--- a/sc/CppunitTest_sc_annotationshapeobj.mk
+++ b/sc/CppunitTest_sc_annotationshapeobj.mk
@@ -64,40 +64,7 @@ $(eval $(call gb_CppunitTest_use_ure,sc_annotationshapeobj))
 $(eval $(call gb_CppunitTest_use_vcl,sc_annotationshapeobj))
 
 $(eval $(call gb_CppunitTest_use_components,sc_annotationshapeobj,\
-    basic/util/sb \
-    comphelper/util/comphelp \
-    configmgr/source/configmgr \
-    dbaccess/util/dba \
-    filter/source/config/cache/filterconfig1 \
-    forms/util/frm \
-    framework/util/fwk \
-    i18npool/util/i18npool \
-    linguistic/source/lng \
-    oox/util/oox \
-    package/source/xstor/xstor \
-    package/util/package2 \
-    sax/source/expatwrap/expwrap \
-    scripting/source/basprov/basprov \
-    scripting/util/scriptframe \
-    sc/util/sc \
-    sc/util/scd \
-    sc/util/scfilt \
-    $(call gb_Helper_optional,SCRIPTING, \
-		sc/util/vbaobj) \
-    sfx2/util/sfx \
-    sot/util/sot \
-    svl/source/fsstor/fsstorage \
-    toolkit/util/tk \
-    ucb/source/core/ucb1 \
-    ucb/source/ucp/file/ucpfile1 \
-    ucb/source/ucp/tdoc/ucptdoc1 \
-    unotools/util/utl \
-    unoxml/source/rdf/unordf \
-    unoxml/source/service/unoxml \
-    uui/util/uui \
-    vcl/vcl.common \
-    xmloff/util/xo \
-    svtools/util/svt \
+    $(sc_unoapi_common_components) \
 ))
 
 $(eval $(call gb_CppunitTest_use_configuration,sc_annotationshapeobj))
diff --git a/sc/CppunitTest_sc_annotationsobj.mk b/sc/CppunitTest_sc_annotationsobj.mk
index 504bbf5764cc..dca699f51ff1 100644
--- a/sc/CppunitTest_sc_annotationsobj.mk
+++ b/sc/CppunitTest_sc_annotationsobj.mk
@@ -64,41 +64,7 @@ $(eval $(call gb_CppunitTest_use_ure,sc_annotationsobj))
 $(eval $(call gb_CppunitTest_use_vcl,sc_annotationsobj))
 
 $(eval $(call gb_CppunitTest_use_components,sc_annotationsobj,\
-    basic/util/sb \
-    comphelper/util/comphelp \
-    configmgr/source/configmgr \
-    dbaccess/util/dba \
-    filter/source/config/cache/filterconfig1 \
-    filter/source/storagefilterdetect/storagefd \
-    forms/util/frm \
-    framework/util/fwk \
-    i18npool/util/i18npool \
-	linguistic/source/lng \
-    oox/util/oox \
-    package/source/xstor/xstor \
-    package/util/package2 \
-    sax/source/expatwrap/expwrap \
-    scripting/source/basprov/basprov \
-    scripting/util/scriptframe \
-    sc/util/sc \
-    sc/util/scd \
-    sc/util/scfilt \
-    $(call gb_Helper_optional,SCRIPTING, \
-	    sc/util/vbaobj) \
-    sfx2/util/sfx \
-    sot/util/sot \
-    svl/source/fsstor/fsstorage \
-    toolkit/util/tk \
-    ucb/source/core/ucb1 \
-    ucb/source/ucp/file/ucpfile1 \
-    ucb/source/ucp/tdoc/ucptdoc1 \
-    unotools/util/utl \
-    unoxml/source/rdf/unordf \
-    unoxml/source/service/unoxml \
-    uui/util/uui \
-    vcl/vcl.common \
-    xmloff/util/xo \
-	svtools/util/svt \
+    $(sc_unoapi_common_components) \
 ))
 
 $(eval $(call gb_CppunitTest_use_configuration,sc_annotationsobj))
diff --git a/sc/CppunitTest_sc_arealinkobj.mk b/sc/CppunitTest_sc_arealinkobj.mk
index 9220a11e6721..d6658a44344c 100644
--- a/sc/CppunitTest_sc_arealinkobj.mk
+++ b/sc/CppunitTest_sc_arealinkobj.mk
@@ -64,41 +64,7 @@ $(eval $(call gb_CppunitTest_use_ure,sc_arealinkobj))
 $(eval $(call gb_CppunitTest_use_vcl,sc_arealinkobj))
 
 $(eval $(call gb_CppunitTest_use_components,sc_arealinkobj,\
-    basic/util/sb \
-    comphelper/util/comphelp \
-    configmgr/source/configmgr \
-    dbaccess/util/dba \
-    filter/source/config/cache/filterconfig1 \
-    filter/source/storagefilterdetect/storagefd \
-    forms/util/frm \
-    framework/util/fwk \
-    i18npool/util/i18npool \
-    linguistic/source/lng \
-    oox/util/oox \
-    package/source/xstor/xstor \
-    package/util/package2 \
-    sax/source/expatwrap/expwrap \
-    scripting/source/basprov/basprov \
-    scripting/util/scriptframe \
-    sc/util/sc \
-    sc/util/scd \
-    sc/util/scfilt \
-    $(call gb_Helper_optional,SCRIPTING, \
-	    sc/util/vbaobj) \
-    sfx2/util/sfx \
-    sot/util/sot \
-    svl/source/fsstor/fsstorage \
-    toolkit/util/tk \
-    ucb/source/core/ucb1 \
-    ucb/source/ucp/file/ucpfile1 \
-    ucb/source/ucp/tdoc/ucptdoc1 \
-    unotools/util/utl \
-    unoxml/source/rdf/unordf \
-    unoxml/source/service/unoxml \
-    uui/util/uui \
-    vcl/vcl.common \
-    xmloff/util/xo \
-	svtools/util/svt \
+    $(sc_unoapi_common_components) \
 ))
 
 $(eval $(call gb_CppunitTest_use_configuration,sc_arealinkobj))
diff --git a/sc/CppunitTest_sc_arealinksobj.mk b/sc/CppunitTest_sc_arealinksobj.mk
index 436472ebcbdb..af01c0448d97 100644
--- a/sc/CppunitTest_sc_arealinksobj.mk
+++ b/sc/CppunitTest_sc_arealinksobj.mk
@@ -64,41 +64,7 @@ $(eval $(call gb_CppunitTest_use_ure,sc_arealinksobj))
 $(eval $(call gb_CppunitTest_use_vcl,sc_arealinksobj))
 
 $(eval $(call gb_CppunitTest_use_components,sc_arealinksobj,\
-    basic/util/sb \
-    comphelper/util/comphelp \
-    configmgr/source/configmgr \
-    dbaccess/util/dba \
-    filter/source/config/cache/filterconfig1 \
-    filter/source/storagefilterdetect/storagefd \
-    forms/util/frm \
-    framework/util/fwk \
-    i18npool/util/i18npool \
-    linguistic/source/lng \
-    oox/util/oox \
-    package/source/xstor/xstor \
-    package/util/package2 \
-    sax/source/expatwrap/expwrap \
-    scripting/source/basprov/basprov \
-    scripting/util/scriptframe \
-    sc/util/sc \
-    sc/util/scd \
-    sc/util/scfilt \
-    $(call gb_Helper_optional,SCRIPTING, \
-	    sc/util/vbaobj) \
-    sfx2/util/sfx \
-    sot/util/sot \
-    svl/source/fsstor/fsstorage \
-    toolkit/util/tk \
-    ucb/source/core/ucb1 \
-    ucb/source/ucp/file/ucpfile1 \
-    ucb/source/ucp/tdoc/ucptdoc1 \
-    unotools/util/utl \
-    unoxml/source/rdf/unordf \
-    unoxml/source/service/unoxml \
-    uui/util/uui \
-    vcl/vcl.common \
-    xmloff/util/xo \
-	svtools/util/svt \
+    $(sc_unoapi_common_components) \
 ))
 
 $(eval $(call gb_CppunitTest_use_configuration,sc_arealinksobj))
diff --git a/sc/CppunitTest_sc_autoformatobj.mk b/sc/CppunitTest_sc_autoformatobj.mk
index adad0b9122f7..cbfbed58edfe 100644
--- a/sc/CppunitTest_sc_autoformatobj.mk
+++ b/sc/CppunitTest_sc_autoformatobj.mk
@@ -64,41 +64,7 @@ $(eval $(call gb_CppunitTest_use_ure,sc_autoformatobj))
 $(eval $(call gb_CppunitTest_use_vcl,sc_autoformatobj))
 
 $(eval $(call gb_CppunitTest_use_components,sc_autoformatobj,\
-	basic/util/sb \
-	comphelper/util/comphelp \
-	configmgr/source/configmgr \
-	dbaccess/util/dba \
-	filter/source/config/cache/filterconfig1 \
-	filter/source/storagefilterdetect/storagefd \
-	forms/util/frm \
-	framework/util/fwk \
-	i18npool/util/i18npool \
-	linguistic/source/lng \
-	oox/util/oox \
-	package/source/xstor/xstor \
-	package/util/package2 \
-	sax/source/expatwrap/expwrap \
-	scripting/source/basprov/basprov \
-	scripting/util/scriptframe \
-	sc/util/sc \
-	sc/util/scd \
-	sc/util/scfilt \
-	$(call gb_Helper_optional,SCRIPTING, \
-		sc/util/vbaobj) \
-	sfx2/util/sfx \
-	sot/util/sot \
-	svl/source/fsstor/fsstorage \
-	toolkit/util/tk \
-	ucb/source/core/ucb1 \
-	ucb/source/ucp/file/ucpfile1 \
-	ucb/source/ucp/tdoc/ucptdoc1 \
-	unotools/util/utl \
-	unoxml/source/rdf/unordf \
-	unoxml/source/service/unoxml \
-	uui/util/uui \
-	vcl/vcl.common \
-	xmloff/util/xo \
-	svtools/util/svt \
+    $(sc_unoapi_common_components) \
 ))
 
 $(eval $(call gb_CppunitTest_use_configuration,sc_autoformatobj))
diff --git a/sc/CppunitTest_sc_cellcursorobj.mk b/sc/CppunitTest_sc_cellcursorobj.mk
index db57eaced17c..7882a8926bc8 100644
--- a/sc/CppunitTest_sc_cellcursorobj.mk
+++ b/sc/CppunitTest_sc_cellcursorobj.mk
@@ -64,41 +64,7 @@ $(eval $(call gb_CppunitTest_use_ure,sc_cellcursorobj))
 $(eval $(call gb_CppunitTest_use_vcl,sc_cellcursorobj))
 
 $(eval $(call gb_CppunitTest_use_components,sc_cellcursorobj,\
-    basic/util/sb \
-    comphelper/util/comphelp \
-    configmgr/source/configmgr \
-    dbaccess/util/dba \
-    filter/source/config/cache/filterconfig1 \
-    filter/source/storagefilterdetect/storagefd \
-    forms/util/frm \
-    framework/util/fwk \
-    i18npool/util/i18npool \
-    linguistic/source/lng \
-    oox/util/oox \
-    package/source/xstor/xstor \
-    package/util/package2 \
-    sax/source/expatwrap/expwrap \
-    scripting/source/basprov/basprov \
-    scripting/util/scriptframe \
-    sc/util/sc \
-    sc/util/scd \
-    sc/util/scfilt \
-    $(call gb_Helper_optional,SCRIPTING, \
-	    sc/util/vbaobj) \
-    sfx2/util/sfx \
-    sot/util/sot \
-    svl/source/fsstor/fsstorage \
-    toolkit/util/tk \
-    ucb/source/core/ucb1 \
-    ucb/source/ucp/file/ucpfile1 \
-    ucb/source/ucp/tdoc/ucptdoc1 \
-    unotools/util/utl \
-    unoxml/source/rdf/unordf \
-    unoxml/source/service/unoxml \
-    uui/util/uui \
-    vcl/vcl.common \
-    xmloff/util/xo \
-	svtools/util/svt \
+    $(sc_unoapi_common_components) \
 ))
 
 $(eval $(call gb_CppunitTest_use_configuration,sc_cellcursorobj))
diff --git a/sc/CppunitTest_sc_cellobj.mk b/sc/CppunitTest_sc_cellobj.mk
index b519c31c6ccc..058a6186a2d4 100644
--- a/sc/CppunitTest_sc_cellobj.mk
+++ b/sc/CppunitTest_sc_cellobj.mk
@@ -64,41 +64,7 @@ $(eval $(call gb_CppunitTest_use_ure,sc_cellobj))
 $(eval $(call gb_CppunitTest_use_vcl,sc_cellobj))
 
 $(eval $(call gb_CppunitTest_use_components,sc_cellobj,\
-    basic/util/sb \
-    comphelper/util/comphelp \
-    configmgr/source/configmgr \
-    dbaccess/util/dba \
-    filter/source/config/cache/filterconfig1 \
-    filter/source/storagefilterdetect/storagefd \
-    forms/util/frm \
-    framework/util/fwk \
-    i18npool/util/i18npool \
-    linguistic/source/lng \
-    oox/util/oox \
-    package/source/xstor/xstor \
-    package/util/package2 \
-    sax/source/expatwrap/expwrap \
-    scripting/source/basprov/basprov \
-    scripting/util/scriptframe \
-    sc/util/sc \
-    sc/util/scd \
-    sc/util/scfilt \
-    $(call gb_Helper_optional,SCRIPTING, \
-	    sc/util/vbaobj) \
-    sfx2/util/sfx \
-    sot/util/sot \
-    svl/source/fsstor/fsstorage \
-    toolkit/util/tk \
-    ucb/source/core/ucb1 \
-    ucb/source/ucp/file/ucpfile1 \
-    ucb/source/ucp/tdoc/ucptdoc1 \
-    unotools/util/utl \
-    unoxml/source/rdf/unordf \
-    unoxml/source/service/unoxml \
-    uui/util/uui \
-    vcl/vcl.common \
-    xmloff/util/xo \
-	svtools/util/svt \
+    $(sc_unoapi_common_components) \
 ))
 
 $(eval $(call gb_CppunitTest_use_configuration,sc_cellobj))
diff --git a/sc/CppunitTest_sc_cellrangeobj.mk b/sc/CppunitTest_sc_cellrangeobj.mk
index 77e39b8b4d37..1428ffee8d30 100644
--- a/sc/CppunitTest_sc_cellrangeobj.mk
+++ b/sc/CppunitTest_sc_cellrangeobj.mk
@@ -64,42 +64,8 @@ $(eval $(call gb_CppunitTest_use_ure,sc_cellrangeobj))
 $(eval $(call gb_CppunitTest_use_vcl,sc_cellrangeobj))
 
 $(eval $(call gb_CppunitTest_use_components,sc_cellrangeobj,\
-	basic/util/sb \
-    comphelper/util/comphelp \
-    configmgr/source/configmgr \
-    dbaccess/util/dba \
-    filter/source/config/cache/filterconfig1 \
-    filter/source/storagefilterdetect/storagefd \
-    forms/util/frm \
-    framework/util/fwk \
+    $(sc_unoapi_common_components) \
     i18npool/source/search/i18nsearch \
-    i18npool/util/i18npool \
-    linguistic/source/lng \
-    oox/util/oox \
-    package/source/xstor/xstor \
-    package/util/package2 \
-    sax/source/expatwrap/expwrap \
-    scripting/source/basprov/basprov \
-    scripting/util/scriptframe \
-    sc/util/sc \
-    sc/util/scd \
-    sc/util/scfilt \
-    $(call gb_Helper_optional,SCRIPTING, \
-	    sc/util/vbaobj) \
-    sfx2/util/sfx \
-    sot/util/sot \
-    svl/source/fsstor/fsstorage \
-    toolkit/util/tk \
-    ucb/source/core/ucb1 \
-    ucb/source/ucp/file/ucpfile1 \
-    ucb/source/ucp/tdoc/ucptdoc1 \
-    unotools/util/utl \
-    unoxml/source/rdf/unordf \
-    unoxml/source/service/unoxml \
-    uui/util/uui \
-    vcl/vcl.common \
-    xmloff/util/xo \
-	svtools/util/svt \
 ))
 
 $(eval $(call gb_CppunitTest_use_configuration,sc_cellrangeobj))
diff --git a/sc/CppunitTest_sc_cellrangesobj.mk b/sc/CppunitTest_sc_cellrangesobj.mk
index 2cd5f055ac40..1c90449c985c 100644
--- a/sc/CppunitTest_sc_cellrangesobj.mk
+++ b/sc/CppunitTest_sc_cellrangesobj.mk
@@ -64,41 +64,8 @@ $(eval $(call gb_CppunitTest_use_ure,sc_cellrangesobj))
 $(eval $(call gb_CppunitTest_use_vcl,sc_cellrangesobj))
 
 $(eval $(call gb_CppunitTest_use_components,sc_cellrangesobj,\
-	basic/util/sb \
-	comphelper/util/comphelp \
-	configmgr/source/configmgr \
-	dbaccess/util/dba \
-	filter/source/config/cache/filterconfig1 \
-	filter/source/storagefilterdetect/storagefd \
-	forms/util/frm \
-	framework/util/fwk \
-	i18npool/source/search/i18nsearch \
-	i18npool/util/i18npool \
-	oox/util/oox \
-	package/source/xstor/xstor \
-	package/util/package2 \
-	sax/source/expatwrap/expwrap \
-	scripting/source/basprov/basprov \
-	scripting/util/scriptframe \
-	sc/util/sc \
-	sc/util/scd \
-	sc/util/scfilt \
-	$(call gb_Helper_optional,SCRIPTING, \
-		sc/util/vbaobj) \
-	sfx2/util/sfx \
-	sot/util/sot \
-	svl/source/fsstor/fsstorage \
-	toolkit/util/tk \
-	ucb/source/core/ucb1 \
-	ucb/source/ucp/file/ucpfile1 \
-	ucb/source/ucp/tdoc/ucptdoc1 \
-	unotools/util/utl \
-	unoxml/source/rdf/unordf \
-	unoxml/source/service/unoxml \
-	uui/util/uui \
-	vcl/vcl.common \
-	xmloff/util/xo \
-	svtools/util/svt \
+    $(sc_unoapi_common_components) \
+    i18npool/source/search/i18nsearch \
 ))
 
 $(eval $(call gb_CppunitTest_use_configuration,sc_cellrangesobj))
diff --git a/sc/CppunitTest_sc_check_data_pilot_field.mk b/sc/CppunitTest_sc_check_data_pilot_field.mk
index 4fbca0c09695..0a1150ce8572 100644
--- a/sc/CppunitTest_sc_check_data_pilot_field.mk
+++ b/sc/CppunitTest_sc_check_data_pilot_field.mk
@@ -65,38 +65,7 @@ $(eval $(call gb_CppunitTest_use_ure,sc_check_data_pilot_field))
 $(eval $(call gb_CppunitTest_use_vcl,sc_check_data_pilot_field))
 
 $(eval $(call gb_CppunitTest_use_components,sc_check_data_pilot_field,\
-    basic/util/sb \
-    comphelper/util/comphelp \
-    configmgr/source/configmgr \
-    dbaccess/util/dba \
-    filter/source/config/cache/filterconfig1 \
-    forms/util/frm \
-    framework/util/fwk \
-    i18npool/util/i18npool \
-    oox/util/oox \
-    package/source/xstor/xstor \
-    package/util/package2 \
-    sax/source/expatwrap/expwrap \
-    scripting/source/basprov/basprov \
-    scripting/util/scriptframe \
-    sc/util/sc \
-    sc/util/scd \
-    sc/util/scfilt \
-    $(call gb_Helper_optional,SCRIPTING, \
-            sc/util/vbaobj) \
-    sfx2/util/sfx \
-    sot/util/sot \
-    svl/source/fsstor/fsstorage \
-    toolkit/util/tk \
-    ucb/source/core/ucb1 \
-    ucb/source/ucp/file/ucpfile1 \
-    ucb/source/ucp/tdoc/ucptdoc1 \
-    unotools/util/utl \
-    unoxml/source/rdf/unordf \
-    unoxml/source/service/unoxml \
-    uui/util/uui \
-    vcl/vcl.common \
-    svtools/util/svt \
+    $(sc_unoapi_common_components) \
 ))
 
 $(eval $(call gb_CppunitTest_use_configuration,sc_check_data_pilot_field))
diff --git a/sc/CppunitTest_sc_check_data_pilot_table.mk b/sc/CppunitTest_sc_check_data_pilot_table.mk
index 9c337f4b2c69..4399775db696 100644
--- a/sc/CppunitTest_sc_check_data_pilot_table.mk
+++ b/sc/CppunitTest_sc_check_data_pilot_table.mk
@@ -65,38 +65,7 @@ $(eval $(call gb_CppunitTest_use_ure,sc_check_data_pilot_table))
 $(eval $(call gb_CppunitTest_use_vcl,sc_check_data_pilot_table))
 
 $(eval $(call gb_CppunitTest_use_components,sc_check_data_pilot_table,\
-    basic/util/sb \
-    comphelper/util/comphelp \
-    configmgr/source/configmgr \
-    dbaccess/util/dba \
-    filter/source/config/cache/filterconfig1 \
-    forms/util/frm \
-    framework/util/fwk \
-    i18npool/util/i18npool \
-    oox/util/oox \
-    package/source/xstor/xstor \
-    package/util/package2 \
-    sax/source/expatwrap/expwrap \
-    scripting/source/basprov/basprov \
-    scripting/util/scriptframe \
-    sc/util/sc \
-    sc/util/scd \
-    sc/util/scfilt \
-    $(call gb_Helper_optional,SCRIPTING, \
-            sc/util/vbaobj) \
-    sfx2/util/sfx \
-    sot/util/sot \
-    svl/source/fsstor/fsstorage \
-    toolkit/util/tk \
-    ucb/source/core/ucb1 \
-    ucb/source/ucp/file/ucpfile1 \
-    ucb/source/ucp/tdoc/ucptdoc1 \
-    unotools/util/utl \
-    unoxml/source/rdf/unordf \
-    unoxml/source/service/unoxml \
-    uui/util/uui \
-    vcl/vcl.common \
-    svtools/util/svt \
+    $(sc_unoapi_common_components) \
 ))
 
 $(eval $(call gb_CppunitTest_use_configuration,sc_check_data_pilot_table))
diff --git a/sc/CppunitTest_sc_check_xcell_ranges_query.mk b/sc/CppunitTest_sc_check_xcell_ranges_query.mk
index 9e12c800dbdc..20cd7c974787 100644
--- a/sc/CppunitTest_sc_check_xcell_ranges_query.mk
+++ b/sc/CppunitTest_sc_check_xcell_ranges_query.mk
@@ -62,38 +62,7 @@ $(eval $(call gb_CppunitTest_use_ure,sc_check_xcell_ranges_query))
 $(eval $(call gb_CppunitTest_use_vcl,sc_check_xcell_ranges_query))
 
 $(eval $(call gb_CppunitTest_use_components,sc_check_xcell_ranges_query,\
-    basic/util/sb \
-    comphelper/util/comphelp \
-    configmgr/source/configmgr \
-    dbaccess/util/dba \
-    filter/source/config/cache/filterconfig1 \
-    forms/util/frm \
-    framework/util/fwk \
-    i18npool/util/i18npool \
-    oox/util/oox \
-    package/source/xstor/xstor \
-    package/util/package2 \
-    sax/source/expatwrap/expwrap \
-    scripting/source/basprov/basprov \
-    scripting/util/scriptframe \
-    sc/util/sc \
-    sc/util/scd \
-    sc/util/scfilt \
-    $(call gb_Helper_optional,SCRIPTING, \
-	    sc/util/vbaobj) \
-    sfx2/util/sfx \
-    sot/util/sot \
-    svl/source/fsstor/fsstorage \
-    toolkit/util/tk \
-    ucb/source/core/ucb1 \
-    ucb/source/ucp/file/ucpfile1 \
-    ucb/source/ucp/tdoc/ucptdoc1 \
-    unotools/util/utl \
-    unoxml/source/rdf/unordf \
-    unoxml/source/service/unoxml \
-    uui/util/uui \
-    vcl/vcl.common \
-	svtools/util/svt \
+    $(sc_unoapi_common_components) \
 ))
 
 $(eval $(call gb_CppunitTest_use_configuration,sc_check_xcell_ranges_query,))
diff --git a/sc/CppunitTest_sc_consolidationdescriptorobj.mk b/sc/CppunitTest_sc_consolidationdescriptorobj.mk
index cd6e42d07f0d..13e0315318b2 100644
--- a/sc/CppunitTest_sc_consolidationdescriptorobj.mk
+++ b/sc/CppunitTest_sc_consolidationdescriptorobj.mk
@@ -64,41 +64,7 @@ $(eval $(call gb_CppunitTest_use_ure,sc_consolidationdescriptorobj))
 $(eval $(call gb_CppunitTest_use_vcl,sc_consolidationdescriptorobj))
 
 $(eval $(call gb_CppunitTest_use_components,sc_consolidationdescriptorobj,\
-	basic/util/sb \
-	comphelper/util/comphelp \
-	configmgr/source/configmgr \
-	dbaccess/util/dba \
-	filter/source/config/cache/filterconfig1 \
-	filter/source/storagefilterdetect/storagefd \
-	forms/util/frm \
-	framework/util/fwk \
-	i18npool/util/i18npool \
-	linguistic/source/lng \
-	oox/util/oox \
-	package/source/xstor/xstor \
-	package/util/package2 \
-	sax/source/expatwrap/expwrap \
-	scripting/source/basprov/basprov \
-	scripting/util/scriptframe \
-	sc/util/sc \
-	sc/util/scd \
-	sc/util/scfilt \
-	$(call gb_Helper_optional,SCRIPTING, \
-		sc/util/vbaobj) \
-	sfx2/util/sfx \
-	sot/util/sot \
-	svl/source/fsstor/fsstorage \
-	toolkit/util/tk \
-	ucb/source/core/ucb1 \
-	ucb/source/ucp/file/ucpfile1 \
-	ucb/source/ucp/tdoc/ucptdoc1 \
-	unotools/util/utl \
-	unoxml/source/rdf/unordf \
-	unoxml/source/service/unoxml \
-	uui/util/uui \
-	vcl/vcl.common \
-	xmloff/util/xo \
-	svtools/util/svt \
+    $(sc_unoapi_common_components) \
 ))
 
 $(eval $(call gb_CppunitTest_use_configuration,sc_consolidationdescriptorobj))
diff --git a/sc/CppunitTest_sc_databaserangeobj.mk b/sc/CppunitTest_sc_databaserangeobj.mk
index b4abe270037d..3708a460af64 100644
--- a/sc/CppunitTest_sc_databaserangeobj.mk
+++ b/sc/CppunitTest_sc_databaserangeobj.mk
@@ -64,40 +64,7 @@ $(eval $(call gb_CppunitTest_use_ure,sc_databaserangeobj))
 $(eval $(call gb_CppunitTest_use_vcl,sc_databaserangeobj))
 
 $(eval $(call gb_CppunitTest_use_components,sc_databaserangeobj,\
-    basic/util/sb \
-    comphelper/util/comphelp \
-    configmgr/source/configmgr \
-    dbaccess/util/dba \
-    filter/source/config/cache/filterconfig1 \
-    filter/source/storagefilterdetect/storagefd \
-    forms/util/frm \
-    framework/util/fwk \
-    i18npool/util/i18npool \
-    linguistic/source/lng \
-    oox/util/oox \
-    package/source/xstor/xstor \
-    package/util/package2 \
-    sax/source/expatwrap/expwrap \
-    scripting/source/basprov/basprov \
-    scripting/util/scriptframe \
-    sc/util/sc \
-    sc/util/scd \
-    sc/util/scfilt \
-    sc/util/vbaobj \
-    sfx2/util/sfx \
-    sot/util/sot \
-    svl/source/fsstor/fsstorage \
-    toolkit/util/tk \
-    ucb/source/core/ucb1 \
-    ucb/source/ucp/file/ucpfile1 \
-    ucb/source/ucp/tdoc/ucptdoc1 \
-    unotools/util/utl \
-    unoxml/source/rdf/unordf \
-    unoxml/source/service/unoxml \
-    uui/util/uui \
-    vcl/vcl.common \
-    xmloff/util/xo \
-	svtools/util/svt \
+    $(sc_unoapi_common_components) \
 ))
 
 $(eval $(call gb_CppunitTest_use_configuration,sc_databaserangeobj))
diff --git a/sc/CppunitTest_sc_databaserangesobj.mk b/sc/CppunitTest_sc_databaserangesobj.mk
index 237b9a79c31d..6458a385a6b8 100644
--- a/sc/CppunitTest_sc_databaserangesobj.mk
+++ b/sc/CppunitTest_sc_databaserangesobj.mk
@@ -64,41 +64,7 @@ $(eval $(call gb_CppunitTest_use_ure,sc_databaserangesobj))
 $(eval $(call gb_CppunitTest_use_vcl,sc_databaserangesobj))
 
 $(eval $(call gb_CppunitTest_use_components,sc_databaserangesobj,\
-	basic/util/sb \
-	comphelper/util/comphelp \
-	configmgr/source/configmgr \
-	dbaccess/util/dba \
-	filter/source/config/cache/filterconfig1 \
-	filter/source/storagefilterdetect/storagefd \
-	forms/util/frm \
-	framework/util/fwk \
-	i18npool/util/i18npool \
-	linguistic/source/lng \
-	oox/util/oox \
-	package/source/xstor/xstor \
-	package/util/package2 \
-	sax/source/expatwrap/expwrap \
-	scripting/source/basprov/basprov \
-	scripting/util/scriptframe \
-	sc/util/sc \
-	sc/util/scd \
-	sc/util/scfilt \
-	$(call gb_Helper_optional,SCRIPTING, \
-		sc/util/vbaobj) \
-	sfx2/util/sfx \
-	sot/util/sot \
-	svl/source/fsstor/fsstorage \
-	toolkit/util/tk \
-	ucb/source/core/ucb1 \
-	ucb/source/ucp/file/ucpfile1 \
-	ucb/source/ucp/tdoc/ucptdoc1 \
-	unotools/util/utl \
-	unoxml/source/rdf/unordf \
-	unoxml/source/service/unoxml \
-	uui/util/uui \
-	vcl/vcl.common \
-	xmloff/util/xo \
-	svtools/util/svt \
+    $(sc_unoapi_common_components) \
 ))
 
 $(eval $(call gb_CppunitTest_use_configuration,sc_databaserangesobj))
diff --git a/sc/CppunitTest_sc_datapilotfieldobj.mk b/sc/CppunitTest_sc_datapilotfieldobj.mk
index 86126b6a98c7..5a7c2a474eed 100644
--- a/sc/CppunitTest_sc_datapilotfieldobj.mk
+++ b/sc/CppunitTest_sc_datapilotfieldobj.mk
@@ -64,40 +64,7 @@ $(eval $(call gb_CppunitTest_use_ure,sc_datapilotfieldobj))
 $(eval $(call gb_CppunitTest_use_vcl,sc_datapilotfieldobj))
 
 $(eval $(call gb_CppunitTest_use_components,sc_datapilotfieldobj,\
-    basic/util/sb \
-    comphelper/util/comphelp \
-    configmgr/source/configmgr \
-    dbaccess/util/dba \
-    filter/source/config/cache/filterconfig1 \
-    filter/source/storagefilterdetect/storagefd \
-    forms/util/frm \
-    framework/util/fwk \
-    i18npool/util/i18npool \
-    oox/util/oox \
-    package/source/xstor/xstor \
-    package/util/package2 \
-    sax/source/expatwrap/expwrap \
-    scripting/source/basprov/basprov \
-    scripting/util/scriptframe \
-    sc/util/sc \
-    sc/util/scd \
-    sc/util/scfilt \
-    $(call gb_Helper_optional,SCRIPTING, \
-	    sc/util/vbaobj) \
-    sfx2/util/sfx \
-    sot/util/sot \
-    svl/source/fsstor/fsstorage \
-    toolkit/util/tk \
-    ucb/source/core/ucb1 \
-    ucb/source/ucp/file/ucpfile1 \
-    ucb/source/ucp/tdoc/ucptdoc1 \
-    unotools/util/utl \
-    unoxml/source/rdf/unordf \
-    unoxml/source/service/unoxml \
-    uui/util/uui \
-    vcl/vcl.common \
-    xmloff/util/xo \
-	svtools/util/svt \
+    $(sc_unoapi_common_components) \
 ))
 
 $(eval $(call gb_CppunitTest_use_configuration,sc_datapilotfieldobj))
diff --git a/sc/CppunitTest_sc_datapilotitemobj.mk b/sc/CppunitTest_sc_datapilotitemobj.mk
index 8219d83e1856..4e1cc35ae92c 100644
--- a/sc/CppunitTest_sc_datapilotitemobj.mk
+++ b/sc/CppunitTest_sc_datapilotitemobj.mk
@@ -64,40 +64,7 @@ $(eval $(call gb_CppunitTest_use_ure,sc_datapilotitemobj))
 $(eval $(call gb_CppunitTest_use_vcl,sc_datapilotitemobj))
 
 $(eval $(call gb_CppunitTest_use_components,sc_datapilotitemobj,\
-    basic/util/sb \
-    comphelper/util/comphelp \
-    configmgr/source/configmgr \
-    dbaccess/util/dba \
-    filter/source/config/cache/filterconfig1 \
-    filter/source/storagefilterdetect/storagefd \
-    forms/util/frm \
-    framework/util/fwk \
-    i18npool/util/i18npool \
-    oox/util/oox \
-    package/source/xstor/xstor \
-    package/util/package2 \
-    sax/source/expatwrap/expwrap \
-    scripting/source/basprov/basprov \
-    scripting/util/scriptframe \
-    sc/util/sc \
-    sc/util/scd \
-    sc/util/scfilt \
-    $(call gb_Helper_optional,SCRIPTING, \
-	    sc/util/vbaobj) \
-    sfx2/util/sfx \
-    sot/util/sot \
-    svl/source/fsstor/fsstorage \
-    toolkit/util/tk \
-    ucb/source/core/ucb1 \
-    ucb/source/ucp/file/ucpfile1 \
-    ucb/source/ucp/tdoc/ucptdoc1 \
-    unotools/util/utl \
-    unoxml/source/rdf/unordf \
-    unoxml/source/service/unoxml \
-    uui/util/uui \
-    vcl/vcl.common \
-    xmloff/util/xo \
-	svtools/util/svt \
+    $(sc_unoapi_common_components) \
 ))
 
 $(eval $(call gb_CppunitTest_use_configuration,sc_datapilotitemobj))
diff --git a/sc/CppunitTest_sc_datapilottableobj.mk b/sc/CppunitTest_sc_datapilottableobj.mk
index b7cd344ff6a1..858a81aaaf00 100644
--- a/sc/CppunitTest_sc_datapilottableobj.mk
+++ b/sc/CppunitTest_sc_datapilottableobj.mk
@@ -64,41 +64,7 @@ $(eval $(call gb_CppunitTest_use_ure,sc_datapilottableobj))
 $(eval $(call gb_CppunitTest_use_vcl,sc_datapilottableobj))
 
 $(eval $(call gb_CppunitTest_use_components,sc_datapilottableobj,\
-	basic/util/sb \
-    comphelper/util/comphelp \
-    configmgr/source/configmgr \
-    dbaccess/util/dba \
-    filter/source/config/cache/filterconfig1 \
-    filter/source/storagefilterdetect/storagefd \
-    forms/util/frm \
-    framework/util/fwk \
-    i18npool/util/i18npool \
-    linguistic/source/lng \
-    oox/util/oox \
-    package/source/xstor/xstor \
-    package/util/package2 \
-    sax/source/expatwrap/expwrap \
-    scripting/source/basprov/basprov \
-    scripting/util/scriptframe \
-    sc/util/sc \
-    sc/util/scd \
-    sc/util/scfilt \
-    $(call gb_Helper_optional,SCRIPTING, \
-	    sc/util/vbaobj) \
-    sfx2/util/sfx \
-    sot/util/sot \
-    svl/source/fsstor/fsstorage \
-    toolkit/util/tk \
-    ucb/source/core/ucb1 \
-    ucb/source/ucp/file/ucpfile1 \
-    ucb/source/ucp/tdoc/ucptdoc1 \
-    unotools/util/utl \
-    unoxml/source/rdf/unordf \
-    unoxml/source/service/unoxml \
-    uui/util/uui \
-    vcl/vcl.common \
-    xmloff/util/xo \
-	svtools/util/svt \
+    $(sc_unoapi_common_components) \
 ))
 
 $(eval $(call gb_CppunitTest_use_configuration,sc_datapilottableobj))
diff --git a/sc/CppunitTest_sc_documentconfigurationobj.mk b/sc/CppunitTest_sc_documentconfigurationobj.mk
index 1220e2b51c98..418d3a0cba67 100644
--- a/sc/CppunitTest_sc_documentconfigurationobj.mk
+++ b/sc/CppunitTest_sc_documentconfigurationobj.mk
@@ -64,41 +64,7 @@ $(eval $(call gb_CppunitTest_use_ure,sc_documentconfigurationobj))
 $(eval $(call gb_CppunitTest_use_vcl,sc_documentconfigurationobj))
 
 $(eval $(call gb_CppunitTest_use_components,sc_documentconfigurationobj,\
-	basic/util/sb \
-	comphelper/util/comphelp \
-	configmgr/source/configmgr \
-	dbaccess/util/dba \
-	filter/source/config/cache/filterconfig1 \
-	filter/source/storagefilterdetect/storagefd \
-	forms/util/frm \
-	framework/util/fwk \
-	i18npool/util/i18npool \
-	linguistic/source/lng \
-	oox/util/oox \
-	package/source/xstor/xstor \
-	package/util/package2 \
-	sax/source/expatwrap/expwrap \
-	scripting/source/basprov/basprov \
-	scripting/util/scriptframe \
-	sc/util/sc \
-	sc/util/scd \
-	sc/util/scfilt \
-	$(call gb_Helper_optional,SCRIPTING, \
-		sc/util/vbaobj) \
-	sfx2/util/sfx \
-	sot/util/sot \
-	svl/source/fsstor/fsstorage \
-	toolkit/util/tk \
-	ucb/source/core/ucb1 \
-	ucb/source/ucp/file/ucpfile1 \
-	ucb/source/ucp/tdoc/ucptdoc1 \
-	unotools/util/utl \
-	unoxml/source/rdf/unordf \
-	unoxml/source/service/unoxml \
-	uui/util/uui \
-	vcl/vcl.common \
-	xmloff/util/xo \
-	svtools/util/svt \
+    $(sc_unoapi_common_components) \
 ))
 
 $(eval $(call gb_CppunitTest_use_configuration,sc_documentconfigurationobj))
diff --git a/sc/CppunitTest_sc_editfieldobj_cell.mk b/sc/CppunitTest_sc_editfieldobj_cell.mk
index 4a665286d2a6..5188429cc2b9 100644
--- a/sc/CppunitTest_sc_editfieldobj_cell.mk
+++ b/sc/CppunitTest_sc_editfieldobj_cell.mk
@@ -64,38 +64,7 @@ $(eval $(call gb_CppunitTest_use_ure,sc_editfieldobj_cell))
 $(eval $(call gb_CppunitTest_use_vcl,sc_editfieldobj_cell))
 
 $(eval $(call gb_CppunitTest_use_components,sc_editfieldobj_cell,\
-    basic/util/sb \
-    comphelper/util/comphelp \
-    configmgr/source/configmgr \
-    dbaccess/util/dba \
-    filter/source/config/cache/filterconfig1 \
-    forms/util/frm \
-    framework/util/fwk \
-    i18npool/util/i18npool \
-    oox/util/oox \
-    package/source/xstor/xstor \
-    package/util/package2 \
-    sax/source/expatwrap/expwrap \
-    scripting/source/basprov/basprov \
-    scripting/util/scriptframe \
-    sc/util/sc \
-    sc/util/scd \
-    sc/util/scfilt \
-    $(call gb_Helper_optional,SCRIPTING, \
-	    sc/util/vbaobj) \
-    sfx2/util/sfx \
-    sot/util/sot \
-    svl/source/fsstor/fsstorage \
-    toolkit/util/tk \
-    ucb/source/core/ucb1 \
-    ucb/source/ucp/file/ucpfile1 \
-    ucb/source/ucp/tdoc/ucptdoc1 \
-    unotools/util/utl \
-    unoxml/source/rdf/unordf \
-    unoxml/source/service/unoxml \
-    uui/util/uui \
-    vcl/vcl.common \
-	svtools/util/svt \
+    $(sc_unoapi_common_components) \
 ))
 
 $(eval $(call gb_CppunitTest_use_configuration,sc_editfieldobj_cell))
diff --git a/sc/CppunitTest_sc_editfieldobj_header.mk b/sc/CppunitTest_sc_editfieldobj_header.mk
index 92c0e9951ece..4efc81d48463 100644
--- a/sc/CppunitTest_sc_editfieldobj_header.mk
+++ b/sc/CppunitTest_sc_editfieldobj_header.mk
@@ -64,38 +64,7 @@ $(eval $(call gb_CppunitTest_use_ure,sc_editfieldobj_header))
 $(eval $(call gb_CppunitTest_use_vcl,sc_editfieldobj_header))
 
 $(eval $(call gb_CppunitTest_use_components,sc_editfieldobj_header,\
-    basic/util/sb \
-    comphelper/util/comphelp \
-    configmgr/source/configmgr \
-    dbaccess/util/dba \
-    filter/source/config/cache/filterconfig1 \
-    forms/util/frm \
-    framework/util/fwk \
-    i18npool/util/i18npool \
-    oox/util/oox \
-    package/source/xstor/xstor \
-    package/util/package2 \
-    sax/source/expatwrap/expwrap \
-    scripting/source/basprov/basprov \
-    scripting/util/scriptframe \
-    sc/util/sc \
-    sc/util/scd \
-    sc/util/scfilt \
-    $(call gb_Helper_optional,SCRIPTING, \
-	    sc/util/vbaobj) \
-    sfx2/util/sfx \
-    sot/util/sot \
-    svl/source/fsstor/fsstorage \
-    toolkit/util/tk \
-    ucb/source/core/ucb1 \
-    ucb/source/ucp/file/ucpfile1 \
-    ucb/source/ucp/tdoc/ucptdoc1 \
-    unotools/util/utl \
-    unoxml/source/rdf/unordf \
-    unoxml/source/service/unoxml \
-    uui/util/uui \
-    vcl/vcl.common \
-	svtools/util/svt \
+    $(sc_unoapi_common_components) \
 ))
 
 $(eval $(call gb_CppunitTest_use_configuration,sc_editfieldobj_header))
diff --git a/sc/CppunitTest_sc_filterdescriptorbaseobj.mk b/sc/CppunitTest_sc_filterdescriptorbaseobj.mk
index 5e65bd0905c7..b7ae08665402 100644
--- a/sc/CppunitTest_sc_filterdescriptorbaseobj.mk
+++ b/sc/CppunitTest_sc_filterdescriptorbaseobj.mk
@@ -64,41 +64,8 @@ $(eval $(call gb_CppunitTest_use_ure,sc_filterdescriptorbaseobj))
 $(eval $(call gb_CppunitTest_use_vcl,sc_filterdescriptorbaseobj))
 
 $(eval $(call gb_CppunitTest_use_components,sc_filterdescriptorbaseobj,\
-	basic/util/sb \
-	comphelper/util/comphelp \
-	configmgr/source/configmgr \
-	dbaccess/util/dba \
-	filter/source/config/cache/filterconfig1 \
-	filter/source/storagefilterdetect/storagefd \
-	forms/util/frm \
-	framework/util/fwk \
-	i18npool/source/search/i18nsearch \
-	i18npool/util/i18npool \
-	oox/util/oox \
-	package/source/xstor/xstor \
-	package/util/package2 \
-	sax/source/expatwrap/expwrap \
-	scripting/source/basprov/basprov \
-	scripting/util/scriptframe \
-	sc/util/sc \
-	sc/util/scd \
-	sc/util/scfilt \
-	$(call gb_Helper_optional,SCRIPTING, \
-		sc/util/vbaobj) \
-	sfx2/util/sfx \
-	sot/util/sot \
-	svl/source/fsstor/fsstorage \
-	toolkit/util/tk \
-	ucb/source/core/ucb1 \
-	ucb/source/ucp/file/ucpfile1 \
-	ucb/source/ucp/tdoc/ucptdoc1 \
-	unotools/util/utl \
-	unoxml/source/rdf/unordf \
-	unoxml/source/service/unoxml \
-	uui/util/uui \
-	vcl/vcl.common \
-	xmloff/util/xo \
-	svtools/util/svt \
+    $(sc_unoapi_common_components) \
+    i18npool/source/search/i18nsearch \
 ))
 
 $(eval $(call gb_CppunitTest_use_configuration,sc_filterdescriptorbaseobj))
diff --git a/sc/CppunitTest_sc_functionlistobj.mk b/sc/CppunitTest_sc_functionlistobj.mk
index 43db1ca636ab..be262aa020a8 100644
--- a/sc/CppunitTest_sc_functionlistobj.mk
+++ b/sc/CppunitTest_sc_functionlistobj.mk
@@ -64,41 +64,7 @@ $(eval $(call gb_CppunitTest_use_ure,sc_functionlistobj))
 $(eval $(call gb_CppunitTest_use_vcl,sc_functionlistobj))
 
 $(eval $(call gb_CppunitTest_use_components,sc_functionlistobj,\
-	basic/util/sb \
-	comphelper/util/comphelp \
-	configmgr/source/configmgr \
-	dbaccess/util/dba \
-	filter/source/config/cache/filterconfig1 \
-	filter/source/storagefilterdetect/storagefd \
-	forms/util/frm \
-	framework/util/fwk \
-	i18npool/util/i18npool \
-	linguistic/source/lng \
-	oox/util/oox \
-	package/source/xstor/xstor \
-	package/util/package2 \
-	sax/source/expatwrap/expwrap \
-	scripting/source/basprov/basprov \
-	scripting/util/scriptframe \
-	sc/util/sc \
-	sc/util/scd \
-	sc/util/scfilt \
-	$(call gb_Helper_optional,SCRIPTING, \
-		sc/util/vbaobj) \
-	sfx2/util/sfx \
-	sot/util/sot \
-	svl/source/fsstor/fsstorage \
-	toolkit/util/tk \
-	ucb/source/core/ucb1 \
-	ucb/source/ucp/file/ucpfile1 \
-	ucb/source/ucp/tdoc/ucptdoc1 \
-	unotools/util/utl \
-	unoxml/source/rdf/unordf \
-	unoxml/source/service/unoxml \
-	uui/util/uui \
-	vcl/vcl.common \
-	xmloff/util/xo \
-	svtools/util/svt \
+    $(sc_unoapi_common_components) \
 ))
 
 $(eval $(call gb_CppunitTest_use_configuration,sc_functionlistobj))
diff --git a/sc/CppunitTest_sc_headerfootercontentobj.mk b/sc/CppunitTest_sc_headerfootercontentobj.mk
index 431bcba67abb..d8f13f4f66d7 100644
--- a/sc/CppunitTest_sc_headerfootercontentobj.mk
+++ b/sc/CppunitTest_sc_headerfootercontentobj.mk
@@ -64,41 +64,7 @@ $(eval $(call gb_CppunitTest_use_ure,sc_headerfootercontentobj))
 $(eval $(call gb_CppunitTest_use_vcl,sc_headerfootercontentobj))
 
 $(eval $(call gb_CppunitTest_use_components,sc_headerfootercontentobj,\
-	basic/util/sb \
-	comphelper/util/comphelp \
-	configmgr/source/configmgr \
-	dbaccess/util/dba \
-	filter/source/config/cache/filterconfig1 \
-	filter/source/storagefilterdetect/storagefd \
-	forms/util/frm \
-	framework/util/fwk \
-	i18npool/util/i18npool \
-	linguistic/source/lng \
-	oox/util/oox \
-	package/source/xstor/xstor \
-	package/util/package2 \
-	sax/source/expatwrap/expwrap \
-	scripting/source/basprov/basprov \
-	scripting/util/scriptframe \
-	sc/util/sc \
-	sc/util/scd \
-	sc/util/scfilt \
-	$(call gb_Helper_optional,SCRIPTING, \
-		sc/util/vbaobj) \
-	sfx2/util/sfx \
-	sot/util/sot \
-	svl/source/fsstor/fsstorage \
-	toolkit/util/tk \
-	ucb/source/core/ucb1 \
-	ucb/source/ucp/file/ucpfile1 \
-	ucb/source/ucp/tdoc/ucptdoc1 \
-	unotools/util/utl \
-	unoxml/source/rdf/unordf \
-	unoxml/source/service/unoxml \
-	uui/util/uui \
-	vcl/vcl.common \
-	xmloff/util/xo \
-	svtools/util/svt \
+    $(sc_unoapi_common_components) \
 ))
 
 $(eval $(call gb_CppunitTest_use_configuration,sc_headerfootercontentobj))
diff --git a/sc/CppunitTest_sc_importdescriptorbaseobj.mk b/sc/CppunitTest_sc_importdescriptorbaseobj.mk
index eb80b26ab6fc..ca20aca5a878 100644
--- a/sc/CppunitTest_sc_importdescriptorbaseobj.mk
+++ b/sc/CppunitTest_sc_importdescriptorbaseobj.mk
@@ -64,41 +64,7 @@ $(eval $(call gb_CppunitTest_use_ure,sc_importdescriptorbaseobj))
 $(eval $(call gb_CppunitTest_use_vcl,sc_importdescriptorbaseobj))
 
 $(eval $(call gb_CppunitTest_use_components,sc_importdescriptorbaseobj,\
-	basic/util/sb \
-	comphelper/util/comphelp \
-	configmgr/source/configmgr \
-	dbaccess/util/dba \
-	filter/source/config/cache/filterconfig1 \
-	filter/source/storagefilterdetect/storagefd \
-	forms/util/frm \
-	framework/util/fwk \
-	i18npool/util/i18npool \
-	linguistic/source/lng \
-	oox/util/oox \
-	package/source/xstor/xstor \
-	package/util/package2 \
-	sax/source/expatwrap/expwrap \
-	scripting/source/basprov/basprov \
-	scripting/util/scriptframe \
-	sc/util/sc \
-	sc/util/scd \
-	sc/util/scfilt \
-	$(call gb_Helper_optional,SCRIPTING, \
-		sc/util/vbaobj) \
-	sfx2/util/sfx \
-	sot/util/sot \
-	svl/source/fsstor/fsstorage \
-	toolkit/util/tk \
-	ucb/source/core/ucb1 \
-	ucb/source/ucp/file/ucpfile1 \
-	ucb/source/ucp/tdoc/ucptdoc1 \
-	unotools/util/utl \
-	unoxml/source/rdf/unordf \
-	unoxml/source/service/unoxml \
-	uui/util/uui \
-	vcl/vcl.common \
-	xmloff/util/xo \
-	svtools/util/svt \
+    $(sc_unoapi_common_components) \
 ))
 
 $(eval $(call gb_CppunitTest_use_configuration,sc_importdescriptorbaseobj))
diff --git a/sc/CppunitTest_sc_labelrangeobj.mk b/sc/CppunitTest_sc_labelrangeobj.mk
index f02cd9b59662..42c6afdec16f 100644
--- a/sc/CppunitTest_sc_labelrangeobj.mk
+++ b/sc/CppunitTest_sc_labelrangeobj.mk
@@ -64,41 +64,7 @@ $(eval $(call gb_CppunitTest_use_ure,sc_labelrangeobj))
 $(eval $(call gb_CppunitTest_use_vcl,sc_labelrangeobj))
 
 $(eval $(call gb_CppunitTest_use_components,sc_labelrangeobj,\
-	basic/util/sb \
-	comphelper/util/comphelp \
-	configmgr/source/configmgr \
-	dbaccess/util/dba \
-	filter/source/config/cache/filterconfig1 \
-	filter/source/storagefilterdetect/storagefd \
-	forms/util/frm \
-	framework/util/fwk \
-	i18npool/util/i18npool \
-	linguistic/source/lng \
-	oox/util/oox \
-	package/source/xstor/xstor \
-	package/util/package2 \
-	sax/source/expatwrap/expwrap \
-	scripting/source/basprov/basprov \
-	scripting/util/scriptframe \
-	sc/util/sc \
-	sc/util/scd \
-	sc/util/scfilt \
-	$(call gb_Helper_optional,SCRIPTING, \
-		sc/util/vbaobj) \
-	sfx2/util/sfx \
-	sot/util/sot \
-	svl/source/fsstor/fsstorage \
-	toolkit/util/tk \
-	ucb/source/core/ucb1 \
-	ucb/source/ucp/file/ucpfile1 \
-	ucb/source/ucp/tdoc/ucptdoc1 \
-	unotools/util/utl \
-	unoxml/source/rdf/unordf \
-	unoxml/source/service/unoxml \
-	uui/util/uui \
-	vcl/vcl.common \
-	xmloff/util/xo \
-	svtools/util/svt \
+    $(sc_unoapi_common_components) \
 ))
 
 $(eval $(call gb_CppunitTest_use_configuration,sc_labelrangeobj))
diff --git a/sc/CppunitTest_sc_labelrangesobj.mk b/sc/CppunitTest_sc_labelrangesobj.mk
index 28688667097d..139eb6febf63 100644
--- a/sc/CppunitTest_sc_labelrangesobj.mk
+++ b/sc/CppunitTest_sc_labelrangesobj.mk
@@ -64,41 +64,7 @@ $(eval $(call gb_CppunitTest_use_ure,sc_labelrangesobj))
 $(eval $(call gb_CppunitTest_use_vcl,sc_labelrangesobj))
 
 $(eval $(call gb_CppunitTest_use_components,sc_labelrangesobj,\
-	basic/util/sb \
-	comphelper/util/comphelp \
-	configmgr/source/configmgr \
-	dbaccess/util/dba \
-	filter/source/config/cache/filterconfig1 \
-	filter/source/storagefilterdetect/storagefd \
-	forms/util/frm \
-	framework/util/fwk \
-	i18npool/util/i18npool \
-	linguistic/source/lng \
-	oox/util/oox \
-	package/source/xstor/xstor \
-	package/util/package2 \
-	sax/source/expatwrap/expwrap \
-	scripting/source/basprov/basprov \
-	scripting/util/scriptframe \
-	sc/util/sc \
-	sc/util/scd \
-	sc/util/scfilt \
-	$(call gb_Helper_optional,SCRIPTING, \
-		sc/util/vbaobj) \
-	sfx2/util/sfx \
-	sot/util/sot \
-	svl/source/fsstor/fsstorage \
-	toolkit/util/tk \
-	ucb/source/core/ucb1 \
-	ucb/source/ucp/file/ucpfile1 \
-	ucb/source/ucp/tdoc/ucptdoc1 \
-	unotools/util/utl \
-	unoxml/source/rdf/unordf \
-	unoxml/source/service/unoxml \
-	uui/util/uui \
-	vcl/vcl.common \
-	xmloff/util/xo \
-	svtools/util/svt \
+    $(sc_unoapi_common_components) \
 ))
 
 $(eval $(call gb_CppunitTest_use_configuration,sc_labelrangesobj))
diff --git a/sc/CppunitTest_sc_modelobj.mk b/sc/CppunitTest_sc_modelobj.mk
index 88f3697c024c..77bef309eaf1 100644
--- a/sc/CppunitTest_sc_modelobj.mk
+++ b/sc/CppunitTest_sc_modelobj.mk
@@ -64,40 +64,7 @@ $(eval $(call gb_CppunitTest_use_ure,sc_modelobj))
 $(eval $(call gb_CppunitTest_use_vcl,sc_modelobj))
 
 $(eval $(call gb_CppunitTest_use_components,sc_modelobj,\
-	basic/util/sb \
-    comphelper/util/comphelp \
-    configmgr/source/configmgr \
-    dbaccess/util/dba \
-    filter/source/config/cache/filterconfig1 \
-    filter/source/storagefilterdetect/storagefd \
-    forms/util/frm \
-    framework/util/fwk \
-    i18npool/util/i18npool \
-    oox/util/oox \
-    package/source/xstor/xstor \
-    package/util/package2 \
-    sax/source/expatwrap/expwrap \
-    scripting/source/basprov/basprov \
-    scripting/util/scriptframe \
-    sc/util/sc \
-    sc/util/scd \
-    sc/util/scfilt \
-    $(call gb_Helper_optional,SCRIPTING, \
-	    sc/util/vbaobj) \
-    sfx2/util/sfx \
-    sot/util/sot \
-    svl/source/fsstor/fsstorage \
-    toolkit/util/tk \
-    ucb/source/core/ucb1 \
-    ucb/source/ucp/file/ucpfile1 \
-    ucb/source/ucp/tdoc/ucptdoc1 \
-    unotools/util/utl \
-    unoxml/source/rdf/unordf \
-    unoxml/source/service/unoxml \
-    uui/util/uui \
-    vcl/vcl.common \
-    xmloff/util/xo \
-	svtools/util/svt \
+    $(sc_unoapi_common_components) \
 ))
 
 $(eval $(call gb_CppunitTest_use_configuration,sc_modelobj))
diff --git a/sc/CppunitTest_sc_namedrangeobj.mk b/sc/CppunitTest_sc_namedrangeobj.mk
index 0fc12d2b96c3..fce08ae899c4 100644
--- a/sc/CppunitTest_sc_namedrangeobj.mk
+++ b/sc/CppunitTest_sc_namedrangeobj.mk
@@ -64,41 +64,7 @@ $(eval $(call gb_CppunitTest_use_ure,sc_namedrangeobj))
 $(eval $(call gb_CppunitTest_use_vcl,sc_namedrangeobj))
 
 $(eval $(call gb_CppunitTest_use_components,sc_namedrangeobj,\
-    basic/util/sb \
-    comphelper/util/comphelp \
-    configmgr/source/configmgr \
-    dbaccess/util/dba \
-    filter/source/config/cache/filterconfig1 \
-    filter/source/storagefilterdetect/storagefd \
-    forms/util/frm \
-    framework/util/fwk \
-    i18npool/util/i18npool \
-    linguistic/source/lng \
-    oox/util/oox \
-    package/source/xstor/xstor \
-    package/util/package2 \
-    sax/source/expatwrap/expwrap \
-    scripting/source/basprov/basprov \
-    scripting/util/scriptframe \
-    sc/util/sc \
-    sc/util/scd \
-    sc/util/scfilt \
-    $(call gb_Helper_optional,SCRIPTING, \
-	    sc/util/vbaobj) \
-    sfx2/util/sfx \
-    sot/util/sot \
-    svl/source/fsstor/fsstorage \
-    toolkit/util/tk \
-    ucb/source/core/ucb1 \
-    ucb/source/ucp/file/ucpfile1 \
-    ucb/source/ucp/tdoc/ucptdoc1 \
-    unotools/util/utl \
-    unoxml/source/rdf/unordf \
-    unoxml/source/service/unoxml \
-    uui/util/uui \
-    vcl/vcl.common \
-    xmloff/util/xo \
-	svtools/util/svt \
+    $(sc_unoapi_common_components) \
 ))
 
 $(eval $(call gb_CppunitTest_use_configuration,sc_namedrangeobj))
diff --git a/sc/CppunitTest_sc_namedrangesobj.mk b/sc/CppunitTest_sc_namedrangesobj.mk
index 46bd69a716c2..0f36a8ece33e 100644
--- a/sc/CppunitTest_sc_namedrangesobj.mk
+++ b/sc/CppunitTest_sc_namedrangesobj.mk
@@ -64,41 +64,7 @@ $(eval $(call gb_CppunitTest_use_ure,sc_namedrangesobj))
 $(eval $(call gb_CppunitTest_use_vcl,sc_namedrangesobj))
 
 $(eval $(call gb_CppunitTest_use_components,sc_namedrangesobj,\
-    basic/util/sb \
-    comphelper/util/comphelp \
-    configmgr/source/configmgr \
-    dbaccess/util/dba \
-    filter/source/config/cache/filterconfig1 \
-    filter/source/storagefilterdetect/storagefd \
-    forms/util/frm \
-    framework/util/fwk \
-    i18npool/util/i18npool \
-    linguistic/source/lng \
-    oox/util/oox \
-    package/source/xstor/xstor \
-    package/util/package2 \
-    sax/source/expatwrap/expwrap \
-    scripting/source/basprov/basprov \
-    scripting/util/scriptframe \
-    sc/util/sc \
-    sc/util/scd \
-    sc/util/scfilt \
-    $(call gb_Helper_optional,SCRIPTING, \
-	    sc/util/vbaobj) \
-    sfx2/util/sfx \
-    sot/util/sot \
-    svl/source/fsstor/fsstorage \
-    toolkit/util/tk \
-    ucb/source/core/ucb1 \
-    ucb/source/ucp/file/ucpfile1 \
-    ucb/source/ucp/tdoc/ucptdoc1 \
-    unotools/util/utl \
-    unoxml/source/rdf/unordf \
-    unoxml/source/service/unoxml \
-    uui/util/uui \
-    vcl/vcl.common \
-    xmloff/util/xo \
-	svtools/util/svt \
+    $(sc_unoapi_common_components) \
 ))
 
 $(eval $(call gb_CppunitTest_use_configuration,sc_namedrangesobj))
diff --git a/sc/CppunitTest_sc_new_cond_format_api.mk b/sc/CppunitTest_sc_new_cond_format_api.mk
index 16484c10292c..7cbe23590779 100644
--- a/sc/CppunitTest_sc_new_cond_format_api.mk
+++ b/sc/CppunitTest_sc_new_cond_format_api.mk
@@ -63,41 +63,7 @@ $(eval $(call gb_CppunitTest_use_ure,sc_new_cond_format_api))
 $(eval $(call gb_CppunitTest_use_vcl,sc_new_cond_format_api))
 
 $(eval $(call gb_CppunitTest_use_components,sc_new_cond_format_api,\
-	basic/util/sb \
-	comphelper/util/comphelp \
-	configmgr/source/configmgr \
-	dbaccess/util/dba \
-	filter/source/config/cache/filterconfig1 \
-	filter/source/storagefilterdetect/storagefd \
-	forms/util/frm \
-	framework/util/fwk \
-	i18npool/util/i18npool \
-	linguistic/source/lng \
-	oox/util/oox \
-	package/source/xstor/xstor \
-	package/util/package2 \
-	sax/source/expatwrap/expwrap \
-	scripting/source/basprov/basprov \
-	scripting/util/scriptframe \
-	sc/util/sc \
-	sc/util/scd \
-	sc/util/scfilt \
-	$(call gb_Helper_optional,SCRIPTING, \
-		sc/util/vbaobj) \
-	sfx2/util/sfx \
-	sot/util/sot \
-	svl/source/fsstor/fsstorage \
-	toolkit/util/tk \
-	ucb/source/core/ucb1 \
-	ucb/source/ucp/file/ucpfile1 \
-	ucb/source/ucp/tdoc/ucptdoc1 \
-	unotools/util/utl \
-	unoxml/source/rdf/unordf \
-	unoxml/source/service/unoxml \
-	uui/util/uui \
-	vcl/vcl.common \
-	xmloff/util/xo \
-	svtools/util/svt \
+    $(sc_unoapi_common_components) \
 ))
 
 $(eval $(call gb_CppunitTest_use_configuration,sc_new_cond_format_api))
diff --git a/sc/CppunitTest_sc_outlineobj.mk b/sc/CppunitTest_sc_outlineobj.mk
index c325e811014f..c231fbb9d881 100644
--- a/sc/CppunitTest_sc_outlineobj.mk
+++ b/sc/CppunitTest_sc_outlineobj.mk
@@ -64,41 +64,7 @@ $(eval $(call gb_CppunitTest_use_ure,sc_outlineobj))
 $(eval $(call gb_CppunitTest_use_vcl,sc_outlineobj))
 
 $(eval $(call gb_CppunitTest_use_components,sc_outlineobj,\
-    basic/util/sb \
-    comphelper/util/comphelp \
-    configmgr/source/configmgr \
-    dbaccess/util/dba \
-    filter/source/config/cache/filterconfig1 \
-    filter/source/storagefilterdetect/storagefd \
-    forms/util/frm \
-    framework/util/fwk \
-    i18npool/util/i18npool \
-	linguistic/source/lng \
-    oox/util/oox \
-    package/source/xstor/xstor \
-    package/util/package2 \
-    sax/source/expatwrap/expwrap \
-    scripting/source/basprov/basprov \
-    scripting/util/scriptframe \
-    sc/util/sc \
-    sc/util/scd \
-    sc/util/scfilt \
-    $(call gb_Helper_optional,SCRIPTING, \
-	    sc/util/vbaobj) \
-    sfx2/util/sfx \
-    sot/util/sot \
-    svl/source/fsstor/fsstorage \
-    toolkit/util/tk \
-    ucb/source/core/ucb1 \
-    ucb/source/ucp/file/ucpfile1 \
-    ucb/source/ucp/tdoc/ucptdoc1 \
-    unotools/util/utl \
-    unoxml/source/rdf/unordf \
-    unoxml/source/service/unoxml \
-    uui/util/uui \
-    vcl/vcl.common \
-    xmloff/util/xo \
-	svtools/util/svt \
+    $(sc_unoapi_common_components) \
 ))
 
 $(eval $(call gb_CppunitTest_use_configuration,sc_outlineobj))
diff --git a/sc/CppunitTest_sc_recentfunctionsobj.mk b/sc/CppunitTest_sc_recentfunctionsobj.mk
index 85a918a7d7bd..d8ac2d014760 100644
--- a/sc/CppunitTest_sc_recentfunctionsobj.mk
+++ b/sc/CppunitTest_sc_recentfunctionsobj.mk
@@ -64,41 +64,7 @@ $(eval $(call gb_CppunitTest_use_ure,sc_recentfunctionsobj))
 $(eval $(call gb_CppunitTest_use_vcl,sc_recentfunctionsobj))
 
 $(eval $(call gb_CppunitTest_use_components,sc_recentfunctionsobj,\
-	basic/util/sb \
-	comphelper/util/comphelp \
-	configmgr/source/configmgr \
-	dbaccess/util/dba \
-	filter/source/config/cache/filterconfig1 \
-	filter/source/storagefilterdetect/storagefd \
-	forms/util/frm \
-	framework/util/fwk \
-	i18npool/util/i18npool \
-	linguistic/source/lng \
-	oox/util/oox \
-	package/source/xstor/xstor \
-	package/util/package2 \
-	sax/source/expatwrap/expwrap \
-	scripting/source/basprov/basprov \
-	scripting/util/scriptframe \
-	sc/util/sc \
-	sc/util/scd \
-	sc/util/scfilt \
-	$(call gb_Helper_optional,SCRIPTING, \
-		sc/util/vbaobj) \
-	sfx2/util/sfx \
-	sot/util/sot \
-	svl/source/fsstor/fsstorage \
-	toolkit/util/tk \
-	ucb/source/core/ucb1 \
-	ucb/source/ucp/file/ucpfile1 \
-	ucb/source/ucp/tdoc/ucptdoc1 \
-	unotools/util/utl \
-	unoxml/source/rdf/unordf \
-	unoxml/source/service/unoxml \
-	uui/util/uui \
-	vcl/vcl.common \
-	xmloff/util/xo \
-	svtools/util/svt \
+    $(sc_unoapi_common_components) \
 ))
 
 $(eval $(call gb_CppunitTest_use_configuration,sc_recentfunctionsobj))
diff --git a/sc/CppunitTest_sc_recordchanges.mk b/sc/CppunitTest_sc_recordchanges.mk
index 2afce187c9c0..526bdd29d7da 100644
--- a/sc/CppunitTest_sc_recordchanges.mk
+++ b/sc/CppunitTest_sc_recordchanges.mk
@@ -64,41 +64,7 @@ $(eval $(call gb_CppunitTest_use_ure,sc_recordchanges))
 $(eval $(call gb_CppunitTest_use_vcl,sc_recordchanges))
 
 $(eval $(call gb_CppunitTest_use_components,sc_recordchanges,\
-    basic/util/sb \
-    comphelper/util/comphelp \
-    configmgr/source/configmgr \
-    dbaccess/util/dba \
-    filter/source/config/cache/filterconfig1 \
-    filter/source/storagefilterdetect/storagefd \
-    forms/util/frm \
-    framework/util/fwk \
-    i18npool/util/i18npool \
-	linguistic/source/lng \
-    oox/util/oox \
-    package/source/xstor/xstor \
-    package/util/package2 \
-    sax/source/expatwrap/expwrap \
-    scripting/source/basprov/basprov \
-    scripting/util/scriptframe \
-    sc/util/sc \
-    sc/util/scd \
-    sc/util/scfilt \
-    $(call gb_Helper_optional,SCRIPTING, \
-	    sc/util/vbaobj) \
-    sfx2/util/sfx \
-    sot/util/sot \
-    svl/source/fsstor/fsstorage \
-    toolkit/util/tk \
-    ucb/source/core/ucb1 \
-    ucb/source/ucp/file/ucpfile1 \
-    ucb/source/ucp/tdoc/ucptdoc1 \
-    unotools/util/utl \
-    unoxml/source/rdf/unordf \
-    unoxml/source/service/unoxml \
-    uui/util/uui \
-    vcl/vcl.common \
-    xmloff/util/xo \
-	svtools/util/svt \
+    $(sc_unoapi_common_components) \
 ))
 
 $(eval $(call gb_CppunitTest_use_configuration,sc_recordchanges))
diff --git a/sc/CppunitTest_sc_scenariosobj.mk b/sc/CppunitTest_sc_scenariosobj.mk
index d88d3733a853..a7e9251ce526 100644
--- a/sc/CppunitTest_sc_scenariosobj.mk
+++ b/sc/CppunitTest_sc_scenariosobj.mk
@@ -64,41 +64,7 @@ $(eval $(call gb_CppunitTest_use_ure,sc_scenariosobj))
 $(eval $(call gb_CppunitTest_use_vcl,sc_scenariosobj))
 
 $(eval $(call gb_CppunitTest_use_components,sc_scenariosobj,\
-	basic/util/sb \
-	comphelper/util/comphelp \
-	configmgr/source/configmgr \
-	dbaccess/util/dba \
-	filter/source/config/cache/filterconfig1 \
-	filter/source/storagefilterdetect/storagefd \
-	forms/util/frm \
-	framework/util/fwk \
-	i18npool/util/i18npool \
-	linguistic/source/lng \
-	oox/util/oox \
-	package/source/xstor/xstor \
-	package/util/package2 \
-	sax/source/expatwrap/expwrap \
-	scripting/source/basprov/basprov \
-	scripting/util/scriptframe \
-	sc/util/sc \
-	sc/util/scd \
-	sc/util/scfilt \
-	$(call gb_Helper_optional,SCRIPTING, \
-		sc/util/vbaobj) \
-	sfx2/util/sfx \
-	sot/util/sot \
-	svl/source/fsstor/fsstorage \
-	toolkit/util/tk \
-	ucb/source/core/ucb1 \
-	ucb/source/ucp/file/ucpfile1 \
-	ucb/source/ucp/tdoc/ucptdoc1 \
-	unotools/util/utl \
-	unoxml/source/rdf/unordf \
-	unoxml/source/service/unoxml \
-	uui/util/uui \
-	vcl/vcl.common \
-	xmloff/util/xo \
-	svtools/util/svt \
+    $(sc_unoapi_common_components) \
 ))
 
 $(eval $(call gb_CppunitTest_use_configuration,sc_scenariosobj))
diff --git a/sc/CppunitTest_sc_shapeobj.mk b/sc/CppunitTest_sc_shapeobj.mk
index 70dd8bf5458b..c16c8be7f536 100644
--- a/sc/CppunitTest_sc_shapeobj.mk
+++ b/sc/CppunitTest_sc_shapeobj.mk
@@ -64,41 +64,7 @@ $(eval $(call gb_CppunitTest_use_ure,sc_shapeobj))
 $(eval $(call gb_CppunitTest_use_vcl,sc_shapeobj))
 
 $(eval $(call gb_CppunitTest_use_components,sc_shapeobj,\
-	basic/util/sb \
-	comphelper/util/comphelp \
-	configmgr/source/configmgr \
-	dbaccess/util/dba \
-	filter/source/config/cache/filterconfig1 \
-	filter/source/storagefilterdetect/storagefd \
-	forms/util/frm \
-	framework/util/fwk \
-	i18npool/util/i18npool \
-	linguistic/source/lng \
-	oox/util/oox \
-	package/source/xstor/xstor \
-	package/util/package2 \
-	sax/source/expatwrap/expwrap \
-	scripting/source/basprov/basprov \
-	scripting/util/scriptframe \
-	sc/util/sc \
-	sc/util/scd \
-	sc/util/scfilt \
-	$(call gb_Helper_optional,SCRIPTING, \
-		sc/util/vbaobj) \
-	sfx2/util/sfx \
-	sot/util/sot \
-	svl/source/fsstor/fsstorage \
-	toolkit/util/tk \
-	ucb/source/core/ucb1 \
-	ucb/source/ucp/file/ucpfile1 \
-	ucb/source/ucp/tdoc/ucptdoc1 \
-	unotools/util/utl \
-	unoxml/source/rdf/unordf \
-	unoxml/source/service/unoxml \
-	uui/util/uui \
-	vcl/vcl.common \
-	xmloff/util/xo \
-	svtools/util/svt \
+    $(sc_unoapi_common_components) \
 ))
 
 $(eval $(call gb_CppunitTest_use_configuration,sc_shapeobj))
diff --git a/sc/CppunitTest_sc_sheetlinkobj.mk b/sc/CppunitTest_sc_sheetlinkobj.mk
index 013e70ebe5f2..f64bed7eda43 100644
--- a/sc/CppunitTest_sc_sheetlinkobj.mk
+++ b/sc/CppunitTest_sc_sheetlinkobj.mk
@@ -64,41 +64,7 @@ $(eval $(call gb_CppunitTest_use_ure,sc_sheetlinkobj))
 $(eval $(call gb_CppunitTest_use_vcl,sc_sheetlinkobj))
 
 $(eval $(call gb_CppunitTest_use_components,sc_sheetlinkobj,\
-	basic/util/sb \
-	comphelper/util/comphelp \
-	configmgr/source/configmgr \
-	dbaccess/util/dba \
-	filter/source/config/cache/filterconfig1 \
-	filter/source/storagefilterdetect/storagefd \
-	forms/util/frm \
-	framework/util/fwk \
-	i18npool/util/i18npool \
-	linguistic/source/lng \
-	oox/util/oox \
-	package/source/xstor/xstor \
-	package/util/package2 \
-	sax/source/expatwrap/expwrap \
-	scripting/source/basprov/basprov \
-	scripting/util/scriptframe \
-	sc/util/sc \
-	sc/util/scd \
-	sc/util/scfilt \
-	$(call gb_Helper_optional,SCRIPTING, \
-		sc/util/vbaobj) \
-	sfx2/util/sfx \
-	sot/util/sot \
-	svl/source/fsstor/fsstorage \
-	toolkit/util/tk \
-	ucb/source/core/ucb1 \
-	ucb/source/ucp/file/ucpfile1 \
-	ucb/source/ucp/tdoc/ucptdoc1 \
-	unotools/util/utl \
-	unoxml/source/rdf/unordf \
-	unoxml/source/service/unoxml \
-	uui/util/uui \
-	vcl/vcl.common \
-	xmloff/util/xo \
-	svtools/util/svt \
+    $(sc_unoapi_common_components) \
 ))
 
 $(eval $(call gb_CppunitTest_use_configuration,sc_sheetlinkobj))
diff --git a/sc/CppunitTest_sc_spreadsheetsettingsobj.mk b/sc/CppunitTest_sc_spreadsheetsettingsobj.mk
index 62ecad80a93f..f39201002bb3 100644
--- a/sc/CppunitTest_sc_spreadsheetsettingsobj.mk
+++ b/sc/CppunitTest_sc_spreadsheetsettingsobj.mk
@@ -64,41 +64,7 @@ $(eval $(call gb_CppunitTest_use_ure,sc_spreadsheetsettingsobj))
 $(eval $(call gb_CppunitTest_use_vcl,sc_spreadsheetsettingsobj))
 
 $(eval $(call gb_CppunitTest_use_components,sc_spreadsheetsettingsobj,\
-	basic/util/sb \
-	comphelper/util/comphelp \
-	configmgr/source/configmgr \
-	dbaccess/util/dba \
-	filter/source/config/cache/filterconfig1 \
-	filter/source/storagefilterdetect/storagefd \
-	forms/util/frm \
-	framework/util/fwk \
-	i18npool/util/i18npool \
-	linguistic/source/lng \
-	oox/util/oox \
-	package/source/xstor/xstor \
-	package/util/package2 \
-	sax/source/expatwrap/expwrap \
-	scripting/source/basprov/basprov \
-	scripting/util/scriptframe \
-	sc/util/sc \
-	sc/util/scd \
-	sc/util/scfilt \
-	$(call gb_Helper_optional,SCRIPTING, \
-		sc/util/vbaobj) \
-	sfx2/util/sfx \
-	sot/util/sot \
-	svl/source/fsstor/fsstorage \
-	toolkit/util/tk \
-	ucb/source/core/ucb1 \
-	ucb/source/ucp/file/ucpfile1 \
-	ucb/source/ucp/tdoc/ucptdoc1 \
-	unotools/util/utl \
-	unoxml/source/rdf/unordf \
-	unoxml/source/service/unoxml \
-	uui/util/uui \
-	vcl/vcl.common \
-	xmloff/util/xo \
-	svtools/util/svt \
+    $(sc_unoapi_common_components) \
 ))
 
 $(eval $(call gb_CppunitTest_use_configuration,sc_spreadsheetsettingsobj))
diff --git a/sc/CppunitTest_sc_styleloaderobj.mk b/sc/CppunitTest_sc_styleloaderobj.mk
index b6fd6bb8f902..d0f37d43424d 100644
--- a/sc/CppunitTest_sc_styleloaderobj.mk
+++ b/sc/CppunitTest_sc_styleloaderobj.mk
@@ -64,41 +64,7 @@ $(eval $(call gb_CppunitTest_use_ure,sc_styleloaderobj))
 $(eval $(call gb_CppunitTest_use_vcl,sc_styleloaderobj))
 
 $(eval $(call gb_CppunitTest_use_components,sc_styleloaderobj,\
-    basic/util/sb \
-    comphelper/util/comphelp \
-    configmgr/source/configmgr \
-    dbaccess/util/dba \
-    filter/source/config/cache/filterconfig1 \
-    filter/source/storagefilterdetect/storagefd \
-    forms/util/frm \
-    framework/util/fwk \
-    i18npool/util/i18npool \
-	linguistic/source/lng \
-    oox/util/oox \
-    package/source/xstor/xstor \
-    package/util/package2 \
-    sax/source/expatwrap/expwrap \
-    scripting/source/basprov/basprov \
-    scripting/util/scriptframe \
-    sc/util/sc \
-    sc/util/scd \
-    sc/util/scfilt \
-    $(call gb_Helper_optional,SCRIPTING, \
-	    sc/util/vbaobj) \
-    sfx2/util/sfx \
-    sot/util/sot \
-    svl/source/fsstor/fsstorage \
-    toolkit/util/tk \
-    ucb/source/core/ucb1 \
-    ucb/source/ucp/file/ucpfile1 \
-    ucb/source/ucp/tdoc/ucptdoc1 \
-    unotools/util/utl \
-    unoxml/source/rdf/unordf \
-    unoxml/source/service/unoxml \
-    uui/util/uui \
-    vcl/vcl.common \
-    xmloff/util/xo \
-	svtools/util/svt \
+    $(sc_unoapi_common_components) \
 ))
 
 $(eval $(call gb_CppunitTest_use_configuration,sc_styleloaderobj))
diff --git a/sc/CppunitTest_sc_subtotaldescriptorbaseobj.mk b/sc/CppunitTest_sc_subtotaldescriptorbaseobj.mk
index 80eae20c787e..56b9fd823154 100644
--- a/sc/CppunitTest_sc_subtotaldescriptorbaseobj.mk
+++ b/sc/CppunitTest_sc_subtotaldescriptorbaseobj.mk
@@ -67,40 +67,7 @@ $(eval $(call gb_CppunitTest_use_ure,sc_subtotaldescriptorbaseobj))
 $(eval $(call gb_CppunitTest_use_vcl,sc_subtotaldescriptorbaseobj))
 
 $(eval $(call gb_CppunitTest_use_components,sc_subtotaldescriptorbaseobj,\
-	basic/util/sb \
-    comphelper/util/comphelp \
-    configmgr/source/configmgr \
-    dbaccess/util/dba \
-    filter/source/config/cache/filterconfig1 \
-    filter/source/storagefilterdetect/storagefd \
-    forms/util/frm \
-    framework/util/fwk \
-    i18npool/util/i18npool \
-    oox/util/oox \
-    package/source/xstor/xstor \
-    package/util/package2 \
-    sax/source/expatwrap/expwrap \
-    scripting/source/basprov/basprov \
-    scripting/util/scriptframe \
-    sc/util/sc \
-    sc/util/scd \
-    sc/util/scfilt \
-    $(call gb_Helper_optional,SCRIPTING, \
-	    sc/util/vbaobj) \
-    sfx2/util/sfx \
-    sot/util/sot \
-    svl/source/fsstor/fsstorage \
-    toolkit/util/tk \
-    ucb/source/core/ucb1 \
-    ucb/source/ucp/file/ucpfile1 \
-    ucb/source/ucp/tdoc/ucptdoc1 \
-    unotools/util/utl \
-    unoxml/source/rdf/unordf \
-    unoxml/source/service/unoxml \
-    uui/util/uui \
-    vcl/vcl.common \
-    xmloff/util/xo \
-	svtools/util/svt \
+    $(sc_unoapi_common_components) \
 ))
 
 $(eval $(call gb_CppunitTest_use_configuration,sc_subtotaldescriptorbaseobj))
diff --git a/sc/CppunitTest_sc_subtotalfieldobj.mk b/sc/CppunitTest_sc_subtotalfieldobj.mk
index e4e1a3619e01..c696d670993d 100644
--- a/sc/CppunitTest_sc_subtotalfieldobj.mk
+++ b/sc/CppunitTest_sc_subtotalfieldobj.mk
@@ -64,41 +64,7 @@ $(eval $(call gb_CppunitTest_use_ure,sc_subtotalfieldobj))
 $(eval $(call gb_CppunitTest_use_vcl,sc_subtotalfieldobj))
 
 $(eval $(call gb_CppunitTest_use_components,sc_subtotalfieldobj,\
-	basic/util/sb \
-	comphelper/util/comphelp \
-	configmgr/source/configmgr \
-	dbaccess/util/dba \
-	filter/source/config/cache/filterconfig1 \
-	filter/source/storagefilterdetect/storagefd \
-	forms/util/frm \
-	framework/util/fwk \
-	i18npool/util/i18npool \
-	linguistic/source/lng \
-	oox/util/oox \
-	package/source/xstor/xstor \
-	package/util/package2 \
-	sax/source/expatwrap/expwrap \
-	scripting/source/basprov/basprov \
-	scripting/util/scriptframe \
-	sc/util/sc \
-	sc/util/scd \
-	sc/util/scfilt \
-	$(call gb_Helper_optional,SCRIPTING, \
-		sc/util/vbaobj) \
-	sfx2/util/sfx \
-	sot/util/sot \
-	svl/source/fsstor/fsstorage \
-	toolkit/util/tk \
-	ucb/source/core/ucb1 \
-	ucb/source/ucp/file/ucpfile1 \
-	ucb/source/ucp/tdoc/ucptdoc1 \
-	unotools/util/utl \
-	unoxml/source/rdf/unordf \
-	unoxml/source/service/unoxml \
-	uui/util/uui \
-	vcl/vcl.common \
-	xmloff/util/xo \
-	svtools/util/svt \
+    $(sc_unoapi_common_components) \
 ))
 
 $(eval $(call gb_CppunitTest_use_configuration,sc_subtotalfieldobj))
diff --git a/sc/CppunitTest_sc_tableconditionalentryobj.mk b/sc/CppunitTest_sc_tableconditionalentryobj.mk
index d7826af06eb8..aa38663970c4 100644
--- a/sc/CppunitTest_sc_tableconditionalentryobj.mk
+++ b/sc/CppunitTest_sc_tableconditionalentryobj.mk
@@ -64,41 +64,7 @@ $(eval $(call gb_CppunitTest_use_ure,sc_tableconditionalentryobj))
 $(eval $(call gb_CppunitTest_use_vcl,sc_tableconditionalentryobj))
 
 $(eval $(call gb_CppunitTest_use_components,sc_tableconditionalentryobj,\
-	basic/util/sb \
-	comphelper/util/comphelp \
-	configmgr/source/configmgr \
-	dbaccess/util/dba \
-	filter/source/config/cache/filterconfig1 \
-	filter/source/storagefilterdetect/storagefd \
-	forms/util/frm \
-	framework/util/fwk \
-	i18npool/util/i18npool \
-	linguistic/source/lng \
-	oox/util/oox \
-	package/source/xstor/xstor \
-	package/util/package2 \
-	sax/source/expatwrap/expwrap \
-	scripting/source/basprov/basprov \
-	scripting/util/scriptframe \
-	sc/util/sc \
-	sc/util/scd \
-	sc/util/scfilt \
-	$(call gb_Helper_optional,SCRIPTING, \
-		sc/util/vbaobj) \
-	sfx2/util/sfx \
-	sot/util/sot \
-	svl/source/fsstor/fsstorage \
-	toolkit/util/tk \
-	ucb/source/core/ucb1 \
-	ucb/source/ucp/file/ucpfile1 \
-	ucb/source/ucp/tdoc/ucptdoc1 \
-	unotools/util/utl \
-	unoxml/source/rdf/unordf \
-	unoxml/source/service/unoxml \
-	uui/util/uui \
-	vcl/vcl.common \
-	xmloff/util/xo \
-	svtools/util/svt \
+    $(sc_unoapi_common_components) \
 ))
 
 $(eval $(call gb_CppunitTest_use_configuration,sc_tableconditionalentryobj))
diff --git a/sc/CppunitTest_sc_tableconditionalformatobj.mk b/sc/CppunitTest_sc_tableconditionalformatobj.mk
index e8f6ddd3018a..9079945792c8 100644
--- a/sc/CppunitTest_sc_tableconditionalformatobj.mk
+++ b/sc/CppunitTest_sc_tableconditionalformatobj.mk
@@ -64,41 +64,7 @@ $(eval $(call gb_CppunitTest_use_ure,sc_tableconditionalformatobj))
 $(eval $(call gb_CppunitTest_use_vcl,sc_tableconditionalformatobj))
 
 $(eval $(call gb_CppunitTest_use_components,sc_tableconditionalformatobj,\
-	basic/util/sb \
-	comphelper/util/comphelp \
-	configmgr/source/configmgr \
-	dbaccess/util/dba \
-	filter/source/config/cache/filterconfig1 \
-	filter/source/storagefilterdetect/storagefd \
-	forms/util/frm \
-	framework/util/fwk \
-	i18npool/util/i18npool \
-	linguistic/source/lng \
-	oox/util/oox \
-	package/source/xstor/xstor \
-	package/util/package2 \
-	sax/source/expatwrap/expwrap \
-	scripting/source/basprov/basprov \
-	scripting/util/scriptframe \
-	sc/util/sc \
-	sc/util/scd \
-	sc/util/scfilt \
-	$(call gb_Helper_optional,SCRIPTING, \
-		sc/util/vbaobj) \
-	sfx2/util/sfx \
-	sot/util/sot \
-	svl/source/fsstor/fsstorage \
-	toolkit/util/tk \
-	ucb/source/core/ucb1 \
-	ucb/source/ucp/file/ucpfile1 \
-	ucb/source/ucp/tdoc/ucptdoc1 \
-	unotools/util/utl \
-	unoxml/source/rdf/unordf \
-	unoxml/source/service/unoxml \
-	uui/util/uui \
-	vcl/vcl.common \
-	xmloff/util/xo \
-	svtools/util/svt \
+	$(sc_unoapi_common_components) \
 ))
 
 $(eval $(call gb_CppunitTest_use_configuration,sc_tableconditionalformatobj))
diff --git a/sc/CppunitTest_sc_tablesheetobj.mk b/sc/CppunitTest_sc_tablesheetobj.mk
index 2c0445042e5d..56a8f2f1564f 100644
--- a/sc/CppunitTest_sc_tablesheetobj.mk
+++ b/sc/CppunitTest_sc_tablesheetobj.mk
@@ -64,42 +64,8 @@ $(eval $(call gb_CppunitTest_use_ure,sc_tablesheetobj))
 $(eval $(call gb_CppunitTest_use_vcl,sc_tablesheetobj))
 
 $(eval $(call gb_CppunitTest_use_components,sc_tablesheetobj,\
-    basic/util/sb \
-    comphelper/util/comphelp \
-    configmgr/source/configmgr \
-    dbaccess/util/dba \
-    filter/source/config/cache/filterconfig1 \
-    filter/source/storagefilterdetect/storagefd \
-    forms/util/frm \
-    framework/util/fwk \
+    $(sc_unoapi_common_components) \
     i18npool/source/search/i18nsearch \
-    i18npool/util/i18npool \
-    linguistic/source/lng \
-    oox/util/oox \
-    package/source/xstor/xstor \
-    package/util/package2 \
-    sax/source/expatwrap/expwrap \
-    scripting/source/basprov/basprov \
-    scripting/util/scriptframe \
-    sc/util/sc \
-    sc/util/scd \
-    sc/util/scfilt \
-    $(call gb_Helper_optional,SCRIPTING, \
-	    sc/util/vbaobj) \
-    sfx2/util/sfx \
-    sot/util/sot \
-    svl/source/fsstor/fsstorage \
-    toolkit/util/tk \
-    ucb/source/core/ucb1 \
-    ucb/source/ucp/file/ucpfile1 \
-    ucb/source/ucp/tdoc/ucptdoc1 \
-    unotools/util/utl \
-    unoxml/source/rdf/unordf \
-    unoxml/source/service/unoxml \
-    uui/util/uui \
-    vcl/vcl.common \
-    xmloff/util/xo \
-	svtools/util/svt \
 ))
 
 $(eval $(call gb_CppunitTest_use_configuration,sc_tablesheetobj))
diff --git a/sc/CppunitTest_sc_tablesheetsobj.mk b/sc/CppunitTest_sc_tablesheetsobj.mk
index 48a49b7c2b28..b45b0dab97cb 100644
--- a/sc/CppunitTest_sc_tablesheetsobj.mk
+++ b/sc/CppunitTest_sc_tablesheetsobj.mk
@@ -64,41 +64,7 @@ $(eval $(call gb_CppunitTest_use_ure,sc_tablesheetsobj))
 $(eval $(call gb_CppunitTest_use_vcl,sc_tablesheetsobj))
 
 $(eval $(call gb_CppunitTest_use_components,sc_tablesheetsobj,\
-    basic/util/sb \
-    comphelper/util/comphelp \
-    configmgr/source/configmgr \
-    dbaccess/util/dba \
-    filter/source/config/cache/filterconfig1 \
-    filter/source/storagefilterdetect/storagefd \
-    forms/util/frm \
-    framework/util/fwk \
-    i18npool/util/i18npool \
-    linguistic/source/lng \
-    oox/util/oox \
-    package/source/xstor/xstor \
-    package/util/package2 \
-    sax/source/expatwrap/expwrap \
-    scripting/source/basprov/basprov \
-    scripting/util/scriptframe \
-    sc/util/sc \
-    sc/util/scd \
-    sc/util/scfilt \
-    $(call gb_Helper_optional,SCRIPTING, \
-	    sc/util/vbaobj) \
-    sfx2/util/sfx \
-    sot/util/sot \
-    svl/source/fsstor/fsstorage \
-    toolkit/util/tk \
-    ucb/source/core/ucb1 \
-    ucb/source/ucp/file/ucpfile1 \
-    ucb/source/ucp/tdoc/ucptdoc1 \
-    unotools/util/utl \
-    unoxml/source/rdf/unordf \
-    unoxml/source/service/unoxml \
-    uui/util/uui \
-    vcl/vcl.common \
-    xmloff/util/xo \
-	svtools/util/svt \
+    $(sc_unoapi_common_components) \
 ))
 
 $(eval $(call gb_CppunitTest_use_configuration,sc_tablesheetsobj))
diff --git a/sc/CppunitTest_sc_tablevalidationobj.mk b/sc/CppunitTest_sc_tablevalidationobj.mk
index 8826d8f43b5a..226ec6b3d5af 100644
--- a/sc/CppunitTest_sc_tablevalidationobj.mk
+++ b/sc/CppunitTest_sc_tablevalidationobj.mk
@@ -64,41 +64,7 @@ $(eval $(call gb_CppunitTest_use_ure,sc_tablevalidationobj))
 $(eval $(call gb_CppunitTest_use_vcl,sc_tablevalidationobj))
 
 $(eval $(call gb_CppunitTest_use_components,sc_tablevalidationobj,\
-	basic/util/sb \
-	comphelper/util/comphelp \
-	configmgr/source/configmgr \
-	dbaccess/util/dba \
-	filter/source/config/cache/filterconfig1 \
-	filter/source/storagefilterdetect/storagefd \
-	forms/util/frm \
-	framework/util/fwk \
-	i18npool/util/i18npool \
-	linguistic/source/lng \
-	oox/util/oox \
-	package/source/xstor/xstor \
-	package/util/package2 \
-	sax/source/expatwrap/expwrap \
-	scripting/source/basprov/basprov \
-	scripting/util/scriptframe \
-	sc/util/sc \
-	sc/util/scd \
-	sc/util/scfilt \
-	$(call gb_Helper_optional,SCRIPTING, \
-		sc/util/vbaobj) \
-	sfx2/util/sfx \
-	sot/util/sot \
-	svl/source/fsstor/fsstorage \
-	toolkit/util/tk \
-	ucb/source/core/ucb1 \
-	ucb/source/ucp/file/ucpfile1 \
-	ucb/source/ucp/tdoc/ucptdoc1 \
-	unotools/util/utl \
-	unoxml/source/rdf/unordf \
-	unoxml/source/service/unoxml \
-	uui/util/uui \
-	vcl/vcl.common \
-	xmloff/util/xo \
-	svtools/util/svt \
+    $(sc_unoapi_common_components) \
 ))
 
 $(eval $(call gb_CppunitTest_use_configuration,sc_tablevalidationobj))
diff --git a/sc/CppunitTest_sc_tabviewobj.mk b/sc/CppunitTest_sc_tabviewobj.mk
index ab5736d751fa..d332608427dc 100644
--- a/sc/CppunitTest_sc_tabviewobj.mk
+++ b/sc/CppunitTest_sc_tabviewobj.mk
@@ -64,41 +64,7 @@ $(eval $(call gb_CppunitTest_use_ure,sc_tabviewobj))
 $(eval $(call gb_CppunitTest_use_vcl,sc_tabviewobj))
 
 $(eval $(call gb_CppunitTest_use_components,sc_tabviewobj,\
-    basic/util/sb \
-    comphelper/util/comphelp \
-    configmgr/source/configmgr \
-    dbaccess/util/dba \
-    filter/source/config/cache/filterconfig1 \
-    filter/source/storagefilterdetect/storagefd \
-    forms/util/frm \
-    framework/util/fwk \
-    i18npool/util/i18npool \
-    linguistic/source/lng \
-    oox/util/oox \
-    package/source/xstor/xstor \
-    package/util/package2 \
-    sax/source/expatwrap/expwrap \
-    scripting/source/basprov/basprov \
-    scripting/util/scriptframe \
-    sc/util/sc \
-    sc/util/scd \
-    sc/util/scfilt \
-    $(call gb_Helper_optional,SCRIPTING, \
-	    sc/util/vbaobj) \
-    sfx2/util/sfx \
-    sot/util/sot \
-    svl/source/fsstor/fsstorage \
-    toolkit/util/tk \
-    ucb/source/core/ucb1 \
-    ucb/source/ucp/file/ucpfile1 \
-    ucb/source/ucp/tdoc/ucptdoc1 \
-    unotools/util/utl \
-    unoxml/source/rdf/unordf \
-    unoxml/source/service/unoxml \
-    uui/util/uui \
-    vcl/vcl.common \
-    xmloff/util/xo \
-	svtools/util/svt \
+    $(sc_unoapi_common_components) \
 ))
 
 $(eval $(call gb_CppunitTest_use_configuration,sc_tabviewobj))
diff --git a/sc/CppunitTest_sc_viewpaneobj.mk b/sc/CppunitTest_sc_viewpaneobj.mk
index ca80372fa4dd..fb960c37ae20 100644
--- a/sc/CppunitTest_sc_viewpaneobj.mk
+++ b/sc/CppunitTest_sc_viewpaneobj.mk
@@ -67,40 +67,7 @@ $(eval $(call gb_CppunitTest_use_ure,sc_viewpaneobj))
 $(eval $(call gb_CppunitTest_use_vcl,sc_viewpaneobj))
 
 $(eval $(call gb_CppunitTest_use_components,sc_viewpaneobj,\
-	basic/util/sb \
-    comphelper/util/comphelp \
-    configmgr/source/configmgr \
-    dbaccess/util/dba \
-    filter/source/config/cache/filterconfig1 \
-    filter/source/storagefilterdetect/storagefd \
-    forms/util/frm \
-    framework/util/fwk \
-    i18npool/util/i18npool \
-    oox/util/oox \
-    package/source/xstor/xstor \
-    package/util/package2 \
-    sax/source/expatwrap/expwrap \
-    scripting/source/basprov/basprov \
-    scripting/util/scriptframe \
-    sc/util/sc \
-    sc/util/scd \
-    sc/util/scfilt \
-    $(call gb_Helper_optional,SCRIPTING, \
-	    sc/util/vbaobj) \
-    sfx2/util/sfx \
-    sot/util/sot \
-    svl/source/fsstor/fsstorage \
-    toolkit/util/tk \
-    ucb/source/core/ucb1 \
-    ucb/source/ucp/file/ucpfile1 \
-    ucb/source/ucp/tdoc/ucptdoc1 \
-    unotools/util/utl \
-    unoxml/source/rdf/unordf \
-    unoxml/source/service/unoxml \
-    uui/util/uui \
-    vcl/vcl.common \
-    xmloff/util/xo \
-	svtools/util/svt \
+    $(sc_unoapi_common_components) \
 ))
 
 $(eval $(call gb_CppunitTest_use_configuration,sc_viewpaneobj))
diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index 808ce932152a..eaecad60104e 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -8,6 +8,8 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
+include $(SRCDIR)/sc/common_unoapi_tests.mk
+
 $(eval $(call gb_Module_Module,sc))
 
 $(eval $(call gb_Module_add_targets,sc,\
diff --git a/sc/common_unoapi_tests.mk b/sc/common_unoapi_tests.mk
new file mode 100644
index 000000000000..191c724b4d10
--- /dev/null
+++ b/sc/common_unoapi_tests.mk
@@ -0,0 +1,49 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*************************************************************************
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+#*************************************************************************
+
+define sc_unoapi_common_components
+    basic/util/sb \
+    comphelper/util/comphelp \
+    configmgr/source/configmgr \
+    dbaccess/util/dba \
+    filter/source/config/cache/filterconfig1 \
+    filter/source/storagefilterdetect/storagefd \
+    forms/util/frm \
+    framework/util/fwk \
+    i18npool/util/i18npool \
+    linguistic/source/lng \
+    oox/util/oox \
+    package/source/xstor/xstor \
+    package/util/package2 \
+    sax/source/expatwrap/expwrap \
+    scripting/source/basprov/basprov \
+    scripting/util/scriptframe \
+    sc/util/sc \
+    sc/util/scd \
+    sc/util/scfilt \
+    $(call gb_Helper_optional,SCRIPTING, sc/util/vbaobj) \
+    sfx2/util/sfx \
+    sot/util/sot \
+    svl/source/fsstor/fsstorage \
+    toolkit/util/tk \
+    ucb/source/core/ucb1 \
+    ucb/source/ucp/file/ucpfile1 \
+    ucb/source/ucp/tdoc/ucptdoc1 \
+    unotools/util/utl \
+    unoxml/source/rdf/unordf \
+    unoxml/source/service/unoxml \
+    uui/util/uui \
+    vcl/vcl.common \
+    xmloff/util/xo \
+    svtools/util/svt
+endef
+
+# vim: set noet sw=4 ts=4: