[Libreoffice-commits] core.git: cppcanvas/qa dbaccess/qa desktop/qa include/test sccomp/qa sc/qa sw/qa test/Library_subsequenttest.mk test/source vcl/qa

Xisco Fauli (via logerrit) Fri, 21 Oct 2022 12:24:27 -0700

 cppcanvas/qa/extras/emfplus/emfplus.cxx                              |   20 --
 dbaccess/qa/extras/dialog-save.cxx                                   |   14 --
 dbaccess/qa/extras/empty-stdlib-save.cxx                             |   12 -
 dbaccess/qa/extras/macros-test.cxx                                   |    4 
 dbaccess/qa/extras/nolib-save.cxx                                    |   12 -
 dbaccess/qa/extras/rowsetclones.cxx                                  |    6 
 dbaccess/qa/unit/dbtest_base.cxx                                     |    4 
 dbaccess/qa/unit/firebird.cxx                                        |   10 +
 dbaccess/qa/unit/hsql_binary_import.cxx                              |    1 
 dbaccess/qa/unit/hsqldb.cxx                                          |    2 
 dbaccess/qa/unit/tdf119625.cxx                                       |    1 
 dbaccess/qa/unit/tdf126268.cxx                                       |    1 
 desktop/qa/desktop_lib/test_desktop_lib.cxx                          |   61 
+++-----
 include/test/calc_unoapi_test.hxx                                    |   38 
-----
 include/test/unoapi_test.hxx                                         |   11 +
 sc/qa/extras/check_data_pilot_field.cxx                              |   10 -
 sc/qa/extras/check_data_pilot_table.cxx                              |    8 -
 sc/qa/extras/check_xcell_ranges_query.cxx                            |    8 -
 sc/qa/extras/macros-test.cxx                                         |    6 
 sc/qa/extras/new_cond_format.cxx                                     |    8 -
 sc/qa/extras/recordchanges-test.cxx                                  |    6 
 sc/qa/extras/scannotationobj.cxx                                     |    8 -
 sc/qa/extras/scannotationshapeobj.cxx                                |   10 -
 sc/qa/extras/scannotationsobj.cxx                                    |    8 -
 sc/qa/extras/scarealinkobj.cxx                                       |    8 -
 sc/qa/extras/scarealinksobj.cxx                                      |    8 -
 sc/qa/extras/scautoformatobj.cxx                                     |    8 -
 sc/qa/extras/scautoformatsobj.cxx                                    |    8 -
 sc/qa/extras/sccellcursorobj.cxx                                     |    8 -
 sc/qa/extras/sccellfieldsobj.cxx                                     |    8 -
 sc/qa/extras/sccellformatsenumeration.cxx                            |    8 -
 sc/qa/extras/sccellformatsobj.cxx                                    |    8 -
 sc/qa/extras/sccellobj.cxx                                           |    8 -
 sc/qa/extras/sccellrangeobj.cxx                                      |    8 -
 sc/qa/extras/sccellrangesobj.cxx                                     |    8 -
 sc/qa/extras/sccellsearchobj.cxx                                     |    8 -
 sc/qa/extras/sccellsenumeration.cxx                                  |    8 -
 sc/qa/extras/sccellsobj.cxx                                          |    8 -
 sc/qa/extras/scchartobj.cxx                                          |    8 -
 sc/qa/extras/scchartsobj.cxx                                         |    8 -
 sc/qa/extras/scconsolidationdescriptorobj.cxx                        |    8 -
 sc/qa/extras/scdatabaserangeobj.cxx                                  |    8 -
 sc/qa/extras/scdatabaserangesobj.cxx                                 |    8 -
 sc/qa/extras/scdatapilotfieldgroupitemobj.cxx                        |    8 -
 sc/qa/extras/scdatapilotfieldgroupobj.cxx                            |    8 -
 sc/qa/extras/scdatapilotfieldgroupsobj.cxx                           |    8 -
 sc/qa/extras/scdatapilotfieldobj.cxx                                 |    8 -
 sc/qa/extras/scdatapilotfieldsobj.cxx                                |    8 -
 sc/qa/extras/scdatapilotitemobj.cxx                                  |   10 -
 sc/qa/extras/scdatapilotitemsobj.cxx                                 |    8 -
 sc/qa/extras/scdatapilottableobj.cxx                                 |    8 -
 sc/qa/extras/scdatapilottablesobj.cxx                                |    8 -
 sc/qa/extras/scddelinkobj.cxx                                        |    8 -
 sc/qa/extras/scddelinksobj.cxx                                       |    8 -
 sc/qa/extras/scdocumentconfigurationobj.cxx                          |    8 -
 sc/qa/extras/scdrawpageobj.cxx                                       |    8 -
 sc/qa/extras/scdrawpagesobj.cxx                                      |    8 -
 sc/qa/extras/sceditfieldobj-cell.cxx                                 |   10 -
 sc/qa/extras/sceditfieldobj-header.cxx                               |   10 -
 sc/qa/extras/scfilterdescriptorbase.cxx                              |    8 -
 sc/qa/extras/scfunctiondescriptionobj.cxx                            |    8 -
 sc/qa/extras/scfunctionlistobj.cxx                                   |    8 -
 sc/qa/extras/scheaderfieldsobj.cxx                                   |   10 -
 sc/qa/extras/scheaderfootercontentobj.cxx                            |    8 -
 sc/qa/extras/scimportdescriptorbaseobj.cxx                           |    8 -
 sc/qa/extras/scindexenumeration_cellannotationsenumeration.cxx       |    8 -
 sc/qa/extras/scindexenumeration_cellarealinksenumeration.cxx         |    9 -
 sc/qa/extras/scindexenumeration_databaserangesenumeration.cxx        |    9 -
 sc/qa/extras/scindexenumeration_datapilotfieldsenumeration.cxx       |    8 -
 sc/qa/extras/scindexenumeration_datapilotitemsenumeration.cxx        |    9 -
 sc/qa/extras/scindexenumeration_datapilottablesenumeration.cxx       |    8 -
 sc/qa/extras/scindexenumeration_ddelinksenumeration.cxx              |    8 -
 sc/qa/extras/scindexenumeration_functiondescriptionenumeration.cxx   |    8 -
 sc/qa/extras/scindexenumeration_labelrangesenumeration.cxx           |    9 -
 sc/qa/extras/scindexenumeration_namedrangesenumeration.cxx           |    9 -
 sc/qa/extras/scindexenumeration_scenariosenumeration.cxx             |    8 -
 sc/qa/extras/scindexenumeration_sheetcellrangesenumeration.cxx       |    8 -
 sc/qa/extras/scindexenumeration_sheetlinksenumeration.cxx            |    8 -
 sc/qa/extras/scindexenumeration_spreadsheetsenumeration.cxx          |    9 -
 sc/qa/extras/scindexenumeration_spreadsheetviewpanesenumeration.cxx  |    8 -
 sc/qa/extras/scindexenumeration_subtotalfieldsenumeration.cxx        |    9 -
 sc/qa/extras/scindexenumeration_tableautoformatenumeration.cxx       |    8 -
 sc/qa/extras/scindexenumeration_tablechartsenumeration.cxx           |    9 -
 sc/qa/extras/scindexenumeration_tablecolumnsenumeration.cxx          |    9 -
 sc/qa/extras/scindexenumeration_tableconditionalentryenumeration.cxx |    8 -
 sc/qa/extras/scindexenumeration_tablerowsenumeration.cxx             |    8 -
 sc/qa/extras/scindexenumeration_textfieldenumeration.cxx             |    8 -
 sc/qa/extras/sclabelrangeobj.cxx                                     |    8 -
 sc/qa/extras/sclabelrangesobj.cxx                                    |    8 -
 sc/qa/extras/scmodelobj.cxx                                          |    8 -
 sc/qa/extras/scnamedrangeobj.cxx                                     |    8 -
 sc/qa/extras/scnamedrangesobj.cxx                                    |    8 -
 sc/qa/extras/scoutlineobj.cxx                                        |    8 -
 sc/qa/extras/scpdfexport.cxx                                         |    6 
 sc/qa/extras/screcentfunctionsobj.cxx                                |    8 -
 sc/qa/extras/scscenariosobj.cxx                                      |    8 -
 sc/qa/extras/scshapeobj.cxx                                          |    8 -
 sc/qa/extras/scsheetlinkobj.cxx                                      |    8 -
 sc/qa/extras/scsheetlinksobj.cxx                                     |    8 -
 sc/qa/extras/scsortdescriptorbaseobj.cxx                             |    8 -
 sc/qa/extras/scspreadsheetsettings.cxx                               |    8 -
 sc/qa/extras/scspreadsheetsettingsobj.cxx                            |    8 -
 sc/qa/extras/scstylefamiliesobj.cxx                                  |   14 +-
 sc/qa/extras/scstylefamilyobj.cxx                                    |    8 -
 sc/qa/extras/scstyleobj.cxx                                          |    8 -
 sc/qa/extras/scsubtotaldescriptorbase.cxx                            |    8 -
 sc/qa/extras/scsubtotalfieldobj.cxx                                  |    8 -
 sc/qa/extras/sctablecolumnobj.cxx                                    |    8 -
 sc/qa/extras/sctablecolumnsobj.cxx                                   |    8 -
 sc/qa/extras/sctableconditionalentryobj.cxx                          |    8 -
 sc/qa/extras/sctableconditionalformat.cxx                            |    8 -
 sc/qa/extras/sctablerowobj.cxx                                       |    8 -
 sc/qa/extras/sctablerowsobj.cxx                                      |    8 -
 sc/qa/extras/sctablesheetobj.cxx                                     |    8 -
 sc/qa/extras/sctablesheetsobj.cxx                                    |   12 -
 sc/qa/extras/sctablevalidationobj.cxx                                |    8 -
 sc/qa/extras/sctabviewobj.cxx                                        |    8 -
 sc/qa/extras/scuniquecellformatsenumeration.cxx                      |    8 -
 sc/qa/extras/scuniquecellformatsobj.cxx                              |    8 -
 sc/qa/extras/scviewpaneobj.cxx                                       |    8 -
 sc/qa/extras/vba-macro-test.cxx                                      |    6 
 sc/qa/perf/scperfobj.cxx                                             |    6 
 sc/qa/unit/cond_format_merge.cxx                                     |    6 
 sc/qa/unit/scshapetest.cxx                                           |    6 
 sc/qa/unit/uicalc/uicalc.cxx                                         |    6 
 sccomp/qa/unit/SwarmSolverTest.cxx                                   |   24 ---
 sw/qa/extras/accessibility/accessible_relation_set.cxx               |   23 +--
 test/Library_subsequenttest.mk                                       |    1 
 test/source/calc_unoapi_test.cxx                                     |   69 
----------
 test/source/unoapi_test.cxx                                          |   52 
++++++-
 vcl/qa/cppunit/gen/gen.cxx                                           |   20 --
 131 files changed, 562 insertions(+), 719 deletions(-)


New commits:
commit 89c732913d6155db48c74dd7c2c0325468048aa5
Author:     Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Fri Oct 21 17:12:24 2022 +0200
Commit:     Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Fri Oct 21 21:23:37 2022 +0200

    test: merge CalcUnoApiTest and UnoApiTest into one
    
    Change-Id: I24ec4c2c1c6d83865ef78a6460cde68cef84fdb2
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141638
    Tested-by: Jenkins
    Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>

diff --git a/cppcanvas/qa/extras/emfplus/emfplus.cxx 
b/cppcanvas/qa/extras/emfplus/emfplus.cxx
index e0d64487e105..2d96c5957fba 100644
--- a/cppcanvas/qa/extras/emfplus/emfplus.cxx
+++ b/cppcanvas/qa/extras/emfplus/emfplus.cxx
@@ -29,24 +29,6 @@ public:
     {
     }
 
-    virtual void setUp() override
-    {
-        UnoApiTest::setUp();
-        mxDesktop.set(
-            
frame::Desktop::create(comphelper::getComponentContext(getMultiServiceFactory())));
-        SfxApplication::GetOrCreate();
-    };
-
-    virtual void tearDown() override
-    {
-        if (mxComponent.is())
-        {
-            closeDocument(mxComponent);
-            mxComponent->dispose();
-        }
-        UnoApiTest::tearDown();
-    };
-
     Bitmap load(const char* pName)
     {
         OUString aFileURL;
@@ -69,8 +51,6 @@ public:
 
         return aResultBitmap.GetBitmap();
     }
-
-    uno::Reference<lang::XComponent> mxComponent;
 };
 
 CPPUNIT_TEST_FIXTURE(Test, testFdo77229)
