[Libreoffice-commits] core.git: sc/common_unoapi_tests.mk sc/CppunitTest_sc_annotationobj.mk sc/CppunitTest_sc_annotationshapeobj.mk sc/CppunitTest_sc_annotationsobj.mk sc/CppunitTest_sc_arealinkobj.mk sc/CppunitTest_sc_arealinksobj.mk sc/CppunitTest_sc_autoformatobj.mk sc/CppunitTest_sc_autoformatsobj.mk sc/CppunitTest_sc_cellcursorobj.mk sc/CppunitTest_sc_cellfieldsobj.mk sc/CppunitTest_sc_cellformatsenumeration.mk sc/CppunitTest_sc_cellformatsobj.mk sc/CppunitTest_sc_cellobj.mk sc/CppunitTest_sc_cellrangeobj.mk sc/CppunitTest_sc_cellrangesobj.mk sc/CppunitTest_sc_cellsearchobj.mk sc/CppunitTest_sc_cellsenumeration.mk sc/CppunitTest_sc_cellsobj.mk sc/CppunitTest_sc_chartobj.mk sc/CppunitTest_sc_chartsobj.mk sc/CppunitTest_sc_check_data_pilot_field.mk sc/CppunitTest_sc_check_data_pilot_table.mk sc/CppunitTest_sc_check_xcell_ranges_query.mk sc/CppunitTest_sc_consolidationdescriptorobj.mk sc/CppunitTest_sc_core.mk sc/CppunitTest_sc_databaserangeobj.mk sc/CppunitTest_sc_databaserangesobj.mk sc/Cppu nitTest_sc_datapilotfieldgroupitemobj.mk sc/CppunitTest_sc_datapilotfieldgroupobj.mk sc/CppunitTest_sc_datapilotfieldgroupsobj.mk sc/CppunitTest_sc_datapilotfieldobj.mk sc/CppunitTest_sc_datapilotfieldsobj.mk sc/CppunitTest_sc_datapilotitemobj.mk sc/CppunitTest_sc_datapilotitemsobj.mk sc/CppunitTest_sc_datapilottableobj.mk sc/CppunitTest_sc_datapilottablesobj.mk sc/CppunitTest_sc_ddelinkobj.mk sc/CppunitTest_sc_ddelinksobj.mk sc/CppunitTest_sc_documentconfigurationobj.mk sc/CppunitTest_sc_drawpageobj.mk sc/CppunitTest_sc_drawpagesobj.mk sc/CppunitTest_sc_editfieldobj_cell.mk sc/CppunitTest_sc_editfieldobj_header.mk sc/CppunitTest_sc_filterdescriptorbase.mk sc/CppunitTest_sc_functiondescriptionobj.mk sc/CppunitTest_sc_functionlistobj.mk sc/CppunitTest_sc_headerfieldsobj.mk sc/CppunitTest_sc_headerfootercontentobj.mk sc/CppunitTest_sc_html_export_test.mk sc/CppunitTest_sc_importdescriptorbaseobj.mk sc/CppunitTest_sc_indexenumeration_cellannotationsenumeration.mk sc/CppunitTest_sc_inde xenumeration_cellarealinksenumeration.mk sc/CppunitTest_sc_indexenumeration_databaserangesenumeration.mk sc/CppunitTest_sc_indexenumeration_datapilotfieldsenumeration.mk sc/CppunitTest_sc_indexenumeration_datapilotitemsenumeration.mk sc/CppunitTest_sc_indexenumeration_datapilottablesenumeration.mk sc/CppunitTest_sc_indexenumeration_ddelinksenumeration.mk sc/CppunitTest_sc_indexenumeration_functiondescriptionenumeration.mk sc/CppunitTest_sc_indexenumeration_labelrangesenumeration.mk sc/CppunitTest_sc_indexenumeration_namedrangesenumeration.mk sc/CppunitTest_sc_indexenumeration_scenariosenumeration.mk sc/CppunitTest_sc_indexenumeration_sheetcellrangesenumeration.mk sc/CppunitTest_sc_indexenumeration_sheetlinksenumeration.mk sc/CppunitTest_sc_indexenumeration_spreadsheetsenumeration.mk sc/CppunitTest_sc_indexenumeration_spreadsheetviewpanesenumeration.mk sc/CppunitTest_sc_indexenumeration_subtotalfieldsenumeration.mk sc/CppunitTest_sc_indexenumeration_tableautoformatenumeration.mk sc/C ppunitTest_sc_indexenumeration_tablechartsenumeration.mk sc/CppunitTest_sc_indexenumeration_tablecolumnsenumeration.mk sc/CppunitTest_sc_indexenumeration_tableconditionalentryenumeration.mk sc/CppunitTest_sc_indexenumeration_tablerowsenumeration.mk sc/CppunitTest_sc_indexenumeration_textfieldenumeration.mk sc/CppunitTest_sc_labelrangeobj.mk sc/CppunitTest_sc_labelrangesobj.mk sc/CppunitTest_sc_modelobj.mk sc/CppunitTest_sc_namedrangeobj.mk sc/CppunitTest_sc_namedrangesobj.mk sc/CppunitTest_sc_new_cond_format_api.mk sc/CppunitTest_sc_outlineobj.mk sc/CppunitTest_sc_pdf_export.mk sc/CppunitTest_sc_recentfunctionsobj.mk sc/CppunitTest_sc_recordchanges.mk sc/CppunitTest_sc_scenariosobj.mk sc/CppunitTest_sc_shapeobj.mk sc/CppunitTest_sc_shapetest.mk sc/CppunitTest_sc_sheetlinkobj.mk sc/CppunitTest_sc_sheetlinksobj.mk sc/CppunitTest_sc_sortdescriptorbaseobj.mk sc/CppunitTest_sc_spreadsheetsettings.mk sc/CppunitTest_sc_spreadsheetsettingsobj.mk sc/CppunitTest_sc_stylefamiliesobj.mk sc/Cppu nitTest_sc_stylefamilyobj.mk sc/CppunitTest_sc_styleobj.mk sc/CppunitTest_sc_subtotaldescriptorbase.mk sc/CppunitTest_sc_subtotalfieldobj.mk sc/CppunitTest_sc_tablecolumnobj.mk sc/CppunitTest_sc_tablecolumnsobj.mk sc/CppunitTest_sc_tableconditionalentryobj.mk sc/CppunitTest_sc_tableconditionalformat.mk sc/CppunitTest_sc_tablerowobj.mk sc/CppunitTest_sc_tablerowsobj.mk sc/CppunitTest_sc_tablesheetobj.mk sc/CppunitTest_sc_tablesheetsobj.mk sc/CppunitTest_sc_tablevalidationobj.mk sc/CppunitTest_sc_tabviewobj.mk sc/CppunitTest_sc_uniquecellformatsenumeration.mk sc/CppunitTest_sc_uniquecellformatsobj.mk sc/CppunitTest_sc_viewpaneobj.mk sc/qa

Mon, 07 Nov 2022 09:09:07 -0800

 sc/CppunitTest_sc_annotationobj.mk                                     |   33 
---
 sc/CppunitTest_sc_annotationshapeobj.mk                                |   33 
---
 sc/CppunitTest_sc_annotationsobj.mk                                    |   33 
---
 sc/CppunitTest_sc_arealinkobj.mk                                       |   33 
---
 sc/CppunitTest_sc_arealinksobj.mk                                      |   33 
---
 sc/CppunitTest_sc_autoformatobj.mk                                     |   33 
---
 sc/CppunitTest_sc_autoformatsobj.mk                                    |   33 
---
 sc/CppunitTest_sc_cellcursorobj.mk                                     |   33 
---
 sc/CppunitTest_sc_cellfieldsobj.mk                                     |   33 
---
 sc/CppunitTest_sc_cellformatsenumeration.mk                            |   33 
---
 sc/CppunitTest_sc_cellformatsobj.mk                                    |   33 
---
 sc/CppunitTest_sc_cellobj.mk                                           |   33 
---
 sc/CppunitTest_sc_cellrangeobj.mk                                      |   34 
---
 sc/CppunitTest_sc_cellrangesobj.mk                                     |   33 
---
 sc/CppunitTest_sc_cellsearchobj.mk                                     |   33 
---
 sc/CppunitTest_sc_cellsenumeration.mk                                  |   33 
---
 sc/CppunitTest_sc_cellsobj.mk                                          |   33 
---
 sc/CppunitTest_sc_chartobj.mk                                          |   34 
---
 sc/CppunitTest_sc_chartsobj.mk                                         |   34 
---
 sc/CppunitTest_sc_check_data_pilot_field.mk                            |   37 
---
 sc/CppunitTest_sc_check_data_pilot_table.mk                            |   37 
---
 sc/CppunitTest_sc_check_xcell_ranges_query.mk                          |   33 
---
 sc/CppunitTest_sc_consolidationdescriptorobj.mk                        |   33 
---
 sc/CppunitTest_sc_core.mk                                              |    4 
 sc/CppunitTest_sc_databaserangeobj.mk                                  |   33 
---
 sc/CppunitTest_sc_databaserangesobj.mk                                 |   33 
---
 sc/CppunitTest_sc_datapilotfieldgroupitemobj.mk                        |   37 
---
 sc/CppunitTest_sc_datapilotfieldgroupobj.mk                            |   37 
---
 sc/CppunitTest_sc_datapilotfieldgroupsobj.mk                           |   37 
---
 sc/CppunitTest_sc_datapilotfieldobj.mk                                 |   33 
---
 sc/CppunitTest_sc_datapilotfieldsobj.mk                                |   33 
---
 sc/CppunitTest_sc_datapilotitemobj.mk                                  |   64 
------
 sc/CppunitTest_sc_datapilotitemsobj.mk                                 |   37 
---
 sc/CppunitTest_sc_datapilottableobj.mk                                 |   33 
---
 sc/CppunitTest_sc_datapilottablesobj.mk                                |   98 
----------
 sc/CppunitTest_sc_ddelinkobj.mk                                        |   35 
---
 sc/CppunitTest_sc_ddelinksobj.mk                                       |   34 
---
 sc/CppunitTest_sc_documentconfigurationobj.mk                          |   33 
---
 sc/CppunitTest_sc_drawpageobj.mk                                       |   33 
---
 sc/CppunitTest_sc_drawpagesobj.mk                                      |   34 
---
 sc/CppunitTest_sc_editfieldobj_cell.mk                                 |   33 
---
 sc/CppunitTest_sc_editfieldobj_header.mk                               |   33 
---
 sc/CppunitTest_sc_filterdescriptorbase.mk                              |   33 
---
 sc/CppunitTest_sc_functiondescriptionobj.mk                            |   33 
---
 sc/CppunitTest_sc_functionlistobj.mk                                   |   36 
+++
 sc/CppunitTest_sc_headerfieldsobj.mk                                   |   33 
---
 sc/CppunitTest_sc_headerfootercontentobj.mk                            |   33 
---
 sc/CppunitTest_sc_html_export_test.mk                                  |   45 
----
 sc/CppunitTest_sc_importdescriptorbaseobj.mk                           |   33 
---
 sc/CppunitTest_sc_indexenumeration_cellannotationsenumeration.mk       |   33 
---
 sc/CppunitTest_sc_indexenumeration_cellarealinksenumeration.mk         |   33 
---
 sc/CppunitTest_sc_indexenumeration_databaserangesenumeration.mk        |   33 
---
 sc/CppunitTest_sc_indexenumeration_datapilotfieldsenumeration.mk       |   33 
---
 sc/CppunitTest_sc_indexenumeration_datapilotitemsenumeration.mk        |   33 
---
 sc/CppunitTest_sc_indexenumeration_datapilottablesenumeration.mk       |   33 
---
 sc/CppunitTest_sc_indexenumeration_ddelinksenumeration.mk              |   33 
---
 sc/CppunitTest_sc_indexenumeration_functiondescriptionenumeration.mk   |   33 
---
 sc/CppunitTest_sc_indexenumeration_labelrangesenumeration.mk           |   33 
---
 sc/CppunitTest_sc_indexenumeration_namedrangesenumeration.mk           |   33 
---
 sc/CppunitTest_sc_indexenumeration_scenariosenumeration.mk             |   33 
---
 sc/CppunitTest_sc_indexenumeration_sheetcellrangesenumeration.mk       |   33 
---
 sc/CppunitTest_sc_indexenumeration_sheetlinksenumeration.mk            |   33 
---
 sc/CppunitTest_sc_indexenumeration_spreadsheetsenumeration.mk          |   33 
---
 sc/CppunitTest_sc_indexenumeration_spreadsheetviewpanesenumeration.mk  |   33 
---
 sc/CppunitTest_sc_indexenumeration_subtotalfieldsenumeration.mk        |   33 
---
 sc/CppunitTest_sc_indexenumeration_tableautoformatenumeration.mk       |   33 
---
 sc/CppunitTest_sc_indexenumeration_tablechartsenumeration.mk           |   35 
---
 sc/CppunitTest_sc_indexenumeration_tablecolumnsenumeration.mk          |   33 
---
 sc/CppunitTest_sc_indexenumeration_tableconditionalentryenumeration.mk |   33 
---
 sc/CppunitTest_sc_indexenumeration_tablerowsenumeration.mk             |   33 
---
 sc/CppunitTest_sc_indexenumeration_textfieldenumeration.mk             |   33 
---
 sc/CppunitTest_sc_labelrangeobj.mk                                     |   33 
---
 sc/CppunitTest_sc_labelrangesobj.mk                                    |   33 
---
 sc/CppunitTest_sc_modelobj.mk                                          |   35 
---
 sc/CppunitTest_sc_namedrangeobj.mk                                     |   64 
------
 sc/CppunitTest_sc_namedrangesobj.mk                                    |   33 
---
 sc/CppunitTest_sc_new_cond_format_api.mk                               |    4 
 sc/CppunitTest_sc_outlineobj.mk                                        |   33 
---
 sc/CppunitTest_sc_pdf_export.mk                                        |   46 
----
 sc/CppunitTest_sc_recentfunctionsobj.mk                                |   33 
---
 sc/CppunitTest_sc_recordchanges.mk                                     |   33 
---
 sc/CppunitTest_sc_scenariosobj.mk                                      |   34 
---
 sc/CppunitTest_sc_shapeobj.mk                                          |   33 
---
 sc/CppunitTest_sc_shapetest.mk                                         |    4 
 sc/CppunitTest_sc_sheetlinkobj.mk                                      |   33 
---
 sc/CppunitTest_sc_sheetlinksobj.mk                                     |   33 
---
 sc/CppunitTest_sc_sortdescriptorbaseobj.mk                             |   33 
---
 sc/CppunitTest_sc_spreadsheetsettings.mk                               |   33 
---
 sc/CppunitTest_sc_spreadsheetsettingsobj.mk                            |   33 
---
 sc/CppunitTest_sc_stylefamiliesobj.mk                                  |   33 
---
 sc/CppunitTest_sc_stylefamilyobj.mk                                    |   33 
---
 sc/CppunitTest_sc_styleobj.mk                                          |   33 
---
 sc/CppunitTest_sc_subtotaldescriptorbase.mk                            |   36 
---
 sc/CppunitTest_sc_subtotalfieldobj.mk                                  |   33 
---
 sc/CppunitTest_sc_tablecolumnobj.mk                                    |   33 
---
 sc/CppunitTest_sc_tablecolumnsobj.mk                                   |   36 
---
 sc/CppunitTest_sc_tableconditionalentryobj.mk                          |   34 
---
 sc/CppunitTest_sc_tableconditionalformat.mk                            |   34 
---
 sc/CppunitTest_sc_tablerowobj.mk                                       |   33 
---
 sc/CppunitTest_sc_tablerowsobj.mk                                      |   36 
---
 sc/CppunitTest_sc_tablesheetobj.mk                                     |   37 
---
 sc/CppunitTest_sc_tablesheetsobj.mk                                    |   33 
---
 sc/CppunitTest_sc_tablevalidationobj.mk                                |   33 
---
 sc/CppunitTest_sc_tabviewobj.mk                                        |   33 
---
 sc/CppunitTest_sc_uniquecellformatsenumeration.mk                      |   33 
---
 sc/CppunitTest_sc_uniquecellformatsobj.mk                              |   33 
---
 sc/CppunitTest_sc_viewpaneobj.mk                                       |   36 
---
 sc/common_unoapi_tests.mk                                              |   77 
++++---
 sc/qa/extras/sccheck_data_pilot_table.cxx                              |   51 
++---
 sc/qa/extras/sccheck_xcell_ranges_query.cxx                            |   78 
++++---
 110 files changed, 250 insertions(+), 3609 deletions(-)

New commits:
commit 4f25551df39c0272f19250e41969e819d9941cdb
Author:     Xisco Fauli <[email protected]>
AuthorDate: Mon Nov 7 10:27:03 2022 +0100
Commit:     Xisco Fauli <[email protected]>
CommitDate: Mon Nov 7 18:08:21 2022 +0100

    sc: factor out common code in make files
    
    I had to rename some .cxx files to follow the same patterns.
    The renaming cause clang-format to be triggered for
    those files
    
    CppunitTest_sc_functionlistobj fails with
    
    xindexaccess.cxx:26:Assertion
    Test name: sc_apitest::ScFunctionListObj::testGetCount
    equality assertion failed
    - Expected: 395
    - Actual  : 508
    
    if it doesn't use gb_CppunitTest_use_components
    Change-Id: I7c929512bbf05293118bc54b343a59c8bbee5538
    
    Change-Id: I21971773f1e2d4bc7a6f33e4c392b20abf8d54de
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142387
    Tested-by: Jenkins
    Reviewed-by: Xisco Fauli <[email protected]>

diff --git a/sc/CppunitTest_sc_annotationobj.mk 
b/sc/CppunitTest_sc_annotationobj.mk
index 43d76b04e839..8dea7da4e908 100644
--- a/sc/CppunitTest_sc_annotationobj.mk
+++ b/sc/CppunitTest_sc_annotationobj.mk
@@ -9,37 +9,6 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_CppunitTest_CppunitTest,sc_annotationobj))
-
-$(eval $(call gb_CppunitTest_use_external,sc_annotationobj,boost_headers))
-
-$(eval $(call gb_CppunitTest_use_common_precompiled_header,sc_annotationobj))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,sc_annotationobj, \
-       sc/qa/extras/scannotationobj \
-))
-
-$(eval $(call gb_CppunitTest_use_libraries,sc_annotationobj, \
-       cppu \
-       sal \
-       subsequenttest \
-       test \
-       unotest \
-))
-
-$(eval $(call gb_CppunitTest_set_include,sc_annotationobj,\
-       $$(INCLUDE) \
-))
-
-$(eval $(call gb_CppunitTest_use_sdk_api,sc_annotationobj))
-
-$(eval $(call gb_CppunitTest_use_ure,sc_annotationobj))
-$(eval $(call gb_CppunitTest_use_vcl,sc_annotationobj))
-
-$(eval $(call gb_CppunitTest_use_components,sc_annotationobj,\
-       $(sc_unoapi_common_components) \
-))
-
-$(eval $(call gb_CppunitTest_use_configuration,sc_annotationobj))
+$(eval $(call sc_unoapi_common,annotationobj))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_annotationshapeobj.mk 
b/sc/CppunitTest_sc_annotationshapeobj.mk
index e01b50c02de3..29299ef34e66 100644
--- a/sc/CppunitTest_sc_annotationshapeobj.mk
+++ b/sc/CppunitTest_sc_annotationshapeobj.mk
@@ -9,37 +9,6 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_CppunitTest_CppunitTest,sc_annotationshapeobj))
-
-$(eval $(call gb_CppunitTest_use_external,sc_annotationshapeobj,boost_headers))
-
-$(eval $(call 
gb_CppunitTest_use_common_precompiled_header,sc_annotationshapeobj))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,sc_annotationshapeobj, \
-       sc/qa/extras/scannotationshapeobj \
-))
-
-$(eval $(call gb_CppunitTest_use_libraries,sc_annotationshapeobj, \
-       cppu \
-       sal \
-       subsequenttest \
-       test \
-       unotest \
-))
-
-$(eval $(call gb_CppunitTest_set_include,sc_annotationshapeobj,\
-       $$(INCLUDE) \
-))
-
-$(eval $(call gb_CppunitTest_use_sdk_api,sc_annotationshapeobj))
-
-$(eval $(call gb_CppunitTest_use_ure,sc_annotationshapeobj))
-$(eval $(call gb_CppunitTest_use_vcl,sc_annotationshapeobj))
-
-$(eval $(call gb_CppunitTest_use_components,sc_annotationshapeobj,\
-       $(sc_unoapi_common_components) \
-))
-
-$(eval $(call gb_CppunitTest_use_configuration,sc_annotationshapeobj))
+$(eval $(call sc_unoapi_common,annotationshapeobj))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_annotationsobj.mk 
b/sc/CppunitTest_sc_annotationsobj.mk
index ec5a49a8c68a..bf52f3da9194 100644
--- a/sc/CppunitTest_sc_annotationsobj.mk
+++ b/sc/CppunitTest_sc_annotationsobj.mk
@@ -9,37 +9,6 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_CppunitTest_CppunitTest,sc_annotationsobj))
-
-$(eval $(call gb_CppunitTest_use_external,sc_annotationsobj,boost_headers))
-
-$(eval $(call gb_CppunitTest_use_common_precompiled_header,sc_annotationsobj))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,sc_annotationsobj, \
-       sc/qa/extras/scannotationsobj \
-))
-
-$(eval $(call gb_CppunitTest_use_libraries,sc_annotationsobj, \
-       cppu \
-       sal \
-       subsequenttest \
-       test \
-       unotest \
-))
-
-$(eval $(call gb_CppunitTest_set_include,sc_annotationsobj,\
-       $$(INCLUDE) \
-))
-
-$(eval $(call gb_CppunitTest_use_sdk_api,sc_annotationsobj))
-
-$(eval $(call gb_CppunitTest_use_ure,sc_annotationsobj))
-$(eval $(call gb_CppunitTest_use_vcl,sc_annotationsobj))
-
-$(eval $(call gb_CppunitTest_use_components,sc_annotationsobj,\
-       $(sc_unoapi_common_components) \
-))
-
-$(eval $(call gb_CppunitTest_use_configuration,sc_annotationsobj))
+$(eval $(call sc_unoapi_common,annotationsobj))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_arealinkobj.mk b/sc/CppunitTest_sc_arealinkobj.mk
index efc7f60f7afe..e28331abb160 100644
--- a/sc/CppunitTest_sc_arealinkobj.mk
+++ b/sc/CppunitTest_sc_arealinkobj.mk
@@ -9,37 +9,6 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_CppunitTest_CppunitTest,sc_arealinkobj))
-
-$(eval $(call gb_CppunitTest_use_external,sc_arealinkobj,boost_headers))
-
-$(eval $(call gb_CppunitTest_use_common_precompiled_header,sc_arealinkobj))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,sc_arealinkobj, \
-       sc/qa/extras/scarealinkobj \
-))
-
-$(eval $(call gb_CppunitTest_use_libraries,sc_arealinkobj, \
-       cppu \
-       sal \
-       subsequenttest \
-       test \
-       unotest \
-))
-
-$(eval $(call gb_CppunitTest_set_include,sc_arealinkobj,\
-       $$(INCLUDE) \
-))
-
-$(eval $(call gb_CppunitTest_use_sdk_api,sc_arealinkobj))
-
-$(eval $(call gb_CppunitTest_use_ure,sc_arealinkobj))
-$(eval $(call gb_CppunitTest_use_vcl,sc_arealinkobj))
-
-$(eval $(call gb_CppunitTest_use_components,sc_arealinkobj,\
-       $(sc_unoapi_common_components) \
-))
-
-$(eval $(call gb_CppunitTest_use_configuration,sc_arealinkobj))
+$(eval $(call sc_unoapi_common,arealinkobj))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_arealinksobj.mk 
b/sc/CppunitTest_sc_arealinksobj.mk
index c523c27625b8..123b0ab0c362 100644
--- a/sc/CppunitTest_sc_arealinksobj.mk
+++ b/sc/CppunitTest_sc_arealinksobj.mk
@@ -9,37 +9,6 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_CppunitTest_CppunitTest,sc_arealinksobj))
-
-$(eval $(call gb_CppunitTest_use_common_precompiled_header,sc_arealinksobj))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,sc_arealinksobj, \
-       sc/qa/extras/scarealinksobj \
-))
-
-$(eval $(call gb_CppunitTest_use_external,sc_arealinksobj,boost_headers))
-
-$(eval $(call gb_CppunitTest_use_libraries,sc_arealinksobj, \
-       cppu \
-       sal \
-       subsequenttest \
-       test \
-       unotest \
-))
-
-$(eval $(call gb_CppunitTest_set_include,sc_arealinksobj,\
-       $$(INCLUDE) \
-))
-
-$(eval $(call gb_CppunitTest_use_sdk_api,sc_arealinksobj))
-
-$(eval $(call gb_CppunitTest_use_ure,sc_arealinksobj))
-$(eval $(call gb_CppunitTest_use_vcl,sc_arealinksobj))
-
-$(eval $(call gb_CppunitTest_use_components,sc_arealinksobj,\
-       $(sc_unoapi_common_components) \
-))
-
-$(eval $(call gb_CppunitTest_use_configuration,sc_arealinksobj))
+$(eval $(call sc_unoapi_common,arealinksobj))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_autoformatobj.mk 
b/sc/CppunitTest_sc_autoformatobj.mk
index 8da9612f245b..e9f0e3f2dc8f 100644
--- a/sc/CppunitTest_sc_autoformatobj.mk
+++ b/sc/CppunitTest_sc_autoformatobj.mk
@@ -9,37 +9,6 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_CppunitTest_CppunitTest,sc_autoformatobj))
-
-$(eval $(call gb_CppunitTest_use_external,sc_autoformatobj,boost_headers))
-
-$(eval $(call gb_CppunitTest_use_common_precompiled_header,sc_autoformatobj))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,sc_autoformatobj, \
-       sc/qa/extras/scautoformatobj \
-))
-
-$(eval $(call gb_CppunitTest_use_libraries,sc_autoformatobj, \
-       cppu \
-       sal \
-       subsequenttest \
-       test \
-       unotest \
-))
-
-$(eval $(call gb_CppunitTest_set_include,sc_autoformatobj,\
-       $$(INCLUDE) \
-))
-
-$(eval $(call gb_CppunitTest_use_sdk_api,sc_autoformatobj))
-
-$(eval $(call gb_CppunitTest_use_ure,sc_autoformatobj))
-$(eval $(call gb_CppunitTest_use_vcl,sc_autoformatobj))
-
-$(eval $(call gb_CppunitTest_use_components,sc_autoformatobj,\
-       $(sc_unoapi_common_components) \
-))
-
-$(eval $(call gb_CppunitTest_use_configuration,sc_autoformatobj))
+$(eval $(call sc_unoapi_common,autoformatobj))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_autoformatsobj.mk 
b/sc/CppunitTest_sc_autoformatsobj.mk
index aa6d33bec662..7b8f48c3dcbc 100644
--- a/sc/CppunitTest_sc_autoformatsobj.mk
+++ b/sc/CppunitTest_sc_autoformatsobj.mk
@@ -9,37 +9,6 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_CppunitTest_CppunitTest,sc_autoformatsobj))
-
-$(eval $(call gb_CppunitTest_use_external,sc_autoformatsobj,boost_headers))
-
-$(eval $(call gb_CppunitTest_use_common_precompiled_header,sc_autoformatsobj))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,sc_autoformatsobj, \
-    sc/qa/extras/scautoformatsobj \
-))
-
-$(eval $(call gb_CppunitTest_use_libraries,sc_autoformatsobj, \
-       cppu \
-       sal \
-       subsequenttest \
-       test \
-       unotest \
-))
-
-$(eval $(call gb_CppunitTest_set_include,sc_autoformatsobj,\
-       $$(INCLUDE) \
-))
-
-$(eval $(call gb_CppunitTest_use_sdk_api,sc_autoformatsobj))
-
-$(eval $(call gb_CppunitTest_use_ure,sc_autoformatsobj))
-$(eval $(call gb_CppunitTest_use_vcl,sc_autoformatsobj))
-
-$(eval $(call gb_CppunitTest_use_components,sc_autoformatsobj,\
-    $(sc_unoapi_common_components) \
-))
-
-$(eval $(call gb_CppunitTest_use_configuration,sc_autoformatsobj))
+$(eval $(call sc_unoapi_common,autoformatsobj))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_cellcursorobj.mk 
b/sc/CppunitTest_sc_cellcursorobj.mk
index 3033294472d0..9d2223e9a631 100644
--- a/sc/CppunitTest_sc_cellcursorobj.mk
+++ b/sc/CppunitTest_sc_cellcursorobj.mk
@@ -9,37 +9,6 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_CppunitTest_CppunitTest,sc_cellcursorobj))
-
-$(eval $(call gb_CppunitTest_use_external,sc_cellcursorobj,boost_headers))
-
-$(eval $(call gb_CppunitTest_use_common_precompiled_header,sc_cellcursorobj))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,sc_cellcursorobj, \
-       sc/qa/extras/sccellcursorobj \
-))
-
-$(eval $(call gb_CppunitTest_use_libraries,sc_cellcursorobj, \
-       cppu \
-       sal \
-       subsequenttest \
-       test \
-       unotest \
-))
-
-$(eval $(call gb_CppunitTest_set_include,sc_cellcursorobj,\
-    $$(INCLUDE) \
-))
-
-$(eval $(call gb_CppunitTest_use_sdk_api,sc_cellcursorobj))
-
-$(eval $(call gb_CppunitTest_use_ure,sc_cellcursorobj))
-$(eval $(call gb_CppunitTest_use_vcl,sc_cellcursorobj))
-
-$(eval $(call gb_CppunitTest_use_components,sc_cellcursorobj,\
-       $(sc_unoapi_common_components) \
-))
-
-$(eval $(call gb_CppunitTest_use_configuration,sc_cellcursorobj))
+$(eval $(call sc_unoapi_common,cellcursorobj))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_cellfieldsobj.mk 
b/sc/CppunitTest_sc_cellfieldsobj.mk
index 2be13dfc6be7..74c7ce3e7df7 100644
--- a/sc/CppunitTest_sc_cellfieldsobj.mk
+++ b/sc/CppunitTest_sc_cellfieldsobj.mk
@@ -9,37 +9,6 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_CppunitTest_CppunitTest,sc_cellfieldsobj))
-
-$(eval $(call gb_CppunitTest_use_external,sc_cellfieldsobj,boost_headers))
-
-$(eval $(call gb_CppunitTest_use_common_precompiled_header,sc_cellfieldsobj))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,sc_cellfieldsobj, \
-    sc/qa/extras/sccellfieldsobj \
-))
-
-$(eval $(call gb_CppunitTest_use_libraries,sc_cellfieldsobj, \
-       cppu \
-       sal \
-       subsequenttest \
-       test \
-       unotest \
-))
-
-$(eval $(call gb_CppunitTest_set_include,sc_cellfieldsobj,\
-       $$(INCLUDE) \
-))
-
-$(eval $(call gb_CppunitTest_use_sdk_api,sc_cellfieldsobj))
-
-$(eval $(call gb_CppunitTest_use_ure,sc_cellfieldsobj))
-$(eval $(call gb_CppunitTest_use_vcl,sc_cellfieldsobj))
-
-$(eval $(call gb_CppunitTest_use_components,sc_cellfieldsobj,\
-    $(sc_unoapi_common_components) \
-))
-
-$(eval $(call gb_CppunitTest_use_configuration,sc_cellfieldsobj))
+$(eval $(call sc_unoapi_common,cellfieldsobj))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_cellformatsenumeration.mk 
b/sc/CppunitTest_sc_cellformatsenumeration.mk
index ce2f574fbbf0..815c21e314ed 100644
--- a/sc/CppunitTest_sc_cellformatsenumeration.mk
+++ b/sc/CppunitTest_sc_cellformatsenumeration.mk
@@ -9,37 +9,6 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_CppunitTest_CppunitTest,sc_cellformatsenumeration))
-
-$(eval $(call 
gb_CppunitTest_use_external,sc_cellformatsenumeration,boost_headers))
-
-$(eval $(call 
gb_CppunitTest_use_common_precompiled_header,sc_cellformatsenumeration))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,sc_cellformatsenumeration, \
-       sc/qa/extras/sccellformatsenumeration \
-))
-
-$(eval $(call gb_CppunitTest_use_libraries,sc_cellformatsenumeration, \
-       cppu \
-       sal \
-       subsequenttest \
-       test \
-       unotest \
-))
-
-$(eval $(call gb_CppunitTest_set_include,sc_cellformatsenumeration,\
-       $$(INCLUDE) \
-))
-
-$(eval $(call gb_CppunitTest_use_sdk_api,sc_cellformatsenumeration))
-
-$(eval $(call gb_CppunitTest_use_ure,sc_cellformatsenumeration))
-$(eval $(call gb_CppunitTest_use_vcl,sc_cellformatsenumeration))
-
-$(eval $(call gb_CppunitTest_use_components,sc_cellformatsenumeration,\
-    $(sc_unoapi_common_components) \
-))
-
-$(eval $(call gb_CppunitTest_use_configuration,sc_cellformatsenumeration))
+$(eval $(call sc_unoapi_common,cellformatsenumeration))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_cellformatsobj.mk 
b/sc/CppunitTest_sc_cellformatsobj.mk
index 5e5728fcff2d..ef651bea5af9 100644
--- a/sc/CppunitTest_sc_cellformatsobj.mk
+++ b/sc/CppunitTest_sc_cellformatsobj.mk
@@ -9,37 +9,6 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_CppunitTest_CppunitTest,sc_cellformatsobj))
-
-$(eval $(call gb_CppunitTest_use_external,sc_cellformatsobj,boost_headers))
-
-$(eval $(call gb_CppunitTest_use_common_precompiled_header,sc_cellformatsobj))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,sc_cellformatsobj, \
-       sc/qa/extras/sccellformatsobj \
-))
-
-$(eval $(call gb_CppunitTest_use_libraries,sc_cellformatsobj, \
-       cppu \
-       sal \
-       subsequenttest \
-       test \
-       unotest \
-))
-
-$(eval $(call gb_CppunitTest_set_include,sc_cellformatsobj,\
-       $$(INCLUDE) \
-))
-
-$(eval $(call gb_CppunitTest_use_sdk_api,sc_cellformatsobj))
-
-$(eval $(call gb_CppunitTest_use_ure,sc_cellformatsobj))
-$(eval $(call gb_CppunitTest_use_vcl,sc_cellformatsobj))
-
-$(eval $(call gb_CppunitTest_use_components,sc_cellformatsobj,\
-       $(sc_unoapi_common_components) \
-))
-
-$(eval $(call gb_CppunitTest_use_configuration,sc_cellformatsobj))
+$(eval $(call sc_unoapi_common,cellformatsobj))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_cellobj.mk b/sc/CppunitTest_sc_cellobj.mk
index dc2d052b2d5e..1e49a038628a 100644
--- a/sc/CppunitTest_sc_cellobj.mk
+++ b/sc/CppunitTest_sc_cellobj.mk
@@ -9,37 +9,6 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_CppunitTest_CppunitTest,sc_cellobj))
-
-$(eval $(call gb_CppunitTest_use_external,sc_cellobj,boost_headers))
-
-$(eval $(call gb_CppunitTest_use_common_precompiled_header,sc_cellobj))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,sc_cellobj, \
-    sc/qa/extras/sccellobj \
-))
-
-$(eval $(call gb_CppunitTest_use_libraries,sc_cellobj, \
-       cppu \
-       sal \
-       subsequenttest \
-       test \
-       unotest \
-))
-
-$(eval $(call gb_CppunitTest_set_include,sc_cellobj,\
-       $$(INCLUDE) \
-))
-
-$(eval $(call gb_CppunitTest_use_sdk_api,sc_cellobj))
-
-$(eval $(call gb_CppunitTest_use_ure,sc_cellobj))
-$(eval $(call gb_CppunitTest_use_vcl,sc_cellobj))
-
-$(eval $(call gb_CppunitTest_use_components,sc_cellobj,\
-    $(sc_unoapi_common_components) \
-))
-
-$(eval $(call gb_CppunitTest_use_configuration,sc_cellobj))
+$(eval $(call sc_unoapi_common,cellobj))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_cellrangeobj.mk 
b/sc/CppunitTest_sc_cellrangeobj.mk
index e35c78e8d542..86ac844dd807 100644
--- a/sc/CppunitTest_sc_cellrangeobj.mk
+++ b/sc/CppunitTest_sc_cellrangeobj.mk
@@ -9,38 +9,6 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_CppunitTest_CppunitTest,sc_cellrangeobj))
-
-$(eval $(call gb_CppunitTest_use_external,sc_cellrangeobj,boost_headers))
-
-$(eval $(call gb_CppunitTest_use_common_precompiled_header,sc_cellrangeobj))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,sc_cellrangeobj, \
-    sc/qa/extras/sccellrangeobj\
-))
-
-$(eval $(call gb_CppunitTest_use_libraries,sc_cellrangeobj, \
-    cppu \
-    sal \
-    subsequenttest \
-       test \
-       unotest \
-))
-
-$(eval $(call gb_CppunitTest_set_include,sc_cellrangeobj,\
-    $$(INCLUDE) \
-))
-
-$(eval $(call gb_CppunitTest_use_sdk_api,sc_cellrangeobj))
-
-$(eval $(call gb_CppunitTest_use_ure,sc_cellrangeobj))
-$(eval $(call gb_CppunitTest_use_vcl,sc_cellrangeobj))
-
-$(eval $(call gb_CppunitTest_use_components,sc_cellrangeobj,\
-    $(sc_unoapi_common_components) \
-    i18npool/source/search/i18nsearch \
-))
-
-$(eval $(call gb_CppunitTest_use_configuration,sc_cellrangeobj))
+$(eval $(call sc_unoapi_common,cellrangeobj))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_cellrangesobj.mk 
b/sc/CppunitTest_sc_cellrangesobj.mk
index d35fce9280fe..17a5a76c27c1 100644
--- a/sc/CppunitTest_sc_cellrangesobj.mk
+++ b/sc/CppunitTest_sc_cellrangesobj.mk
@@ -9,37 +9,6 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_CppunitTest_CppunitTest,sc_cellrangesobj))
-
-$(eval $(call gb_CppunitTest_use_external,sc_cellrangesobj,boost_headers))
-
-$(eval $(call gb_CppunitTest_use_common_precompiled_header,sc_cellrangesobj))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,sc_cellrangesobj, \
-       sc/qa/extras/sccellrangesobj\
-))
-
-$(eval $(call gb_CppunitTest_use_libraries,sc_cellrangesobj, \
-       cppu \
-       sal \
-       subsequenttest \
-       test \
-       unotest \
-))
-
-$(eval $(call gb_CppunitTest_set_include,sc_cellrangesobj,\
-       $$(INCLUDE) \
-))
-
-$(eval $(call gb_CppunitTest_use_sdk_api,sc_cellrangesobj))
-
-$(eval $(call gb_CppunitTest_use_ure,sc_cellrangesobj))
-$(eval $(call gb_CppunitTest_use_vcl,sc_cellrangesobj))
-
-$(eval $(call gb_CppunitTest_use_components,sc_cellrangesobj,\
-    $(sc_unoapi_common_components) \
-))
-
-$(eval $(call gb_CppunitTest_use_configuration,sc_cellrangesobj))
+$(eval $(call sc_unoapi_common,cellrangesobj))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_cellsearchobj.mk 
b/sc/CppunitTest_sc_cellsearchobj.mk
index 24ef2769b00c..5acf3b36d928 100644
--- a/sc/CppunitTest_sc_cellsearchobj.mk
+++ b/sc/CppunitTest_sc_cellsearchobj.mk
@@ -9,37 +9,6 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_CppunitTest_CppunitTest,sc_cellsearchobj))
-
-$(eval $(call gb_CppunitTest_use_external,sc_cellsearchobj,boost_headers))
-
-$(eval $(call gb_CppunitTest_use_common_precompiled_header,sc_cellsearchobj))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,sc_cellsearchobj, \
-       sc/qa/extras/sccellsearchobj \
-))
-
-$(eval $(call gb_CppunitTest_use_libraries,sc_cellsearchobj, \
-       cppu \
-       sal \
-       subsequenttest \
-       test \
-       unotest \
-))
-
-$(eval $(call gb_CppunitTest_set_include,sc_cellsearchobj,\
-       $$(INCLUDE) \
-))
-
-$(eval $(call gb_CppunitTest_use_sdk_api,sc_cellsearchobj))
-
-$(eval $(call gb_CppunitTest_use_ure,sc_cellsearchobj))
-$(eval $(call gb_CppunitTest_use_vcl,sc_cellsearchobj))
-
-$(eval $(call gb_CppunitTest_use_components,sc_cellsearchobj,\
-       $(sc_unoapi_common_components) \
-))
-
-$(eval $(call gb_CppunitTest_use_configuration,sc_cellsearchobj))
+$(eval $(call sc_unoapi_common,cellsearchobj))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_cellsenumeration.mk 
b/sc/CppunitTest_sc_cellsenumeration.mk
index 43755b4a812e..c8f816cdff35 100644
--- a/sc/CppunitTest_sc_cellsenumeration.mk
+++ b/sc/CppunitTest_sc_cellsenumeration.mk
@@ -9,37 +9,6 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_CppunitTest_CppunitTest,sc_cellsenumeration))
-
-$(eval $(call gb_CppunitTest_use_external,sc_cellsenumeration,boost_headers))
-
-$(eval $(call 
gb_CppunitTest_use_common_precompiled_header,sc_cellsenumeration))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,sc_cellsenumeration, \
-       sc/qa/extras/sccellsenumeration \
-))
-
-$(eval $(call gb_CppunitTest_use_libraries,sc_cellsenumeration, \
-       cppu \
-       sal \
-       subsequenttest \
-       test \
-       unotest \
-))
-
-$(eval $(call gb_CppunitTest_set_include,sc_cellsenumeration,\
-       $$(INCLUDE) \
-))
-
-$(eval $(call gb_CppunitTest_use_sdk_api,sc_cellsenumeration))
-
-$(eval $(call gb_CppunitTest_use_ure,sc_cellsenumeration))
-$(eval $(call gb_CppunitTest_use_vcl,sc_cellsenumeration))
-
-$(eval $(call gb_CppunitTest_use_components,sc_cellsenumeration,\
-    $(sc_unoapi_common_components) \
-))
-
-$(eval $(call gb_CppunitTest_use_configuration,sc_cellsenumeration))
+$(eval $(call sc_unoapi_common,cellsenumeration))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_cellsobj.mk b/sc/CppunitTest_sc_cellsobj.mk
index 20360fd816e1..2e475f6511c0 100644
--- a/sc/CppunitTest_sc_cellsobj.mk
+++ b/sc/CppunitTest_sc_cellsobj.mk
@@ -9,37 +9,6 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_CppunitTest_CppunitTest,sc_cellsobj))
-
-$(eval $(call gb_CppunitTest_use_external,sc_cellsobj,boost_headers))
-
-$(eval $(call gb_CppunitTest_use_common_precompiled_header,sc_cellsobj))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,sc_cellsobj, \
-    sc/qa/extras/sccellsobj \
-))
-
-$(eval $(call gb_CppunitTest_use_libraries,sc_cellsobj, \
-       cppu \
-       sal \
-       subsequenttest \
-       test \
-       unotest \
-))
-
-$(eval $(call gb_CppunitTest_set_include,sc_cellsobj,\
-       $$(INCLUDE) \
-))
-
-$(eval $(call gb_CppunitTest_use_sdk_api,sc_cellsobj))
-
-$(eval $(call gb_CppunitTest_use_ure,sc_cellsobj))
-$(eval $(call gb_CppunitTest_use_vcl,sc_cellsobj))
-
-$(eval $(call gb_CppunitTest_use_components,sc_cellsobj,\
-    $(sc_unoapi_common_components) \
-))
-
-$(eval $(call gb_CppunitTest_use_configuration,sc_cellsobj))
+$(eval $(call sc_unoapi_common,cellsobj))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_chartobj.mk b/sc/CppunitTest_sc_chartobj.mk
index 962e4d305a55..8ea9ed858bc2 100644
--- a/sc/CppunitTest_sc_chartobj.mk
+++ b/sc/CppunitTest_sc_chartobj.mk
@@ -8,39 +8,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 #*************************************************************************
-$(eval $(call gb_CppunitTest_CppunitTest,sc_chartobj))
 