diff --git a/dbaccess/qa/extras/dialog-save.cxx 
b/dbaccess/qa/extras/dialog-save.cxx
index 212127d48ea9..39705f549574 100644
--- a/dbaccess/qa/extras/dialog-save.cxx
+++ b/dbaccess/qa/extras/dialog-save.cxx
@@ -51,9 +51,9 @@ void DialogSaveTest::test()
 {
     const OUString 
aFileName(m_directories.getURLFromWorkdir(u"CppunitTest/testDialogSave.odb"));
     {
-        uno::Reference< lang::XComponent > xComponent = 
loadFromDesktop(aFileName);
-        uno::Reference< frame::XStorable > xDocStorable(xComponent, 
UNO_QUERY_THROW);
-        uno::Reference< document::XEmbeddedScripts > xDocScr(xComponent, 
UNO_QUERY_THROW);
+        mxComponent = loadFromDesktop(aFileName);
+        uno::Reference< frame::XStorable > xDocStorable(mxComponent, 
UNO_QUERY_THROW);
+        uno::Reference< document::XEmbeddedScripts > xDocScr(mxComponent, 
UNO_QUERY_THROW);
         uno::Reference< script::XStorageBasedLibraryContainer > 
xStorBasLib(xDocScr->getBasicLibraries());
         CPPUNIT_ASSERT(xStorBasLib.is());
         uno::Reference< script::XLibraryContainer > xBasLib(xStorBasLib, 
UNO_QUERY_THROW);
@@ -68,21 +68,17 @@ void DialogSaveTest::test()
         CPPUNIT_ASSERT(!xDlgLib->isLibraryLoaded(sStandard));
 
         // make some change to enable a save
-        // uno::Reference< document::XDocumentPropertiesSupplier > 
xDocPropSuppl(xComponent, UNO_QUERY_THROW);
+        // uno::Reference< document::XDocumentPropertiesSupplier > 
xDocPropSuppl(mxComponent, UNO_QUERY_THROW);
         // uno::Reference< document::XDocumentPropertiesSupplier > 
xDocProps(xDocPropSuppl->getDocumentProperties());
         // CPPUNIT_ASSERT(xDocProps.is());
         // xDocProps.setTitle(xDocProps.getTitle() + " suffix");
-        uno::Reference< util::XModifiable > xDocMod(xComponent, 
UNO_QUERY_THROW);
+        uno::Reference< util::XModifiable > xDocMod(mxComponent, 
UNO_QUERY_THROW);
         xDocMod->setModified(true);
 
         // now save; the code path to exercise in this test is the "store to 
same location"
         //           do *not* change to store(As|To|URL)!
         xDocStorable->store();
 
-        // close
-        uno::Reference< util::XCloseable > xDocCloseable(xComponent, 
UNO_QUERY_THROW);
-        xDocCloseable->close(false);
-
         // All our uno::References are (should?) be invalid now -> let them go 
out of scope
     }
     {
diff --git a/dbaccess/qa/extras/empty-stdlib-save.cxx 
b/dbaccess/qa/extras/empty-stdlib-save.cxx
index 440fc19d4945..d3b383d1fa88 100644
--- a/dbaccess/qa/extras/empty-stdlib-save.cxx
+++ b/dbaccess/qa/extras/empty-stdlib-save.cxx
@@ -49,9 +49,9 @@ void DialogSaveTest::test()
 {
     const OUString 
aFileName(m_directories.getURLFromWorkdir(u"CppunitTest/testEmptyStdlibSave.odb"));
     {
-        uno::Reference< lang::XComponent > xComponent = 
loadFromDesktop(aFileName);
-        uno::Reference< frame::XStorable > xDocStorable(xComponent, 
UNO_QUERY_THROW);
-        uno::Reference< document::XEmbeddedScripts > xDocScr(xComponent, 
UNO_QUERY_THROW);
+        mxComponent = loadFromDesktop(aFileName);
+        uno::Reference< frame::XStorable > xDocStorable(mxComponent, 
UNO_QUERY_THROW);
+        uno::Reference< document::XEmbeddedScripts > xDocScr(mxComponent, 
UNO_QUERY_THROW);
         uno::Reference< script::XStorageBasedLibraryContainer > 
xStorBasLib(xDocScr->getBasicLibraries());
         CPPUNIT_ASSERT(xStorBasLib.is());
         uno::Reference< script::XLibraryContainer > xBasLib(xStorBasLib, 
UNO_QUERY_THROW);
@@ -83,7 +83,7 @@ void DialogSaveTest::test()
         // uno::Reference< util::XModifiable > xScrMod(xDocScr, 
UNO_QUERY_THROW);
         // xScrMod->setModified(sal_True);
 
-        // uno::Reference< util::XModifiable > xDocMod(xComponent, 
UNO_QUERY_THROW);
+        // uno::Reference< util::XModifiable > xDocMod(mxComponent, 
UNO_QUERY_THROW);
         // std::cerr << "** Modified: " << 
static_cast<bool>(xDocMod->isModified()) << std::endl;
         // xDocMod->setModified(sal_True);
         // std::cerr << "** Modified: " << 
static_cast<bool>(xDocMod->isModified()) << std::endl;
@@ -93,10 +93,6 @@ void DialogSaveTest::test()
         //           do *not* change to store(As|To|URL)!
         xDocStorable->store();
 
-        // close
-        uno::Reference< util::XCloseable > xDocCloseable(xComponent, 
UNO_QUERY_THROW);
-        xDocCloseable->close(false);
-
         // All our uno::References are (should?) be invalid now -> let them go 
out of scope
     }
     {
diff --git a/dbaccess/qa/extras/macros-test.cxx 
b/dbaccess/qa/extras/macros-test.cxx
index dee5919c3463..8adcc8a2a9bd 100644
--- a/dbaccess/qa/extras/macros-test.cxx
+++ b/dbaccess/qa/extras/macros-test.cxx
@@ -37,9 +37,7 @@ void DBAccessTest::test()
 {
     OUString aFileName;
     createFileURL(u"testdb.odb", aFileName);
-    uno::Reference<lang::XComponent> xComponent = loadFromDesktop(aFileName);
-    uno::Reference<util::XCloseable> xDocCloseable(xComponent, 
UNO_QUERY_THROW);
-    xDocCloseable->close(false);
+    mxComponent = loadFromDesktop(aFileName);
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(DBAccessTest);
diff --git a/dbaccess/qa/extras/nolib-save.cxx 
b/dbaccess/qa/extras/nolib-save.cxx
index 59fee844fd78..bf6093c96875 100644
--- a/dbaccess/qa/extras/nolib-save.cxx
+++ b/dbaccess/qa/extras/nolib-save.cxx
@@ -49,9 +49,9 @@ void DialogSaveTest::test()
 {
     const OUString 
aFileName(m_directories.getURLFromWorkdir(u"CppunitTest/testNolibSave.odb"));
     {
-        uno::Reference< lang::XComponent > xComponent = 
loadFromDesktop(aFileName);
-        uno::Reference< frame::XStorable > xDocStorable(xComponent, 
UNO_QUERY_THROW);
-        uno::Reference< document::XEmbeddedScripts > xDocScr(xComponent, 
UNO_QUERY_THROW);
+        mxComponent = loadFromDesktop(aFileName);
+        uno::Reference< frame::XStorable > xDocStorable(mxComponent, 
UNO_QUERY_THROW);
+        uno::Reference< document::XEmbeddedScripts > xDocScr(mxComponent, 
UNO_QUERY_THROW);
         uno::Reference< script::XStorageBasedLibraryContainer > 
xStorBasLib(xDocScr->getBasicLibraries());
         CPPUNIT_ASSERT(xStorBasLib.is());
         uno::Reference< script::XLibraryContainer > xBasLib(xStorBasLib, 
UNO_QUERY_THROW);
@@ -73,7 +73,7 @@ void DialogSaveTest::test()
         // uno::Reference< util::XModifiable > xScrMod(xDocScr, 
UNO_QUERY_THROW);
         // xScrMod->setModified(sal_True);
 
-        // uno::Reference< util::XModifiable > xDocMod(xComponent, 
UNO_QUERY_THROW);
+        // uno::Reference< util::XModifiable > xDocMod(mxComponent, 
UNO_QUERY_THROW);
         // std::cerr << "** Modified: " << 
static_cast<bool>(xDocMod->isModified()) << std::endl;
         // xDocMod->setModified(sal_True);
         // std::cerr << "** Modified: " << 
static_cast<bool>(xDocMod->isModified()) << std::endl;
@@ -83,10 +83,6 @@ void DialogSaveTest::test()
         //           do *not* change to store(As|To|URL)!
         xDocStorable->store();
 
-        // close
-        uno::Reference< util::XCloseable > xDocCloseable(xComponent, 
UNO_QUERY_THROW);
-        xDocCloseable->close(false);
-
         // All our uno::References are (should?) be invalid now -> let them go 
out of scope
     }
     {
diff --git a/dbaccess/qa/extras/rowsetclones.cxx 
b/dbaccess/qa/extras/rowsetclones.cxx
index d83d160ca132..be4e52d3cd35 100644
--- a/dbaccess/qa/extras/rowsetclones.cxx
+++ b/dbaccess/qa/extras/rowsetclones.cxx
@@ -50,8 +50,8 @@ void RowSetClones::test()
 {
     const OUString 
sFilePath(m_directories.getURLFromWorkdir(u"CppunitTest/RowSetClones.odb"));
 
-    uno::Reference< lang::XComponent > xComponent (loadFromDesktop(sFilePath));
-    uno::Reference< XOfficeDatabaseDocument > xDocument(xComponent, 
UNO_QUERY_THROW);
+    mxComponent = loadFromDesktop(sFilePath);
+    uno::Reference< XOfficeDatabaseDocument > xDocument(mxComponent, 
UNO_QUERY_THROW);
 
     uno::Reference< XDataSource > xDataSource = xDocument->getDataSource();
     CPPUNIT_ASSERT(xDataSource.is());
@@ -122,8 +122,6 @@ void RowSetClones::test()
     CPPUNIT_ASSERT(xResultSetClone->isLast());
     CPPUNIT_ASSERT(xResultSet->isFirst());
     CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(1), xRow->getInt(1));
-
-    closeDocument(uno::Reference<lang::XComponent>(xDocument, uno::UNO_QUERY));
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(RowSetClones);
diff --git a/dbaccess/qa/unit/dbtest_base.cxx b/dbaccess/qa/unit/dbtest_base.cxx
index 6a2bbb2ef706..798c5523a929 100644
--- a/dbaccess/qa/unit/dbtest_base.cxx
+++ b/dbaccess/qa/unit/dbtest_base.cxx
@@ -66,8 +66,8 @@ uno::Reference< XOfficeDatabaseDocument >
 }
 
 uno::Reference<XOfficeDatabaseDocument> DBTestBase::getDocumentForUrl(OUString 
const & url) {
-    uno::Reference< lang::XComponent > xComponent (loadFromDesktop(url));
-    uno::Reference< XOfficeDatabaseDocument > xDocument(xComponent, 
UNO_QUERY_THROW);
+    mxComponent = loadFromDesktop(url);
+    uno::Reference< XOfficeDatabaseDocument > xDocument(mxComponent, 
UNO_QUERY_THROW);
     return xDocument;
 }
 
diff --git a/dbaccess/qa/unit/firebird.cxx b/dbaccess/qa/unit/firebird.cxx
index 7a8143810097..9e1c76dd0700 100644
--- a/dbaccess/qa/unit/firebird.cxx
+++ b/dbaccess/qa/unit/firebird.cxx
@@ -15,6 +15,7 @@
 #include <com/sun/star/sdbc/XResultSet.hpp>
 #include <com/sun/star/sdbc/XRow.hpp>
 #include <com/sun/star/sdbc/XStatement.hpp>
+#include <com/sun/star/util/XCloseable.hpp>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::sdb;
@@ -48,7 +49,8 @@ void FirebirdTest::testEmptyDBConnection()
 
     getConnectionForDocument(xDocument);
 