-$(eval $(call gb_CppunitTest_use_external,sc_chartobj,boost_headers))
-
-$(eval $(call gb_CppunitTest_use_common_precompiled_header,sc_chartobj))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,sc_chartobj, \
-       sc/qa/extras/scchartobj \
-))
-
-$(eval $(call gb_CppunitTest_use_libraries,sc_chartobj, \
-       comphelper \
-       cppu \
-       cppuhelper \
-       sal \
-       subsequenttest \
-       test \
-       unotest \
-))
-
-$(eval $(call gb_CppunitTest_set_include,sc_chartobj,\
-       $$(INCLUDE) \
-))
-
-$(eval $(call gb_CppunitTest_use_sdk_api,sc_chartobj))
-
-$(eval $(call gb_CppunitTest_use_ure,sc_chartobj))
-$(eval $(call gb_CppunitTest_use_vcl,sc_chartobj))
-
-$(eval $(call gb_CppunitTest_use_rdb,sc_chartobj,services))
-
-$(eval $(call gb_CppunitTest_use_components,sc_chartobj))
-
-$(eval $(call gb_CppunitTest_use_configuration,sc_chartobj))
+$(eval $(call sc_unoapi_common,chartobj))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_chartsobj.mk b/sc/CppunitTest_sc_chartsobj.mk
index 7cd24be8f5e2..ab6265a44347 100644
--- a/sc/CppunitTest_sc_chartsobj.mk
+++ b/sc/CppunitTest_sc_chartsobj.mk
@@ -8,39 +8,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 #*************************************************************************
-$(eval $(call gb_CppunitTest_CppunitTest,sc_chartsobj))
 
-$(eval $(call gb_CppunitTest_use_external,sc_chartsobj,boost_headers))
-
-$(eval $(call gb_CppunitTest_use_common_precompiled_header,sc_chartsobj))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,sc_chartsobj, \
-       sc/qa/extras/scchartsobj \
-))
-
-$(eval $(call gb_CppunitTest_use_libraries,sc_chartsobj, \
-       comphelper \
-       cppu \
-       cppuhelper \
-       sal \
-       subsequenttest \
-       test \
-       unotest \
-))
-
-$(eval $(call gb_CppunitTest_set_include,sc_chartsobj,\
-       $$(INCLUDE) \
-))
-
-$(eval $(call gb_CppunitTest_use_sdk_api,sc_chartsobj))
-
-$(eval $(call gb_CppunitTest_use_ure,sc_chartsobj))
-$(eval $(call gb_CppunitTest_use_vcl,sc_chartsobj))
-
-$(eval $(call gb_CppunitTest_use_rdb,sc_chartsobj,services))
-
-$(eval $(call gb_CppunitTest_use_components,sc_chartsobj))
-
-$(eval $(call gb_CppunitTest_use_configuration,sc_chartsobj))
+$(eval $(call sc_unoapi_common,chartsobj))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_check_data_pilot_field.mk 
b/sc/CppunitTest_sc_check_data_pilot_field.mk
index 22c682859c7e..a20fad5893a9 100644
--- a/sc/CppunitTest_sc_check_data_pilot_field.mk
+++ b/sc/CppunitTest_sc_check_data_pilot_field.mk
@@ -9,41 +9,6 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_CppunitTest_CppunitTest,sc_check_data_pilot_field))
-
-$(eval $(call 
gb_CppunitTest_use_common_precompiled_header,sc_check_data_pilot_field))
-
-$(eval $(call 
gb_CppunitTest_use_external,sc_check_data_pilot_field,boost_headers))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,sc_check_data_pilot_field, \
-       sc/qa/extras/check_data_pilot_field \
-))
-
-$(eval $(call gb_CppunitTest_use_libraries,sc_check_data_pilot_field, \
-       cppu \
-       sal \
-       subsequenttest \
-       test \
-       unotest \
-       utl \
-))
-
-$(eval $(call gb_CppunitTest_set_include,sc_check_data_pilot_field,\
-       $$(INCLUDE) \
-))
-
-$(eval $(call gb_CppunitTest_use_api,sc_check_data_pilot_field,\
-       offapi \
-       udkapi \
-))
-
-$(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,\
-       $(sc_unoapi_common_components) \
-))
-
-$(eval $(call gb_CppunitTest_use_configuration,sc_check_data_pilot_field))
+$(eval $(call sc_unoapi_common,check_data_pilot_field))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_check_data_pilot_table.mk 
b/sc/CppunitTest_sc_check_data_pilot_table.mk
index e8286a7b4220..f9201914e429 100644
--- a/sc/CppunitTest_sc_check_data_pilot_table.mk
+++ b/sc/CppunitTest_sc_check_data_pilot_table.mk
@@ -9,41 +9,6 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_CppunitTest_CppunitTest,sc_check_data_pilot_table))
-
-$(eval $(call 
gb_CppunitTest_use_common_precompiled_header,sc_check_data_pilot_table))
-
-$(eval $(call 
gb_CppunitTest_use_external,sc_check_data_pilot_table,boost_headers))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,sc_check_data_pilot_table, \
-        sc/qa/extras/check_data_pilot_table \
-))
-
-$(eval $(call gb_CppunitTest_use_libraries,sc_check_data_pilot_table, \
-       cppu \
-       sal \
-       subsequenttest \
-       test \
-       unotest \
-       utl \
-))
-
-$(eval $(call gb_CppunitTest_set_include,sc_check_data_pilot_table,\
-       $$(INCLUDE) \
-))
-
-$(eval $(call gb_CppunitTest_use_api,sc_check_data_pilot_table,\
-        offapi \
-        udkapi \
-))
-
-$(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,\
-       $(sc_unoapi_common_components) \
-))
-
-$(eval $(call gb_CppunitTest_use_configuration,sc_check_data_pilot_table))
+$(eval $(call sc_unoapi_common,check_data_pilot_table))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_check_xcell_ranges_query.mk 
b/sc/CppunitTest_sc_check_xcell_ranges_query.mk
index c6cc3378739c..fff424b5db16 100644
--- a/sc/CppunitTest_sc_check_xcell_ranges_query.mk
+++ b/sc/CppunitTest_sc_check_xcell_ranges_query.mk
@@ -9,37 +9,6 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_CppunitTest_CppunitTest,sc_check_xcell_ranges_query))
-
-$(eval $(call 
gb_CppunitTest_use_common_precompiled_header,sc_check_xcell_ranges_query))
-
-$(eval $(call 
gb_CppunitTest_use_external,sc_check_xcell_ranges_query,boost_headers))
-
-$(eval $(call 
gb_CppunitTest_add_exception_objects,sc_check_xcell_ranges_query, \
-       sc/qa/extras/check_xcell_ranges_query \
-))
-
-$(eval $(call gb_CppunitTest_use_libraries,sc_check_xcell_ranges_query, \
-       cppu \
-       sal \
-       subsequenttest \
-       test \
-       unotest \
-))
-
-$(eval $(call gb_CppunitTest_set_include,sc_check_xcell_ranges_query,\
-       $$(INCLUDE) \
-))
-
-$(eval $(call gb_CppunitTest_use_sdk_api,sc_check_xcell_ranges_query))
-
-$(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,\
-       $(sc_unoapi_common_components) \
-))
-
-$(eval $(call gb_CppunitTest_use_configuration,sc_check_xcell_ranges_query,))
+$(eval $(call sc_unoapi_common,check_xcell_ranges_query))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_consolidationdescriptorobj.mk 
b/sc/CppunitTest_sc_consolidationdescriptorobj.mk
index 67eebee76009..1217927a7315 100644
--- a/sc/CppunitTest_sc_consolidationdescriptorobj.mk
+++ b/sc/CppunitTest_sc_consolidationdescriptorobj.mk
@@ -9,37 +9,6 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_CppunitTest_CppunitTest,sc_consolidationdescriptorobj))
-
-$(eval $(call 
gb_CppunitTest_use_external,sc_consolidationdescriptorobj,boost_headers))
-
-$(eval $(call 
gb_CppunitTest_use_common_precompiled_header,sc_consolidationdescriptorobj))
-
-$(eval $(call 
gb_CppunitTest_add_exception_objects,sc_consolidationdescriptorobj, \
-       sc/qa/extras/scconsolidationdescriptorobj \
-))
-
-$(eval $(call gb_CppunitTest_use_libraries,sc_consolidationdescriptorobj, \
-       cppu \
-       sal \
-       subsequenttest \
-       test \
-       unotest \
-))
-
-$(eval $(call gb_CppunitTest_set_include,sc_consolidationdescriptorobj,\
-       $$(INCLUDE) \
-))
-
-$(eval $(call gb_CppunitTest_use_sdk_api,sc_consolidationdescriptorobj))
-
-$(eval $(call gb_CppunitTest_use_ure,sc_consolidationdescriptorobj))
-$(eval $(call gb_CppunitTest_use_vcl,sc_consolidationdescriptorobj))
-
-$(eval $(call gb_CppunitTest_use_components,sc_consolidationdescriptorobj,\
-       $(sc_unoapi_common_components) \
-))
-
-$(eval $(call gb_CppunitTest_use_configuration,sc_consolidationdescriptorobj))
+$(eval $(call sc_unoapi_common,consolidationdescriptorobj))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_core.mk b/sc/CppunitTest_sc_core.mk
index 2e0f6e7ba3bc..0bac803bc652 100644
--- a/sc/CppunitTest_sc_core.mk
+++ b/sc/CppunitTest_sc_core.mk
@@ -39,9 +39,7 @@ $(eval $(call gb_CppunitTest_use_sdk_api,sc_core))
 $(eval $(call gb_CppunitTest_use_ure,sc_core))
 $(eval $(call gb_CppunitTest_use_vcl,sc_core))
 
-$(eval $(call gb_CppunitTest_use_components,sc_core,\
-    $(sc_unoapi_common_components) \
-))
+$(eval $(call gb_CppunitTest_use_rdb,sc_core,services))
 
 $(eval $(call gb_CppunitTest_use_configuration,sc_core))
 
diff --git a/sc/CppunitTest_sc_databaserangeobj.mk 
b/sc/CppunitTest_sc_databaserangeobj.mk
index 5b652a3bcbb8..be7195e2c6db 100644
--- a/sc/CppunitTest_sc_databaserangeobj.mk
+++ b/sc/CppunitTest_sc_databaserangeobj.mk
@@ -9,37 +9,6 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_CppunitTest_CppunitTest,sc_databaserangeobj))
-
-$(eval $(call gb_CppunitTest_use_external,sc_databaserangeobj,boost_headers))
-
-$(eval $(call 
gb_CppunitTest_use_common_precompiled_header,sc_databaserangeobj))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,sc_databaserangeobj, \
-       sc/qa/extras/scdatabaserangeobj \
-))
-
-$(eval $(call gb_CppunitTest_use_libraries,sc_databaserangeobj, \
-       cppu \
-       sal \
-       subsequenttest \
-       test \
-       unotest \
-))
-
-$(eval $(call gb_CppunitTest_set_include,sc_databaserangeobj,\
-       $$(INCLUDE) \
-))
-
-$(eval $(call gb_CppunitTest_use_sdk_api,sc_databaserangeobj))
-
-$(eval $(call gb_CppunitTest_use_ure,sc_databaserangeobj))
-$(eval $(call gb_CppunitTest_use_vcl,sc_databaserangeobj))
-
-$(eval $(call gb_CppunitTest_use_components,sc_databaserangeobj,\
-       $(sc_unoapi_common_components) \
-))
-
-$(eval $(call gb_CppunitTest_use_configuration,sc_databaserangeobj))
+$(eval $(call sc_unoapi_common,databaserangeobj))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_databaserangesobj.mk 
b/sc/CppunitTest_sc_databaserangesobj.mk
index f5952e691a2d..718ee617ea10 100644
--- a/sc/CppunitTest_sc_databaserangesobj.mk
+++ b/sc/CppunitTest_sc_databaserangesobj.mk
@@ -9,37 +9,6 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_CppunitTest_CppunitTest,sc_databaserangesobj))
-
-$(eval $(call gb_CppunitTest_use_external,sc_databaserangesobj,boost_headers))
-
-$(eval $(call 
gb_CppunitTest_use_common_precompiled_header,sc_databaserangesobj))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,sc_databaserangesobj, \
-       sc/qa/extras/scdatabaserangesobj \
-))
-
-$(eval $(call gb_CppunitTest_use_libraries,sc_databaserangesobj, \
-       cppu \
-       sal \
-       subsequenttest \
-       test \
-       unotest \
-))
-
-$(eval $(call gb_CppunitTest_set_include,sc_databaserangesobj,\
-       $$(INCLUDE) \
-))
-
-$(eval $(call gb_CppunitTest_use_sdk_api,sc_databaserangesobj))
-
-$(eval $(call gb_CppunitTest_use_ure,sc_databaserangesobj))
-$(eval $(call gb_CppunitTest_use_vcl,sc_databaserangesobj))
-
-$(eval $(call gb_CppunitTest_use_components,sc_databaserangesobj,\
-       $(sc_unoapi_common_components) \
-))
-
-$(eval $(call gb_CppunitTest_use_configuration,sc_databaserangesobj))
+$(eval $(call sc_unoapi_common,databaserangesobj))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_datapilotfieldgroupitemobj.mk 
b/sc/CppunitTest_sc_datapilotfieldgroupitemobj.mk
index 638f0b350784..b3e1310e78bb 100644
--- a/sc/CppunitTest_sc_datapilotfieldgroupitemobj.mk
+++ b/sc/CppunitTest_sc_datapilotfieldgroupitemobj.mk
@@ -9,41 +9,6 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_CppunitTest_CppunitTest,sc_datapilotfieldgroupitemobj))
-
-$(eval $(call 
gb_CppunitTest_use_external,sc_datapilotfieldgroupitemobj,boost_headers))
-
-$(eval $(call 
gb_CppunitTest_use_common_precompiled_header,sc_datapilotfieldgroupitemobj))
-
-$(eval $(call 
gb_CppunitTest_add_exception_objects,sc_datapilotfieldgroupitemobj, \
-       sc/qa/extras/scdatapilotfieldgroupitemobj \
-))
-
-$(eval $(call gb_CppunitTest_use_libraries,sc_datapilotfieldgroupitemobj, \
-       comphelper \
-       cppu \
-       sal \
-       subsequenttest \
-       test \
-       unotest \
-))
-
-$(eval $(call gb_CppunitTest_set_include,sc_datapilotfieldgroupitemobj,\
-       $$(INCLUDE) \
-))
-
-$(eval $(call gb_CppunitTest_use_api,sc_datapilotfieldgroupitemobj,\
-       offapi \
-       udkapi \
-))
-
-$(eval $(call gb_CppunitTest_use_ure,sc_datapilotfieldgroupitemobj))
-$(eval $(call gb_CppunitTest_use_vcl,sc_datapilotfieldgroupitemobj))
-
-$(eval $(call gb_CppunitTest_use_rdb,sc_datapilotfieldgroupitemobj,services))
-
-$(eval $(call gb_CppunitTest_use_components,sc_datapilotfieldgroupitemobj))
-
-$(eval $(call gb_CppunitTest_use_configuration,sc_datapilotfieldgroupitemobj))
+$(eval $(call sc_unoapi_common,datapilotfieldgroupitemobj))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_datapilotfieldgroupobj.mk 
b/sc/CppunitTest_sc_datapilotfieldgroupobj.mk
index 5fc7a4c4cb8e..bf282d1c3790 100644
--- a/sc/CppunitTest_sc_datapilotfieldgroupobj.mk
+++ b/sc/CppunitTest_sc_datapilotfieldgroupobj.mk
@@ -9,41 +9,6 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_CppunitTest_CppunitTest,sc_datapilotfieldgroupobj))
-
-$(eval $(call 
gb_CppunitTest_use_external,sc_datapilotfieldgroupobj,boost_headers))
-
-$(eval $(call 
gb_CppunitTest_use_common_precompiled_header,sc_datapilotfieldgroupobj))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,sc_datapilotfieldgroupobj, \
-       sc/qa/extras/scdatapilotfieldgroupobj \
-))
-
-$(eval $(call gb_CppunitTest_use_libraries,sc_datapilotfieldgroupobj, \
-       comphelper \
-       cppu \
-       sal \
-       subsequenttest \
-       test \
-       unotest \
-))
-
-$(eval $(call gb_CppunitTest_set_include,sc_datapilotfieldgroupobj,\
-       $$(INCLUDE) \
-))
-
-$(eval $(call gb_CppunitTest_use_api,sc_datapilotfieldgroupobj,\
-       offapi \
-       udkapi \
-))
-
-$(eval $(call gb_CppunitTest_use_ure,sc_datapilotfieldgroupobj))
-$(eval $(call gb_CppunitTest_use_vcl,sc_datapilotfieldgroupobj))
-
-$(eval $(call gb_CppunitTest_use_rdb,sc_datapilotfieldgroupobj,services))
-
-$(eval $(call gb_CppunitTest_use_components,sc_datapilotfieldgroupobj))
-
-$(eval $(call gb_CppunitTest_use_configuration,sc_datapilotfieldgroupobj))
+$(eval $(call sc_unoapi_common,datapilotfieldgroupobj))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_datapilotfieldgroupsobj.mk 
b/sc/CppunitTest_sc_datapilotfieldgroupsobj.mk
index 22c5eda357f0..becf9829749a 100644
--- a/sc/CppunitTest_sc_datapilotfieldgroupsobj.mk
+++ b/sc/CppunitTest_sc_datapilotfieldgroupsobj.mk
@@ -9,41 +9,6 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_CppunitTest_CppunitTest,sc_datapilotfieldgroupsobj))
-
-$(eval $(call 
gb_CppunitTest_use_external,sc_datapilotfieldgroupsobj,boost_headers))
-
-$(eval $(call 
gb_CppunitTest_use_common_precompiled_header,sc_datapilotfieldgroupsobj))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,sc_datapilotfieldgroupsobj, 
\
-    sc/qa/extras/scdatapilotfieldgroupsobj \
-))
-
-$(eval $(call gb_CppunitTest_use_libraries,sc_datapilotfieldgroupsobj, \
-       comphelper \
-    cppu \
-    sal \
-    subsequenttest \
-       test \
-       unotest \
-))
-
-$(eval $(call gb_CppunitTest_set_include,sc_datapilotfieldgroupsobj,\
-    $$(INCLUDE) \
-))
-
-$(eval $(call gb_CppunitTest_use_api,sc_datapilotfieldgroupsobj,\
-    offapi \
-    udkapi \
-))
-
-$(eval $(call gb_CppunitTest_use_ure,sc_datapilotfieldgroupsobj))
-$(eval $(call gb_CppunitTest_use_vcl,sc_datapilotfieldgroupsobj))
-
-$(eval $(call gb_CppunitTest_use_rdb,sc_datapilotfieldgroupsobj,services))
-
-$(eval $(call gb_CppunitTest_use_components,sc_datapilotfieldgroupsobj))
-
-$(eval $(call gb_CppunitTest_use_configuration,sc_datapilotfieldgroupsobj))
+$(eval $(call sc_unoapi_common,datapilotfieldgroupsobj))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_datapilotfieldobj.mk 
b/sc/CppunitTest_sc_datapilotfieldobj.mk
index b43e693d15cc..40c617c80464 100644
--- a/sc/CppunitTest_sc_datapilotfieldobj.mk
+++ b/sc/CppunitTest_sc_datapilotfieldobj.mk
@@ -9,37 +9,6 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_CppunitTest_CppunitTest,sc_datapilotfieldobj))
-
-$(eval $(call gb_CppunitTest_use_external,sc_datapilotfieldobj,boost_headers))
-
-$(eval $(call 
gb_CppunitTest_use_common_precompiled_header,sc_datapilotfieldobj))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,sc_datapilotfieldobj, \
-       sc/qa/extras/scdatapilotfieldobj \
-))
-
-$(eval $(call gb_CppunitTest_use_libraries,sc_datapilotfieldobj, \
-       cppu \
-       sal \
-       subsequenttest \
-       test \
-       unotest \
-))
-
-$(eval $(call gb_CppunitTest_set_include,sc_datapilotfieldobj,\
-       $$(INCLUDE) \
-))
-
-$(eval $(call gb_CppunitTest_use_sdk_api,sc_datapilotfieldobj))
-
-$(eval $(call gb_CppunitTest_use_ure,sc_datapilotfieldobj))
-$(eval $(call gb_CppunitTest_use_vcl,sc_datapilotfieldobj))
-
-$(eval $(call gb_CppunitTest_use_components,sc_datapilotfieldobj,\
-       $(sc_unoapi_common_components) \
-))
-
-$(eval $(call gb_CppunitTest_use_configuration,sc_datapilotfieldobj))
+$(eval $(call sc_unoapi_common,datapilotfieldobj))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_datapilotfieldsobj.mk 
b/sc/CppunitTest_sc_datapilotfieldsobj.mk
index 394c8f02da57..0e8b4ba13b1a 100644
--- a/sc/CppunitTest_sc_datapilotfieldsobj.mk
+++ b/sc/CppunitTest_sc_datapilotfieldsobj.mk
@@ -9,37 +9,6 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_CppunitTest_CppunitTest,sc_datapilotfieldsobj))
-
-$(eval $(call gb_CppunitTest_use_external,sc_datapilotfieldsobj,boost_headers))
-
-$(eval $(call 
gb_CppunitTest_use_common_precompiled_header,sc_datapilotfieldsobj))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,sc_datapilotfieldsobj, \
-       sc/qa/extras/scdatapilotfieldsobj \
-))
-
-$(eval $(call gb_CppunitTest_use_libraries,sc_datapilotfieldsobj, \
-       cppu \
-       sal \
-       subsequenttest \
-       test \
-       unotest \
-))
-
-$(eval $(call gb_CppunitTest_set_include,sc_datapilotfieldsobj,\
-       $$(INCLUDE) \
-))
-
-$(eval $(call gb_CppunitTest_use_sdk_api,sc_datapilotfieldsobj))
-
-$(eval $(call gb_CppunitTest_use_ure,sc_datapilotfieldsobj))
-$(eval $(call gb_CppunitTest_use_vcl,sc_datapilotfieldsobj))
-
-$(eval $(call gb_CppunitTest_use_components,sc_datapilotfieldsobj,\
-       $(sc_unoapi_common_components) \
-))
-
-$(eval $(call gb_CppunitTest_use_configuration,sc_datapilotfieldsobj))
+$(eval $(call sc_unoapi_common,datapilotfieldsobj))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_datapilotitemobj.mk 
b/sc/CppunitTest_sc_datapilotitemobj.mk
index 5290c9f0fb61..dfb3e19bfb3c 100644
--- a/sc/CppunitTest_sc_datapilotitemobj.mk
+++ b/sc/CppunitTest_sc_datapilotitemobj.mk
@@ -9,68 +9,6 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_CppunitTest_CppunitTest,sc_datapilotitemobj))
-
-$(eval $(call gb_CppunitTest_use_external,sc_datapilotitemobj,boost_headers))
-
-$(eval $(call 
gb_CppunitTest_use_common_precompiled_header,sc_datapilotitemobj))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,sc_datapilotitemobj, \
-    sc/qa/extras/scdatapilotitemobj \
-))
-
-$(eval $(call gb_CppunitTest_use_libraries,sc_datapilotitemobj, \
-    basegfx \
-    comphelper \
-    cppu \
-    cppuhelper \
-    drawinglayer \
-    drawinglayercore \
-    editeng \
-    for \
-    forui \
-    i18nlangtag \
-    msfilter \
-    oox \
-    sal \
-    salhelper \
-    sax \
-    sb \
-    sc \
-    sfx \
-    sot \
-    subsequenttest \
-    svl \
-    svt \
-    svx \
-    svxcore \
-       test \
-    tk \
-    tl \
-    ucbhelper \
-       unotest \
-    utl \
-    $(call gb_Helper_optional,SCRIPTING, \
-        vbahelper) \
-    vcl \
-    xo \
-))
-
-$(eval $(call gb_CppunitTest_set_include,sc_datapilotitemobj,\
-    -I$(SRCDIR)/sc/source/ui/inc \
-    -I$(SRCDIR)/sc/inc \
-    $$(INCLUDE) \
-))
-
-$(eval $(call gb_CppunitTest_use_sdk_api,sc_datapilotitemobj))
-
-$(eval $(call gb_CppunitTest_use_ure,sc_datapilotitemobj))
-$(eval $(call gb_CppunitTest_use_vcl,sc_datapilotitemobj))
-
-$(eval $(call gb_CppunitTest_use_components,sc_datapilotitemobj,\
-    $(sc_unoapi_common_components) \
-))
-
-$(eval $(call gb_CppunitTest_use_configuration,sc_datapilotitemobj))
+$(eval $(call sc_unoapi_common,datapilotitemobj))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_datapilotitemsobj.mk 
b/sc/CppunitTest_sc_datapilotitemsobj.mk
index 73201be40ca8..fd3caed9689b 100644
--- a/sc/CppunitTest_sc_datapilotitemsobj.mk
+++ b/sc/CppunitTest_sc_datapilotitemsobj.mk
@@ -9,41 +9,6 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_CppunitTest_CppunitTest,sc_datapilotitemsobj))
-
-$(eval $(call gb_CppunitTest_use_external,sc_datapilotitemsobj,boost_headers))
-
-$(eval $(call 
gb_CppunitTest_use_common_precompiled_header,sc_datapilotitemsobj))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,sc_datapilotitemsobj, \
-       sc/qa/extras/scdatapilotitemsobj \
-))
-
-$(eval $(call gb_CppunitTest_use_libraries,sc_datapilotitemsobj, \
-       comphelper \
-       cppu \
-       sal \
-       subsequenttest \
-       test \
-       unotest \
-))
-
-$(eval $(call gb_CppunitTest_set_include,sc_datapilotitemsobj,\
-       $$(INCLUDE) \
-))
-
-$(eval $(call gb_CppunitTest_use_api,sc_datapilotitemsobj,\
-       offapi \
-       udkapi \
-))
-
-$(eval $(call gb_CppunitTest_use_ure,sc_datapilotitemsobj))
-$(eval $(call gb_CppunitTest_use_vcl,sc_datapilotitemsobj))
-
-$(eval $(call gb_CppunitTest_use_rdb,sc_datapilotitemsobj,services))
-
-$(eval $(call gb_CppunitTest_use_components,sc_datapilotitemsobj))
-
-$(eval $(call gb_CppunitTest_use_configuration,sc_datapilotitemsobj))
+$(eval $(call sc_unoapi_common,datapilotitemsobj))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_datapilottableobj.mk 
b/sc/CppunitTest_sc_datapilottableobj.mk
index d40b25c3c229..0f54bb7023f0 100644
--- a/sc/CppunitTest_sc_datapilottableobj.mk
+++ b/sc/CppunitTest_sc_datapilottableobj.mk
@@ -9,37 +9,6 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_CppunitTest_CppunitTest,sc_datapilottableobj))
-
-$(eval $(call gb_CppunitTest_use_external,sc_datapilottableobj,boost_headers))
-
-$(eval $(call 
gb_CppunitTest_use_common_precompiled_header,sc_datapilottableobj))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,sc_datapilottableobj, \
-       sc/qa/extras/scdatapilottableobj \
-))
-
-$(eval $(call gb_CppunitTest_use_libraries,sc_datapilottableobj, \
-       cppu \
-       sal \
-       subsequenttest \
-       test \
-       unotest \
-))
-
-$(eval $(call gb_CppunitTest_set_include,sc_datapilottableobj,\
-       $$(INCLUDE) \
-))
-
-$(eval $(call gb_CppunitTest_use_sdk_api,sc_datapilottableobj))
-
-$(eval $(call gb_CppunitTest_use_ure,sc_datapilottableobj))
-$(eval $(call gb_CppunitTest_use_vcl,sc_datapilottableobj))
-
-$(eval $(call gb_CppunitTest_use_components,sc_datapilottableobj,\
-       $(sc_unoapi_common_components) \
-))
-
-$(eval $(call gb_CppunitTest_use_configuration,sc_datapilottableobj))
+$(eval $(call sc_unoapi_common,datapilottableobj))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_datapilottablesobj.mk 
b/sc/CppunitTest_sc_datapilottablesobj.mk
index 5892e3c89f99..0d1e5878eea6 100644
--- a/sc/CppunitTest_sc_datapilottablesobj.mk
+++ b/sc/CppunitTest_sc_datapilottablesobj.mk
@@ -9,102 +9,6 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_CppunitTest_CppunitTest,sc_datapilottablesobj))
-
-$(eval $(call gb_CppunitTest_use_external,sc_datapilottablesobj,boost_headers))
-
-$(eval $(call 
gb_CppunitTest_use_common_precompiled_header,sc_datapilottablesobj))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,sc_datapilottablesobj, \
-       sc/qa/extras/scdatapilottablesobj \
-))
-
-$(eval $(call gb_CppunitTest_use_libraries,sc_datapilottablesobj, \
-       basegfx \
-       comphelper \
-       cppu \
-       cppuhelper \
-       drawinglayer \
-       drawinglayercore \
-       editeng \
-       for \
-       forui \
-       i18nlangtag \
-       msfilter \
-       oox \
-       sal \
-       salhelper \
-       sax \
-       sb \
-       sc \
-       sfx \
-       sot \
-       subsequenttest \
-       svl \
-       svt \
-       svx \
-       svxcore \
-       test \
-       tk \
-       tl \
-       ucbhelper \
-       unotest \
-       utl \
-    $(call gb_Helper_optional,SCRIPTING, \
-        vbahelper) \
-       vcl \
-       xo \
-))
-
-$(eval $(call gb_CppunitTest_set_include,sc_datapilottablesobj,\
-       -I$(SRCDIR)/sc/source/ui/inc \
-       -I$(SRCDIR)/sc/inc \
-       $$(INCLUDE) \
-))
-
-$(eval $(call gb_CppunitTest_use_sdk_api,sc_datapilottablesobj))
-
-$(eval $(call gb_CppunitTest_use_ure,sc_datapilottablesobj))
-$(eval $(call gb_CppunitTest_use_vcl,sc_datapilottablesobj))
-
-$(eval $(call gb_CppunitTest_use_components,sc_datapilottablesobj,\
-       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 \
-))
-
-$(eval $(call gb_CppunitTest_use_configuration,sc_datapilottablesobj))
+$(eval $(call sc_unoapi_common,datapilottablesobj))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_ddelinkobj.mk b/sc/CppunitTest_sc_ddelinkobj.mk
index 6e361d361304..0efccf578799 100644
--- a/sc/CppunitTest_sc_ddelinkobj.mk
+++ b/sc/CppunitTest_sc_ddelinkobj.mk
@@ -9,39 +9,6 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_CppunitTest_CppunitTest,sc_ddelinkobj))
-
-$(eval $(call gb_CppunitTest_use_external,sc_ddelinkobj,boost_headers))
-
-$(eval $(call gb_CppunitTest_use_common_precompiled_header,sc_ddelinkobj))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,sc_ddelinkobj, \
-       sc/qa/extras/scddelinkobj \
-))
-
-$(eval $(call gb_CppunitTest_use_libraries,sc_ddelinkobj, \
-       cppu \
-       sal \
-       subsequenttest \
-       test \
-       unotest \
-       utl \
-       vcl \
-))
-
-$(eval $(call gb_CppunitTest_set_include,sc_ddelinkobj,\
-       $$(INCLUDE) \
-))
-
-$(eval $(call gb_CppunitTest_use_sdk_api,sc_ddelinkobj))
-
-$(eval $(call gb_CppunitTest_use_ure,sc_ddelinkobj))
-$(eval $(call gb_CppunitTest_use_vcl,sc_ddelinkobj))
-
-$(eval $(call gb_CppunitTest_use_components,sc_ddelinkobj,\
-    $(sc_unoapi_common_components) \
-))
-
-$(eval $(call gb_CppunitTest_use_configuration,sc_ddelinkobj))
+$(eval $(call sc_unoapi_common,ddelinkobj))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_ddelinksobj.mk b/sc/CppunitTest_sc_ddelinksobj.mk
index 702784d99ac7..4c1d75198663 100644
--- a/sc/CppunitTest_sc_ddelinksobj.mk
+++ b/sc/CppunitTest_sc_ddelinksobj.mk
@@ -9,38 +9,6 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_CppunitTest_CppunitTest,sc_ddelinksobj))
-
-$(eval $(call gb_CppunitTest_use_external,sc_ddelinksobj,boost_headers))
-
-$(eval $(call gb_CppunitTest_use_common_precompiled_header,sc_ddelinksobj))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,sc_ddelinksobj, \
-       sc/qa/extras/scddelinksobj \
-))
-
-$(eval $(call gb_CppunitTest_use_libraries,sc_ddelinksobj, \
-       cppu \
-       sal \
-       subsequenttest \
-       test \
-       unotest \
-       vcl \
-))
-
-$(eval $(call gb_CppunitTest_set_include,sc_ddelinksobj,\
-       $$(INCLUDE) \
-))
-
-$(eval $(call gb_CppunitTest_use_sdk_api,sc_ddelinksobj))
-
-$(eval $(call gb_CppunitTest_use_ure,sc_ddelinksobj))
-$(eval $(call gb_CppunitTest_use_vcl,sc_ddelinksobj))
-
-$(eval $(call gb_CppunitTest_use_components,sc_ddelinksobj,\
-    $(sc_unoapi_common_components) \
-))
-
-$(eval $(call gb_CppunitTest_use_configuration,sc_ddelinksobj))
+$(eval $(call sc_unoapi_common,ddelinksobj))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_documentconfigurationobj.mk 
b/sc/CppunitTest_sc_documentconfigurationobj.mk
index d75a34288cbd..124725f5b666 100644
--- a/sc/CppunitTest_sc_documentconfigurationobj.mk
+++ b/sc/CppunitTest_sc_documentconfigurationobj.mk
@@ -9,37 +9,6 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_CppunitTest_CppunitTest,sc_documentconfigurationobj))
-
-$(eval $(call 
gb_CppunitTest_use_external,sc_documentconfigurationobj,boost_headers))
-
-$(eval $(call 
gb_CppunitTest_use_common_precompiled_header,sc_documentconfigurationobj))
-
-$(eval $(call 
gb_CppunitTest_add_exception_objects,sc_documentconfigurationobj, \
-       sc/qa/extras/scdocumentconfigurationobj \
-))
-
-$(eval $(call gb_CppunitTest_use_libraries,sc_documentconfigurationobj, \
-       cppu \
-       sal \
-       subsequenttest \
-       test \
-       unotest \
-))
-
-$(eval $(call gb_CppunitTest_set_include,sc_documentconfigurationobj,\
-       $$(INCLUDE) \
-))
-
-$(eval $(call gb_CppunitTest_use_sdk_api,sc_documentconfigurationobj))
-
-$(eval $(call gb_CppunitTest_use_ure,sc_documentconfigurationobj))
-$(eval $(call gb_CppunitTest_use_vcl,sc_documentconfigurationobj))
-
-$(eval $(call gb_CppunitTest_use_components,sc_documentconfigurationobj,\
-       $(sc_unoapi_common_components) \
-))
-
-$(eval $(call gb_CppunitTest_use_configuration,sc_documentconfigurationobj))
+$(eval $(call sc_unoapi_common,documentconfigurationobj))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_drawpageobj.mk b/sc/CppunitTest_sc_drawpageobj.mk
index 46c8356206de..80d48afcaaf3 100644
--- a/sc/CppunitTest_sc_drawpageobj.mk
+++ b/sc/CppunitTest_sc_drawpageobj.mk
@@ -9,37 +9,6 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_CppunitTest_CppunitTest,sc_drawpageobj))
-
-$(eval $(call gb_CppunitTest_use_external,sc_drawpageobj,boost_headers))
-
-$(eval $(call gb_CppunitTest_use_common_precompiled_header,sc_drawpageobj))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,sc_drawpageobj, \
-       sc/qa/extras/scdrawpageobj \
-))
-
-$(eval $(call gb_CppunitTest_use_libraries,sc_drawpageobj, \
-       cppu \
-       sal \
-       subsequenttest \
-       test \
-       unotest \
-))
-
-$(eval $(call gb_CppunitTest_set_include,sc_drawpageobj,\
-       $$(INCLUDE) \
-))
-
-$(eval $(call gb_CppunitTest_use_sdk_api,sc_drawpageobj))
-
-$(eval $(call gb_CppunitTest_use_ure,sc_drawpageobj))
-$(eval $(call gb_CppunitTest_use_vcl,sc_drawpageobj))
-
-$(eval $(call gb_CppunitTest_use_components,sc_drawpageobj,\
-       $(sc_unoapi_common_components) \
-))
-
-$(eval $(call gb_CppunitTest_use_configuration,sc_drawpageobj))
+$(eval $(call sc_unoapi_common,drawpageobj))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_drawpagesobj.mk 
b/sc/CppunitTest_sc_drawpagesobj.mk
index a0f05cc7bcaa..be1291c5f9f0 100644
--- a/sc/CppunitTest_sc_drawpagesobj.mk
+++ b/sc/CppunitTest_sc_drawpagesobj.mk
@@ -9,38 +9,6 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_CppunitTest_CppunitTest,sc_drawpagesobj))
-
-$(eval $(call gb_CppunitTest_use_external,sc_drawpagesobj,boost_headers))
-
-$(eval $(call gb_CppunitTest_use_common_precompiled_header,sc_drawpagesobj))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,sc_drawpagesobj, \
-       sc/qa/extras/scdrawpagesobj \
-))
-
-$(eval $(call gb_CppunitTest_use_libraries,sc_drawpagesobj, \
-       cppu \
-       sal \
-       subsequenttest \
-       test \
-       unotest \
-       vcl \
-))
-
-$(eval $(call gb_CppunitTest_set_include,sc_drawpagesobj,\
-       $$(INCLUDE) \
-))
-
-$(eval $(call gb_CppunitTest_use_sdk_api,sc_drawpagesobj))
-
-$(eval $(call gb_CppunitTest_use_ure,sc_drawpagesobj))
-$(eval $(call gb_CppunitTest_use_vcl,sc_drawpagesobj))
-
-$(eval $(call gb_CppunitTest_use_components,sc_drawpagesobj,\
-    $(sc_unoapi_common_components) \
-))
-
-$(eval $(call gb_CppunitTest_use_configuration,sc_drawpagesobj))
+$(eval $(call sc_unoapi_common,drawpagesobj))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_editfieldobj_cell.mk 
b/sc/CppunitTest_sc_editfieldobj_cell.mk
index 0a500013af5d..27a741411a75 100644
--- a/sc/CppunitTest_sc_editfieldobj_cell.mk
+++ b/sc/CppunitTest_sc_editfieldobj_cell.mk
@@ -9,37 +9,6 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_CppunitTest_CppunitTest,sc_editfieldobj_cell))
-
-$(eval $(call gb_CppunitTest_use_external,sc_editfieldobj_cell,boost_headers))
-
-$(eval $(call 
gb_CppunitTest_use_common_precompiled_header,sc_editfieldobj_cell))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,sc_editfieldobj_cell, \
-       sc/qa/extras/sceditfieldobj-cell \
-))
-
-$(eval $(call gb_CppunitTest_use_libraries,sc_editfieldobj_cell, \
-       cppu \
-       sal \
-       subsequenttest \
-       test \
-       unotest \
-))
-
-$(eval $(call gb_CppunitTest_set_include,sc_editfieldobj_cell,\
-       $$(INCLUDE) \
-))
-
-$(eval $(call gb_CppunitTest_use_sdk_api,sc_editfieldobj_cell))
-
-$(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,\
-       $(sc_unoapi_common_components) \
-))
-
-$(eval $(call gb_CppunitTest_use_configuration,sc_editfieldobj_cell))
+$(eval $(call sc_unoapi_common,editfieldobj_cell))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_editfieldobj_header.mk 
b/sc/CppunitTest_sc_editfieldobj_header.mk
index d3ae5ebe2ee5..c8dfd1e4d8ae 100644
--- a/sc/CppunitTest_sc_editfieldobj_header.mk
+++ b/sc/CppunitTest_sc_editfieldobj_header.mk
@@ -9,37 +9,6 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_CppunitTest_CppunitTest,sc_editfieldobj_header))
-
-$(eval $(call 
gb_CppunitTest_use_external,sc_editfieldobj_header,boost_headers))
-
-$(eval $(call 
gb_CppunitTest_use_common_precompiled_header,sc_editfieldobj_header))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,sc_editfieldobj_header, \
-       sc/qa/extras/sceditfieldobj-header \
-))
-
-$(eval $(call gb_CppunitTest_use_libraries,sc_editfieldobj_header, \
-       cppu \
-       sal \
-       subsequenttest \
-       test \
-       unotest \
-))
-
-$(eval $(call gb_CppunitTest_set_include,sc_editfieldobj_header,\
-       $$(INCLUDE) \
-))
-
-$(eval $(call gb_CppunitTest_use_sdk_api,sc_editfieldobj_header))
-
-$(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,\
-       $(sc_unoapi_common_components) \
-))
-
-$(eval $(call gb_CppunitTest_use_configuration,sc_editfieldobj_header))
+$(eval $(call sc_unoapi_common,editfieldobj_header))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_filterdescriptorbase.mk 
b/sc/CppunitTest_sc_filterdescriptorbase.mk
index 9dda0200f82c..e5fdd3429a13 100644
--- a/sc/CppunitTest_sc_filterdescriptorbase.mk
+++ b/sc/CppunitTest_sc_filterdescriptorbase.mk
@@ -9,37 +9,6 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_CppunitTest_CppunitTest,sc_filterdescriptorbase))
-
-$(eval $(call 
gb_CppunitTest_use_external,sc_filterdescriptorbase,boost_headers))
-
-$(eval $(call 
gb_CppunitTest_use_common_precompiled_header,sc_filterdescriptorbase))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,sc_filterdescriptorbase, \
-       sc/qa/extras/scfilterdescriptorbase\
-))
-
-$(eval $(call gb_CppunitTest_use_libraries,sc_filterdescriptorbase, \
-       cppu \
-       sal \
-       subsequenttest \
-       test \
-       unotest \
-))
-
-$(eval $(call gb_CppunitTest_set_include,sc_filterdescriptorbase,\
-       $$(INCLUDE) \
-))
-
-$(eval $(call gb_CppunitTest_use_sdk_api,sc_filterdescriptorbase))
-
-$(eval $(call gb_CppunitTest_use_ure,sc_filterdescriptorbase))
-$(eval $(call gb_CppunitTest_use_vcl,sc_filterdescriptorbase))
-
-$(eval $(call gb_CppunitTest_use_components,sc_filterdescriptorbase,\
-       $(sc_unoapi_common_components) \
-))
-
-$(eval $(call gb_CppunitTest_use_configuration,sc_filterdescriptorbase))
+$(eval $(call sc_unoapi_common,filterdescriptorbase))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_functiondescriptionobj.mk 
b/sc/CppunitTest_sc_functiondescriptionobj.mk
index fe0ad516283d..404c13e64e3d 100644
--- a/sc/CppunitTest_sc_functiondescriptionobj.mk
+++ b/sc/CppunitTest_sc_functiondescriptionobj.mk
@@ -9,37 +9,6 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_CppunitTest_CppunitTest,sc_functiondescriptionobj))
-
-$(eval $(call 
gb_CppunitTest_use_external,sc_functiondescriptionobj,boost_headers))
-
-$(eval $(call 
gb_CppunitTest_use_common_precompiled_header,sc_functiondescriptionobj))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,sc_functiondescriptionobj, \
-       sc/qa/extras/scfunctiondescriptionobj \
-))
-
-$(eval $(call gb_CppunitTest_use_libraries,sc_functiondescriptionobj, \
-       cppu \
-       sal \
-       subsequenttest \
-       test \
-       unotest \
-))
-
-$(eval $(call gb_CppunitTest_set_include,sc_functiondescriptionobj,\
-       $$(INCLUDE) \
-))
-
-$(eval $(call gb_CppunitTest_use_sdk_api,sc_functiondescriptionobj))
-
-$(eval $(call gb_CppunitTest_use_ure,sc_functiondescriptionobj))
-$(eval $(call gb_CppunitTest_use_vcl,sc_functiondescriptionobj))
-
-$(eval $(call gb_CppunitTest_use_components,sc_functiondescriptionobj,\
-    $(sc_unoapi_common_components) \
-))
-
-$(eval $(call gb_CppunitTest_use_configuration,sc_functiondescriptionobj))
+$(eval $(call sc_unoapi_common,functiondescriptionobj))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_functionlistobj.mk 
b/sc/CppunitTest_sc_functionlistobj.mk
index f3e094706f5e..5e00fae0d2e2 100644
--- a/sc/CppunitTest_sc_functionlistobj.mk
+++ b/sc/CppunitTest_sc_functionlistobj.mk
@@ -37,7 +37,41 @@ $(eval $(call gb_CppunitTest_use_ure,sc_functionlistobj))
 $(eval $(call gb_CppunitTest_use_vcl,sc_functionlistobj))
 
 $(eval $(call gb_CppunitTest_use_components,sc_functionlistobj,\
-       $(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/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_functionlistobj))
diff --git a/sc/CppunitTest_sc_headerfieldsobj.mk 
b/sc/CppunitTest_sc_headerfieldsobj.mk
index e62545830ce1..3d220ec773ef 100644
--- a/sc/CppunitTest_sc_headerfieldsobj.mk
+++ b/sc/CppunitTest_sc_headerfieldsobj.mk
@@ -9,37 +9,6 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_CppunitTest_CppunitTest,sc_headerfieldsobj))
-
-$(eval $(call gb_CppunitTest_use_external,sc_headerfieldsobj,boost_headers))
-
-$(eval $(call gb_CppunitTest_use_common_precompiled_header,sc_headerfieldsobj))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,sc_headerfieldsobj, \
-    sc/qa/extras/scheaderfieldsobj \
-))
-
-$(eval $(call gb_CppunitTest_use_libraries,sc_headerfieldsobj, \
-       cppu \
-       sal \
-       subsequenttest \
-       test \
-       unotest \
-))
-
-$(eval $(call gb_CppunitTest_set_include,sc_headerfieldsobj,\
-       $$(INCLUDE) \
-))
-
-$(eval $(call gb_CppunitTest_use_sdk_api,sc_headerfieldsobj))
-
-$(eval $(call gb_CppunitTest_use_ure,sc_headerfieldsobj))
-$(eval $(call gb_CppunitTest_use_vcl,sc_headerfieldsobj))
-
-$(eval $(call gb_CppunitTest_use_components,sc_headerfieldsobj,\
-    $(sc_unoapi_common_components) \
-))
-
-$(eval $(call gb_CppunitTest_use_configuration,sc_headerfieldsobj))
+$(eval $(call sc_unoapi_common,headerfieldsobj))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_headerfootercontentobj.mk 
b/sc/CppunitTest_sc_headerfootercontentobj.mk
index 9e2059890e39..7c6d96769317 100644
--- a/sc/CppunitTest_sc_headerfootercontentobj.mk
+++ b/sc/CppunitTest_sc_headerfootercontentobj.mk
@@ -9,37 +9,6 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_CppunitTest_CppunitTest,sc_headerfootercontentobj))
-
-$(eval $(call 
gb_CppunitTest_use_external,sc_headerfootercontentobj,boost_headers))
-
-$(eval $(call 
gb_CppunitTest_use_common_precompiled_header,sc_headerfootercontentobj))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,sc_headerfootercontentobj, \
-       sc/qa/extras/scheaderfootercontentobj \
-))
-
-$(eval $(call gb_CppunitTest_use_libraries,sc_headerfootercontentobj, \
-       cppu \
-       sal \
-       subsequenttest \
-       test \
-       unotest \
-))
-
-$(eval $(call gb_CppunitTest_set_include,sc_headerfootercontentobj,\
-       $$(INCLUDE) \
-))
-
-$(eval $(call gb_CppunitTest_use_sdk_api,sc_headerfootercontentobj))
-
-$(eval $(call gb_CppunitTest_use_ure,sc_headerfootercontentobj))
-$(eval $(call gb_CppunitTest_use_vcl,sc_headerfootercontentobj))
-
-$(eval $(call gb_CppunitTest_use_components,sc_headerfootercontentobj,\
-       $(sc_unoapi_common_components) \
-))
-
-$(eval $(call gb_CppunitTest_use_configuration,sc_headerfootercontentobj))
+$(eval $(call sc_unoapi_common,headerfootercontentobj))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_html_export_test.mk 
b/sc/CppunitTest_sc_html_export_test.mk
index dae834614229..f9da77710a29 100644
--- a/sc/CppunitTest_sc_html_export_test.mk
+++ b/sc/CppunitTest_sc_html_export_test.mk
@@ -70,50 +70,7 @@ $(eval $(call gb_CppunitTest_use_api,sc_html_export_test,\
 $(eval $(call gb_CppunitTest_use_ure,sc_html_export_test))
 $(eval $(call gb_CppunitTest_use_vcl,sc_html_export_test))
 
-$(eval $(call gb_CppunitTest_use_components,sc_html_export_test,\
-    basic/util/sb \
-    comphelper/util/comphelp \
-    configmgr/source/configmgr \
-    dbaccess/util/dba \
-    eventattacher/source/evtatt \
-    filter/source/config/cache/filterconfig1 \
-    filter/source/storagefilterdetect/storagefd \
-    forms/util/frm \
-    framework/util/fwk \
-    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/source/dlgprov/dlgprov \
-    scripting/source/vbaevents/vbaevents \
-    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 \
-    svtools/util/svt \
-    svx/util/svx \
-    svx/util/svxcore \
-    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 \
-    vbahelper/util/msforms \
-    xmloff/util/xo \
-))
+$(eval $(call gb_CppunitTest_use_rdb,sc_html_export_test,services))
 
 $(eval $(call gb_CppunitTest_use_configuration,sc_html_export_test))
 
diff --git a/sc/CppunitTest_sc_importdescriptorbaseobj.mk 
b/sc/CppunitTest_sc_importdescriptorbaseobj.mk
index 02bc0e53214b..4cfd0e18085e 100644
--- a/sc/CppunitTest_sc_importdescriptorbaseobj.mk
+++ b/sc/CppunitTest_sc_importdescriptorbaseobj.mk
@@ -9,37 +9,6 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_CppunitTest_CppunitTest,sc_importdescriptorbaseobj))
-
-$(eval $(call 
gb_CppunitTest_use_external,sc_importdescriptorbaseobj,boost_headers))
-
-$(eval $(call 
gb_CppunitTest_use_common_precompiled_header,sc_importdescriptorbaseobj))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,sc_importdescriptorbaseobj, 
\
-       sc/qa/extras/scimportdescriptorbaseobj \
-))
-
-$(eval $(call gb_CppunitTest_use_libraries,sc_importdescriptorbaseobj, \
-       cppu \
-       sal \
-       subsequenttest \
-       test \
-       unotest \
-))
-
-$(eval $(call gb_CppunitTest_set_include,sc_importdescriptorbaseobj,\
-       $$(INCLUDE) \
-))
-
-$(eval $(call gb_CppunitTest_use_sdk_api,sc_importdescriptorbaseobj))
-
-$(eval $(call gb_CppunitTest_use_ure,sc_importdescriptorbaseobj))
-$(eval $(call gb_CppunitTest_use_vcl,sc_importdescriptorbaseobj))
-
-$(eval $(call gb_CppunitTest_use_components,sc_importdescriptorbaseobj,\
-       $(sc_unoapi_common_components) \
-))
-
-$(eval $(call gb_CppunitTest_use_configuration,sc_importdescriptorbaseobj))
+$(eval $(call sc_unoapi_common,importdescriptorbaseobj))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_indexenumeration_cellannotationsenumeration.mk 
b/sc/CppunitTest_sc_indexenumeration_cellannotationsenumeration.mk
index f9d1d4c55e31..d3b02913725a 100644
--- a/sc/CppunitTest_sc_indexenumeration_cellannotationsenumeration.mk
+++ b/sc/CppunitTest_sc_indexenumeration_cellannotationsenumeration.mk
@@ -9,37 +9,6 @@
 #
 #*************************************************************************
 