-    closeDocument(uno::Reference<lang::XComponent>(xDocument, uno::UNO_QUERY));
+    css::uno::Reference<util::XCloseable> xCloseable(mxComponent, 
css::uno::UNO_QUERY_THROW);
+    xCloseable->close(false);
 }
 
 /**
@@ -89,7 +91,8 @@ void FirebirdTest::testIntegerDatabase()
 
     CPPUNIT_ASSERT(!xResultSet->next()); // Should only be one row
 
-    closeDocument(uno::Reference<lang::XComponent>(xDocument, uno::UNO_QUERY));
+    css::uno::Reference<util::XCloseable> xCloseable(mxComponent, 
css::uno::UNO_QUERY_THROW);
+    xCloseable->close(false);
 }
 
 void FirebirdTest::testTdf132924()
@@ -115,7 +118,8 @@ void FirebirdTest::testTdf132924()
     CPPUNIT_ASSERT_EQUAL(sal_Int16(1), 
xRow->getShort(xColumnLocate->findColumn("TestId")));
     CPPUNIT_ASSERT_EQUAL(OUString("TestName"), 
xRow->getString(xColumnLocate->findColumn("TestName")));
 
-    closeDocument(uno::Reference<lang::XComponent>(xDocument, uno::UNO_QUERY));
+    css::uno::Reference<util::XCloseable> xCloseable(mxComponent, 
css::uno::UNO_QUERY_THROW);
+    xCloseable->close(false);
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(FirebirdTest);
diff --git a/dbaccess/qa/unit/hsql_binary_import.cxx 
b/dbaccess/qa/unit/hsql_binary_import.cxx
index c77d9e5328d3..fb9185a82b4c 100644
--- a/dbaccess/qa/unit/hsql_binary_import.cxx
+++ b/dbaccess/qa/unit/hsql_binary_import.cxx
@@ -86,7 +86,6 @@ void HsqlBinaryImportTest::testBinaryImport()
     CPPUNIT_ASSERT_EQUAL(sal_uInt16{ 2 }, date.Month);
     CPPUNIT_ASSERT_EQUAL(sal_Int16{ 1998 }, date.Year);
 
-    closeDocument(uno::Reference<lang::XComponent>(xDocument, uno::UNO_QUERY));
     if (!oldValue)
     {
         std::shared_ptr<comphelper::ConfigurationChanges> xChanges(
diff --git a/dbaccess/qa/unit/hsqldb.cxx b/dbaccess/qa/unit/hsqldb.cxx
index 5ee011af276e..7d792b3c26a8 100644
--- a/dbaccess/qa/unit/hsqldb.cxx
+++ b/dbaccess/qa/unit/hsqldb.cxx
@@ -36,8 +36,6 @@ void HSQLDBTest::testEmptyDBConnection()
     uno::Reference<XOfficeDatabaseDocument> xDocument = 
getDocumentForUrl(file.GetURL());
 
     getConnectionForDocument(xDocument);
-
-    css::uno::Reference<css::lang::XComponent>(xDocument, 
css::uno::UNO_QUERY_THROW)->dispose();
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(HSQLDBTest);
diff --git a/dbaccess/qa/unit/tdf119625.cxx b/dbaccess/qa/unit/tdf119625.cxx
index 267730286561..7486f9f44fe2 100644
--- a/dbaccess/qa/unit/tdf119625.cxx
+++ b/dbaccess/qa/unit/tdf119625.cxx
@@ -106,7 +106,6 @@ void Tdf119625Test::testTime()
     }
     CPPUNIT_ASSERT(!xRes->next());
 
-    closeDocument(uno::Reference<lang::XComponent>(xDocument, uno::UNO_QUERY));
     if (!oldValue)
     {
         std::shared_ptr<comphelper::ConfigurationChanges> xChanges(
diff --git a/dbaccess/qa/unit/tdf126268.cxx b/dbaccess/qa/unit/tdf126268.cxx
index b325d8dc1f62..c565648b6150 100644
--- a/dbaccess/qa/unit/tdf126268.cxx
+++ b/dbaccess/qa/unit/tdf126268.cxx
@@ -82,7 +82,6 @@ void Tdf126268Test::testNumbers()
     }
     CPPUNIT_ASSERT(!xRes->next());
 
-    closeDocument(uno::Reference<lang::XComponent>(xDocument, uno::UNO_QUERY));
     if (!oldValue)
     {
         std::shared_ptr<comphelper::ConfigurationChanges> xChanges(
diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx 
b/desktop/qa/desktop_lib/test_desktop_lib.cxx
index f8b5e02536df..86932809328a 100644
--- a/desktop/qa/desktop_lib/test_desktop_lib.cxx
+++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx
@@ -21,6 +21,7 @@
 #include <com/sun/star/text/TextContentAnchorType.hpp>
 #include <boost/property_tree/json_parser.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/util/XCloseable.hpp>
 
 #include <vcl/scheduler.hxx>
 #include <vcl/svapp.hxx>
@@ -117,28 +118,27 @@ public:
         comphelper::LibreOfficeKit::setActive(true);
 
         UnoApiTest::setUp();
-        
mxDesktop.set(frame::Desktop::create(comphelper::getComponentContext(getMultiServiceFactory())));
-        SfxApplication::GetOrCreate();
     }
 
     virtual void tearDown() override
     {
         closeDoc();
 
-        UnoApiTest::tearDown();
+        // documents are already closed, no need to call UnoApiTest::tearDown
+        test::BootstrapFixture::tearDown();
 
         comphelper::LibreOfficeKit::setActive(false);
     }
 
-    std::pair<std::unique_ptr<LibLODocument_Impl>, 
uno::Reference<lang::XComponent>>
+    std::unique_ptr<LibLODocument_Impl>
     loadDocImpl(const char* pName, LibreOfficeKitDocumentType eType);
 
 private:
-    std::pair<std::unique_ptr<LibLODocument_Impl>, 
uno::Reference<lang::XComponent>>
+    std::unique_ptr<LibLODocument_Impl>
     loadDocImpl(const char* pName);
 
 public:
-    std::pair<std::unique_ptr<LibLODocument_Impl>, 
uno::Reference<lang::XComponent>>
+    std::unique_ptr<LibLODocument_Impl>
     loadDocUrlImpl(const OUString& rFileURL, LibreOfficeKitDocumentType eType);
 
     LibLODocument_Impl* loadDocUrl(const OUString& rFileURL, 
LibreOfficeKitDocumentType eType);
@@ -148,9 +148,8 @@ public:
         return loadDoc(pName, getDocumentTypeFromName(pName));
     }
 
-    void closeDoc(std::unique_ptr<LibLODocument_Impl>& loDocument,
-                  uno::Reference<lang::XComponent>& xComponent);
-    void closeDoc() { closeDoc(m_pDocument, mxComponent); }
+    void closeDoc(std::unique_ptr<LibLODocument_Impl>& loDocument);
+    void closeDoc() { closeDoc(m_pDocument); }
     static void callback(int nType, const char* pPayload, void* pData);
     void callbackImpl(int nType, const char* pPayload);
 
@@ -292,7 +291,6 @@ public:
     CPPUNIT_TEST(testABI);
     CPPUNIT_TEST_SUITE_END();
 
-    uno::Reference<lang::XComponent> mxComponent;
     OString m_aTextSelection;
     OString m_aTextSelectionStart;
     OString m_aTextSelectionEnd;
@@ -341,7 +339,7 @@ static Control* GetFocusControl(vcl::Window const * pParent)
     return nullptr;
 }
 
-std::pair<std::unique_ptr<LibLODocument_Impl>, 
uno::Reference<lang::XComponent>>
+std::unique_ptr<LibLODocument_Impl>
 DesktopLOKTest::loadDocUrlImpl(const OUString& rFileURL, 
LibreOfficeKitDocumentType eType)
 {
     OUString aService;
@@ -363,15 +361,15 @@ DesktopLOKTest::loadDocUrlImpl(const OUString& rFileURL, 
LibreOfficeKitDocumentT
 
     static int nDocumentIdCounter = 0;
     SfxViewShell::SetCurrentDocId(ViewShellDocId(nDocumentIdCounter));
-    uno::Reference<lang::XComponent> xComponent = loadFromDesktop(rFileURL, 
aService);
+    mxComponent = loadFromDesktop(rFileURL, aService);
 
-    std::unique_ptr<LibLODocument_Impl> pDocument(new 
LibLODocument_Impl(xComponent, nDocumentIdCounter));
+    std::unique_ptr<LibLODocument_Impl> pDocument(new 
LibLODocument_Impl(mxComponent, nDocumentIdCounter));
     ++nDocumentIdCounter;
 
-    return std::make_pair(std::move(pDocument), xComponent);
+    return pDocument;
 }
 
-std::pair<std::unique_ptr<LibLODocument_Impl>, 
uno::Reference<lang::XComponent>>
+std::unique_ptr<LibLODocument_Impl>
 DesktopLOKTest::loadDocImpl(const char* pName, LibreOfficeKitDocumentType 
eType)
 {
     OUString aFileURL;
@@ -379,7 +377,7 @@ DesktopLOKTest::loadDocImpl(const char* pName, 
LibreOfficeKitDocumentType eType)
     return loadDocUrlImpl(aFileURL, eType);
 }
 
-std::pair<std::unique_ptr<LibLODocument_Impl>, 
uno::Reference<lang::XComponent>>
+std::unique_ptr<LibLODocument_Impl>
 DesktopLOKTest::loadDocImpl(const char* pName)
 {
     return loadDocImpl(pName, getDocumentTypeFromName(pName));
@@ -387,18 +385,17 @@ DesktopLOKTest::loadDocImpl(const char* pName)
 
 LibLODocument_Impl* DesktopLOKTest::loadDocUrl(const OUString& rFileURL, 
LibreOfficeKitDocumentType eType)
 {
-    std::tie(m_pDocument, mxComponent) = loadDocUrlImpl(rFileURL, eType);
+    m_pDocument = loadDocUrlImpl(rFileURL, eType);
     return m_pDocument.get();
 }
 
 LibLODocument_Impl* DesktopLOKTest::loadDoc(const char* pName, 
LibreOfficeKitDocumentType eType)
 {
-    std::tie(m_pDocument, mxComponent) = loadDocImpl(pName, eType);
+    m_pDocument = loadDocImpl(pName, eType);
     return m_pDocument.get();
 }
 
-void DesktopLOKTest::closeDoc(std::unique_ptr<LibLODocument_Impl>& pDocument,
-                              uno::Reference<lang::XComponent>& xComponent)
+void DesktopLOKTest::closeDoc(std::unique_ptr<LibLODocument_Impl>& pDocument)
 {
     if (pDocument)
     {
@@ -406,10 +403,11 @@ void 
DesktopLOKTest::closeDoc(std::unique_ptr<LibLODocument_Impl>& pDocument,
         pDocument.reset();
     }
 
-    if (xComponent.is())
+    if (mxComponent.is())
     {
-        closeDocument(xComponent);
-        xComponent.clear();
+        css::uno::Reference<util::XCloseable> xCloseable(mxComponent, 
css::uno::UNO_QUERY_THROW);
+        xCloseable->close(false);
+        mxComponent.clear();
     }
 }
 
@@ -2048,7 +2046,6 @@ void DesktopLOKTest::testBinaryCallback()
 
 void DesktopLOKTest::testDialogInput()
 {
-    comphelper::LibreOfficeKit::setActive();
     LibLODocument_Impl* pDocument = loadDoc("blank_text.odt");
     pDocument->pClass->postUnoCommand(pDocument, ".uno:HyperlinkDialog", 
nullptr, false);
     Scheduler::ProcessEventsToIdle();
@@ -3094,8 +3091,6 @@ void DesktopLOKTest::testComplexSelection()
 
 void DesktopLOKTest::testCalcSaveAs()
 {
-    comphelper::LibreOfficeKit::setActive();
-
     LibLODocument_Impl* pDocument = loadDoc("sheets.ods");
     CPPUNIT_ASSERT(pDocument);
 
@@ -3181,9 +3176,7 @@ void DesktopLOKTest::testMultiDocuments()
     for (int i = 0; i < 3; i++)
     {
         // Load a document.
-        uno::Reference<lang::XComponent> xComponent1;
-        std::unique_ptr<LibLODocument_Impl> document1;
-        std::tie(document1, xComponent1) = loadDocImpl("blank_text.odt");
+        std::unique_ptr<LibLODocument_Impl> document1 = 
loadDocImpl("blank_text.odt");
         LibLODocument_Impl* pDocument1 = document1.get();
         CPPUNIT_ASSERT_EQUAL(1, 
pDocument1->m_pDocumentClass->getViewsCount(pDocument1));
         const int nDocId1 = pDocument1->mnDocumentId;
@@ -3212,9 +3205,7 @@ void DesktopLOKTest::testMultiDocuments()
         CPPUNIT_ASSERT_EQUAL(2, 
pDocument1->m_pDocumentClass->getViewsCount(pDocument1));
 
         // Load another document.
-        uno::Reference<lang::XComponent> xComponent2;
-        std::unique_ptr<LibLODocument_Impl> document2;
-        std::tie(document2, xComponent2) = 
loadDocImpl("blank_presentation.odp");
+        std::unique_ptr<LibLODocument_Impl> document2 = 
loadDocImpl("blank_presentation.odp");
         LibLODocument_Impl* pDocument2 = document2.get();
         CPPUNIT_ASSERT_EQUAL(1, 
pDocument2->m_pDocumentClass->getViewsCount(pDocument2));
         const int nDocId2 = pDocument2->mnDocumentId;
@@ -3266,9 +3257,9 @@ void DesktopLOKTest::testMultiDocuments()
         pDocument2->m_pDocumentClass->destroyView(pDocument2, nDoc2View1);
         CPPUNIT_ASSERT_EQUAL(1, 
pDocument2->m_pDocumentClass->getViewsCount(pDocument2));
 
-        closeDoc(document2, xComponent2);
+        closeDoc(document2);
 
-        closeDoc(document1, xComponent1);
+        closeDoc(document1);
     }
 }
 
@@ -3463,7 +3454,6 @@ static void lcl_repeatKeyStroke(LibLODocument_Impl 
*pDocument, int nCharCode, in
 
 void DesktopLOKTest::testNoDuplicateTableSelection()
 {
-    comphelper::LibreOfficeKit::setActive();
     LibLODocument_Impl* pDocument = loadDoc("table-selection.odt");
 
     // Create view 1.
@@ -3497,7 +3487,6 @@ void DesktopLOKTest::testNoDuplicateTableSelection()
 
 void DesktopLOKTest::testMultiViewTableSelection()
 {
-    comphelper::LibreOfficeKit::setActive();
     LibLODocument_Impl* pDocument = loadDoc("table-selection.odt");
 
     // Create view 1.
diff --git a/include/test/calc_unoapi_test.hxx 
b/include/test/calc_unoapi_test.hxx
deleted file mode 100644
index a34418876bf3..000000000000
--- a/include/test/calc_unoapi_test.hxx
+++ /dev/null
@@ -1,38 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-#ifndef INCLUDED_TEST_CALC_UNOAPI_TEST_HXX
-#define INCLUDED_TEST_CALC_UNOAPI_TEST_HXX
-
-#include <test/unoapi_test.hxx>
-#include <unotools/tempfile.hxx>
-
-// basic uno api test class for calc
-
-class OOO_DLLPUBLIC_TEST CalcUnoApiTest : public UnoApiTest
-{
-public:
-    CalcUnoApiTest(const OUString& path);
-
-    virtual void tearDown() override;
-
-    css::uno::Any executeMacro(const OUString& rScriptURL,
-                               const css::uno::Sequence<css::uno::Any>& 
rParams = {});
-
-    utl::TempFileNamed save(const OUString& rFilter);
-    void saveAndReload(const OUString& rFilter);
-
-protected:
-    // reference to document component that we are testing
-    css::uno::Reference<css::lang::XComponent> mxComponent;
-};
-
-#endif // INCLUDED_TEST_CALC_UNOAPI_TEST_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/test/unoapi_test.hxx b/include/test/unoapi_test.hxx
index ac5bd0675b12..8dbc3acc257e 100644
--- a/include/test/unoapi_test.hxx
+++ b/include/test/unoapi_test.hxx
@@ -18,6 +18,7 @@
 #include <unotest/macros_test.hxx>
 #include <com/sun/star/lang/XComponent.hpp>
 #include <osl/file.hxx>
+#include <unotools/tempfile.hxx>
 
 // basic uno api test class
 
@@ -29,9 +30,17 @@ public:
     void createFileURL(std::u16string_view aFileBase, OUString& rFilePath);
 
     virtual void setUp() override;
+    virtual void tearDown() override;
+
+    css::uno::Any executeMacro(const OUString& rScriptURL,
+                               const css::uno::Sequence<css::uno::Any>& 
rParams = {});
+
+    utl::TempFileNamed save(const OUString& rFilter);
+    void saveAndReload(const OUString& rFilter);
 
 protected:
-    void closeDocument(css::uno::Reference<css::lang::XComponent> const& 
xDocument);
+    // reference to document component that we are testing
+    css::uno::Reference<css::lang::XComponent> mxComponent;
 
 private:
     OUString m_aBaseString;
diff --git a/sc/qa/extras/check_data_pilot_field.cxx 
b/sc/qa/extras/check_data_pilot_field.cxx
index 781414124cc0..52cc34481958 100644
--- a/sc/qa/extras/check_data_pilot_field.cxx
+++ b/sc/qa/extras/check_data_pilot_field.cxx
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <test/calc_unoapi_test.hxx>
+#include <test/unoapi_test.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/container/XIndexAccess.hpp>
 #include <com/sun/star/sheet/XDataPilotDescriptor.hpp>
@@ -29,9 +29,7 @@ using namespace css::lang;
 
 namespace sc_apitest
 {
-class CheckDataPilotField : public CalcUnoApiTest,
-                            public apitest::XNamed,
-                            public apitest::XPropertySet
+class CheckDataPilotField : public UnoApiTest, public apitest::XNamed, public 
apitest::XPropertySet
 {
 public:
     CheckDataPilotField();
@@ -68,7 +66,7 @@ bool CheckDataPilotField::isPropertyIgnored(const OUString& 
rName)
 }
 
 CheckDataPilotField::CheckDataPilotField()
-    : CalcUnoApiTest("/sc/qa/extras/testdocuments")
+    : UnoApiTest("/sc/qa/extras/testdocuments")
     , apitest::XNamed("Col1")
 {
 }
@@ -171,7 +169,7 @@ uno::Reference<uno::XInterface> CheckDataPilotField::init()
 
 void CheckDataPilotField::setUp()
 {
-    CalcUnoApiTest::setUp();
+    UnoApiTest::setUp();
     init();
 }
 
diff --git a/sc/qa/extras/check_data_pilot_table.cxx 
b/sc/qa/extras/check_data_pilot_table.cxx
index 0b66740b2417..0abc6fa86231 100644
--- a/sc/qa/extras/check_data_pilot_table.cxx
+++ b/sc/qa/extras/check_data_pilot_table.cxx
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <test/calc_unoapi_test.hxx>
+#include <test/unoapi_test.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/container/XIndexAccess.hpp>
 #include <com/sun/star/sheet/XDataPilotDescriptor.hpp>
@@ -31,7 +31,7 @@ using namespace css::lang;
 
 namespace sc_apitest {
 
-class CheckDataPilotTable : public CalcUnoApiTest, public apitest::XNamed, 
public apitest::XDataPilotTable, public apitest::XPropertySet, public 
apitest::XDataPilotDescriptor
+class CheckDataPilotTable : public UnoApiTest, public apitest::XNamed, public 
apitest::XDataPilotTable, public apitest::XPropertySet, public 
apitest::XDataPilotDescriptor
 {
 public:
     CheckDataPilotTable();
@@ -66,7 +66,7 @@ private:
 };
 
 CheckDataPilotTable::CheckDataPilotTable()
-     : CalcUnoApiTest("/sc/qa/extras/testdocuments"),
+     : UnoApiTest("/sc/qa/extras/testdocuments"),
        apitest::XNamed("DataPilotTable")
 {
 }
@@ -168,7 +168,7 @@ uno::Reference< uno::XInterface > 
CheckDataPilotTable::init()
 
 void CheckDataPilotTable::setUp()
 {
-    CalcUnoApiTest::setUp();
+    UnoApiTest::setUp();
     init();
 }
 
diff --git a/sc/qa/extras/check_xcell_ranges_query.cxx 
b/sc/qa/extras/check_xcell_ranges_query.cxx
index b14c0e3249be..b4d078c65687 100644
--- a/sc/qa/extras/check_xcell_ranges_query.cxx
+++ b/sc/qa/extras/check_xcell_ranges_query.cxx
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <test/calc_unoapi_test.hxx>
+#include <test/unoapi_test.hxx>
 #include <com/sun/star/container/XIndexAccess.hpp>
 #include <com/sun/star/sheet/XCellRangesQuery.hpp>
 #include <com/sun/star/sheet/XSheetCellRanges.hpp>
@@ -21,7 +21,7 @@ using namespace css::lang;
 
 namespace sc_apitest {
 
-class CheckXCellRangesQuery : public CalcUnoApiTest
+class CheckXCellRangesQuery : public UnoApiTest
 {
 public:
     CheckXCellRangesQuery();
@@ -47,7 +47,7 @@ private:
 };
 
 CheckXCellRangesQuery::CheckXCellRangesQuery()
-     : CalcUnoApiTest("/sc/qa/extras/testdocuments")
+     : UnoApiTest("/sc/qa/extras/testdocuments")
 {
 }
 
@@ -166,7 +166,7 @@ void CheckXCellRangesQuery::_queryRowDifferences(const 
OUString& expected) {
 
 void CheckXCellRangesQuery::setUp()
 {
-    CalcUnoApiTest::setUp();
+    UnoApiTest::setUp();
     init();
 }
 
diff --git a/sc/qa/extras/macros-test.cxx b/sc/qa/extras/macros-test.cxx
index 886548317942..48b16ba80547 100644
--- a/sc/qa/extras/macros-test.cxx
+++ b/sc/qa/extras/macros-test.cxx
@@ -8,7 +8,7 @@
  */
 
 #include <sal/config.h>
-#include <test/calc_unoapi_test.hxx>
+#include <test/unoapi_test.hxx>
 #include <sal/log.hxx>
 #include <unotools/tempfile.hxx>
 #include <svx/svdpage.hxx>
@@ -35,7 +35,7 @@ using namespace ::com::sun::star::uno;
 
 /* Implementation of Macros test */
 
-class ScMacrosTest : public CalcUnoApiTest, public XmlTestTools
+class ScMacrosTest : public UnoApiTest, public XmlTestTools
 {
 protected:
     void registerNamespaces(xmlXPathContextPtr& pXmlXPathCtx) override;
@@ -963,7 +963,7 @@ void ScMacrosTest::testFunctionAccessIndirect()
 }
 
 ScMacrosTest::ScMacrosTest()
-      : CalcUnoApiTest("/sc/qa/extras/testdocuments")
+      : UnoApiTest("/sc/qa/extras/testdocuments")
 {
 }
 