-$(eval $(call 
gb_CppunitTest_CppunitTest,sc_indexenumeration_cellannotationsenumeration))
-
-$(eval $(call 
gb_CppunitTest_use_external,sc_indexenumeration_cellannotationsenumeration,boost_headers))
-
-$(eval $(call 
gb_CppunitTest_use_common_precompiled_header,sc_indexenumeration_cellannotationsenumeration))
-
-$(eval $(call 
gb_CppunitTest_add_exception_objects,sc_indexenumeration_cellannotationsenumeration,
 \
-       sc/qa/extras/scindexenumeration_cellannotationsenumeration \
-))
-
-$(eval $(call 
gb_CppunitTest_use_libraries,sc_indexenumeration_cellannotationsenumeration, \
-       cppu \
-       sal \
-       subsequenttest \
-       test \
-       unotest \
-))
-
-$(eval $(call 
gb_CppunitTest_set_include,sc_indexenumeration_cellannotationsenumeration,\
-       $$(INCLUDE) \
-))
-
-$(eval $(call 
gb_CppunitTest_use_sdk_api,sc_indexenumeration_cellannotationsenumeration))
-
-$(eval $(call 
gb_CppunitTest_use_ure,sc_indexenumeration_cellannotationsenumeration))
-$(eval $(call 
gb_CppunitTest_use_vcl,sc_indexenumeration_cellannotationsenumeration))
-
-$(eval $(call 
gb_CppunitTest_use_components,sc_indexenumeration_cellannotationsenumeration,\
-    $(sc_unoapi_common_components) \
-))
-
-$(eval $(call 
gb_CppunitTest_use_configuration,sc_indexenumeration_cellannotationsenumeration))
+$(eval $(call sc_unoapi_common,indexenumeration_cellannotationsenumeration))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_indexenumeration_cellarealinksenumeration.mk 
b/sc/CppunitTest_sc_indexenumeration_cellarealinksenumeration.mk
index 4507dd08c8aa..53228f097598 100644
--- a/sc/CppunitTest_sc_indexenumeration_cellarealinksenumeration.mk
+++ b/sc/CppunitTest_sc_indexenumeration_cellarealinksenumeration.mk
@@ -9,37 +9,6 @@
 #
 #*************************************************************************
 
-$(eval $(call 
gb_CppunitTest_CppunitTest,sc_indexenumeration_cellarealinksenumeration))
-
-$(eval $(call 
gb_CppunitTest_use_external,sc_indexenumeration_cellarealinksenumeration,boost_headers))
-
-$(eval $(call 
gb_CppunitTest_use_common_precompiled_header,sc_indexenumeration_cellarealinksenumeration))
-
-$(eval $(call 
gb_CppunitTest_add_exception_objects,sc_indexenumeration_cellarealinksenumeration,
 \
-       sc/qa/extras/scindexenumeration_cellarealinksenumeration \
-))
-
-$(eval $(call 
gb_CppunitTest_use_libraries,sc_indexenumeration_cellarealinksenumeration, \
-       cppu \
-       sal \
-       subsequenttest \
-       test \
-       unotest \
-))
-
-$(eval $(call 
gb_CppunitTest_set_include,sc_indexenumeration_cellarealinksenumeration,\
-       $$(INCLUDE) \
-))
-
-$(eval $(call 
gb_CppunitTest_use_sdk_api,sc_indexenumeration_cellarealinksenumeration))
-
-$(eval $(call 
gb_CppunitTest_use_ure,sc_indexenumeration_cellarealinksenumeration))
-$(eval $(call 
gb_CppunitTest_use_vcl,sc_indexenumeration_cellarealinksenumeration))
-
-$(eval $(call 
gb_CppunitTest_use_components,sc_indexenumeration_cellarealinksenumeration,\
-    $(sc_unoapi_common_components) \
-))
-
-$(eval $(call 
gb_CppunitTest_use_configuration,sc_indexenumeration_cellarealinksenumeration))
+$(eval $(call sc_unoapi_common,indexenumeration_cellarealinksenumeration))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_indexenumeration_databaserangesenumeration.mk 
b/sc/CppunitTest_sc_indexenumeration_databaserangesenumeration.mk
index 3c3446bb574f..aab79dadc348 100644
--- a/sc/CppunitTest_sc_indexenumeration_databaserangesenumeration.mk
+++ b/sc/CppunitTest_sc_indexenumeration_databaserangesenumeration.mk
@@ -9,37 +9,6 @@
 #
 #*************************************************************************
 