diff --git a/sc/qa/extras/new_cond_format.cxx b/sc/qa/extras/new_cond_format.cxx
index 787773a5671a..a7e7972eaa9e 100644
--- a/sc/qa/extras/new_cond_format.cxx
+++ b/sc/qa/extras/new_cond_format.cxx
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <test/calc_unoapi_test.hxx>
+#include <test/unoapi_test.hxx>
 
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/sheet/XConditionalFormats.hpp>
@@ -29,7 +29,7 @@ static std::ostream& operator<<(std::ostream& rStrm, const 
Color& rColor)
 
 namespace sc_apitest {
 
-class ScConditionalFormatTest : public CalcUnoApiTest
+class ScConditionalFormatTest : public UnoApiTest
 {
 public:
     ScConditionalFormatTest();
@@ -57,7 +57,7 @@ public:
 };
 
 ScConditionalFormatTest::ScConditionalFormatTest()
-    : CalcUnoApiTest("sc/qa/extras/testdocuments/")
+    : UnoApiTest("sc/qa/extras/testdocuments/")
 {
 }
 
@@ -438,7 +438,7 @@ void ScConditionalFormatTest::testColorScaleProperties()
 
 void ScConditionalFormatTest::setUp()
 {
-    CalcUnoApiTest::setUp();
+    UnoApiTest::setUp();
     // get the test file
     OUString aFileURL;
     createFileURL(u"new_cond_format_api.ods", aFileURL);
diff --git a/sc/qa/extras/recordchanges-test.cxx 
b/sc/qa/extras/recordchanges-test.cxx
index 6430368b74b9..b0961625afb1 100644
--- a/sc/qa/extras/recordchanges-test.cxx
+++ b/sc/qa/extras/recordchanges-test.cxx
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <test/calc_unoapi_test.hxx>
+#include <test/unoapi_test.hxx>
 
 #include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
@@ -19,7 +19,7 @@ using namespace ::com::sun::star::uno;
 
 /* Implementation of calc Record Changes test */
 
-class ScRecordChangesTest : public CalcUnoApiTest
+class ScRecordChangesTest : public UnoApiTest
 {
 public:
     ScRecordChangesTest();
@@ -94,7 +94,7 @@ void ScRecordChangesTest::testCheckRecordChangesProtection()
 }
 
 ScRecordChangesTest::ScRecordChangesTest()
-    : CalcUnoApiTest("/sc/qa/extras/testdocuments")
+    : UnoApiTest("/sc/qa/extras/testdocuments")
 {
 }
 
diff --git a/sc/qa/extras/scannotationobj.cxx b/sc/qa/extras/scannotationobj.cxx
index c2f414b6262f..dba7cce666cc 100644
--- a/sc/qa/extras/scannotationobj.cxx
+++ b/sc/qa/extras/scannotationobj.cxx
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <test/calc_unoapi_test.hxx>
+#include <test/unoapi_test.hxx>
 #include <test/container/xchild.hxx>
 #include <test/lang/xserviceinfo.hxx>
 #include <test/sheet/xsheetannotation.hxx>
@@ -29,7 +29,7 @@ using namespace css;
 
 namespace sc_apitest
 {
-class ScAnnontationObj : public CalcUnoApiTest,
+class ScAnnontationObj : public UnoApiTest,
                          public apitest::XChild,
                          public apitest::XServiceInfo,
                          public apitest::XSheetAnnotation,
@@ -81,7 +81,7 @@ public:
 };
 
 ScAnnontationObj::ScAnnontationObj()
-    : CalcUnoApiTest("/sc/qa/extras/testdocuments")
+    : UnoApiTest("/sc/qa/extras/testdocuments")
     , XServiceInfo("ScAnnotationObj", "com.sun.star.sheet.CellAnnotation")
 {
 }
@@ -120,7 +120,7 @@ uno::Reference<uno::XInterface> ScAnnontationObj::init()
 
 void ScAnnontationObj::setUp()
 {
-    CalcUnoApiTest::setUp();
+    UnoApiTest::setUp();
 
     // get the test file
     OUString aFileURL;
diff --git a/sc/qa/extras/scannotationshapeobj.cxx 
b/sc/qa/extras/scannotationshapeobj.cxx
index f90a2341e0c3..ceb37e89a445 100644
--- a/sc/qa/extras/scannotationshapeobj.cxx
+++ b/sc/qa/extras/scannotationshapeobj.cxx
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <test/calc_unoapi_test.hxx>
+#include <test/unoapi_test.hxx>
 #include <test/drawing/captionshape.hxx>
 #include <test/drawing/xgluepointssupplier.hxx>
 #include <test/drawing/xshape.hxx>
@@ -37,7 +37,7 @@ using namespace css;
 
 namespace sc_apitest
 {
-class ScAnnotationShapeObj : public CalcUnoApiTest,
+class ScAnnotationShapeObj : public UnoApiTest,
                              public apitest::CaptionShape,
                              public apitest::XGluePointsSupplier,
                              public apitest::XShape,
@@ -93,21 +93,21 @@ private:
 uno::Reference<text::XTextContent> ScAnnotationShapeObj::m_xField;
 
 ScAnnotationShapeObj::ScAnnotationShapeObj()
-    : CalcUnoApiTest("sc/qa/extras/testdocuments")
+    : UnoApiTest("sc/qa/extras/testdocuments")
     , XShapeDescriptor("com.sun.star.drawing.CaptionShape")
 {
 }
 
 void ScAnnotationShapeObj::setUp()
 {
-    CalcUnoApiTest::setUp();
+    UnoApiTest::setUp();
     mxComponent = loadFromDesktop("private:factory/scalc");
 }
 
 void ScAnnotationShapeObj::tearDown()
 {
     m_xField.clear();
-    CalcUnoApiTest::tearDown();
+    UnoApiTest::tearDown();
 }
 
 uno::Reference<uno::XInterface> ScAnnotationShapeObj::init()
diff --git a/sc/qa/extras/scannotationsobj.cxx 
b/sc/qa/extras/scannotationsobj.cxx
index d95232ebc0e8..5afcae6deceb 100644
--- a/sc/qa/extras/scannotationsobj.cxx
+++ b/sc/qa/extras/scannotationsobj.cxx
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <test/calc_unoapi_test.hxx>
+#include <test/unoapi_test.hxx>
 #include <test/container/xelementaccess.hxx>
 #include <test/container/xenumerationaccess.hxx>
 #include <test/container/xindexaccess.hxx>
@@ -31,7 +31,7 @@ using namespace css::uno;
 
 namespace sc_apitest {
 
-class ScAnnontationsObj : public CalcUnoApiTest, public 
apitest::XElementAccess,
+class ScAnnontationsObj : public UnoApiTest, public apitest::XElementAccess,
                                                  public 
apitest::XEnumerationAccess,
                                                  public apitest::XIndexAccess,
                                                  public 
apitest::XSheetAnnotations
@@ -68,7 +68,7 @@ public:
 
 
 ScAnnontationsObj::ScAnnontationsObj()
-       : CalcUnoApiTest("/sc/qa/extras/testdocuments")
+       : UnoApiTest("/sc/qa/extras/testdocuments")
        , XElementAccess(cppu::UnoType<sheet::XSheetAnnotation>::get())
        , XIndexAccess(1)
 {
@@ -96,7 +96,7 @@ uno::Reference< uno::XInterface > ScAnnontationsObj::init()
 
 void ScAnnontationsObj::setUp()
 {
-    CalcUnoApiTest::setUp();
+    UnoApiTest::setUp();
 
     // get the test file
     OUString aFileURL;
diff --git a/sc/qa/extras/scarealinkobj.cxx b/sc/qa/extras/scarealinkobj.cxx
index d62a8611461f..05d5b92f81d8 100644
--- a/sc/qa/extras/scarealinkobj.cxx
+++ b/sc/qa/extras/scarealinkobj.cxx
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <test/calc_unoapi_test.hxx>
+#include <test/unoapi_test.hxx>
 #include <test/beans/xpropertyset.hxx>
 #include <test/sheet/cellarealink.hxx>
 #include <test/sheet/xarealink.hxx>
@@ -27,7 +27,7 @@ using namespace css;
 
 namespace sc_apitest
 {
-class ScAreaLinkObj : public CalcUnoApiTest,
+class ScAreaLinkObj : public UnoApiTest,
                       public apitest::CellAreaLink,
                       public apitest::XAreaLink,
                       public apitest::XPropertySet,
@@ -68,7 +68,7 @@ public:
 };
 
 ScAreaLinkObj::ScAreaLinkObj()
-    : CalcUnoApiTest("/sc/qa/extras/testdocuments")
+    : UnoApiTest("/sc/qa/extras/testdocuments")
     , 
CellAreaLink(m_directories.getURLFromSrc(u"/sc/qa/extras/testdocuments/scarealinkobj.ods"))
 {
 }
@@ -92,7 +92,7 @@ uno::Reference<uno::XInterface> ScAreaLinkObj::init()
 
 void ScAreaLinkObj::setUp()
 {
-    CalcUnoApiTest::setUp();
+    UnoApiTest::setUp();
     mxComponent = loadFromDesktop("private:factory/scalc");
 }
 
diff --git a/sc/qa/extras/scarealinksobj.cxx b/sc/qa/extras/scarealinksobj.cxx
index 47b14cc63ed8..86859da2dde5 100644
--- a/sc/qa/extras/scarealinksobj.cxx
+++ b/sc/qa/extras/scarealinksobj.cxx
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <test/calc_unoapi_test.hxx>
+#include <test/unoapi_test.hxx>
 #include <test/container/xelementaccess.hxx>
 #include <test/container/xenumerationaccess.hxx>
 #include <test/container/xindexaccess.hxx>
@@ -30,7 +30,7 @@ using namespace css::uno;
 
 namespace sc_apitest
 {
-class ScAreaLinksObj : public CalcUnoApiTest,
+class ScAreaLinksObj : public UnoApiTest,
                        public apitest::XAreaLinks,
                        public apitest::XElementAccess,
                        public apitest::XEnumerationAccess,
@@ -63,7 +63,7 @@ public:
 };
 
 ScAreaLinksObj::ScAreaLinksObj()
-    : CalcUnoApiTest("/sc/qa/extras/testdocuments")
+    : UnoApiTest("/sc/qa/extras/testdocuments")
     , XElementAccess(cppu::UnoType<sheet::XAreaLink>::get())
     , XIndexAccess(1)
 {
@@ -85,7 +85,7 @@ uno::Reference<uno::XInterface> ScAreaLinksObj::init()
 
 void ScAreaLinksObj::setUp()
 {
-    CalcUnoApiTest::setUp();
+    UnoApiTest::setUp();
     mxComponent = loadFromDesktop("private:factory/scalc");
 }
 
diff --git a/sc/qa/extras/scautoformatobj.cxx b/sc/qa/extras/scautoformatobj.cxx
index e3a85a2c51ab..ba28fdf6c217 100644
--- a/sc/qa/extras/scautoformatobj.cxx
+++ b/sc/qa/extras/scautoformatobj.cxx
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <test/calc_unoapi_test.hxx>
+#include <test/unoapi_test.hxx>
 #include <test/beans/xpropertyset.hxx>
 #include <test/container/xelementaccess.hxx>
 #include <test/container/xenumerationaccess.hxx>
@@ -30,7 +30,7 @@ using namespace css;
 
 namespace sc_apitest
 {
-class ScAutoFormatObj : public CalcUnoApiTest,
+class ScAutoFormatObj : public UnoApiTest,
                         public apitest::TableAutoFormat,
                         public apitest::XElementAccess,
                         public apitest::XEnumerationAccess,
@@ -81,7 +81,7 @@ public:
 };
 
 ScAutoFormatObj::ScAutoFormatObj()
-    : CalcUnoApiTest("/sc/qa/extras/testdocuments")
+    : UnoApiTest("/sc/qa/extras/testdocuments")
     , XElementAccess(cppu::UnoType<beans::XPropertySet>::get())
     , XIndexAccess(16)
     , XNamed("Default")
@@ -104,7 +104,7 @@ uno::Reference<uno::XInterface> ScAutoFormatObj::init()
 
 void ScAutoFormatObj::setUp()
 {
-    CalcUnoApiTest::setUp();
+    UnoApiTest::setUp();
     mxComponent = loadFromDesktop("private:factory/scalc");
 }
 
diff --git a/sc/qa/extras/scautoformatsobj.cxx 
b/sc/qa/extras/scautoformatsobj.cxx
index 14192c89e509..90da32ea3400 100644
--- a/sc/qa/extras/scautoformatsobj.cxx
+++ b/sc/qa/extras/scautoformatsobj.cxx
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <test/calc_unoapi_test.hxx>
+#include <test/unoapi_test.hxx>
 #include <test/container/xelementaccess.hxx>
 #include <test/container/xenumerationaccess.hxx>
 #include <test/container/xindexaccess.hxx>
@@ -30,7 +30,7 @@ using namespace css;
 
 namespace sc_apitest
 {
-class ScAutoFormatsObj : public CalcUnoApiTest,
+class ScAutoFormatsObj : public UnoApiTest,
                          public apitest::XElementAccess,
                          public apitest::XEnumerationAccess,
                          public apitest::XIndexAccess,
@@ -82,7 +82,7 @@ public:
 };
 
 ScAutoFormatsObj::ScAutoFormatsObj()
-    : CalcUnoApiTest("/sc/qa/extras/testdocuments")
+    : UnoApiTest("/sc/qa/extras/testdocuments")
     , XElementAccess(cppu::UnoType<container::XNamed>::get())
     , XIndexAccess(2)
     , XNameAccess("Default")
@@ -115,7 +115,7 @@ uno::Reference<uno::XInterface> ScAutoFormatsObj::init()
 
 void ScAutoFormatsObj::setUp()
 {
-    CalcUnoApiTest::setUp();
+    UnoApiTest::setUp();
     // create calc document
     mxComponent = loadFromDesktop("private:factory/scalc");
 }
diff --git a/sc/qa/extras/sccellcursorobj.cxx b/sc/qa/extras/sccellcursorobj.cxx
index 5e1ffce7d1f2..b9629e25014a 100644
--- a/sc/qa/extras/sccellcursorobj.cxx
+++ b/sc/qa/extras/sccellcursorobj.cxx
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <test/calc_unoapi_test.hxx>
+#include <test/unoapi_test.hxx>
 #include <test/sheet/sheetcellrange.hxx>
 #include <test/sheet/xarrayformularange.hxx>
 #include <test/sheet/xcellformatrangessupplier.hxx>
@@ -39,7 +39,7 @@ using namespace css::uno;
 
 namespace sc_apitest {
 
-class ScCellCursorObj : public CalcUnoApiTest, public apitest::SheetCellRange,
+class ScCellCursorObj : public UnoApiTest, public apitest::SheetCellRange,
                                                public 
apitest::XArrayFormulaRange,
                                                public apitest::XCellCursor,
                                                public 
apitest::XCellFormatRangesSupplier,
@@ -156,7 +156,7 @@ public:
 };
 
 ScCellCursorObj::ScCellCursorObj():
-    CalcUnoApiTest("/sc/qa/extras/testdocuments"),
+    UnoApiTest("/sc/qa/extras/testdocuments"),
     apitest::XCellSeries(0, 0),
     apitest::XFormulaQuery(table::CellRangeAddress(0, 15, 15, 15, 15), 
table::CellRangeAddress(0, 0, 15, 0, 15))
 {
@@ -200,7 +200,7 @@ uno::Reference< uno::XInterface > 
ScCellCursorObj::getXSpreadsheet()
 
 void ScCellCursorObj::setUp()
 {
-    CalcUnoApiTest::setUp();
+    UnoApiTest::setUp();
 
     OUString aFileURL;
     createFileURL(u"ScCellCursorObj.ods", aFileURL);
diff --git a/sc/qa/extras/sccellfieldsobj.cxx b/sc/qa/extras/sccellfieldsobj.cxx
index 9d7a05e592ab..17db9339f168 100644
--- a/sc/qa/extras/sccellfieldsobj.cxx
+++ b/sc/qa/extras/sccellfieldsobj.cxx
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <test/calc_unoapi_test.hxx>
+#include <test/unoapi_test.hxx>
 #include <test/container/xelementaccess.hxx>
 #include <test/container/xenumerationaccess.hxx>
 #include <test/util/xrefreshable.hxx>
@@ -34,7 +34,7 @@ using namespace css::uno;
 
 namespace sc_apitest
 {
-class ScCellFieldsObj : public CalcUnoApiTest,
+class ScCellFieldsObj : public UnoApiTest,
                         public apitest::XElementAccess,
                         public apitest::XEnumerationAccess,
                         public apitest::XRefreshable
@@ -61,7 +61,7 @@ public:
 };
 
 ScCellFieldsObj::ScCellFieldsObj()
-    : CalcUnoApiTest("/sc/qa/extras/testdocuments")
+    : UnoApiTest("/sc/qa/extras/testdocuments")
     , XElementAccess(cppu::UnoType<text::XTextField>::get())
 {
 }
@@ -89,7 +89,7 @@ uno::Reference<uno::XInterface> ScCellFieldsObj::init()
 
 void ScCellFieldsObj::setUp()
 {
-    CalcUnoApiTest::setUp();
+    UnoApiTest::setUp();
     mxComponent = loadFromDesktop("private:factory/scalc");
 }
 
diff --git a/sc/qa/extras/sccellformatsenumeration.cxx 
b/sc/qa/extras/sccellformatsenumeration.cxx
index e2db66b2a296..85128937e2ca 100644
--- a/sc/qa/extras/sccellformatsenumeration.cxx
+++ b/sc/qa/extras/sccellformatsenumeration.cxx
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <test/calc_unoapi_test.hxx>
+#include <test/unoapi_test.hxx>
 #include <test/container/xenumeration.hxx>
 
 #include <com/sun/star/container/XEnumerationAccess.hpp>
@@ -26,7 +26,7 @@ using namespace css::uno;
 
 namespace sc_apitest
 {
-class ScCellFormatsEnumeration : public CalcUnoApiTest, public 
apitest::XEnumeration
+class ScCellFormatsEnumeration : public UnoApiTest, public 
apitest::XEnumeration
 {
 public:
     ScCellFormatsEnumeration();
@@ -44,7 +44,7 @@ public:
 };
 
 ScCellFormatsEnumeration::ScCellFormatsEnumeration()
-    : CalcUnoApiTest("/sc/qa/extras/testdocuments")
+    : UnoApiTest("/sc/qa/extras/testdocuments")
 {
 }
 
@@ -67,7 +67,7 @@ uno::Reference<uno::XInterface> 
ScCellFormatsEnumeration::init()
 
 void ScCellFormatsEnumeration::setUp()
 {
-    CalcUnoApiTest::setUp();
+    UnoApiTest::setUp();
     mxComponent = loadFromDesktop("private:factory/scalc");
 }
 
diff --git a/sc/qa/extras/sccellformatsobj.cxx 
b/sc/qa/extras/sccellformatsobj.cxx
index 8b41a8602562..0add386b4328 100644
--- a/sc/qa/extras/sccellformatsobj.cxx
+++ b/sc/qa/extras/sccellformatsobj.cxx
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <test/calc_unoapi_test.hxx>
+#include <test/unoapi_test.hxx>
 #include <test/container/xelementaccess.hxx>
 #include <test/container/xenumerationaccess.hxx>
 #include <test/container/xindexaccess.hxx>
@@ -30,7 +30,7 @@ using namespace css::uno;
 
 namespace sc_apitest
 {
-class ScCellFormatsObj : public CalcUnoApiTest,
+class ScCellFormatsObj : public UnoApiTest,
                          public apitest::XElementAccess,
                          public apitest::XEnumerationAccess,
                          public apitest::XIndexAccess
@@ -58,7 +58,7 @@ public:
 };
 
 ScCellFormatsObj::ScCellFormatsObj()
-    : CalcUnoApiTest("/sc/qa/extras/testdocuments")
+    : UnoApiTest("/sc/qa/extras/testdocuments")
     , XElementAccess(cppu::UnoType<table::XCellRange>::get())
     , XIndexAccess(1)
 {
@@ -80,7 +80,7 @@ uno::Reference<uno::XInterface> ScCellFormatsObj::init()
 
 void ScCellFormatsObj::setUp()
 {
-    CalcUnoApiTest::setUp();
+    UnoApiTest::setUp();
     mxComponent = loadFromDesktop("private:factory/scalc");
 }
 
diff --git a/sc/qa/extras/sccellobj.cxx b/sc/qa/extras/sccellobj.cxx
index 255e7de08ad6..2a7f6d5cdfba 100644
--- a/sc/qa/extras/sccellobj.cxx
+++ b/sc/qa/extras/sccellobj.cxx
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <test/calc_unoapi_test.hxx>
+#include <test/unoapi_test.hxx>
 #include <test/container/xenumerationaccess.hxx>
 #include <test/sheet/sheetcell.hxx>
 #include <test/sheet/xcelladdressable.hxx>
@@ -32,7 +32,7 @@ using namespace css::uno;
 
 namespace sc_apitest
 {
-class ScCellObj : public CalcUnoApiTest,
+class ScCellObj : public UnoApiTest,
                   public apitest::SheetCell,
                   public apitest::XCell,
                   public apitest::XCellAddressable,
@@ -92,7 +92,7 @@ public:
 };
 
 ScCellObj::ScCellObj()
-    : CalcUnoApiTest("/sc/qa/extras/testdocuments")
+    : UnoApiTest("/sc/qa/extras/testdocuments")
     , apitest::XFormulaQuery(table::CellRangeAddress(0, 2, 3, 2, 3),
                              table::CellRangeAddress(0, 0, 0, 3, 0), 0, 0)
 {
@@ -129,7 +129,7 @@ uno::Reference<uno::XInterface> ScCellObj::getXSpreadsheet()
 
 void ScCellObj::setUp()
 {
-    CalcUnoApiTest::setUp();
+    UnoApiTest::setUp();
     mxComponent = loadFromDesktop("private:factory/scalc");
 }
 
diff --git a/sc/qa/extras/sccellrangeobj.cxx b/sc/qa/extras/sccellrangeobj.cxx
index ed77e4d64c6d..aa41dd9588ad 100644
--- a/sc/qa/extras/sccellrangeobj.cxx
+++ b/sc/qa/extras/sccellrangeobj.cxx
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <test/calc_unoapi_test.hxx>
+#include <test/unoapi_test.hxx>
 #include <test/chart/xchartdata.hxx>
 #include <test/sheet/cellproperties.hxx>
 #include <test/sheet/sheetcellrange.hxx>
@@ -47,7 +47,7 @@ using namespace css;
 
 namespace sc_apitest
 {
-class ScCellRangeObj : public CalcUnoApiTest,
+class ScCellRangeObj : public UnoApiTest,
                        public apitest::CellProperties,
                        public apitest::SheetCellRange,
                        public apitest::XArrayFormulaRange,
@@ -177,7 +177,7 @@ public:
 };
 
 ScCellRangeObj::ScCellRangeObj()
-    : CalcUnoApiTest("/sc/qa/extras/testdocuments")
+    : UnoApiTest("/sc/qa/extras/testdocuments")
     , XCellSeries(2, 1)
     , XFormulaQuery(table::CellRangeAddress(0, 15, 15, 15, 15),
                     table::CellRangeAddress(0, 0, 15, 0, 15))
@@ -243,7 +243,7 @@ void ScCellRangeObj::testSortOOB()
 
 void ScCellRangeObj::setUp()
 {
-    CalcUnoApiTest::setUp();
+    UnoApiTest::setUp();
 
     OUString aFileURL;
     createFileURL(u"xcellrangesquery.ods", aFileURL);
diff --git a/sc/qa/extras/sccellrangesobj.cxx b/sc/qa/extras/sccellrangesobj.cxx
index e87fb5afad7a..0c27f584c678 100644
--- a/sc/qa/extras/sccellrangesobj.cxx
+++ b/sc/qa/extras/sccellrangesobj.cxx
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <test/calc_unoapi_test.hxx>
+#include <test/unoapi_test.hxx>
 #include <test/container/xenumerationaccess.hxx>
 #include <test/sheet/sheetcellranges.hxx>
 #include <test/sheet/xformulaquery.hxx>
@@ -30,7 +30,7 @@ using namespace css::uno;
 
 namespace sc_apitest
 {
-class ScCellRangesObj : public CalcUnoApiTest,
+class ScCellRangesObj : public UnoApiTest,
                         public apitest::SheetCellRanges,
                         public apitest::XEnumerationAccess,
                         public apitest::XFormulaQuery,
@@ -80,7 +80,7 @@ public:
 };
 
 ScCellRangesObj::ScCellRangesObj()
-    : CalcUnoApiTest("/sc/qa/extras/testdocuments")
+    : UnoApiTest("/sc/qa/extras/testdocuments")
     , apitest::XFormulaQuery(table::CellRangeAddress(0, 4, 1, 5, 4),
                              table::CellRangeAddress(0, 4, 1, 5, 4))
 {
@@ -132,7 +132,7 @@ uno::Reference<uno::XInterface> 
ScCellRangesObj::getXSpreadsheet()
 
 void ScCellRangesObj::setUp()
 {
-    CalcUnoApiTest::setUp();
+    UnoApiTest::setUp();
     // create a calc document
     mxComponent = loadFromDesktop("private:factory/scalc");
 }
diff --git a/sc/qa/extras/sccellsearchobj.cxx b/sc/qa/extras/sccellsearchobj.cxx
index f60a8d8320bf..97283fa35693 100644
--- a/sc/qa/extras/sccellsearchobj.cxx
+++ b/sc/qa/extras/sccellsearchobj.cxx
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <test/calc_unoapi_test.hxx>
+#include <test/unoapi_test.hxx>
 #include <test/beans/xpropertyset.hxx>
 #include <test/lang/xserviceinfo.hxx>
 #include <test/util/searchdescriptor.hxx>
@@ -28,7 +28,7 @@ using namespace css;
 
 namespace sc_apitest
 {
-class ScCellSearchObj : public CalcUnoApiTest,
+class ScCellSearchObj : public UnoApiTest,
                         public apitest::SearchDescriptor,
                         public apitest::XPropertySet,
                         public apitest::XReplaceDescriptor,
@@ -68,7 +68,7 @@ public:
 };
 
 ScCellSearchObj::ScCellSearchObj()
-    : CalcUnoApiTest("/sc/qa/extras/testdocuments")
+    : UnoApiTest("/sc/qa/extras/testdocuments")
     , XServiceInfo("ScCellSearchObj",
                    { "com.sun.star.util.ReplaceDescriptor", 
"com.sun.star.util.SearchDescriptor" })
 {
@@ -87,7 +87,7 @@ uno::Reference<uno::XInterface> ScCellSearchObj::init()
 
 void ScCellSearchObj::setUp()
 {
-    CalcUnoApiTest::setUp();
+    UnoApiTest::setUp();
     // create calc document
     mxComponent = loadFromDesktop("private:factory/scalc");
 }
diff --git a/sc/qa/extras/sccellsenumeration.cxx 
b/sc/qa/extras/sccellsenumeration.cxx
index 6480641a4c26..21263b1e88d5 100644
--- a/sc/qa/extras/sccellsenumeration.cxx
+++ b/sc/qa/extras/sccellsenumeration.cxx
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <test/calc_unoapi_test.hxx>
+#include <test/unoapi_test.hxx>
 #include <test/container/xenumeration.hxx>
 
 #include <com/sun/star/container/XEnumerationAccess.hpp>
@@ -29,7 +29,7 @@ using namespace css::uno;
 
 namespace sc_apitest
 {
-class ScCellsEnumeration : public CalcUnoApiTest, public apitest::XEnumeration
+class ScCellsEnumeration : public UnoApiTest, public apitest::XEnumeration
 {
 public:
     ScCellsEnumeration();
@@ -47,7 +47,7 @@ public:
 };
 
 ScCellsEnumeration::ScCellsEnumeration()
-    : CalcUnoApiTest("/sc/qa/extras/testdocuments")
+    : UnoApiTest("/sc/qa/extras/testdocuments")
 {
 }
 
@@ -80,7 +80,7 @@ uno::Reference<uno::XInterface> ScCellsEnumeration::init()
 
 void ScCellsEnumeration::setUp()
 {
-    CalcUnoApiTest::setUp();
+    UnoApiTest::setUp();
     mxComponent = loadFromDesktop("private:factory/scalc");
 }
 
diff --git a/sc/qa/extras/sccellsobj.cxx b/sc/qa/extras/sccellsobj.cxx
index f62427786407..32c7a88d17e3 100644
--- a/sc/qa/extras/sccellsobj.cxx
+++ b/sc/qa/extras/sccellsobj.cxx
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <test/calc_unoapi_test.hxx>
+#include <test/unoapi_test.hxx>
 #include <test/container/xelementaccess.hxx>
 #include <test/container/xenumerationaccess.hxx>
 
@@ -31,7 +31,7 @@ using namespace css::uno;
 
 namespace sc_apitest
 {
-class ScCellsObj : public CalcUnoApiTest,
+class ScCellsObj : public UnoApiTest,
                    public apitest::XElementAccess,
                    public apitest::XEnumerationAccess
 {
@@ -54,7 +54,7 @@ public:
 };
 
 ScCellsObj::ScCellsObj()
-    : CalcUnoApiTest("/sc/qa/extras/testdocuments")
+    : UnoApiTest("/sc/qa/extras/testdocuments")
     , XElementAccess(cppu::UnoType<table::XCell>::get())
 {
 }
@@ -87,7 +87,7 @@ uno::Reference<uno::XInterface> ScCellsObj::init()
 
 void ScCellsObj::setUp()
 {
-    CalcUnoApiTest::setUp();
+    UnoApiTest::setUp();
     mxComponent = loadFromDesktop("private:factory/scalc");
 }
 
diff --git a/sc/qa/extras/scchartobj.cxx b/sc/qa/extras/scchartobj.cxx
index 3311852189f6..aac4ee1171f8 100644
--- a/sc/qa/extras/scchartobj.cxx
+++ b/sc/qa/extras/scchartobj.cxx
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <test/calc_unoapi_test.hxx>
+#include <test/unoapi_test.hxx>
 #include <test/beans/xpropertyset.hxx>
 #include <test/container/xnamed.hxx>
 #include <test/document/xembeddedobjectsupplier.hxx>
@@ -37,7 +37,7 @@ using namespace css;
 
 namespace sc_apitest
 {
-class ScChartObj : public CalcUnoApiTest,
+class ScChartObj : public UnoApiTest,
                    public apitest::XEmbeddedObjectSupplier,
                    public apitest::XNamed,
                    public apitest::XPropertySet,
@@ -76,7 +76,7 @@ public:
 };
 
 ScChartObj::ScChartObj()
-    : CalcUnoApiTest("/sc/qa/extras/testdocuments")
+    : UnoApiTest("/sc/qa/extras/testdocuments")
     , XNamed("ScChartObj")
     , XServiceInfo("ScChartObj", "com.sun.star.table.TableChart")
 {
@@ -166,7 +166,7 @@ uno::Reference<uno::XInterface> ScChartObj::init()
 
 void ScChartObj::setUp()
 {
-    CalcUnoApiTest::setUp();
+    UnoApiTest::setUp();
     // create a calc document
     mxComponent = loadFromDesktop("private:factory/scalc");
 }
diff --git a/sc/qa/extras/scchartsobj.cxx b/sc/qa/extras/scchartsobj.cxx
index a1d744fb47b9..0f5167de5fcc 100644
--- a/sc/qa/extras/scchartsobj.cxx
+++ b/sc/qa/extras/scchartsobj.cxx
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <test/calc_unoapi_test.hxx>
+#include <test/unoapi_test.hxx>
 #include <test/container/xelementaccess.hxx>
 #include <test/container/xenumerationaccess.hxx>
 #include <test/container/xindexaccess.hxx>
@@ -37,7 +37,7 @@ using namespace css;
 
 namespace sc_apitest
 {
-class ScChartsObj : public CalcUnoApiTest,
+class ScChartsObj : public UnoApiTest,
                     public apitest::XEnumerationAccess,
                     public apitest::XElementAccess,
                     public apitest::XIndexAccess,
@@ -81,7 +81,7 @@ public:
 };
 
 ScChartsObj::ScChartsObj()
-    : CalcUnoApiTest("/sc/qa/extras/testdocuments")
+    : UnoApiTest("/sc/qa/extras/testdocuments")
     , XElementAccess(cppu::UnoType<table::XTableChart>::get())
     , XIndexAccess(1)
     , XNameAccess("ScChartsObj")
@@ -170,7 +170,7 @@ uno::Reference<uno::XInterface> ScChartsObj::init()
 
 void ScChartsObj::setUp()
 {
-    CalcUnoApiTest::setUp();
+    UnoApiTest::setUp();
     // create calc document
     mxComponent = loadFromDesktop("private:factory/scalc");
 }
diff --git a/sc/qa/extras/scconsolidationdescriptorobj.cxx 
b/sc/qa/extras/scconsolidationdescriptorobj.cxx
index 53c64aaef327..eb0392d8780d 100644
--- a/sc/qa/extras/scconsolidationdescriptorobj.cxx
+++ b/sc/qa/extras/scconsolidationdescriptorobj.cxx
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <test/calc_unoapi_test.hxx>
+#include <test/unoapi_test.hxx>
 #include <test/sheet/xconsolidationdescriptor.hxx>
 
 #include <com/sun/star/lang/XComponent.hpp>
@@ -23,7 +23,7 @@ using namespace com::sun::star;
 
 namespace sc_apitest
 {
-class ScConsolidationDescriptorObj : public CalcUnoApiTest, public 
apitest::XConsolidationDescriptor
+class ScConsolidationDescriptorObj : public UnoApiTest, public 
apitest::XConsolidationDescriptor
 {
 public:
     ScConsolidationDescriptorObj();
@@ -51,7 +51,7 @@ public:
 };
 
 ScConsolidationDescriptorObj::ScConsolidationDescriptorObj()
-    : CalcUnoApiTest("/sc/qa/extras/testdocuments")
+    : UnoApiTest("/sc/qa/extras/testdocuments")
 {
 }
 
@@ -65,7 +65,7 @@ uno::Reference<uno::XInterface> 
ScConsolidationDescriptorObj::init()
 
 void ScConsolidationDescriptorObj::setUp()
 {
-    CalcUnoApiTest::setUp();
+    UnoApiTest::setUp();
     // create a calc document
     mxComponent = loadFromDesktop("private:factory/scalc");
 }
diff --git a/sc/qa/extras/scdatabaserangeobj.cxx 
b/sc/qa/extras/scdatabaserangeobj.cxx
index aab9ce323d3d..91491a8fbdc4 100644
--- a/sc/qa/extras/scdatabaserangeobj.cxx
+++ b/sc/qa/extras/scdatabaserangeobj.cxx
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <test/calc_unoapi_test.hxx>
+#include <test/unoapi_test.hxx>
 #include <test/sheet/databaserange.hxx>
 #include <test/sheet/xcellrangereferrer.hxx>
 #include <test/sheet/xdatabaserange.hxx>
@@ -24,7 +24,7 @@ using namespace css::uno;
 
 namespace sc_apitest {
 
-class ScDatabaseRangeObj : public CalcUnoApiTest,
+class ScDatabaseRangeObj : public UnoApiTest,
                            public apitest::DatabaseRange,
                            public apitest::XCellRangeReferrer,
                            public apitest::XDatabaseRange
@@ -67,7 +67,7 @@ public:
 };
 
 ScDatabaseRangeObj::ScDatabaseRangeObj()
-      : CalcUnoApiTest("/sc/qa/extras/testdocuments")
+      : UnoApiTest("/sc/qa/extras/testdocuments")
 {
 }
 
@@ -95,7 +95,7 @@ uno::Reference< uno::XInterface > ScDatabaseRangeObj::init( 
const OUString& rDBN
 
 void ScDatabaseRangeObj::setUp()
 {
-    CalcUnoApiTest::setUp();
+    UnoApiTest::setUp();
 
     OUString aFileURL;
     createFileURL(u"ScDatabaseRangeObj.ods", aFileURL);
diff --git a/sc/qa/extras/scdatabaserangesobj.cxx 
b/sc/qa/extras/scdatabaserangesobj.cxx
index a4ff6f232779..7926cb6ecf0b 100644
--- a/sc/qa/extras/scdatabaserangesobj.cxx
+++ b/sc/qa/extras/scdatabaserangesobj.cxx
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <test/calc_unoapi_test.hxx>
+#include <test/unoapi_test.hxx>
 #include <test/container/xelementaccess.hxx>
 #include <test/container/xenumerationaccess.hxx>
 #include <test/container/xindexaccess.hxx>
@@ -33,7 +33,7 @@ using namespace com::sun::star;
 
 namespace sc_apitest
 {
-class ScDatabaseRangesObj : public CalcUnoApiTest,
+class ScDatabaseRangesObj : public UnoApiTest,
                             public apitest::XDatabaseRanges,
                             public apitest::XElementAccess,
                             public apitest::XEnumerationAccess,
@@ -77,7 +77,7 @@ public:
 };
 
 ScDatabaseRangesObj::ScDatabaseRangesObj()
-    : CalcUnoApiTest("/sc/qa/extras/testdocuments")
+    : UnoApiTest("/sc/qa/extras/testdocuments")
     , XElementAccess(cppu::UnoType<sheet::XDatabaseRange>::get())
     , XIndexAccess(1)
     , XNameAccess("DbRange")
@@ -101,7 +101,7 @@ uno::Reference<uno::XInterface> ScDatabaseRangesObj::init()
 
 void ScDatabaseRangesObj::setUp()
 {
-    CalcUnoApiTest::setUp();
+    UnoApiTest::setUp();
     // create a calc document
     mxComponent = loadFromDesktop("private:factory/scalc");
 }
diff --git a/sc/qa/extras/scdatapilotfieldgroupitemobj.cxx 
b/sc/qa/extras/scdatapilotfieldgroupitemobj.cxx
index b6fd8fbcc154..09df41061bec 100644
--- a/sc/qa/extras/scdatapilotfieldgroupitemobj.cxx
+++ b/sc/qa/extras/scdatapilotfieldgroupitemobj.cxx
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <test/calc_unoapi_test.hxx>
+#include <test/unoapi_test.hxx>
 #include <test/container/xnamed.hxx>
 #include <test/lang/xserviceinfo.hxx>
 
@@ -38,7 +38,7 @@ using namespace css;
 
 namespace sc_apitest
 {
-class ScDataPilotFieldGroupItemObj : public CalcUnoApiTest,
+class ScDataPilotFieldGroupItemObj : public UnoApiTest,
                                      public apitest::XNamed,
                                      public apitest::XServiceInfo
 {
@@ -66,7 +66,7 @@ private:
 };
 
 ScDataPilotFieldGroupItemObj::ScDataPilotFieldGroupItemObj()
-    : CalcUnoApiTest("/sc/qa/extras/testdocuments")
+    : UnoApiTest("/sc/qa/extras/testdocuments")
     , XNamed("aName")
     , XServiceInfo("ScDataPilotFieldGroupItemObj", 
"com.sun.star.sheet.DataPilotFieldGroupItem")
 {
@@ -170,7 +170,7 @@ uno::Reference<uno::XInterface> 
ScDataPilotFieldGroupItemObj::init()
 
 void ScDataPilotFieldGroupItemObj::setUp()
 {
-    CalcUnoApiTest::setUp();
+    UnoApiTest::setUp();
     // create a calc document
     mxComponent = loadFromDesktop("private:factory/scalc");
 }
diff --git a/sc/qa/extras/scdatapilotfieldgroupobj.cxx 
b/sc/qa/extras/scdatapilotfieldgroupobj.cxx
index 11363301d8f2..2e54f1c236bf 100644
--- a/sc/qa/extras/scdatapilotfieldgroupobj.cxx
+++ b/sc/qa/extras/scdatapilotfieldgroupobj.cxx
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <test/calc_unoapi_test.hxx>
+#include <test/unoapi_test.hxx>
 #include <test/container/xelementaccess.hxx>
 #include <test/container/xenumerationaccess.hxx>
 #include <test/container/xindexaccess.hxx>
@@ -41,7 +41,7 @@ using namespace css;
 
 namespace sc_apitest
 {
-class ScDataPilotFieldGroupObj : public CalcUnoApiTest,
+class ScDataPilotFieldGroupObj : public UnoApiTest,
                                  public apitest::XElementAccess,
                                  public apitest::XEnumerationAccess,
                                  public apitest::XIndexAccess,
@@ -89,7 +89,7 @@ private:
 };
 
 ScDataPilotFieldGroupObj::ScDataPilotFieldGroupObj()
-    : CalcUnoApiTest("/sc/qa/extras/testdocuments")
+    : UnoApiTest("/sc/qa/extras/testdocuments")
     , XElementAccess(cppu::UnoType<container::XNamed>::get())
     , XIndexAccess(2)
     , XNameAccess("aName")
@@ -195,7 +195,7 @@ uno::Reference<uno::XInterface> 
ScDataPilotFieldGroupObj::init()
 
 void ScDataPilotFieldGroupObj::setUp()
 {
-    CalcUnoApiTest::setUp();
+    UnoApiTest::setUp();
     // create calc document
     mxComponent = loadFromDesktop("private:factory/scalc");
 }
diff --git a/sc/qa/extras/scdatapilotfieldgroupsobj.cxx 
b/sc/qa/extras/scdatapilotfieldgroupsobj.cxx
index e52af4dc1a78..485fc7d28a20 100644
--- a/sc/qa/extras/scdatapilotfieldgroupsobj.cxx
+++ b/sc/qa/extras/scdatapilotfieldgroupsobj.cxx
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <test/calc_unoapi_test.hxx>
+#include <test/unoapi_test.hxx>
 #include <test/container/xelementaccess.hxx>
 #include <test/container/xenumerationaccess.hxx>
 #include <test/container/xindexaccess.hxx>
@@ -42,7 +42,7 @@ using namespace css;
 
 namespace sc_apitest
 {
-class ScDataPilotFieldGroupsObj : public CalcUnoApiTest,
+class ScDataPilotFieldGroupsObj : public UnoApiTest,
                                   public apitest::XElementAccess,
                                   public apitest::XEnumerationAccess,
                                   public apitest::XIndexAccess,
@@ -93,7 +93,7 @@ private:
 };
 
 ScDataPilotFieldGroupsObj::ScDataPilotFieldGroupsObj()
-    : CalcUnoApiTest("/sc/qa/extras/testdocuments")
+    : UnoApiTest("/sc/qa/extras/testdocuments")
     , XElementAccess(cppu::UnoType<container::XNameAccess>::get())
     , XIndexAccess(1)
     , XNameAccess("Group1")
@@ -200,7 +200,7 @@ uno::Reference<uno::XInterface> 
ScDataPilotFieldGroupsObj::init()
 
 void ScDataPilotFieldGroupsObj::setUp()
 {
-    CalcUnoApiTest::setUp();
+    UnoApiTest::setUp();
     // create a calc document
     mxComponent = loadFromDesktop("private:factory/scalc");
 }
diff --git a/sc/qa/extras/scdatapilotfieldobj.cxx 
b/sc/qa/extras/scdatapilotfieldobj.cxx
index e8d3a43059b1..c63dcff38c47 100644
--- a/sc/qa/extras/scdatapilotfieldobj.cxx
+++ b/sc/qa/extras/scdatapilotfieldobj.cxx
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <test/calc_unoapi_test.hxx>
+#include <test/unoapi_test.hxx>
 #include <test/beans/xpropertyset.hxx>
 #include <test/container/xnamed.hxx>
 #include <test/lang/xserviceinfo.hxx>
@@ -29,7 +29,7 @@ using namespace css;
 
 namespace sc_apitest
 {
-class ScDataPilotFieldObj : public CalcUnoApiTest,
+class ScDataPilotFieldObj : public UnoApiTest,
                             public apitest::DataPilotField,
                             public apitest::XDataPilotField,
                             public apitest::XDataPilotFieldGrouping,
@@ -80,7 +80,7 @@ public:
 };
 
 ScDataPilotFieldObj::ScDataPilotFieldObj()
-    : CalcUnoApiTest("/sc/qa/extras/testdocuments")
+    : UnoApiTest("/sc/qa/extras/testdocuments")
     , XNamed("Col1")
     , XPropertySet({ "Function", "HasAutoShowInfo", "HasLayoutInfo", 
"HasSortInfo", "Subtotals",
                      "Subtotals2" })
@@ -108,7 +108,7 @@ uno::Reference<uno::XInterface> ScDataPilotFieldObj::init()
 
 void ScDataPilotFieldObj::setUp()
 {
-    CalcUnoApiTest::setUp();
+    UnoApiTest::setUp();
 
     OUString aFileURL;
     createFileURL(u"scdatapilotfieldobj.ods", aFileURL);
diff --git a/sc/qa/extras/scdatapilotfieldsobj.cxx 
b/sc/qa/extras/scdatapilotfieldsobj.cxx
index ee9be942ff65..4320dbd311ec 100644
--- a/sc/qa/extras/scdatapilotfieldsobj.cxx
+++ b/sc/qa/extras/scdatapilotfieldsobj.cxx
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <test/calc_unoapi_test.hxx>
+#include <test/unoapi_test.hxx>
 #include <test/container/xelementaccess.hxx>
 #include <test/container/xenumerationaccess.hxx>
 #include <test/container/xindexaccess.hxx>
@@ -33,7 +33,7 @@
 using namespace css;
 namespace sc_apitest
 {
-class ScDataPilotFieldsObj : public CalcUnoApiTest,
+class ScDataPilotFieldsObj : public UnoApiTest,
                              public apitest::XElementAccess,
                              public apitest::XEnumerationAccess,
                              public apitest::XIndexAccess,
@@ -72,7 +72,7 @@ public:
 };
 
 ScDataPilotFieldsObj::ScDataPilotFieldsObj()
-    : CalcUnoApiTest("/sc/qa/extras/testdocuments")
+    : UnoApiTest("/sc/qa/extras/testdocuments")
     , XElementAccess(cppu::UnoType<beans::XPropertySet>::get())
     , XIndexAccess(6)
     , XNameAccess("")
@@ -115,7 +115,7 @@ uno::Reference<uno::XInterface> ScDataPilotFieldsObj::init()
 
 void ScDataPilotFieldsObj::setUp()
 {
-    CalcUnoApiTest::setUp();
+    UnoApiTest::setUp();
     // create a calc document
     mxComponent = loadFromDesktop("private:factory/scalc");
 }
diff --git a/sc/qa/extras/scdatapilotitemobj.cxx 
b/sc/qa/extras/scdatapilotitemobj.cxx
index 6217b29a5936..46a45b47bd3b 100644
--- a/sc/qa/extras/scdatapilotitemobj.cxx
+++ b/sc/qa/extras/scdatapilotitemobj.cxx
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <test/calc_unoapi_test.hxx>
+#include <test/unoapi_test.hxx>
 #include <test/container/xnamed.hxx>
 #include <test/sheet/datapilotitem.hxx>
 
@@ -31,9 +31,7 @@ using namespace css;
 
 namespace sc_apitest
 {
-class ScDataPilotItemObj : public CalcUnoApiTest,
-                           public apitest::DataPilotItem,
-                           public apitest::XNamed
+class ScDataPilotItemObj : public UnoApiTest, public apitest::DataPilotItem, 
public apitest::XNamed
 {
 public:
     virtual void setUp() override;
@@ -56,7 +54,7 @@ private:
 };
 
 ScDataPilotItemObj::ScDataPilotItemObj()
-    : CalcUnoApiTest("/sc/qa/extras/testdocuments")
+    : UnoApiTest("/sc/qa/extras/testdocuments")
     , XNamed("2")
 {
 }
@@ -118,7 +116,7 @@ uno::Reference<uno::XInterface> ScDataPilotItemObj::init()
 
 void ScDataPilotItemObj::setUp()
 {
-    CalcUnoApiTest::setUp();
+    UnoApiTest::setUp();
     // create calc document
     mxComponent = loadFromDesktop("private:factory/scalc");
 }
diff --git a/sc/qa/extras/scdatapilotitemsobj.cxx 
b/sc/qa/extras/scdatapilotitemsobj.cxx
index a3a858623a9a..550a0fcf0eee 100644
--- a/sc/qa/extras/scdatapilotitemsobj.cxx
+++ b/sc/qa/extras/scdatapilotitemsobj.cxx
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <test/calc_unoapi_test.hxx>
+#include <test/unoapi_test.hxx>
 #include <test/container/xelementaccess.hxx>
 #include <test/container/xenumerationaccess.hxx>
 #include <test/container/xindexaccess.hxx>
@@ -36,7 +36,7 @@ using namespace css;
 
 namespace sc_apitest
 {
-class ScDataPilotItemsObj : public CalcUnoApiTest,
+class ScDataPilotItemsObj : public UnoApiTest,
                             public apitest::XElementAccess,
                             public apitest::XEnumerationAccess,
                             public apitest::XIndexAccess,
@@ -79,7 +79,7 @@ private:
 };
 
 ScDataPilotItemsObj::ScDataPilotItemsObj()
-    : CalcUnoApiTest("/sc/qa/extras/testdocuments")
+    : UnoApiTest("/sc/qa/extras/testdocuments")
     , XElementAccess(cppu::UnoType<beans::XPropertySet>::get())
     , XIndexAccess(5)
     , XNameAccess("2")
@@ -142,7 +142,7 @@ uno::Reference<uno::XInterface> ScDataPilotItemsObj::init()
 
 void ScDataPilotItemsObj::setUp()
 {
-    CalcUnoApiTest::setUp();
+    UnoApiTest::setUp();
     // create a calc document
     mxComponent = loadFromDesktop("private:factory/scalc");
 }
diff --git a/sc/qa/extras/scdatapilottableobj.cxx 
b/sc/qa/extras/scdatapilottableobj.cxx
index 5dcdeea53eb8..67f417f7ea33 100644
--- a/sc/qa/extras/scdatapilottableobj.cxx
+++ b/sc/qa/extras/scdatapilottableobj.cxx
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <test/calc_unoapi_test.hxx>
+#include <test/unoapi_test.hxx>
 #include <test/container/xnamed.hxx>
 #include <test/sheet/xdatapilotdescriptor.hxx>
 #include <test/sheet/xdatapilottable.hxx>
@@ -25,7 +25,7 @@ using namespace css::uno;
 
 namespace sc_apitest {
 
-class ScDataPilotTableObj : public CalcUnoApiTest,
+class ScDataPilotTableObj : public UnoApiTest,
                             public apitest::XDataPilotDescriptor,
                             public apitest::XDataPilotTable,
                             public apitest::XDataPilotTable2,
@@ -70,7 +70,7 @@ public:
 };
 
 ScDataPilotTableObj::ScDataPilotTableObj()
-    : CalcUnoApiTest("/sc/qa/extras/testdocuments"),
+    : UnoApiTest("/sc/qa/extras/testdocuments"),
       apitest::XNamed("DataPilotTable")
 {
 }
@@ -129,7 +129,7 @@ uno::Reference< uno::XInterface > 
ScDataPilotTableObj::initDP2()
 
 void ScDataPilotTableObj::setUp()
 {
-    CalcUnoApiTest::setUp();
+    UnoApiTest::setUp();
     // create a calc document
     OUString aFileURL;
     createFileURL(u"ScDataPilotTableObj.ods", aFileURL);
diff --git a/sc/qa/extras/scdatapilottablesobj.cxx 
b/sc/qa/extras/scdatapilottablesobj.cxx
index 5dcff4302d1d..faa9c5f0f504 100644
--- a/sc/qa/extras/scdatapilottablesobj.cxx
+++ b/sc/qa/extras/scdatapilottablesobj.cxx
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <test/calc_unoapi_test.hxx>
+#include <test/unoapi_test.hxx>
 #include <test/container/xelementaccess.hxx>
 #include <test/container/xenumerationaccess.hxx>
 #include <test/container/xindexaccess.hxx>
@@ -38,7 +38,7 @@ using namespace com::sun::star;
 
 namespace sc_apitest
 {
-class ScDataPilotTablesObj : public CalcUnoApiTest,
+class ScDataPilotTablesObj : public UnoApiTest,
                              public apitest::XDataPilotTables,
                              public apitest::XElementAccess,
                              public apitest::XEnumerationAccess,
@@ -83,7 +83,7 @@ public:
 };
 
 ScDataPilotTablesObj::ScDataPilotTablesObj()
-    : CalcUnoApiTest("/sc/qa/extras/testdocuments")
+    : UnoApiTest("/sc/qa/extras/testdocuments")
     , XElementAccess(cppu::UnoType<sheet::XDataPilotTable2>::get())
     , XIndexAccess(1)
     , XNameAccess("DataPilotTable")
@@ -128,7 +128,7 @@ uno::Reference<uno::XInterface> 
ScDataPilotTablesObj::getXSpreadsheet()
 
 void ScDataPilotTablesObj::setUp()
 {
-    CalcUnoApiTest::setUp();
+    UnoApiTest::setUp();
     // create a calc document
     mxComponent = loadFromDesktop("private:factory/scalc");
 }
diff --git a/sc/qa/extras/scddelinkobj.cxx b/sc/qa/extras/scddelinkobj.cxx
index 9bd598746106..9be1a660d867 100644
--- a/sc/qa/extras/scddelinkobj.cxx
+++ b/sc/qa/extras/scddelinkobj.cxx
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <test/calc_unoapi_test.hxx>
+#include <test/unoapi_test.hxx>
 #include <test/container/xnamed.hxx>
 #include <test/sheet/xddelink.hxx>
 #include <test/util/xrefreshable.hxx>
@@ -58,7 +58,7 @@ struct TempFileBase
 };
 }
 
-class ScDDELinkObj : public CalcUnoApiTest,
+class ScDDELinkObj : public UnoApiTest,
                      public TempFileBase,
                      public apitest::XDDELink,
                      public apitest::XNamed,
@@ -88,7 +88,7 @@ public:
 };
 
 ScDDELinkObj::ScDDELinkObj()
-    : CalcUnoApiTest("/sc/qa/extras/testdocuments")
+    : UnoApiTest("/sc/qa/extras/testdocuments")
     , 
TempFileBase(m_directories.getURLFromSrc(u"/sc/qa/unoapi/testdocuments/ScDDELinksObj.ods"))
     , XDDELink(m_TempFile.GetURL())
     , XNamed("soffice|" + m_TempFile.GetURL() + "!Sheet1.A1")
@@ -121,7 +121,7 @@ uno::Reference<uno::XInterface> ScDDELinkObj::init()
 void ScDDELinkObj::setUp()
 {
     Application::SetAppName("soffice"); // Enable DDE
-    CalcUnoApiTest::setUp();
+    UnoApiTest::setUp();
     // create a calc document
     mxComponent = loadFromDesktop("private:factory/scalc");
 }
diff --git a/sc/qa/extras/scddelinksobj.cxx b/sc/qa/extras/scddelinksobj.cxx
index 4b23455a758f..bb92a5a5151a 100644
--- a/sc/qa/extras/scddelinksobj.cxx
+++ b/sc/qa/extras/scddelinksobj.cxx
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <test/calc_unoapi_test.hxx>
+#include <test/unoapi_test.hxx>
 #include <test/container/xelementaccess.hxx>
 #include <test/container/xenumerationaccess.hxx>
 #include <test/container/xindexaccess.hxx>
@@ -36,7 +36,7 @@ using namespace com::sun::star;
 
 namespace sc_apitest
 {
-class ScDDELinksObj : public CalcUnoApiTest,
+class ScDDELinksObj : public UnoApiTest,
                       public apitest::XDDELinks,
                       public apitest::XElementAccess,
                       public apitest::XEnumerationAccess,
@@ -80,7 +80,7 @@ public:
 };
 
 ScDDELinksObj::ScDDELinksObj()
-    : CalcUnoApiTest("/sc/qa/extras/testdocuments")
+    : UnoApiTest("/sc/qa/extras/testdocuments")
     , 
XDDELinks(m_directories.getURLFromSrc(u"/sc/qa/unoapi/testdocuments/ScDDELinksObj.ods"))
     , XElementAccess(cppu::UnoType<sheet::XDDELink>::get())
     , XIndexAccess(1)
@@ -119,7 +119,7 @@ uno::Reference<uno::XInterface> ScDDELinksObj::init()
 void ScDDELinksObj::setUp()
 {
     Application::SetAppName("soffice"); // Enable DDE
-    CalcUnoApiTest::setUp();
+    UnoApiTest::setUp();
     // create a calc document
     mxComponent = loadFromDesktop("private:factory/scalc");
 }
diff --git a/sc/qa/extras/scdocumentconfigurationobj.cxx 
b/sc/qa/extras/scdocumentconfigurationobj.cxx
index 052d09b1d512..d5dbd0bf466d 100644
--- a/sc/qa/extras/scdocumentconfigurationobj.cxx
+++ b/sc/qa/extras/scdocumentconfigurationobj.cxx
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <test/calc_unoapi_test.hxx>
+#include <test/unoapi_test.hxx>
 #include <test/sheet/documentsettings.hxx>
 
 #include <com/sun/star/lang/XComponent.hpp>
@@ -23,7 +23,7 @@ using namespace com::sun::star;
 
 namespace sc_apitest
 {
-class ScDocumentConfigurationObj : public CalcUnoApiTest, public 
apitest::DocumentSettings
+class ScDocumentConfigurationObj : public UnoApiTest, public 
apitest::DocumentSettings
 {
 public:
     ScDocumentConfigurationObj();
@@ -41,7 +41,7 @@ public:
 };
 
 ScDocumentConfigurationObj::ScDocumentConfigurationObj()
-    : CalcUnoApiTest("/sc/qa/extras/testdocuments")
+    : UnoApiTest("/sc/qa/extras/testdocuments")
 {
 }
 
@@ -54,7 +54,7 @@ uno::Reference<uno::XInterface> 
ScDocumentConfigurationObj::init()
 
 void ScDocumentConfigurationObj::setUp()
 {
-    CalcUnoApiTest::setUp();
+    UnoApiTest::setUp();
     // create a calc document
     mxComponent = loadFromDesktop("private:factory/scalc");
 }
diff --git a/sc/qa/extras/scdrawpageobj.cxx b/sc/qa/extras/scdrawpageobj.cxx
index b313b083b3bc..1899650d3eb2 100644
--- a/sc/qa/extras/scdrawpageobj.cxx
+++ b/sc/qa/extras/scdrawpageobj.cxx
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <test/calc_unoapi_test.hxx>
+#include <test/unoapi_test.hxx>
 #include <test/helper/shape.hxx>
 #include <test/container/xelementaccess.hxx>
 #include <test/container/xindexaccess.hxx>
@@ -31,7 +31,7 @@ using namespace css;
 
 namespace sc_apitest
 {
-class ScDrawPageObj : public CalcUnoApiTest,
+class ScDrawPageObj : public UnoApiTest,
                       public apitest::XElementAccess,
                       public apitest::XIndexAccess,
                       public apitest::XServiceInfo,
@@ -70,7 +70,7 @@ public:
 };
 
 ScDrawPageObj::ScDrawPageObj()
-    : CalcUnoApiTest("/sc/qa/extras/testdocuments")
+    : UnoApiTest("/sc/qa/extras/testdocuments")
     , XElementAccess(cppu::UnoType<drawing::XShape>::get())
     , XIndexAccess(2)
     , XServiceInfo("ScPageObj", "com.sun.star.sheet.SpreadsheetDrawPage")
@@ -106,7 +106,7 @@ uno::Reference<uno::XInterface> ScDrawPageObj::init()
 
 void ScDrawPageObj::setUp()
 {
-    CalcUnoApiTest::setUp();
+    UnoApiTest::setUp();
     // create calc document
     mxComponent = loadFromDesktop("private:factory/scalc");
 }
diff --git a/sc/qa/extras/scdrawpagesobj.cxx b/sc/qa/extras/scdrawpagesobj.cxx
index 9f096acd3e28..b63d4d1d5710 100644
--- a/sc/qa/extras/scdrawpagesobj.cxx
+++ b/sc/qa/extras/scdrawpagesobj.cxx
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <test/calc_unoapi_test.hxx>
+#include <test/unoapi_test.hxx>
 #include <test/container/xelementaccess.hxx>
 #include <test/container/xindexaccess.hxx>
 #include <test/drawing/xdrawpages.hxx>
@@ -29,7 +29,7 @@ using namespace css::uno;
 
 namespace sc_apitest
 {
-class ScDrawPagesObj : public CalcUnoApiTest,
+class ScDrawPagesObj : public UnoApiTest,
                        public apitest::XDrawPages,
                        public apitest::XElementAccess,
                        public apitest::XIndexAccess,
@@ -64,7 +64,7 @@ public:
 };
 
 ScDrawPagesObj::ScDrawPagesObj()
-    : CalcUnoApiTest("/sc/qa/extras/testdocuments")
+    : UnoApiTest("/sc/qa/extras/testdocuments")
     , XElementAccess(cppu::UnoType<drawing::XDrawPage>::get())
     , XIndexAccess(3)
     , XServiceInfo("ScDrawPagesObj", "com.sun.star.drawing.DrawPages")
@@ -86,7 +86,7 @@ uno::Reference<uno::XInterface> ScDrawPagesObj::init()
 
 void ScDrawPagesObj::setUp()
 {
-    CalcUnoApiTest::setUp();
+    UnoApiTest::setUp();
     // create a calc document
     mxComponent = loadFromDesktop("private:factory/scalc");
 }
diff --git a/sc/qa/extras/sceditfieldobj-cell.cxx 
b/sc/qa/extras/sceditfieldobj-cell.cxx
index 8326c88e63a1..79dff2ae7b5a 100644
--- a/sc/qa/extras/sceditfieldobj-cell.cxx
+++ b/sc/qa/extras/sceditfieldobj-cell.cxx
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <test/calc_unoapi_test.hxx>
+#include <test/unoapi_test.hxx>
 #include <test/beans/xpropertyset.hxx>
 #include <test/lang/xcomponent.hxx>
 #include <test/text/textcontent.hxx>
@@ -34,7 +34,7 @@ using namespace css;
 
 namespace sc_apitest
 {
-class ScEditFieldObj_Cell : public CalcUnoApiTest,
+class ScEditFieldObj_Cell : public UnoApiTest,
                             public apitest::TextContent,
                             public apitest::XComponent,
                             public apitest::XPropertySet,
@@ -90,7 +90,7 @@ private:
 uno::Reference<text::XTextField> ScEditFieldObj_Cell::mxField;
 
 ScEditFieldObj_Cell::ScEditFieldObj_Cell()
-    : CalcUnoApiTest("/sc/qa/extras/testdocuments")
+    : UnoApiTest("/sc/qa/extras/testdocuments")
     , TextContent(text::TextContentAnchorType_AS_CHARACTER,
                   text::TextContentAnchorType_AS_CHARACTER, 
text::WrapTextMode_NONE,
                   text::WrapTextMode_NONE)
@@ -99,7 +99,7 @@ ScEditFieldObj_Cell::ScEditFieldObj_Cell()
 
 void ScEditFieldObj_Cell::setUp()
 {
-    CalcUnoApiTest::setUp();
+    UnoApiTest::setUp();
     // Load an empty document.
     mxComponent = loadFromDesktop("private:factory/scalc");
 }
@@ -107,7 +107,7 @@ void ScEditFieldObj_Cell::setUp()
 void ScEditFieldObj_Cell::tearDown()
 {
     mxField.clear();
-    CalcUnoApiTest::tearDown();
+    UnoApiTest::tearDown();
 }
 
 namespace
diff --git a/sc/qa/extras/sceditfieldobj-header.cxx 
b/sc/qa/extras/sceditfieldobj-header.cxx
index cba2b5ce1365..3c577836b692 100644
--- a/sc/qa/extras/sceditfieldobj-header.cxx
+++ b/sc/qa/extras/sceditfieldobj-header.cxx
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <test/calc_unoapi_test.hxx>
+#include <test/unoapi_test.hxx>
 #include <test/beans/xpropertyset.hxx>
 #include <test/lang/xcomponent.hxx>
 #include <test/text/textcontent.hxx>
@@ -34,7 +34,7 @@ using namespace css;
 
 namespace sc_apitest
 {
-class ScEditFieldObj_Header : public CalcUnoApiTest,
+class ScEditFieldObj_Header : public UnoApiTest,
                               public apitest::TextContent,
                               public apitest::XComponent,
                               public apitest::XPropertySet,
@@ -87,7 +87,7 @@ uno::Reference<text::XTextField> 
ScEditFieldObj_Header::mxField;
 uno::Reference<text::XText> ScEditFieldObj_Header::mxRightText;
 
 ScEditFieldObj_Header::ScEditFieldObj_Header()
-    : CalcUnoApiTest("/sc/qa/extras/testdocuments")
+    : UnoApiTest("/sc/qa/extras/testdocuments")
     , TextContent(text::TextContentAnchorType_AS_CHARACTER,
                   text::TextContentAnchorType_AS_CHARACTER, 
text::WrapTextMode_NONE,
                   text::WrapTextMode_NONE)
@@ -96,7 +96,7 @@ ScEditFieldObj_Header::ScEditFieldObj_Header()
 
 void ScEditFieldObj_Header::setUp()
 {
-    CalcUnoApiTest::setUp();
+    UnoApiTest::setUp();
     // Load an empty document.
     mxComponent = loadFromDesktop("private:factory/scalc");
 }
@@ -107,7 +107,7 @@ void ScEditFieldObj_Header::tearDown()
     mxField.clear();
     mxRightText.clear();
 
-    CalcUnoApiTest::tearDown();
+    UnoApiTest::tearDown();
 }
 
 uno::Reference<uno::XInterface> ScEditFieldObj_Header::init()
diff --git a/sc/qa/extras/scfilterdescriptorbase.cxx 
b/sc/qa/extras/scfilterdescriptorbase.cxx
index f4e179236c9d..fead15e96dd2 100644
--- a/sc/qa/extras/scfilterdescriptorbase.cxx
+++ b/sc/qa/extras/scfilterdescriptorbase.cxx
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <test/calc_unoapi_test.hxx>
+#include <test/unoapi_test.hxx>
 #include <test/beans/xpropertyset.hxx>
 #include <test/lang/xserviceinfo.hxx>
 #include <test/sheet/sheetfilterdescriptor.hxx>
@@ -29,7 +29,7 @@ using namespace css::uno;
 
 namespace sc_apitest
 {
-class ScFilterDescriptorBase : public CalcUnoApiTest,
+class ScFilterDescriptorBase : public UnoApiTest,
                                public apitest::SheetFilterDescriptor,
                                public apitest::XPropertySet,
                                public apitest::XServiceInfo,
@@ -74,7 +74,7 @@ public:
 };
 
 ScFilterDescriptorBase::ScFilterDescriptorBase()
-    : CalcUnoApiTest("/sc/qa/extras/testdocuments")
+    : UnoApiTest("/sc/qa/extras/testdocuments")
     , XPropertySet({ "Orientation", "OutputPosition" })
     , XServiceInfo("ScFilterDescriptorBase", 
"com.sun.star.sheet.SheetFilterDescriptor")
 {
@@ -98,7 +98,7 @@ uno::Reference<uno::XInterface> ScFilterDescriptorBase::init()
 
 void ScFilterDescriptorBase::setUp()
 {
-    CalcUnoApiTest::setUp();
+    UnoApiTest::setUp();
     // create a calc document
     mxComponent = loadFromDesktop("private:factory/scalc");
 }
diff --git a/sc/qa/extras/scfunctiondescriptionobj.cxx 
b/sc/qa/extras/scfunctiondescriptionobj.cxx
index 1ef320b9880d..01b8d365721f 100644
--- a/sc/qa/extras/scfunctiondescriptionobj.cxx
+++ b/sc/qa/extras/scfunctiondescriptionobj.cxx
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <test/calc_unoapi_test.hxx>
+#include <test/unoapi_test.hxx>
 #include <test/sheet/functiondescription.hxx>
 
 #include <com/sun/star/beans/PropertyValue.hpp>
@@ -26,7 +26,7 @@ using namespace com::sun::star;
 
 namespace sc_apitest
 {
-class ScFunctionDescriptionObj : public CalcUnoApiTest, public 
apitest::FunctionDescription
+class ScFunctionDescriptionObj : public UnoApiTest, public 
apitest::FunctionDescription
 {
 public:
     ScFunctionDescriptionObj();
@@ -44,7 +44,7 @@ public:
 };
 
 ScFunctionDescriptionObj::ScFunctionDescriptionObj()
-    : CalcUnoApiTest("/sc/qa/extras/testdocuments")
+    : UnoApiTest("/sc/qa/extras/testdocuments")
 {
 }
 
@@ -66,7 +66,7 @@ uno::Sequence<beans::PropertyValue> 
ScFunctionDescriptionObj::init()
 
 void ScFunctionDescriptionObj::setUp()
 {
-    CalcUnoApiTest::setUp();
+    UnoApiTest::setUp();
     // create a calc document
     mxComponent = loadFromDesktop("private:factory/scalc");
 }
diff --git a/sc/qa/extras/scfunctionlistobj.cxx 
b/sc/qa/extras/scfunctionlistobj.cxx
index 71d3e08c5e97..940aba8c3983 100644
--- a/sc/qa/extras/scfunctionlistobj.cxx
+++ b/sc/qa/extras/scfunctionlistobj.cxx
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <test/calc_unoapi_test.hxx>
+#include <test/unoapi_test.hxx>
 #include <test/container/xelementaccess.hxx>
 #include <test/container/xenumerationaccess.hxx>
 #include <test/container/xindexaccess.hxx>
@@ -32,7 +32,7 @@ using namespace com::sun::star;
 
 namespace sc_apitest
 {
-class ScFunctionListObj : public CalcUnoApiTest,
+class ScFunctionListObj : public UnoApiTest,
                           public apitest::XElementAccess,
                           public apitest::XEnumerationAccess,
                           public apitest::XFunctionDescriptions,
@@ -76,7 +76,7 @@ public:
 };
 
 ScFunctionListObj::ScFunctionListObj()
-    : CalcUnoApiTest("/sc/qa/extras/testdocuments")
+    : UnoApiTest("/sc/qa/extras/testdocuments")
     , XElementAccess(cppu::UnoType<uno::Sequence<beans::PropertyValue>>::get())
     , XIndexAccess(395)
     , XNameAccess("IF")
@@ -93,7 +93,7 @@ uno::Reference<uno::XInterface> ScFunctionListObj::init()
 
 void ScFunctionListObj::setUp()
 {
-    CalcUnoApiTest::setUp();
+    UnoApiTest::setUp();
     // create a calc document
     mxComponent = loadFromDesktop("private:factory/scalc");
 }
diff --git a/sc/qa/extras/scheaderfieldsobj.cxx 
b/sc/qa/extras/scheaderfieldsobj.cxx
index ae9c226acace..93b1629587d8 100644
--- a/sc/qa/extras/scheaderfieldsobj.cxx
+++ b/sc/qa/extras/scheaderfieldsobj.cxx
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <test/calc_unoapi_test.hxx>
+#include <test/unoapi_test.hxx>
 #include <test/container/xelementaccess.hxx>
 #include <test/container/xenumerationaccess.hxx>
 #include <test/util/xrefreshable.hxx>
@@ -32,7 +32,7 @@ using namespace css;
 
 namespace sc_apitest
 {
-class ScHeaderFieldsObj : public CalcUnoApiTest,
+class ScHeaderFieldsObj : public UnoApiTest,
                           public apitest::XElementAccess,
                           public apitest::XEnumerationAccess,
                           public apitest::XRefreshable
@@ -68,7 +68,7 @@ private:
 uno::Reference<text::XText> ScHeaderFieldsObj::m_xText;
 
 ScHeaderFieldsObj::ScHeaderFieldsObj()
-    : CalcUnoApiTest("/sc/qa/extras/testdocuments")
+    : UnoApiTest("/sc/qa/extras/testdocuments")
     , ::apitest::XElementAccess(cppu::UnoType<text::XTextField>::get())
 {
 }
@@ -99,7 +99,7 @@ uno::Reference<uno::XInterface> ScHeaderFieldsObj::init()
 
 void ScHeaderFieldsObj::setUp()
 {
-    CalcUnoApiTest::setUp();
+    UnoApiTest::setUp();
     // create calc document
     mxComponent = loadFromDesktop("private:factory/scalc");
 }
@@ -108,7 +108,7 @@ void ScHeaderFieldsObj::tearDown()
 {
     m_xText.clear();
 
-    CalcUnoApiTest::tearDown();
+    UnoApiTest::tearDown();
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(ScHeaderFieldsObj);
diff --git a/sc/qa/extras/scheaderfootercontentobj.cxx 
b/sc/qa/extras/scheaderfootercontentobj.cxx
index 6462e2f5b2b5..24efb2c56b06 100644
--- a/sc/qa/extras/scheaderfootercontentobj.cxx
+++ b/sc/qa/extras/scheaderfootercontentobj.cxx
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <test/calc_unoapi_test.hxx>
+#include <test/unoapi_test.hxx>
 #include <test/sheet/xheaderfootercontent.hxx>
 
 #include <com/sun/star/beans/XPropertySet.hpp>
@@ -27,7 +27,7 @@ using namespace com::sun::star;
 
 namespace sc_apitest
 {
-class ScHeaderFooterContentObj : public CalcUnoApiTest, public 
apitest::XHeaderFooterContent
+class ScHeaderFooterContentObj : public UnoApiTest, public 
apitest::XHeaderFooterContent
 {
 public:
     ScHeaderFooterContentObj();
@@ -46,7 +46,7 @@ public:
 };
 
 ScHeaderFooterContentObj::ScHeaderFooterContentObj()
-    : CalcUnoApiTest("/sc/qa/extras/testdocuments")
+    : UnoApiTest("/sc/qa/extras/testdocuments")
 {
 }
 
@@ -80,7 +80,7 @@ uno::Reference<uno::XInterface> 
ScHeaderFooterContentObj::init()
 
 void ScHeaderFooterContentObj::setUp()
 {
-    CalcUnoApiTest::setUp();
+    UnoApiTest::setUp();
     // create a calc document
     mxComponent = loadFromDesktop("private:factory/scalc");
 }
diff --git a/sc/qa/extras/scimportdescriptorbaseobj.cxx 
b/sc/qa/extras/scimportdescriptorbaseobj.cxx
index 79dfb5b7d8ff..764432ce3ac3 100644
--- a/sc/qa/extras/scimportdescriptorbaseobj.cxx
+++ b/sc/qa/extras/scimportdescriptorbaseobj.cxx
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <test/calc_unoapi_test.hxx>
+#include <test/unoapi_test.hxx>
 #include <test/sheet/databaseimportdescriptor.hxx>
 
 #include <com/sun/star/container/XIndexAccess.hpp>
@@ -26,7 +26,7 @@ using namespace com::sun::star;
 
 namespace sc_apitest
 {
-class ScImportDescriptorBaseObj : public CalcUnoApiTest, public 
apitest::DatabaseImportDescriptor
+class ScImportDescriptorBaseObj : public UnoApiTest, public 
apitest::DatabaseImportDescriptor
 {
 public:
     ScImportDescriptorBaseObj();
@@ -45,7 +45,7 @@ public:
 };
 
 ScImportDescriptorBaseObj::ScImportDescriptorBaseObj()
-    : CalcUnoApiTest("/sc/qa/extras/testdocuments")
+    : UnoApiTest("/sc/qa/extras/testdocuments")
 {
 }
 
@@ -74,7 +74,7 @@ uno::Reference<uno::XInterface> 
ScImportDescriptorBaseObj::getXImportable()
 
 void ScImportDescriptorBaseObj::setUp()
 {
-    CalcUnoApiTest::setUp();
+    UnoApiTest::setUp();
     // create a calc document
     mxComponent = loadFromDesktop("private:factory/scalc");
 }
diff --git a/sc/qa/extras/scindexenumeration_cellannotationsenumeration.cxx 
b/sc/qa/extras/scindexenumeration_cellannotationsenumeration.cxx
index bd5d241e102c..e9e359513a89 100644
--- a/sc/qa/extras/scindexenumeration_cellannotationsenumeration.cxx
+++ b/sc/qa/extras/scindexenumeration_cellannotationsenumeration.cxx
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <test/calc_unoapi_test.hxx>
+#include <test/unoapi_test.hxx>
 #include <test/container/xenumeration.hxx>
 
 #include <com/sun/star/container/XEnumeration.hpp>
@@ -29,7 +29,7 @@ using namespace css::uno;
 
 namespace sc_apitest
 {
-class ScIndexEnumeration_CellAnnotationsEnumeration : public CalcUnoApiTest,
+class ScIndexEnumeration_CellAnnotationsEnumeration : public UnoApiTest,
                                                       public 
apitest::XEnumeration
 {
 public:
@@ -48,7 +48,7 @@ public:
 };
 
 
ScIndexEnumeration_CellAnnotationsEnumeration::ScIndexEnumeration_CellAnnotationsEnumeration()
-    : CalcUnoApiTest("/sc/qa/extras/testdocuments")
+    : UnoApiTest("/sc/qa/extras/testdocuments")
 {
 }
 
@@ -73,7 +73,7 @@ uno::Reference<uno::XInterface> 
ScIndexEnumeration_CellAnnotationsEnumeration::i
 
 void ScIndexEnumeration_CellAnnotationsEnumeration::setUp()
 {
-    CalcUnoApiTest::setUp();
+    UnoApiTest::setUp();
     mxComponent = loadFromDesktop("private:factory/scalc");
 }
 
diff --git a/sc/qa/extras/scindexenumeration_cellarealinksenumeration.cxx 
b/sc/qa/extras/scindexenumeration_cellarealinksenumeration.cxx
index 9c895d1504ab..241f4b947c90 100644
--- a/sc/qa/extras/scindexenumeration_cellarealinksenumeration.cxx
+++ b/sc/qa/extras/scindexenumeration_cellarealinksenumeration.cxx
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <test/calc_unoapi_test.hxx>
+#include <test/unoapi_test.hxx>
 #include <test/container/xenumeration.hxx>
 
 #include <com/sun/star/beans/XPropertySet.hpp>
@@ -25,8 +25,7 @@ using namespace css::uno;
 
 namespace sc_apitest
 {
-class ScIndexEnumeration_CellAreaLinksEnumeration : public CalcUnoApiTest,
-                                                    public 
apitest::XEnumeration
+class ScIndexEnumeration_CellAreaLinksEnumeration : public UnoApiTest, public 
apitest::XEnumeration
 {
 public:
     ScIndexEnumeration_CellAreaLinksEnumeration();
@@ -44,7 +43,7 @@ public:
 };
 
 
ScIndexEnumeration_CellAreaLinksEnumeration::ScIndexEnumeration_CellAreaLinksEnumeration()
-    : CalcUnoApiTest("/sc/qa/extras/testdocuments")
+    : UnoApiTest("/sc/qa/extras/testdocuments")
 {
 }
 
@@ -66,7 +65,7 @@ uno::Reference<uno::XInterface> 
ScIndexEnumeration_CellAreaLinksEnumeration::ini
 
 void ScIndexEnumeration_CellAreaLinksEnumeration::setUp()
 {
-    CalcUnoApiTest::setUp();
+    UnoApiTest::setUp();
     mxComponent = loadFromDesktop("private:factory/scalc");
 }
 
diff --git a/sc/qa/extras/scindexenumeration_databaserangesenumeration.cxx 
b/sc/qa/extras/scindexenumeration_databaserangesenumeration.cxx
index ae4e16ca6974..3a2b66d5699e 100644
--- a/sc/qa/extras/scindexenumeration_databaserangesenumeration.cxx
+++ b/sc/qa/extras/scindexenumeration_databaserangesenumeration.cxx
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <test/calc_unoapi_test.hxx>
+#include <test/unoapi_test.hxx>
 #include <test/container/xenumeration.hxx>
 
 #include <com/sun/star/beans/XPropertySet.hpp>
@@ -25,8 +25,7 @@ using namespace css::uno;
 
 namespace sc_apitest
 {
-class ScIndexEnumeration_DatabaseRangesEnumeration : public CalcUnoApiTest,
-                                                     public 
apitest::XEnumeration
+class ScIndexEnumeration_DatabaseRangesEnumeration : public UnoApiTest, public 
apitest::XEnumeration
 {
 public:
     ScIndexEnumeration_DatabaseRangesEnumeration();
@@ -44,7 +43,7 @@ public:
 };
 
 
ScIndexEnumeration_DatabaseRangesEnumeration::ScIndexEnumeration_DatabaseRangesEnumeration()
-    : CalcUnoApiTest("/sc/qa/extras/testdocuments")
+    : UnoApiTest("/sc/qa/extras/testdocuments")
 {
 }
 
@@ -65,7 +64,7 @@ uno::Reference<uno::XInterface> 
ScIndexEnumeration_DatabaseRangesEnumeration::in
 
 void ScIndexEnumeration_DatabaseRangesEnumeration::setUp()
 {
-    CalcUnoApiTest::setUp();
+    UnoApiTest::setUp();
     mxComponent = loadFromDesktop("private:factory/scalc");
 }
 
diff --git a/sc/qa/extras/scindexenumeration_datapilotfieldsenumeration.cxx 
b/sc/qa/extras/scindexenumeration_datapilotfieldsenumeration.cxx
index 2d94b8e0056a..def3a7f7b1db 100644
--- a/sc/qa/extras/scindexenumeration_datapilotfieldsenumeration.cxx
+++ b/sc/qa/extras/scindexenumeration_datapilotfieldsenumeration.cxx
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <test/calc_unoapi_test.hxx>
+#include <test/unoapi_test.hxx>
 #include <test/container/xenumeration.hxx>
 
 #include <com/sun/star/container/XEnumerationAccess.hpp>
@@ -30,7 +30,7 @@ using namespace css::uno;
 
 namespace sc_apitest
 {
-class ScIndexEnumeration_DataPilotFieldsEnumeration : public CalcUnoApiTest,
+class ScIndexEnumeration_DataPilotFieldsEnumeration : public UnoApiTest,
                                                       public 
apitest::XEnumeration
 {
 public:
@@ -49,7 +49,7 @@ public:
 };
 
 
ScIndexEnumeration_DataPilotFieldsEnumeration::ScIndexEnumeration_DataPilotFieldsEnumeration()
-    : CalcUnoApiTest("/sc/qa/extras/testdocuments")
+    : UnoApiTest("/sc/qa/extras/testdocuments")
 {
 }
 
@@ -87,7 +87,7 @@ uno::Reference<uno::XInterface> 
ScIndexEnumeration_DataPilotFieldsEnumeration::i
 
 void ScIndexEnumeration_DataPilotFieldsEnumeration::setUp()
 {
-    CalcUnoApiTest::setUp();
+    UnoApiTest::setUp();
     mxComponent = loadFromDesktop("private:factory/scalc");
 }
 
diff --git a/sc/qa/extras/scindexenumeration_datapilotitemsenumeration.cxx 
b/sc/qa/extras/scindexenumeration_datapilotitemsenumeration.cxx
index 7b0552080c7c..628b916a7081 100644
--- a/sc/qa/extras/scindexenumeration_datapilotitemsenumeration.cxx
+++ b/sc/qa/extras/scindexenumeration_datapilotitemsenumeration.cxx
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <test/calc_unoapi_test.hxx>
+#include <test/unoapi_test.hxx>
 #include <test/container/xenumeration.hxx>
 
 #include <com/sun/star/beans/XPropertySet.hpp>
@@ -34,8 +34,7 @@ using namespace com::sun::star;
 
 namespace sc_apitest
 {
-class ScIndexEnumeration_DataPilotItemsEnumeration : public CalcUnoApiTest,
-                                                     public 
apitest::XEnumeration
+class ScIndexEnumeration_DataPilotItemsEnumeration : public UnoApiTest, public 
apitest::XEnumeration
 {
 public:
     ScIndexEnumeration_DataPilotItemsEnumeration();
@@ -56,7 +55,7 @@ private:
 };
 

... etc. - the rest is truncated

[Libreoffice-commits] core.git: cppcanvas/qa dbaccess/qa desktop/qa include/test sccomp/qa sc/qa sw/qa test/Library_subsequenttest.mk test/source vcl/qa

Reply via email to