-$(eval $(call 
gb_CppunitTest_CppunitTest,sc_indexenumeration_databaserangesenumeration))
-
-$(eval $(call 
gb_CppunitTest_use_external,sc_indexenumeration_databaserangesenumeration,boost_headers))
-
-$(eval $(call 
gb_CppunitTest_use_common_precompiled_header,sc_indexenumeration_databaserangesenumeration))
-
-$(eval $(call 
gb_CppunitTest_add_exception_objects,sc_indexenumeration_databaserangesenumeration,
 \
-       sc/qa/extras/scindexenumeration_databaserangesenumeration \
-))
-
-$(eval $(call 
gb_CppunitTest_use_libraries,sc_indexenumeration_databaserangesenumeration, \
-       cppu \
-       sal \
-       subsequenttest \
-       test \
-       unotest \
-))
-
-$(eval $(call 
gb_CppunitTest_set_include,sc_indexenumeration_databaserangesenumeration,\
-       $$(INCLUDE) \
-))
-
-$(eval $(call 
gb_CppunitTest_use_sdk_api,sc_indexenumeration_databaserangesenumeration))
-
-$(eval $(call 
gb_CppunitTest_use_ure,sc_indexenumeration_databaserangesenumeration))
-$(eval $(call 
gb_CppunitTest_use_vcl,sc_indexenumeration_databaserangesenumeration))
-
-$(eval $(call 
gb_CppunitTest_use_components,sc_indexenumeration_databaserangesenumeration,\
-    $(sc_unoapi_common_components) \
-))
-
-$(eval $(call 
gb_CppunitTest_use_configuration,sc_indexenumeration_databaserangesenumeration))
+$(eval $(call sc_unoapi_common,indexenumeration_databaserangesenumeration))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_indexenumeration_datapilotfieldsenumeration.mk 
b/sc/CppunitTest_sc_indexenumeration_datapilotfieldsenumeration.mk
index 33c0f571d5b8..d07e0d106fb1 100644
--- a/sc/CppunitTest_sc_indexenumeration_datapilotfieldsenumeration.mk
+++ b/sc/CppunitTest_sc_indexenumeration_datapilotfieldsenumeration.mk
@@ -9,37 +9,6 @@
 #
 #*************************************************************************
 
-$(eval $(call 
gb_CppunitTest_CppunitTest,sc_indexenumeration_datapilotfieldsenumeration))
-
-$(eval $(call 
gb_CppunitTest_use_external,sc_indexenumeration_datapilotfieldsenumeration,boost_headers))
-
-$(eval $(call 
gb_CppunitTest_use_common_precompiled_header,sc_indexenumeration_datapilotfieldsenumeration))
-
-$(eval $(call 
gb_CppunitTest_add_exception_objects,sc_indexenumeration_datapilotfieldsenumeration,
 \
-       sc/qa/extras/scindexenumeration_datapilotfieldsenumeration \
-))
-
-$(eval $(call 
gb_CppunitTest_use_libraries,sc_indexenumeration_datapilotfieldsenumeration, \
-       cppu \
-       sal \
-       subsequenttest \
-       test \
-       unotest \
-))
-
-$(eval $(call 
gb_CppunitTest_set_include,sc_indexenumeration_datapilotfieldsenumeration,\
-       $$(INCLUDE) \
-))
-
-$(eval $(call 
gb_CppunitTest_use_sdk_api,sc_indexenumeration_datapilotfieldsenumeration))
-
-$(eval $(call 
gb_CppunitTest_use_ure,sc_indexenumeration_datapilotfieldsenumeration))
-$(eval $(call 
gb_CppunitTest_use_vcl,sc_indexenumeration_datapilotfieldsenumeration))
-
-$(eval $(call 
gb_CppunitTest_use_components,sc_indexenumeration_datapilotfieldsenumeration,\
-    $(sc_unoapi_common_components) \
-))
-
-$(eval $(call 
gb_CppunitTest_use_configuration,sc_indexenumeration_datapilotfieldsenumeration))
+$(eval $(call sc_unoapi_common,indexenumeration_datapilotfieldsenumeration))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_indexenumeration_datapilotitemsenumeration.mk 
b/sc/CppunitTest_sc_indexenumeration_datapilotitemsenumeration.mk
index 5507bad06bff..585c21893d3f 100644
--- a/sc/CppunitTest_sc_indexenumeration_datapilotitemsenumeration.mk
+++ b/sc/CppunitTest_sc_indexenumeration_datapilotitemsenumeration.mk
@@ -9,37 +9,6 @@
 #
 #*************************************************************************
 
-$(eval $(call 
gb_CppunitTest_CppunitTest,sc_indexenumeration_datapilotitemsenumeration))
-
-$(eval $(call 
gb_CppunitTest_use_external,sc_indexenumeration_datapilotitemsenumeration,boost_headers))
-
-$(eval $(call 
gb_CppunitTest_use_common_precompiled_header,sc_indexenumeration_datapilotitemsenumeration))
-
-$(eval $(call 
gb_CppunitTest_add_exception_objects,sc_indexenumeration_datapilotitemsenumeration,
 \
-       sc/qa/extras/scindexenumeration_datapilotitemsenumeration \
-))
-
-$(eval $(call 
gb_CppunitTest_use_libraries,sc_indexenumeration_datapilotitemsenumeration, \
-       cppu \
-       sal \
-       subsequenttest \
-       test \
-       unotest \
-))
-
-$(eval $(call 
gb_CppunitTest_set_include,sc_indexenumeration_datapilotitemsenumeration,\
-       $$(INCLUDE) \
-))
-
-$(eval $(call 
gb_CppunitTest_use_sdk_api,sc_indexenumeration_datapilotitemsenumeration))
-
-$(eval $(call 
gb_CppunitTest_use_ure,sc_indexenumeration_datapilotitemsenumeration))
-$(eval $(call 
gb_CppunitTest_use_vcl,sc_indexenumeration_datapilotitemsenumeration))
-
-$(eval $(call 
gb_CppunitTest_use_components,sc_indexenumeration_datapilotitemsenumeration,\
-    $(sc_unoapi_common_components) \
-))
-
-$(eval $(call 
gb_CppunitTest_use_configuration,sc_indexenumeration_datapilotitemsenumeration))
+$(eval $(call sc_unoapi_common,indexenumeration_datapilotitemsenumeration))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_indexenumeration_datapilottablesenumeration.mk 
b/sc/CppunitTest_sc_indexenumeration_datapilottablesenumeration.mk
index f19332dfd74a..fb0cc5b74eac 100644
--- a/sc/CppunitTest_sc_indexenumeration_datapilottablesenumeration.mk
+++ b/sc/CppunitTest_sc_indexenumeration_datapilottablesenumeration.mk
@@ -9,37 +9,6 @@
 #
 #*************************************************************************
 
-$(eval $(call 
gb_CppunitTest_CppunitTest,sc_indexenumeration_datapilottablesenumeration))
-
-$(eval $(call 
gb_CppunitTest_use_external,sc_indexenumeration_datapilottablesenumeration,boost_headers))
-
-$(eval $(call 
gb_CppunitTest_use_common_precompiled_header,sc_indexenumeration_datapilottablesenumeration))
-
-$(eval $(call 
gb_CppunitTest_add_exception_objects,sc_indexenumeration_datapilottablesenumeration,
 \
-       sc/qa/extras/scindexenumeration_datapilottablesenumeration \
-))
-
-$(eval $(call 
gb_CppunitTest_use_libraries,sc_indexenumeration_datapilottablesenumeration, \
-       cppu \
-       sal \
-       subsequenttest \
-       test \
-       unotest \
-))
-
-$(eval $(call 
gb_CppunitTest_set_include,sc_indexenumeration_datapilottablesenumeration,\
-       $$(INCLUDE) \
-))
-
-$(eval $(call 
gb_CppunitTest_use_sdk_api,sc_indexenumeration_datapilottablesenumeration))
-
-$(eval $(call 
gb_CppunitTest_use_ure,sc_indexenumeration_datapilottablesenumeration))
-$(eval $(call 
gb_CppunitTest_use_vcl,sc_indexenumeration_datapilottablesenumeration))
-
-$(eval $(call 
gb_CppunitTest_use_components,sc_indexenumeration_datapilottablesenumeration,\
-    $(sc_unoapi_common_components) \
-))
-
-$(eval $(call 
gb_CppunitTest_use_configuration,sc_indexenumeration_datapilottablesenumeration))
+$(eval $(call sc_unoapi_common,indexenumeration_datapilottablesenumeration))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_indexenumeration_ddelinksenumeration.mk 
b/sc/CppunitTest_sc_indexenumeration_ddelinksenumeration.mk
index b6be456f1246..e6e534b6f32b 100644
--- a/sc/CppunitTest_sc_indexenumeration_ddelinksenumeration.mk
+++ b/sc/CppunitTest_sc_indexenumeration_ddelinksenumeration.mk
@@ -9,37 +9,6 @@
 #
 #*************************************************************************
 
-$(eval $(call 
gb_CppunitTest_CppunitTest,sc_indexenumeration_ddelinksenumeration))
-
-$(eval $(call 
gb_CppunitTest_use_external,sc_indexenumeration_ddelinksenumeration,boost_headers))
-
-$(eval $(call 
gb_CppunitTest_use_common_precompiled_header,sc_indexenumeration_ddelinksenumeration))
-
-$(eval $(call 
gb_CppunitTest_add_exception_objects,sc_indexenumeration_ddelinksenumeration, \
-       sc/qa/extras/scindexenumeration_ddelinksenumeration \
-))
-
-$(eval $(call 
gb_CppunitTest_use_libraries,sc_indexenumeration_ddelinksenumeration, \
-       cppu \
-       sal \
-       subsequenttest \
-       test \
-       unotest \
-))
-
-$(eval $(call 
gb_CppunitTest_set_include,sc_indexenumeration_ddelinksenumeration,\
-       $$(INCLUDE) \
-))
-
-$(eval $(call 
gb_CppunitTest_use_sdk_api,sc_indexenumeration_ddelinksenumeration))
-
-$(eval $(call gb_CppunitTest_use_ure,sc_indexenumeration_ddelinksenumeration))
-$(eval $(call gb_CppunitTest_use_vcl,sc_indexenumeration_ddelinksenumeration))
-
-$(eval $(call 
gb_CppunitTest_use_components,sc_indexenumeration_ddelinksenumeration,\
-    $(sc_unoapi_common_components) \
-))
-
-$(eval $(call 
gb_CppunitTest_use_configuration,sc_indexenumeration_ddelinksenumeration))
+$(eval $(call sc_unoapi_common,indexenumeration_ddelinksenumeration))
 
 # vim: set noet sw=4 ts=4:
diff --git 
a/sc/CppunitTest_sc_indexenumeration_functiondescriptionenumeration.mk 
b/sc/CppunitTest_sc_indexenumeration_functiondescriptionenumeration.mk
index 5bfe63336661..70fae45a2ee0 100644
--- a/sc/CppunitTest_sc_indexenumeration_functiondescriptionenumeration.mk
+++ b/sc/CppunitTest_sc_indexenumeration_functiondescriptionenumeration.mk
@@ -9,37 +9,6 @@
 #
 #*************************************************************************
 
-$(eval $(call 
gb_CppunitTest_CppunitTest,sc_indexenumeration_functiondescriptionenumeration))
-
-$(eval $(call 
gb_CppunitTest_use_external,sc_indexenumeration_functiondescriptionenumeration,boost_headers))
-
-$(eval $(call 
gb_CppunitTest_use_common_precompiled_header,sc_indexenumeration_functiondescriptionenumeration))
-
-$(eval $(call 
gb_CppunitTest_add_exception_objects,sc_indexenumeration_functiondescriptionenumeration,
 \
-       sc/qa/extras/scindexenumeration_functiondescriptionenumeration \
-))
-
-$(eval $(call 
gb_CppunitTest_use_libraries,sc_indexenumeration_functiondescriptionenumeration,
 \
-       cppu \
-       sal \
-       subsequenttest \
-       test \
-       unotest \
-))
-
-$(eval $(call 
gb_CppunitTest_set_include,sc_indexenumeration_functiondescriptionenumeration,\
-       $$(INCLUDE) \
-))
-
-$(eval $(call 
gb_CppunitTest_use_sdk_api,sc_indexenumeration_functiondescriptionenumeration))
-
-$(eval $(call 
gb_CppunitTest_use_ure,sc_indexenumeration_functiondescriptionenumeration))
-$(eval $(call 
gb_CppunitTest_use_vcl,sc_indexenumeration_functiondescriptionenumeration))
-
-$(eval $(call 
gb_CppunitTest_use_components,sc_indexenumeration_functiondescriptionenumeration,\
-    $(sc_unoapi_common_components) \
-))
-
-$(eval $(call 
gb_CppunitTest_use_configuration,sc_indexenumeration_functiondescriptionenumeration))
+$(eval $(call 
sc_unoapi_common,indexenumeration_functiondescriptionenumeration))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_indexenumeration_labelrangesenumeration.mk 
b/sc/CppunitTest_sc_indexenumeration_labelrangesenumeration.mk
index 102e00253bae..c86475323cb0 100644
--- a/sc/CppunitTest_sc_indexenumeration_labelrangesenumeration.mk
+++ b/sc/CppunitTest_sc_indexenumeration_labelrangesenumeration.mk
@@ -9,37 +9,6 @@
 #
 #*************************************************************************
 
-$(eval $(call 
gb_CppunitTest_CppunitTest,sc_indexenumeration_labelrangesenumeration))
-
-$(eval $(call 
gb_CppunitTest_use_external,sc_indexenumeration_labelrangesenumeration,boost_headers))
-
-$(eval $(call 
gb_CppunitTest_use_common_precompiled_header,sc_indexenumeration_labelrangesenumeration))
-
-$(eval $(call 
gb_CppunitTest_add_exception_objects,sc_indexenumeration_labelrangesenumeration,
 \
-       sc/qa/extras/scindexenumeration_labelrangesenumeration \
-))
-
-$(eval $(call 
gb_CppunitTest_use_libraries,sc_indexenumeration_labelrangesenumeration, \
-       cppu \
-       sal \
-       subsequenttest \
-       test \
-       unotest \
-))
-
-$(eval $(call 
gb_CppunitTest_set_include,sc_indexenumeration_labelrangesenumeration,\
-       $$(INCLUDE) \
-))
-
-$(eval $(call 
gb_CppunitTest_use_sdk_api,sc_indexenumeration_labelrangesenumeration))
-
-$(eval $(call 
gb_CppunitTest_use_ure,sc_indexenumeration_labelrangesenumeration))
-$(eval $(call 
gb_CppunitTest_use_vcl,sc_indexenumeration_labelrangesenumeration))
-
-$(eval $(call 
gb_CppunitTest_use_components,sc_indexenumeration_labelrangesenumeration,\
-    $(sc_unoapi_common_components) \
-))
-
-$(eval $(call 
gb_CppunitTest_use_configuration,sc_indexenumeration_labelrangesenumeration))
+$(eval $(call sc_unoapi_common,indexenumeration_labelrangesenumeration))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_indexenumeration_namedrangesenumeration.mk 
b/sc/CppunitTest_sc_indexenumeration_namedrangesenumeration.mk
index 22eb741e513b..cbab935a8866 100644
--- a/sc/CppunitTest_sc_indexenumeration_namedrangesenumeration.mk
+++ b/sc/CppunitTest_sc_indexenumeration_namedrangesenumeration.mk
@@ -9,37 +9,6 @@
 #
 #*************************************************************************
 
-$(eval $(call 
gb_CppunitTest_CppunitTest,sc_indexenumeration_namedrangesenumeration))
-
-$(eval $(call 
gb_CppunitTest_use_external,sc_indexenumeration_namedrangesenumeration,boost_headers))
-
-$(eval $(call 
gb_CppunitTest_use_common_precompiled_header,sc_indexenumeration_namedrangesenumeration))
-
-$(eval $(call 
gb_CppunitTest_add_exception_objects,sc_indexenumeration_namedrangesenumeration,
 \
-       sc/qa/extras/scindexenumeration_namedrangesenumeration \
-))
-
-$(eval $(call 
gb_CppunitTest_use_libraries,sc_indexenumeration_namedrangesenumeration, \
-       cppu \
-       sal \
-       subsequenttest \
-       test \
-       unotest \
-))
-
-$(eval $(call 
gb_CppunitTest_set_include,sc_indexenumeration_namedrangesenumeration,\
-       $$(INCLUDE) \
-))
-
-$(eval $(call 
gb_CppunitTest_use_sdk_api,sc_indexenumeration_namedrangesenumeration))
-
-$(eval $(call 
gb_CppunitTest_use_ure,sc_indexenumeration_namedrangesenumeration))
-$(eval $(call 
gb_CppunitTest_use_vcl,sc_indexenumeration_namedrangesenumeration))
-
-$(eval $(call 
gb_CppunitTest_use_components,sc_indexenumeration_namedrangesenumeration,\
-    $(sc_unoapi_common_components) \
-))
-
-$(eval $(call 
gb_CppunitTest_use_configuration,sc_indexenumeration_namedrangesenumeration))
+$(eval $(call sc_unoapi_common,indexenumeration_namedrangesenumeration))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_indexenumeration_scenariosenumeration.mk 
b/sc/CppunitTest_sc_indexenumeration_scenariosenumeration.mk
index e248db403b80..3cccbb209ee5 100644
--- a/sc/CppunitTest_sc_indexenumeration_scenariosenumeration.mk
+++ b/sc/CppunitTest_sc_indexenumeration_scenariosenumeration.mk
@@ -9,37 +9,6 @@
 #
 #*************************************************************************
 
-$(eval $(call 
gb_CppunitTest_CppunitTest,sc_indexenumeration_scenariosenumeration))
-
-$(eval $(call 
gb_CppunitTest_use_external,sc_indexenumeration_scenariosenumeration,boost_headers))
-
-$(eval $(call 
gb_CppunitTest_use_common_precompiled_header,sc_indexenumeration_scenariosenumeration))
-
-$(eval $(call 
gb_CppunitTest_add_exception_objects,sc_indexenumeration_scenariosenumeration, \
-       sc/qa/extras/scindexenumeration_scenariosenumeration \
-))
-
-$(eval $(call 
gb_CppunitTest_use_libraries,sc_indexenumeration_scenariosenumeration, \
-       cppu \
-       sal \
-       subsequenttest \
-       test \
-       unotest \
-))
-
-$(eval $(call 
gb_CppunitTest_set_include,sc_indexenumeration_scenariosenumeration,\
-       $$(INCLUDE) \
-))
-
-$(eval $(call 
gb_CppunitTest_use_sdk_api,sc_indexenumeration_scenariosenumeration))
-
-$(eval $(call gb_CppunitTest_use_ure,sc_indexenumeration_scenariosenumeration))
-$(eval $(call gb_CppunitTest_use_vcl,sc_indexenumeration_scenariosenumeration))
-
-$(eval $(call 
gb_CppunitTest_use_components,sc_indexenumeration_scenariosenumeration,\
-    $(sc_unoapi_common_components) \
-))
-
-$(eval $(call 
gb_CppunitTest_use_configuration,sc_indexenumeration_scenariosenumeration))
+$(eval $(call sc_unoapi_common,indexenumeration_scenariosenumeration))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_indexenumeration_sheetcellrangesenumeration.mk 
b/sc/CppunitTest_sc_indexenumeration_sheetcellrangesenumeration.mk
index a815ede48c1c..220926e90017 100644
--- a/sc/CppunitTest_sc_indexenumeration_sheetcellrangesenumeration.mk
+++ b/sc/CppunitTest_sc_indexenumeration_sheetcellrangesenumeration.mk
@@ -9,37 +9,6 @@
 #
 #*************************************************************************
 
-$(eval $(call 
gb_CppunitTest_CppunitTest,sc_indexenumeration_sheetcellrangesenumeration))
-
-$(eval $(call 
gb_CppunitTest_use_external,sc_indexenumeration_sheetcellrangesenumeration,boost_headers))
-
-$(eval $(call 
gb_CppunitTest_use_common_precompiled_header,sc_indexenumeration_sheetcellrangesenumeration))
-
-$(eval $(call 
gb_CppunitTest_add_exception_objects,sc_indexenumeration_sheetcellrangesenumeration,
 \
-       sc/qa/extras/scindexenumeration_sheetcellrangesenumeration \
-))
-
-$(eval $(call 
gb_CppunitTest_use_libraries,sc_indexenumeration_sheetcellrangesenumeration, \
-       cppu \
-       sal \
-       subsequenttest \
-       test \
-       unotest \
-))
-
-$(eval $(call 
gb_CppunitTest_set_include,sc_indexenumeration_sheetcellrangesenumeration,\
-       $$(INCLUDE) \
-))
-
-$(eval $(call 
gb_CppunitTest_use_sdk_api,sc_indexenumeration_sheetcellrangesenumeration))
-
-$(eval $(call 
gb_CppunitTest_use_ure,sc_indexenumeration_sheetcellrangesenumeration))
-$(eval $(call 
gb_CppunitTest_use_vcl,sc_indexenumeration_sheetcellrangesenumeration))
-
-$(eval $(call 
gb_CppunitTest_use_components,sc_indexenumeration_sheetcellrangesenumeration,\
-    $(sc_unoapi_common_components) \
-))
-
-$(eval $(call 
gb_CppunitTest_use_configuration,sc_indexenumeration_sheetcellrangesenumeration))
+$(eval $(call sc_unoapi_common,indexenumeration_sheetcellrangesenumeration))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_indexenumeration_sheetlinksenumeration.mk 
b/sc/CppunitTest_sc_indexenumeration_sheetlinksenumeration.mk
index 4ecd3c4e541f..554715f5f52a 100644
--- a/sc/CppunitTest_sc_indexenumeration_sheetlinksenumeration.mk
+++ b/sc/CppunitTest_sc_indexenumeration_sheetlinksenumeration.mk
@@ -9,37 +9,6 @@
 #
 #*************************************************************************
 
-$(eval $(call 
gb_CppunitTest_CppunitTest,sc_indexenumeration_sheetlinksenumeration))
-
-$(eval $(call 
gb_CppunitTest_use_external,sc_indexenumeration_sheetlinksenumeration,boost_headers))
-
-$(eval $(call 
gb_CppunitTest_use_common_precompiled_header,sc_indexenumeration_sheetlinksenumeration))
-
-$(eval $(call 
gb_CppunitTest_add_exception_objects,sc_indexenumeration_sheetlinksenumeration, 
\
-       sc/qa/extras/scindexenumeration_sheetlinksenumeration \
-))
-
-$(eval $(call 
gb_CppunitTest_use_libraries,sc_indexenumeration_sheetlinksenumeration, \
-       cppu \
-       sal \
-       subsequenttest \
-       test \
-       unotest \
-))
-
-$(eval $(call 
gb_CppunitTest_set_include,sc_indexenumeration_sheetlinksenumeration,\
-       $$(INCLUDE) \
-))
-
-$(eval $(call 
gb_CppunitTest_use_sdk_api,sc_indexenumeration_sheetlinksenumeration))
-
-$(eval $(call 
gb_CppunitTest_use_ure,sc_indexenumeration_sheetlinksenumeration))
-$(eval $(call 
gb_CppunitTest_use_vcl,sc_indexenumeration_sheetlinksenumeration))
-
-$(eval $(call 
gb_CppunitTest_use_components,sc_indexenumeration_sheetlinksenumeration,\
-    $(sc_unoapi_common_components) \
-))
-
-$(eval $(call 
gb_CppunitTest_use_configuration,sc_indexenumeration_sheetlinksenumeration))
+$(eval $(call sc_unoapi_common,indexenumeration_sheetlinksenumeration))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_indexenumeration_spreadsheetsenumeration.mk 
b/sc/CppunitTest_sc_indexenumeration_spreadsheetsenumeration.mk
index 1da149364343..655e21ae043a 100644
--- a/sc/CppunitTest_sc_indexenumeration_spreadsheetsenumeration.mk
+++ b/sc/CppunitTest_sc_indexenumeration_spreadsheetsenumeration.mk
@@ -9,37 +9,6 @@
 #
 #*************************************************************************
 
-$(eval $(call 
gb_CppunitTest_CppunitTest,sc_indexenumeration_spreadsheetsenumeration))
-
-$(eval $(call 
gb_CppunitTest_use_external,sc_indexenumeration_spreadsheetsenumeration,boost_headers))
-
-$(eval $(call 
gb_CppunitTest_use_common_precompiled_header,sc_indexenumeration_spreadsheetsenumeration))
-
-$(eval $(call 
gb_CppunitTest_add_exception_objects,sc_indexenumeration_spreadsheetsenumeration,
 \
-       sc/qa/extras/scindexenumeration_spreadsheetsenumeration \
-))
-
-$(eval $(call 
gb_CppunitTest_use_libraries,sc_indexenumeration_spreadsheetsenumeration, \
-       cppu \
-       sal \
-       subsequenttest \
-       test \
-       unotest \
-))
-
-$(eval $(call 
gb_CppunitTest_set_include,sc_indexenumeration_spreadsheetsenumeration,\
-       $$(INCLUDE) \
-))
-
-$(eval $(call 
gb_CppunitTest_use_sdk_api,sc_indexenumeration_spreadsheetsenumeration))
-
-$(eval $(call 
gb_CppunitTest_use_ure,sc_indexenumeration_spreadsheetsenumeration))
-$(eval $(call 
gb_CppunitTest_use_vcl,sc_indexenumeration_spreadsheetsenumeration))
-
-$(eval $(call 
gb_CppunitTest_use_components,sc_indexenumeration_spreadsheetsenumeration,\
-    $(sc_unoapi_common_components) \
-))
-
-$(eval $(call 
gb_CppunitTest_use_configuration,sc_indexenumeration_spreadsheetsenumeration))
+$(eval $(call sc_unoapi_common,indexenumeration_spreadsheetsenumeration))
 
 # vim: set noet sw=4 ts=4:
diff --git 
a/sc/CppunitTest_sc_indexenumeration_spreadsheetviewpanesenumeration.mk 
b/sc/CppunitTest_sc_indexenumeration_spreadsheetviewpanesenumeration.mk
index df78d51cd7b0..0fcb7569085d 100644
--- a/sc/CppunitTest_sc_indexenumeration_spreadsheetviewpanesenumeration.mk
+++ b/sc/CppunitTest_sc_indexenumeration_spreadsheetviewpanesenumeration.mk
@@ -9,37 +9,6 @@
 #
 #*************************************************************************
 
-$(eval $(call 
gb_CppunitTest_CppunitTest,sc_indexenumeration_spreadsheetviewpanesenumeration))
-
-$(eval $(call 
gb_CppunitTest_use_external,sc_indexenumeration_spreadsheetviewpanesenumeration,boost_headers))
-
-$(eval $(call 
gb_CppunitTest_use_common_precompiled_header,sc_indexenumeration_spreadsheetviewpanesenumeration))
-
-$(eval $(call 
gb_CppunitTest_add_exception_objects,sc_indexenumeration_spreadsheetviewpanesenumeration,
 \
-       sc/qa/extras/scindexenumeration_spreadsheetviewpanesenumeration \
-))
-
-$(eval $(call 
gb_CppunitTest_use_libraries,sc_indexenumeration_spreadsheetviewpanesenumeration,
 \
-       cppu \
-       sal \
-       subsequenttest \
-       test \
-       unotest \
-))
-
-$(eval $(call 
gb_CppunitTest_set_include,sc_indexenumeration_spreadsheetviewpanesenumeration,\
-       $$(INCLUDE) \
-))
-
-$(eval $(call 
gb_CppunitTest_use_sdk_api,sc_indexenumeration_spreadsheetviewpanesenumeration))
-
-$(eval $(call 
gb_CppunitTest_use_ure,sc_indexenumeration_spreadsheetviewpanesenumeration))
-$(eval $(call 
gb_CppunitTest_use_vcl,sc_indexenumeration_spreadsheetviewpanesenumeration))
-
-$(eval $(call 
gb_CppunitTest_use_components,sc_indexenumeration_spreadsheetviewpanesenumeration,\
-    $(sc_unoapi_common_components) \
-))
-
-$(eval $(call 
gb_CppunitTest_use_configuration,sc_indexenumeration_spreadsheetviewpanesenumeration))
+$(eval $(call 
sc_unoapi_common,indexenumeration_spreadsheetviewpanesenumeration))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_indexenumeration_subtotalfieldsenumeration.mk 
b/sc/CppunitTest_sc_indexenumeration_subtotalfieldsenumeration.mk
index 7acc6910d923..7b913c7658ce 100644
--- a/sc/CppunitTest_sc_indexenumeration_subtotalfieldsenumeration.mk
+++ b/sc/CppunitTest_sc_indexenumeration_subtotalfieldsenumeration.mk
@@ -9,37 +9,6 @@
 #
 #*************************************************************************
 
-$(eval $(call 
gb_CppunitTest_CppunitTest,sc_indexenumeration_subtotalfieldsenumeration))
-
-$(eval $(call 
gb_CppunitTest_use_external,sc_indexenumeration_subtotalfieldsenumeration,boost_headers))
-
-$(eval $(call 
gb_CppunitTest_use_common_precompiled_header,sc_indexenumeration_subtotalfieldsenumeration))
-
-$(eval $(call 
gb_CppunitTest_add_exception_objects,sc_indexenumeration_subtotalfieldsenumeration,
 \
-       sc/qa/extras/scindexenumeration_subtotalfieldsenumeration \
-))
-
-$(eval $(call 
gb_CppunitTest_use_libraries,sc_indexenumeration_subtotalfieldsenumeration, \
-       cppu \
-       sal \
-       subsequenttest \
-       test \
-       unotest \
-))
-
-$(eval $(call 
gb_CppunitTest_set_include,sc_indexenumeration_subtotalfieldsenumeration,\
-       $$(INCLUDE) \
-))
-
-$(eval $(call 
gb_CppunitTest_use_sdk_api,sc_indexenumeration_subtotalfieldsenumeration))
-
-$(eval $(call 
gb_CppunitTest_use_ure,sc_indexenumeration_subtotalfieldsenumeration))
-$(eval $(call 
gb_CppunitTest_use_vcl,sc_indexenumeration_subtotalfieldsenumeration))
-
-$(eval $(call 
gb_CppunitTest_use_components,sc_indexenumeration_subtotalfieldsenumeration,\
-    $(sc_unoapi_common_components) \
-))
-
-$(eval $(call 
gb_CppunitTest_use_configuration,sc_indexenumeration_subtotalfieldsenumeration))
+$(eval $(call sc_unoapi_common,indexenumeration_subtotalfieldsenumeration))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_indexenumeration_tableautoformatenumeration.mk 
b/sc/CppunitTest_sc_indexenumeration_tableautoformatenumeration.mk
index b5e38741c1de..6f004421b888 100644
--- a/sc/CppunitTest_sc_indexenumeration_tableautoformatenumeration.mk
+++ b/sc/CppunitTest_sc_indexenumeration_tableautoformatenumeration.mk
@@ -9,37 +9,6 @@
 #
 #*************************************************************************
 
-$(eval $(call 
gb_CppunitTest_CppunitTest,sc_indexenumeration_tableautoformatenumeration))
-
-$(eval $(call 
gb_CppunitTest_use_external,sc_indexenumeration_tableautoformatenumeration,boost_headers))
-
-$(eval $(call 
gb_CppunitTest_use_common_precompiled_header,sc_indexenumeration_tableautoformatenumeration))
-
-$(eval $(call 
gb_CppunitTest_add_exception_objects,sc_indexenumeration_tableautoformatenumeration,
 \
-       sc/qa/extras/scindexenumeration_tableautoformatenumeration \
-))
-
-$(eval $(call 
gb_CppunitTest_use_libraries,sc_indexenumeration_tableautoformatenumeration, \
-       cppu \
-       sal \
-       subsequenttest \
-       test \
-       unotest \
-))
-
-$(eval $(call 
gb_CppunitTest_set_include,sc_indexenumeration_tableautoformatenumeration,\
-       $$(INCLUDE) \
-))
-
-$(eval $(call 
gb_CppunitTest_use_sdk_api,sc_indexenumeration_tableautoformatenumeration))
-
-$(eval $(call 
gb_CppunitTest_use_ure,sc_indexenumeration_tableautoformatenumeration))
-$(eval $(call 
gb_CppunitTest_use_vcl,sc_indexenumeration_tableautoformatenumeration))
-
-$(eval $(call 
gb_CppunitTest_use_components,sc_indexenumeration_tableautoformatenumeration,\
-    $(sc_unoapi_common_components) \
-))
-
-$(eval $(call 
gb_CppunitTest_use_configuration,sc_indexenumeration_tableautoformatenumeration))
+$(eval $(call sc_unoapi_common,indexenumeration_tableautoformatenumeration))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_indexenumeration_tablechartsenumeration.mk 
b/sc/CppunitTest_sc_indexenumeration_tablechartsenumeration.mk
index e87e6c56ebf2..55846edad024 100644
--- a/sc/CppunitTest_sc_indexenumeration_tablechartsenumeration.mk
+++ b/sc/CppunitTest_sc_indexenumeration_tablechartsenumeration.mk
@@ -9,39 +9,6 @@
 #
 #*************************************************************************
 
-$(eval $(call 
gb_CppunitTest_CppunitTest,sc_indexenumeration_tablechartsenumeration))
-
-$(eval $(call 
gb_CppunitTest_use_external,sc_indexenumeration_tablechartsenumeration,boost_headers))
-
-$(eval $(call 
gb_CppunitTest_use_common_precompiled_header,sc_indexenumeration_tablechartsenumeration))
-
-$(eval $(call 
gb_CppunitTest_add_exception_objects,sc_indexenumeration_tablechartsenumeration,
 \
-       sc/qa/extras/scindexenumeration_tablechartsenumeration \
-))
-
-$(eval $(call 
gb_CppunitTest_use_libraries,sc_indexenumeration_tablechartsenumeration, \
-       comphelper \
-       cppu \
-       cppuhelper \
-       sal \
-       subsequenttest \
-       test \
-       unotest \
-))
-

... etc. - the rest is truncated

Reply via email to