diff options
| author | Xisco Fauli <xiscofauli@libreoffice.org> | 2022-10-14 11:11:19 +0200 |
|---|---|---|
| committer | Xisco Fauli <xiscofauli@libreoffice.org> | 2022-10-17 14:48:29 +0200 |
| commit | e6ce4b980da5f89470277ded589ec9805e33e7f9 (patch) | |
| tree | 39585716f1c4ffd63e8d54376c05357673c3c333 | |
| parent | 55628d6b258f77eac8a34a1a8f6bbcbf09fd97cc (diff) | |
CalcUnoApiTest: factor out tearDown
Change-Id: Iae1ae76c1903ff3155da2dd407f1237c29f91840
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141375
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
109 files changed, 1 insertions, 740 deletions
diff --git a/sc/qa/extras/anchor.cxx b/sc/qa/extras/anchor.cxx index 1948356e5e7e..26da82b798d1 100644 --- a/sc/qa/extras/anchor.cxx +++ b/sc/qa/extras/anchor.cxx @@ -35,8 +35,6 @@ class ScAnchorTest : public CalcUnoApiTest public: ScAnchorTest(); - virtual void tearDown() override; - void testUndoAnchor(); void testTdf76183(); void testODFAnchorTypes(); @@ -65,12 +63,6 @@ ScAnchorTest::ScAnchorTest() { } -void ScAnchorTest::tearDown() -{ - closeDocument(mxComponent); - CalcUnoApiTest::tearDown(); -} - void ScAnchorTest::testUndoAnchor() { OUString aFileURL; diff --git a/sc/qa/extras/check_data_pilot_field.cxx b/sc/qa/extras/check_data_pilot_field.cxx index ca5e59ae7be6..781414124cc0 100644 --- a/sc/qa/extras/check_data_pilot_field.cxx +++ b/sc/qa/extras/check_data_pilot_field.cxx @@ -37,7 +37,6 @@ public: CheckDataPilotField(); virtual void setUp() override; - virtual void tearDown() override; uno::Reference<uno::XInterface> init() override; @@ -176,13 +175,6 @@ void CheckDataPilotField::setUp() init(); } -void CheckDataPilotField::tearDown() -{ - closeDocument(mxComponent); - mxComponent.clear(); - CalcUnoApiTest::tearDown(); -} - CPPUNIT_TEST_SUITE_REGISTRATION(CheckDataPilotField); } diff --git a/sc/qa/extras/check_data_pilot_table.cxx b/sc/qa/extras/check_data_pilot_table.cxx index 381b3c550a0c..0b66740b2417 100644 --- a/sc/qa/extras/check_data_pilot_table.cxx +++ b/sc/qa/extras/check_data_pilot_table.cxx @@ -37,7 +37,6 @@ public: CheckDataPilotTable(); virtual void setUp() override; - virtual void tearDown() override; uno::Reference< uno::XInterface > init() override; @@ -173,13 +172,6 @@ void CheckDataPilotTable::setUp() init(); } -void CheckDataPilotTable::tearDown() -{ - closeDocument(mxComponent); - mxComponent.clear(); - CalcUnoApiTest::tearDown(); -} - CPPUNIT_TEST_SUITE_REGISTRATION(CheckDataPilotTable); } diff --git a/sc/qa/extras/check_xcell_ranges_query.cxx b/sc/qa/extras/check_xcell_ranges_query.cxx index 25fbf7e0e1e6..b14c0e3249be 100644 --- a/sc/qa/extras/check_xcell_ranges_query.cxx +++ b/sc/qa/extras/check_xcell_ranges_query.cxx @@ -27,7 +27,6 @@ public: CheckXCellRangesQuery(); virtual void setUp() override; - virtual void tearDown() override; uno::Reference< uno::XInterface > init(); void checkEmptyCell(); @@ -171,13 +170,6 @@ void CheckXCellRangesQuery::setUp() init(); } -void CheckXCellRangesQuery::tearDown() -{ - closeDocument(mxComponent); - mxComponent.clear(); - CalcUnoApiTest::tearDown(); -} - CPPUNIT_TEST_SUITE_REGISTRATION(CheckXCellRangesQuery); } diff --git a/sc/qa/extras/macros-test.cxx b/sc/qa/extras/macros-test.cxx index 587eb454f3eb..1690b4f00824 100644 --- a/sc/qa/extras/macros-test.cxx +++ b/sc/qa/extras/macros-test.cxx @@ -43,8 +43,6 @@ public: ScMacrosTest(); void saveAndReload(const OUString& rFilter); - virtual void tearDown() override; - void testStarBasic(); void testMSP(); void testPasswordProtectedStarBasic(); @@ -133,12 +131,6 @@ void ScMacrosTest::saveAndReload(const OUString& rFilter) mxComponent = loadFromDesktop(aTempFile.GetURL(), "com.sun.star.sheet.SpreadsheetDocument"); } -void ScMacrosTest::tearDown() -{ - closeDocument(mxComponent); - CalcUnoApiTest::tearDown(); -} - // I suppose you could say this test doesn't really belong here, OTOH // we need a full document to run the test ( it related originally to an // imported Excel VBA macro ) It's convenient and fast to unit test diff --git a/sc/qa/extras/new_cond_format.cxx b/sc/qa/extras/new_cond_format.cxx index 2ddf9e639e0e..787773a5671a 100644 --- a/sc/qa/extras/new_cond_format.cxx +++ b/sc/qa/extras/new_cond_format.cxx @@ -35,7 +35,6 @@ public: ScConditionalFormatTest(); virtual void setUp() override; - virtual void tearDown() override; uno::Reference< uno::XInterface > init(sal_Int32 nIndex = 0); void testRequestCondFormatListFromSheet(); @@ -446,12 +445,6 @@ void ScConditionalFormatTest::setUp() mxComponent = loadFromDesktop(aFileURL); } -void ScConditionalFormatTest::tearDown() -{ - closeDocument(mxComponent); - CalcUnoApiTest::tearDown(); -} - CPPUNIT_TEST_SUITE_REGISTRATION(ScConditionalFormatTest); } diff --git a/sc/qa/extras/recordchanges-test.cxx b/sc/qa/extras/recordchanges-test.cxx index e8e2337a2475..6430368b74b9 100644 --- a/sc/qa/extras/recordchanges-test.cxx +++ b/sc/qa/extras/recordchanges-test.cxx @@ -24,8 +24,6 @@ class ScRecordChangesTest : public CalcUnoApiTest public: ScRecordChangesTest(); - virtual void tearDown() override; - void testSetRecordChanges(); void testCheckRecordChangesProtection(); @@ -35,12 +33,6 @@ public: CPPUNIT_TEST_SUITE_END(); }; -void ScRecordChangesTest::tearDown() -{ - closeDocument(mxComponent); - CalcUnoApiTest::tearDown(); -} - void ScRecordChangesTest::testSetRecordChanges() { mxComponent = loadFromDesktop("private:factory/scalc"); diff --git a/sc/qa/extras/scannotationobj.cxx b/sc/qa/extras/scannotationobj.cxx index edcef85b6296..c2f414b6262f 100644 --- a/sc/qa/extras/scannotationobj.cxx +++ b/sc/qa/extras/scannotationobj.cxx @@ -41,7 +41,6 @@ public: ScAnnontationObj(); virtual void setUp() override; - virtual void tearDown() override; virtual uno::Reference<uno::XInterface> init() override; virtual uno::Reference<sheet::XSheetAnnotation> getAnnotation(table::CellAddress&) override; @@ -129,12 +128,6 @@ void ScAnnontationObj::setUp() mxComponent = loadFromDesktop(aFileURL); } -void ScAnnontationObj::tearDown() -{ - closeDocument(mxComponent); - CalcUnoApiTest::tearDown(); -} - CPPUNIT_TEST_SUITE_REGISTRATION(ScAnnontationObj); } // namespace sc_apitest diff --git a/sc/qa/extras/scannotationshapeobj.cxx b/sc/qa/extras/scannotationshapeobj.cxx index 5cc09f9f3468..f90a2341e0c3 100644 --- a/sc/qa/extras/scannotationshapeobj.cxx +++ b/sc/qa/extras/scannotationshapeobj.cxx @@ -107,8 +107,6 @@ void ScAnnotationShapeObj::setUp() void ScAnnotationShapeObj::tearDown() { m_xField.clear(); - closeDocument(mxComponent); - CalcUnoApiTest::tearDown(); } diff --git a/sc/qa/extras/scannotationsobj.cxx b/sc/qa/extras/scannotationsobj.cxx index ffd369d7df2e..d95232ebc0e8 100644 --- a/sc/qa/extras/scannotationsobj.cxx +++ b/sc/qa/extras/scannotationsobj.cxx @@ -40,7 +40,6 @@ public: ScAnnontationsObj(); virtual void setUp() override; - virtual void tearDown() override; virtual uno::Reference< uno::XInterface > init() override; virtual uno::Reference< sheet::XSheetAnnotations > getAnnotations(tools::Long nIndex) override; @@ -105,12 +104,6 @@ void ScAnnontationsObj::setUp() mxComponent = loadFromDesktop(aFileURL); } -void ScAnnontationsObj::tearDown() -{ - closeDocument(mxComponent); - CalcUnoApiTest::tearDown(); -} - CPPUNIT_TEST_SUITE_REGISTRATION(ScAnnontationsObj); } diff --git a/sc/qa/extras/scarealinkobj.cxx b/sc/qa/extras/scarealinkobj.cxx index 6acb22aa3db6..d62a8611461f 100644 --- a/sc/qa/extras/scarealinkobj.cxx +++ b/sc/qa/extras/scarealinkobj.cxx @@ -38,7 +38,6 @@ public: virtual uno::Reference<uno::XInterface> init() override; virtual void setUp() override; - virtual void tearDown() override; CPPUNIT_TEST_SUITE(ScAreaLinkObj); @@ -97,12 +96,6 @@ void ScAreaLinkObj::setUp() mxComponent = loadFromDesktop("private:factory/scalc"); } -void ScAreaLinkObj::tearDown() -{ - closeDocument(mxComponent); - CalcUnoApiTest::tearDown(); -} - CPPUNIT_TEST_SUITE_REGISTRATION(ScAreaLinkObj); } // namespace sc_apitest diff --git a/sc/qa/extras/scarealinksobj.cxx b/sc/qa/extras/scarealinksobj.cxx index 67ff77fecf78..47b14cc63ed8 100644 --- a/sc/qa/extras/scarealinksobj.cxx +++ b/sc/qa/extras/scarealinksobj.cxx @@ -41,7 +41,6 @@ public: virtual uno::Reference<uno::XInterface> init() override; virtual void setUp() override; - virtual void tearDown() override; CPPUNIT_TEST_SUITE(ScAreaLinksObj); @@ -90,12 +89,6 @@ void ScAreaLinksObj::setUp() mxComponent = loadFromDesktop("private:factory/scalc"); } -void ScAreaLinksObj::tearDown() -{ - closeDocument(mxComponent); - CalcUnoApiTest::tearDown(); -} - CPPUNIT_TEST_SUITE_REGISTRATION(ScAreaLinksObj); } // namespace sc_apitest diff --git a/sc/qa/extras/scautoformatobj.cxx b/sc/qa/extras/scautoformatobj.cxx index c5ef48d7bf16..e3a85a2c51ab 100644 --- a/sc/qa/extras/scautoformatobj.cxx +++ b/sc/qa/extras/scautoformatobj.cxx @@ -44,7 +44,6 @@ public: virtual uno::Reference<uno::XInterface> init() override; virtual void setUp() override; - virtual void tearDown() override; CPPUNIT_TEST_SUITE(ScAutoFormatObj); @@ -109,12 +108,6 @@ void ScAutoFormatObj::setUp() mxComponent = loadFromDesktop("private:factory/scalc"); } -void ScAutoFormatObj::tearDown() -{ - closeDocument(mxComponent); - CalcUnoApiTest::tearDown(); -} - CPPUNIT_TEST_SUITE_REGISTRATION(ScAutoFormatObj); } // namespace sc_apitest diff --git a/sc/qa/extras/scautoformatsobj.cxx b/sc/qa/extras/scautoformatsobj.cxx index 7dfd54eb1a62..14192c89e509 100644 --- a/sc/qa/extras/scautoformatsobj.cxx +++ b/sc/qa/extras/scautoformatsobj.cxx @@ -44,7 +44,6 @@ public: virtual uno::Reference<uno::XInterface> init() override; virtual void setUp() override; - virtual void tearDown() override; CPPUNIT_TEST_SUITE(ScAutoFormatsObj); @@ -121,12 +120,6 @@ void ScAutoFormatsObj::setUp() mxComponent = loadFromDesktop("private:factory/scalc"); } -void ScAutoFormatsObj::tearDown() -{ - closeDocument(mxComponent); - CalcUnoApiTest::tearDown(); -} - CPPUNIT_TEST_SUITE_REGISTRATION(ScAutoFormatsObj); } // namespace sc_apitest diff --git a/sc/qa/extras/sccellcursorobj.cxx b/sc/qa/extras/sccellcursorobj.cxx index 5ae195f168b2..5e1ffce7d1f2 100644 --- a/sc/qa/extras/sccellcursorobj.cxx +++ b/sc/qa/extras/sccellcursorobj.cxx @@ -65,7 +65,6 @@ public: ScCellCursorObj(); virtual void setUp() override; - virtual void tearDown() override; virtual uno::Reference< uno::XInterface > init() override; virtual uno::Reference< uno::XInterface > getXCellRangeData() override; virtual uno::Reference< uno::XInterface > getXSpreadsheet() override; @@ -208,12 +207,6 @@ void ScCellCursorObj::setUp() mxComponent = loadFromDesktop(aFileURL, "com.sun.star.sheet.SpreadsheetDocument"); } -void ScCellCursorObj::tearDown() -{ - closeDocument(mxComponent); - CalcUnoApiTest::tearDown(); -} - CPPUNIT_TEST_SUITE_REGISTRATION(ScCellCursorObj); } diff --git a/sc/qa/extras/sccellfieldsobj.cxx b/sc/qa/extras/sccellfieldsobj.cxx index 3f0d086a0ad6..9d7a05e592ab 100644 --- a/sc/qa/extras/sccellfieldsobj.cxx +++ b/sc/qa/extras/sccellfieldsobj.cxx @@ -44,7 +44,6 @@ public: virtual uno::Reference<uno::XInterface> init() override; virtual void setUp() override; - virtual void tearDown() override; CPPUNIT_TEST_SUITE(ScCellFieldsObj); @@ -94,12 +93,6 @@ void ScCellFieldsObj::setUp() mxComponent = loadFromDesktop("private:factory/scalc"); } -void ScCellFieldsObj::tearDown() -{ - closeDocument(mxComponent); - CalcUnoApiTest::tearDown(); -} - CPPUNIT_TEST_SUITE_REGISTRATION(ScCellFieldsObj); } // namespace sc_apitest diff --git a/sc/qa/extras/sccellformatsenumeration.cxx b/sc/qa/extras/sccellformatsenumeration.cxx index 6dd9ca2693d2..e2db66b2a296 100644 --- a/sc/qa/extras/sccellformatsenumeration.cxx +++ b/sc/qa/extras/sccellformatsenumeration.cxx @@ -33,7 +33,6 @@ public: virtual uno::Reference<uno::XInterface> init() override; virtual void setUp() override; - virtual void tearDown() override; CPPUNIT_TEST_SUITE(ScCellFormatsEnumeration); @@ -72,12 +71,6 @@ void ScCellFormatsEnumeration::setUp() mxComponent = loadFromDesktop("private:factory/scalc"); } -void ScCellFormatsEnumeration::tearDown() -{ - closeDocument(mxComponent); - CalcUnoApiTest::tearDown(); -} - CPPUNIT_TEST_SUITE_REGISTRATION(ScCellFormatsEnumeration); } // namespace sc_apitest diff --git a/sc/qa/extras/sccellformatsobj.cxx b/sc/qa/extras/sccellformatsobj.cxx index 7a0fa4ad59d1..8b41a8602562 100644 --- a/sc/qa/extras/sccellformatsobj.cxx +++ b/sc/qa/extras/sccellformatsobj.cxx @@ -40,7 +40,6 @@ public: virtual uno::Reference<uno::XInterface> init() override; virtual void setUp() override; - virtual void tearDown() override; CPPUNIT_TEST_SUITE(ScCellFormatsObj); @@ -85,12 +84,6 @@ void ScCellFormatsObj::setUp() mxComponent = loadFromDesktop("private:factory/scalc"); } -void ScCellFormatsObj::tearDown() -{ - closeDocument(mxComponent); - CalcUnoApiTest::tearDown(); -} - CPPUNIT_TEST_SUITE_REGISTRATION(ScCellFormatsObj); } // namespace sc_apitest diff --git a/sc/qa/extras/sccellobj.cxx b/sc/qa/extras/sccellobj.cxx index 11631f79f4c2..255e7de08ad6 100644 --- a/sc/qa/extras/sccellobj.cxx +++ b/sc/qa/extras/sccellobj.cxx @@ -49,7 +49,6 @@ public: virtual uno::Reference<uno::XInterface> init() override; virtual uno::Reference<uno::XInterface> getXSpreadsheet() override; virtual void setUp() override; - virtual void tearDown() override; CPPUNIT_TEST_SUITE(ScCellObj); @@ -134,12 +133,6 @@ void ScCellObj::setUp() mxComponent = loadFromDesktop("private:factory/scalc"); } -void ScCellObj::tearDown() -{ - closeDocument(mxComponent); - CalcUnoApiTest::tearDown(); -} - CPPUNIT_TEST_SUITE_REGISTRATION(ScCellObj); } // end namespace diff --git a/sc/qa/extras/sccellrangeobj.cxx b/sc/qa/extras/sccellrangeobj.cxx index 0781638e1bf3..ed77e4d64c6d 100644 --- a/sc/qa/extras/sccellrangeobj.cxx +++ b/sc/qa/extras/sccellrangeobj.cxx @@ -76,7 +76,6 @@ public: ScCellRangeObj(); virtual void setUp() override; - virtual void tearDown() override; virtual uno::Reference<uno::XInterface> init() override; virtual uno::Reference<uno::XInterface> getXCellRangeData() override; virtual uno::Reference<uno::XInterface> getXSpreadsheet() override; @@ -251,12 +250,6 @@ void ScCellRangeObj::setUp() mxComponent = loadFromDesktop(aFileURL, "com.sun.star.sheet.SpreadsheetDocument"); } -void ScCellRangeObj::tearDown() -{ - closeDocument(mxComponent); - CalcUnoApiTest::tearDown(); -} - CPPUNIT_TEST_SUITE_REGISTRATION(ScCellRangeObj); } // namespace sc_apitest diff --git a/sc/qa/extras/sccellrangesobj.cxx b/sc/qa/extras/sccellrangesobj.cxx index 69a4339c8743..e87fb5afad7a 100644 --- a/sc/qa/extras/sccellrangesobj.cxx +++ b/sc/qa/extras/sccellrangesobj.cxx @@ -43,7 +43,6 @@ public: ScCellRangesObj(); virtual void setUp() override; - virtual void tearDown() override; virtual uno::Reference<uno::XInterface> getXSpreadsheet() override; virtual uno::Reference<uno::XInterface> init() override; @@ -138,12 +137,6 @@ void ScCellRangesObj::setUp() mxComponent = loadFromDesktop("private:factory/scalc"); } -void ScCellRangesObj::tearDown() -{ - closeDocument(mxComponent); - CalcUnoApiTest::tearDown(); -} - CPPUNIT_TEST_SUITE_REGISTRATION(ScCellRangesObj); } diff --git a/sc/qa/extras/sccellsearchobj.cxx b/sc/qa/extras/sccellsearchobj.cxx index 470f31f258a5..f60a8d8320bf 100644 --- a/sc/qa/extras/sccellsearchobj.cxx +++ b/sc/qa/extras/sccellsearchobj.cxx @@ -40,7 +40,6 @@ public: virtual uno::Reference<uno::XInterface> init() override; virtual void setUp() override; - virtual void tearDown() override; CPPUNIT_TEST_SUITE(ScCellSearchObj); @@ -93,12 +92,6 @@ void ScCellSearchObj::setUp() mxComponent = loadFromDesktop("private:factory/scalc"); } -void ScCellSearchObj::tearDown() -{ - closeDocument(mxComponent); - CalcUnoApiTest::tearDown(); -} - CPPUNIT_TEST_SUITE_REGISTRATION(ScCellSearchObj); } // namespace sc_apitest diff --git a/sc/qa/extras/sccellsenumeration.cxx b/sc/qa/extras/sccellsenumeration.cxx index a6c594a59e9e..6480641a4c26 100644 --- a/sc/qa/extras/sccellsenumeration.cxx +++ b/sc/qa/extras/sccellsenumeration.cxx @@ -36,7 +36,6 @@ public: virtual uno::Reference<uno::XInterface> init() override; virtual void setUp() override; - virtual void tearDown() override; CPPUNIT_TEST_SUITE(ScCellsEnumeration); @@ -85,12 +84,6 @@ void ScCellsEnumeration::setUp() mxComponent = loadFromDesktop("private:factory/scalc"); } -void ScCellsEnumeration::tearDown() -{ - closeDocument(mxComponent); - CalcUnoApiTest::tearDown(); -} - CPPUNIT_TEST_SUITE_REGISTRATION(ScCellsEnumeration); } // namespace sc_apitest diff --git a/sc/qa/extras/sccellsobj.cxx b/sc/qa/extras/sccellsobj.cxx index b96d214d1184..f62427786407 100644 --- a/sc/qa/extras/sccellsobj.cxx +++ b/sc/qa/extras/sccellsobj.cxx @@ -40,7 +40,6 @@ public: virtual uno::Reference<uno::XInterface> init() override; virtual void setUp() override; - virtual void tearDown() override; CPPUNIT_TEST_SUITE(ScCellsObj); @@ -92,12 +91,6 @@ void ScCellsObj::setUp() mxComponent = loadFromDesktop("private:factory/scalc"); } -void ScCellsObj::tearDown() -{ - closeDocument(mxComponent); - CalcUnoApiTest::tearDown(); -} - CPPUNIT_TEST_SUITE_REGISTRATION(ScCellsObj); } // namespace sc_apitest diff --git a/sc/qa/extras/scchartobj.cxx b/sc/qa/extras/scchartobj.cxx index ef45d628c223..3311852189f6 100644 --- a/sc/qa/extras/scchartobj.cxx +++ b/sc/qa/extras/scchartobj.cxx @@ -49,7 +49,6 @@ public: virtual uno::Reference<uno::XInterface> init() override; virtual void setUp() override; - virtual void tearDown() override; CPPUNIT_TEST_SUITE(ScChartObj); @@ -172,12 +171,6 @@ void ScChartObj::setUp() mxComponent = loadFromDesktop("private:factory/scalc"); } -void ScChartObj::tearDown() -{ - closeDocument(mxComponent); - CalcUnoApiTest::tearDown(); -} - CPPUNIT_TEST_SUITE_REGISTRATION(ScChartObj); } // namespace sc_apitest diff --git a/sc/qa/extras/scchartsobj.cxx b/sc/qa/extras/scchartsobj.cxx index e0a6be045d65..a1d744fb47b9 100644 --- a/sc/qa/extras/scchartsobj.cxx +++ b/sc/qa/extras/scchartsobj.cxx @@ -50,7 +50,6 @@ public: virtual uno::Reference<uno::XInterface> init() override; virtual void setUp() override; - virtual void tearDown() override; CPPUNIT_TEST_SUITE(ScChartsObj); @@ -176,12 +175,6 @@ void ScChartsObj::setUp() mxComponent = loadFromDesktop("private:factory/scalc"); } -void ScChartsObj::tearDown() -{ - closeDocument(mxComponent); - CalcUnoApiTest::tearDown(); -} - CPPUNIT_TEST_SUITE_REGISTRATION(ScChartsObj); } // namespace sc_apitest diff --git a/sc/qa/extras/scconsolidationdescriptorobj.cxx b/sc/qa/extras/scconsolidationdescriptorobj.cxx index 259368ace8cd..53c64aaef327 100644 --- a/sc/qa/extras/scconsolidationdescriptorobj.cxx +++ b/sc/qa/extras/scconsolidationdescriptorobj.cxx @@ -30,7 +30,6 @@ public: virtual uno::Reference<uno::XInterface> init() override; virtual void setUp() override; - virtual void tearDown() override; CPPUNIT_TEST_SUITE(ScConsolidationDescriptorObj); @@ -71,12 +70,6 @@ void ScConsolidationDescriptorObj::setUp() mxComponent = loadFromDesktop("private:factory/scalc"); } -void ScConsolidationDescriptorObj::tearDown() -{ - closeDocument(mxComponent); - CalcUnoApiTest::tearDown(); -} - CPPUNIT_TEST_SUITE_REGISTRATION(ScConsolidationDescriptorObj); } // end namespace diff --git a/sc/qa/extras/scdatabaserangeobj.cxx b/sc/qa/extras/scdatabaserangeobj.cxx index 7eeaa6948c64..aab9ce323d3d 100644 --- a/sc/qa/extras/scdatabaserangeobj.cxx +++ b/sc/qa/extras/scdatabaserangeobj.cxx @@ -31,7 +31,6 @@ class ScDatabaseRangeObj : public CalcUnoApiTest, { public: virtual void setUp() override; - virtual void tearDown() override; virtual uno::Reference< uno::XInterface > init() override; virtual uno::Reference< uno::XInterface > init( const OUString& rDBName ) override; @@ -104,12 +103,6 @@ void ScDatabaseRangeObj::setUp() } -void ScDatabaseRangeObj::tearDown() -{ - closeDocument(mxComponent); - CalcUnoApiTest::tearDown(); -} - CPPUNIT_TEST_SUITE_REGISTRATION(ScDatabaseRangeObj); } diff --git a/sc/qa/extras/scdatabaserangesobj.cxx b/sc/qa/extras/scdatabaserangesobj.cxx index 7e387c39c42f..a4ff6f232779 100644 --- a/sc/qa/extras/scdatabaserangesobj.cxx +++ b/sc/qa/extras/scdatabaserangesobj.cxx @@ -46,7 +46,6 @@ public: virtual uno::Reference<uno::XInterface> init() override; virtual void setUp() override; - virtual void tearDown() override; CPPUNIT_TEST_SUITE(ScDatabaseRangesObj); @@ -107,12 +106,6 @@ void ScDatabaseRangesObj::setUp() mxComponent = loadFromDesktop("private:factory/scalc"); } -void ScDatabaseRangesObj::tearDown() -{ - closeDocument(mxComponent); - CalcUnoApiTest::tearDown(); -} - CPPUNIT_TEST_SUITE_REGISTRATION(ScDatabaseRangesObj); } // namespace sc_apitest diff --git a/sc/qa/extras/scdatapilotfieldgroupitemobj.cxx b/sc/qa/extras/scdatapilotfieldgroupitemobj.cxx index 7982c4763449..b6fd8fbcc154 100644 --- a/sc/qa/extras/scdatapilotfieldgroupitemobj.cxx +++ b/sc/qa/extras/scdatapilotfieldgroupitemobj.cxx @@ -47,7 +47,6 @@ public: virtual uno::Reference<uno::XInterface> init() override; virtual void setUp() override; - virtual void tearDown() override; CPPUNIT_TEST_SUITE(ScDataPilotFieldGroupItemObj); @@ -176,12 +175,6 @@ void ScDataPilotFieldGroupItemObj::setUp() mxComponent = loadFromDesktop("private:factory/scalc"); } -void ScDataPilotFieldGroupItemObj::tearDown() -{ - closeDocument(mxComponent); - CalcUnoApiTest::tearDown(); -} - CPPUNIT_TEST_SUITE_REGISTRATION(ScDataPilotFieldGroupItemObj); } // namespace sc_apitest diff --git a/sc/qa/extras/scdatapilotfieldgroupobj.cxx b/sc/qa/extras/scdatapilotfieldgroupobj.cxx index ac8bead1b67b..11363301d8f2 100644 --- a/sc/qa/extras/scdatapilotfieldgroupobj.cxx +++ b/sc/qa/extras/scdatapilotfieldgroupobj.cxx @@ -54,7 +54,6 @@ public: virtual uno::Reference<uno::XInterface> init() override; virtual void setUp() override; - virtual void tearDown() override; CPPUNIT_TEST_SUITE(ScDataPilotFieldGroupObj); @@ -201,12 +200,6 @@ void ScDataPilotFieldGroupObj::setUp() mxComponent = loadFromDesktop("private:factory/scalc"); } -void ScDataPilotFieldGroupObj::tearDown() -{ - closeDocument(mxComponent); - CalcUnoApiTest::tearDown(); -} - CPPUNIT_TEST_SUITE_REGISTRATION(ScDataPilotFieldGroupObj); } // namespace sc_apitest diff --git a/sc/qa/extras/scdatapilotfieldgroupsobj.cxx b/sc/qa/extras/scdatapilotfieldgroupsobj.cxx index ad0d015dd882..e52af4dc1a78 100644 --- a/sc/qa/extras/scdatapilotfieldgroupsobj.cxx +++ b/sc/qa/extras/scdatapilotfieldgroupsobj.cxx @@ -55,7 +55,6 @@ public: virtual uno::Reference<uno::XInterface> init() override; virtual void setUp() override; - virtual void tearDown() override; CPPUNIT_TEST_SUITE(ScDataPilotFieldGroupsObj); @@ -206,12 +205,6 @@ void ScDataPilotFieldGroupsObj::setUp() mxComponent = loadFromDesktop("private:factory/scalc"); } -void ScDataPilotFieldGroupsObj::tearDown() -{ - closeDocument(mxComponent); - CalcUnoApiTest::tearDown(); -} - CPPUNIT_TEST_SUITE_REGISTRATION(ScDataPilotFieldGroupsObj); } // namespace sc_apitest diff --git a/sc/qa/extras/scdatapilotfieldobj.cxx b/sc/qa/extras/scdatapilotfieldobj.cxx index 51fa3f13aead..e8d3a43059b1 100644 --- a/sc/qa/extras/scdatapilotfieldobj.cxx +++ b/sc/qa/extras/scdatapilotfieldobj.cxx @@ -39,7 +39,6 @@ class ScDataPilotFieldObj : public CalcUnoApiTest, { public: virtual void setUp() override; - virtual void tearDown() override; virtual uno::Reference<uno::XInterface> init() override; ScDataPilotFieldObj(); @@ -116,12 +115,6 @@ void ScDataPilotFieldObj::setUp() mxComponent = loadFromDesktop(aFileURL, "com.sun.star.sheet.SpreadsheetDocument"); } -void ScDataPilotFieldObj::tearDown() -{ - closeDocument(mxComponent); - CalcUnoApiTest::tearDown(); -} - CPPUNIT_TEST_SUITE_REGISTRATION(ScDataPilotFieldObj); } // namespace sc_apitest diff --git a/sc/qa/extras/scdatapilotfieldsobj.cxx b/sc/qa/extras/scdatapilotfieldsobj.cxx index 1677942df9d6..ee9be942ff65 100644 --- a/sc/qa/extras/scdatapilotfieldsobj.cxx +++ b/sc/qa/extras/scdatapilotfieldsobj.cxx @@ -44,7 +44,6 @@ public: ScDataPilotFieldsObj(); virtual uno::Reference<uno::XInterface> init() override; virtual void setUp() override; - virtual void tearDown() override; CPPUNIT_TEST_SUITE(ScDataPilotFieldsObj); @@ -121,12 +120,6 @@ void ScDataPilotFieldsObj::setUp() mxComponent = loadFromDesktop("private:factory/scalc"); } -void ScDataPilotFieldsObj::tearDown() -{ - closeDocument(mxComponent); - CalcUnoApiTest::tearDown(); -} - CPPUNIT_TEST_SUITE_REGISTRATION(ScDataPilotFieldsObj); } // namespace sc_apitest diff --git a/sc/qa/extras/scdatapilotitemobj.cxx b/sc/qa/extras/scdatapilotitemobj.cxx index 57bb666b5e31..6217b29a5936 100644 --- a/sc/qa/extras/scdatapilotitemobj.cxx +++ b/sc/qa/extras/scdatapilotitemobj.cxx @@ -37,7 +37,6 @@ class ScDataPilotItemObj : public CalcUnoApiTest, { public: virtual void setUp() override; - virtual void tearDown() override; virtual uno::Reference<uno::XInterface> init() override; ScDataPilotItemObj(); @@ -124,12 +123,6 @@ void ScDataPilotItemObj::setUp() mxComponent = loadFromDesktop("private:factory/scalc"); } -void ScDataPilotItemObj::tearDown() -{ - closeDocument(mxComponent); - CalcUnoApiTest::tearDown(); -} - CPPUNIT_TEST_SUITE_REGISTRATION(ScDataPilotItemObj); } // namespace sc_apitest diff --git a/sc/qa/extras/scdatapilotitemsobj.cxx b/sc/qa/extras/scdatapilotitemsobj.cxx index c8390924dd63..a3a858623a9a 100644 --- a/sc/qa/extras/scdatapilotitemsobj.cxx +++ b/sc/qa/extras/scdatapilotitemsobj.cxx @@ -48,7 +48,6 @@ public: virtual uno::Reference<uno::XInterface> init() override; virtual void setUp() override; - virtual void tearDown() override; CPPUNIT_TEST_SUITE(ScDataPilotItemsObj); @@ -148,12 +147,6 @@ void ScDataPilotItemsObj::setUp() mxComponent = loadFromDesktop("private:factory/scalc"); } -void ScDataPilotItemsObj::tearDown() -{ - closeDocument(mxComponent); - CalcUnoApiTest::tearDown(); -} - CPPUNIT_TEST_SUITE_REGISTRATION(ScDataPilotItemsObj); } // namespace sc_apitest diff --git a/sc/qa/extras/scdatapilottableobj.cxx b/sc/qa/extras/scdatapilottableobj.cxx index 5f4ce9712597..5dcdeea53eb8 100644 --- a/sc/qa/extras/scdatapilottableobj.cxx +++ b/sc/qa/extras/scdatapilottableobj.cxx @@ -35,7 +35,6 @@ public: ScDataPilotTableObj(); virtual void setUp() override; - virtual void tearDown() override; virtual uno::Reference< uno::XInterface > init() override; virtual uno::Reference< uno::XInterface > initDP2() override; virtual uno::Reference< uno::XInterface > getSheets() override; @@ -137,12 +136,6 @@ void ScDataPilotTableObj::setUp() mxComponent = loadFromDesktop(aFileURL, "com.sun.star.sheet.SpreadsheetDocument"); } -void ScDataPilotTableObj::tearDown() -{ - closeDocument(mxComponent); - CalcUnoApiTest::tearDown(); -} - CPPUNIT_TEST_SUITE_REGISTRATION(ScDataPilotTableObj); } diff --git a/sc/qa/extras/scdatapilottablesobj.cxx b/sc/qa/extras/scdatapilottablesobj.cxx index 1847c5db2576..5dcff4302d1d 100644 --- a/sc/qa/extras/scdatapilottablesobj.cxx +++ b/sc/qa/extras/scdatapilottablesobj.cxx @@ -52,7 +52,6 @@ public: virtual uno::Reference<uno::XInterface> init() override; virtual uno::Reference<uno::XInterface> getXSpreadsheet() override; virtual void setUp() override; - virtual void tearDown() override; CPPUNIT_TEST_SUITE(ScDataPilotTablesObj); @@ -134,12 +133,6 @@ void ScDataPilotTablesObj::setUp() mxComponent = loadFromDesktop("private:factory/scalc"); } -void ScDataPilotTablesObj::tearDown() -{ - closeDocument(mxComponent); - CalcUnoApiTest::tearDown(); -} - CPPUNIT_TEST_SUITE_REGISTRATION(ScDataPilotTablesObj); } // namespace sc_apitest diff --git a/sc/qa/extras/scddelinkobj.cxx b/sc/qa/extras/scddelinkobj.cxx index 89855263d14d..9bd598746106 100644 --- a/sc/qa/extras/scddelinkobj.cxx +++ b/sc/qa/extras/scddelinkobj.cxx @@ -69,7 +69,6 @@ public: virtual uno::Reference<uno::XInterface> init() override; virtual void setUp() override; - virtual void tearDown() override; CPPUNIT_TEST_SUITE(ScDDELinkObj); @@ -127,12 +126,6 @@ void ScDDELinkObj::setUp() mxComponent = loadFromDesktop("private:factory/scalc"); } -void ScDDELinkObj::tearDown() -{ - closeDocument(mxComponent); - CalcUnoApiTest::tearDown(); -} - CPPUNIT_TEST_SUITE_REGISTRATION(ScDDELinkObj); } // namespace sc_apitest diff --git a/sc/qa/extras/scddelinksobj.cxx b/sc/qa/extras/scddelinksobj.cxx index 6b628861d0dc..4b23455a758f 100644 --- a/sc/qa/extras/scddelinksobj.cxx +++ b/sc/qa/extras/scddelinksobj.cxx @@ -49,7 +49,6 @@ public: virtual uno::Reference<uno::XInterface> init() override; virtual void setUp() override; - virtual void tearDown() override; CPPUNIT_TEST_SUITE(ScDDELinksObj); @@ -125,12 +124,6 @@ void ScDDELinksObj::setUp() mxComponent = loadFromDesktop("private:factory/scalc"); } -void ScDDELinksObj::tearDown() -{ - closeDocument(mxComponent); - CalcUnoApiTest::tearDown(); -} - CPPUNIT_TEST_SUITE_REGISTRATION(ScDDELinksObj); } // namespace sc_apitest diff --git a/sc/qa/extras/scdocumentconfigurationobj.cxx b/sc/qa/extras/scdocumentconfigurationobj.cxx index af650fe0a56d..052d09b1d512 100644 --- a/sc/qa/extras/scdocumentconfigurationobj.cxx +++ b/sc/qa/extras/scdocumentconfigurationobj.cxx @@ -31,7 +31,6 @@ public: virtual uno::Reference<uno::XInterface> init() override; virtual void setUp() override; - virtual void tearDown() override; CPPUNIT_TEST_SUITE(ScDocumentConfigurationObj); @@ -60,12 +59,6 @@ void ScDocumentConfigurationObj::setUp() mxComponent = loadFromDesktop("private:factory/scalc"); } -void ScDocumentConfigurationObj::tearDown() -{ - closeDocument(mxComponent); - CalcUnoApiTest::tearDown(); -} - CPPUNIT_TEST_SUITE_REGISTRATION(ScDocumentConfigurationObj); } // end namespace diff --git a/sc/qa/extras/scdrawpageobj.cxx b/sc/qa/extras/scdrawpageobj.cxx index 7400493bf8e0..b313b083b3bc 100644 --- a/sc/qa/extras/scdrawpageobj.cxx +++ b/sc/qa/extras/scdrawpageobj.cxx @@ -43,7 +43,6 @@ public: virtual uno::Reference<uno::XInterface> init() override; virtual void setUp() override; - virtual void tearDown() override; CPPUNIT_TEST_SUITE(ScDrawPageObj); @@ -112,12 +111,6 @@ void ScDrawPageObj::setUp() mxComponent = loadFromDesktop("private:factory/scalc"); } -void ScDrawPageObj::tearDown() -{ - closeDocument(mxComponent); - CalcUnoApiTest::tearDown(); -} - CPPUNIT_TEST_SUITE_REGISTRATION(ScDrawPageObj); } // namespace sc_apitest diff --git a/sc/qa/extras/scdrawpagesobj.cxx b/sc/qa/extras/scdrawpagesobj.cxx index c4d53761b11e..9f096acd3e28 100644 --- a/sc/qa/extras/scdrawpagesobj.cxx +++ b/sc/qa/extras/scdrawpagesobj.cxx @@ -40,7 +40,6 @@ public: virtual uno::Reference<uno::XInterface> init() override; virtual void setUp() override; - virtual void tearDown() override; CPPUNIT_TEST_SUITE(ScDrawPagesObj); @@ -92,12 +91,6 @@ void ScDrawPagesObj::setUp() mxComponent = loadFromDesktop("private:factory/scalc"); } -void ScDrawPagesObj::tearDown() -{ - closeDocument(mxComponent); - CalcUnoApiTest::tearDown(); -} - CPPUNIT_TEST_SUITE_REGISTRATION(ScDrawPagesObj); } // namespace sc_apitest diff --git a/sc/qa/extras/sceditfieldobj-cell.cxx b/sc/qa/extras/sceditfieldobj-cell.cxx index ae7c23fcf995..8326c88e63a1 100644 --- a/sc/qa/extras/sceditfieldobj-cell.cxx +++ b/sc/qa/extras/sceditfieldobj-cell.cxx @@ -107,7 +107,6 @@ void ScEditFieldObj_Cell::setUp() void ScEditFieldObj_Cell::tearDown() { mxField.clear(); - closeDocument(mxComponent); CalcUnoApiTest::tearDown(); } diff --git a/sc/qa/extras/sceditfieldobj-header.cxx b/sc/qa/extras/sceditfieldobj-header.cxx index 320b82a07353..cba2b5ce1365 100644 --- a/sc/qa/extras/sceditfieldobj-header.cxx +++ b/sc/qa/extras/sceditfieldobj-header.cxx @@ -106,7 +106,6 @@ void ScEditFieldObj_Header::tearDown() // Clear these before the component is destroyed. This is important! mxField.clear(); mxRightText.clear(); - closeDocument(mxComponent); CalcUnoApiTest::tearDown(); } diff --git a/sc/qa/extras/scfilterdescriptorbase.cxx b/sc/qa/extras/scfilterdescriptorbase.cxx index 51a3e3bf2490..f4e179236c9d 100644 --- a/sc/qa/extras/scfilterdescriptorbase.cxx +++ b/sc/qa/extras/scfilterdescriptorbase.cxx @@ -41,7 +41,6 @@ public: ScFilterDescriptorBase(); virtual void setUp() override; - virtual void tearDown() override; virtual uno::Reference<uno::XInterface> init() override; @@ -104,12 +103,6 @@ void ScFilterDescriptorBase::setUp() mxComponent = loadFromDesktop("private:factory/scalc"); } -void ScFilterDescriptorBase::tearDown() -{ - closeDocument(mxComponent); - CalcUnoApiTest::tearDown(); -} - CPPUNIT_TEST_SUITE_REGISTRATION(ScFilterDescriptorBase); } // namespace sc_apitest diff --git a/sc/qa/extras/scfunctiondescriptionobj.cxx b/sc/qa/extras/scfunctiondescriptionobj.cxx index a30a89d1aea2..1ef320b9880d 100644 --- a/sc/qa/extras/scfunctiondescriptionobj.cxx +++ b/sc/qa/extras/scfunctiondescriptionobj.cxx @@ -34,7 +34,6 @@ public: virtual uno::Sequence<beans::PropertyValue> init() override; virtual void setUp() override; - virtual void tearDown() override; CPPUNIT_TEST_SUITE(ScFunctionDescriptionObj); @@ -72,12 +71,6 @@ void ScFunctionDescriptionObj::setUp() mxComponent = loadFromDesktop("private:factory/scalc"); } -void ScFunctionDescriptionObj::tearDown() -{ - closeDocument(mxComponent); - CalcUnoApiTest::tearDown(); -} - CPPUNIT_TEST_SUITE_REGISTRATION(ScFunctionDescriptionObj); } // end namespace diff --git a/sc/qa/extras/scfunctionlistobj.cxx b/sc/qa/extras/scfunctionlistobj.cxx index 1a5ba0363416..71d3e08c5e97 100644 --- a/sc/qa/extras/scfunctionlistobj.cxx +++ b/sc/qa/extras/scfunctionlistobj.cxx @@ -45,7 +45,6 @@ public: virtual uno::Reference<uno::XInterface> init() override; virtual void setUp() override; - virtual void tearDown() override; CPPUNIT_TEST_SUITE(ScFunctionListObj); @@ -99,12 +98,6 @@ void ScFunctionListObj::setUp() mxComponent = loadFromDesktop("private:factory/scalc"); } -void ScFunctionListObj::tearDown() -{ - closeDocument(mxComponent); - CalcUnoApiTest::tearDown(); -} - CPPUNIT_TEST_SUITE_REGISTRATION(ScFunctionListObj); } // namespace sc_apitest diff --git a/sc/qa/extras/scheaderfieldsobj.cxx b/sc/qa/extras/scheaderfieldsobj.cxx index 6fbd7d1b56a2..ae9c226acace 100644 --- a/sc/qa/extras/scheaderfieldsobj.cxx +++ b/sc/qa/extras/scheaderfieldsobj.cxx @@ -108,7 +108,6 @@ void ScHeaderFieldsObj::tearDown() { m_xText.clear(); - closeDocument(mxComponent); CalcUnoApiTest::tearDown(); } diff --git a/sc/qa/extras/scheaderfootercontentobj.cxx b/sc/qa/extras/scheaderfootercontentobj.cxx index b48d98de6fb9..6462e2f5b2b5 100644 --- a/sc/qa/extras/scheaderfootercontentobj.cxx +++ b/sc/qa/extras/scheaderfootercontentobj.cxx @@ -34,7 +34,6 @@ public: virtual uno::Reference<uno::XInterface> init() override; virtual void setUp() override; - virtual void tearDown() override; CPPUNIT_TEST_SUITE(ScHeaderFooterContentObj); @@ -86,12 +85,6 @@ void ScHeaderFooterContentObj::setUp() mxComponent = loadFromDesktop("private:factory/scalc"); } -void ScHeaderFooterContentObj::tearDown() -{ - closeDocument(mxComponent); - CalcUnoApiTest::tearDown(); -} - CPPUNIT_TEST_SUITE_REGISTRATION(ScHeaderFooterContentObj); } // end namespace diff --git a/sc/qa/extras/scimportdescriptorbaseobj.cxx b/sc/qa/extras/scimportdescriptorbaseobj.cxx index 1d750f26cf3d..79dfb5b7d8ff 100644 --- a/sc/qa/extras/scimportdescriptorbaseobj.cxx +++ b/sc/qa/extras/scimportdescriptorbaseobj.cxx @@ -35,7 +35,6 @@ public: virtual uno::Reference<uno::XInterface> getXImportable() override; virtual void setUp() override; - virtual void tearDown() override; CPPUNIT_TEST_SUITE(ScImportDescriptorBaseObj); @@ -80,12 +79,6 @@ void ScImportDescriptorBaseObj::setUp() mxComponent = loadFromDesktop("private:factory/scalc"); } -void ScImportDescriptorBaseObj::tearDown() -{ - closeDocument(mxComponent); - CalcUnoApiTest::tearDown(); -} - CPPUNIT_TEST_SUITE_REGISTRATION(ScImportDescriptorBaseObj); } // end namespace diff --git a/sc/qa/extras/scindexenumeration_cellannotationsenumeration.cxx b/sc/qa/extras/scindexenumeration_cellannotationsenumeration.cxx index b40b68383109..bd5d241e102c 100644 --- a/sc/qa/extras/scindexenumeration_cellannotationsenumeration.cxx +++ b/sc/qa/extras/scindexenumeration_cellannotationsenumeration.cxx @@ -37,7 +37,6 @@ public: virtual uno::Reference<uno::XInterface> init() override; virtual void setUp() override; - virtual void tearDown() override; CPPUNIT_TEST_SUITE(ScIndexEnumeration_CellAnnotationsEnumeration); @@ -78,12 +77,6 @@ void ScIndexEnumeration_CellAnnotationsEnumeration::setUp() mxComponent = loadFromDesktop("private:factory/scalc"); } -void ScIndexEnumeration_CellAnnotationsEnumeration::tearDown() -{ - closeDocument(mxComponent); - CalcUnoApiTest::tearDown(); -} - CPPUNIT_TEST_SUITE_REGISTRATION(ScIndexEnumeration_CellAnnotationsEnumeration); } // namespace sc_apitest diff --git a/sc/qa/extras/scindexenumeration_cellarealinksenumeration.cxx b/sc/qa/extras/scindexenumeration_cellarealinksenumeration.cxx index a226862c5e88..9c895d1504ab 100644 --- a/sc/qa/extras/scindexenumeration_cellarealinksenumeration.cxx +++ b/sc/qa/extras/scindexenumeration_cellarealinksenumeration.cxx @@ -33,7 +33,6 @@ public: virtual uno::Reference<uno::XInterface> init() override; virtual void setUp() override; - virtual void tearDown() override; CPPUNIT_TEST_SUITE(ScIndexEnumeration_CellAreaLinksEnumeration); @@ -71,12 +70,6 @@ void ScIndexEnumeration_CellAreaLinksEnumeration::setUp() mxComponent = loadFromDesktop("private:factory/scalc"); } -void ScIndexEnumeration_CellAreaLinksEnumeration::tearDown() -{ - closeDocument(mxComponent); - CalcUnoApiTest::tearDown(); -} - CPPUNIT_TEST_SUITE_REGISTRATION(ScIndexEnumeration_CellAreaLinksEnumeration); } // namespace sc_apitest diff --git a/sc/qa/extras/scindexenumeration_databaserangesenumeration.cxx b/sc/qa/extras/scindexenumeration_databaserangesenumeration.cxx index 730c079d834d..ae4e16ca6974 100644 --- a/sc/qa/extras/scindexenumeration_databaserangesenumeration.cxx +++ b/sc/qa/extras/scindexenumeration_databaserangesenumeration.cxx @@ -33,7 +33,6 @@ public: virtual uno::Reference<uno::XInterface> init() override; virtual void setUp() override; - virtual void tearDown() override; CPPUNIT_TEST_SUITE(ScIndexEnumeration_DatabaseRangesEnumeration); @@ -70,12 +69,6 @@ void ScIndexEnumeration_DatabaseRangesEnumeration::setUp() mxComponent = loadFromDesktop("private:factory/scalc"); } -void ScIndexEnumeration_DatabaseRangesEnumeration::tearDown() -{ - closeDocument(mxComponent); - CalcUnoApiTest::tearDown(); -} - CPPUNIT_TEST_SUITE_REGISTRATION(ScIndexEnumeration_DatabaseRangesEnumeration); } // namespace sc_apitest diff --git a/sc/qa/extras/scindexenumeration_datapilotfieldsenumeration.cxx b/sc/qa/extras/scindexenumeration_datapilotfieldsenumeration.cxx index bcf0b962c853..2d94b8e0056a 100644 --- a/sc/qa/extras/scindexenumeration_datapilotfieldsenumeration.cxx +++ b/sc/qa/extras/scindexenumeration_datapilotfieldsenumeration.cxx @@ -38,7 +38,6 @@ public: virtual uno::Reference<uno::XInterface> init() override; virtual void setUp() override; - virtual void tearDown() override; CPPUNIT_TEST_SUITE(ScIndexEnumeration_DataPilotFieldsEnumeration); @@ -92,12 +91,6 @@ void ScIndexEnumeration_DataPilotFieldsEnumeration::setUp() mxComponent = loadFromDesktop("private:factory/scalc"); } -void ScIndexEnumeration_DataPilotFieldsEnumeration::tearDown() -{ - closeDocument(mxComponent); - CalcUnoApiTest::tearDown(); -} - CPPUNIT_TEST_SUITE_REGISTRATION(ScIndexEnumeration_DataPilotFieldsEnumeration); } // namespace sc_apitest diff --git a/sc/qa/extras/scindexenumeration_datapilotitemsenumeration.cxx b/sc/qa/extras/scindexenumeration_datapilotitemsenumeration.cxx index 1ea9ac71737e..7b0552080c7c 100644 --- a/sc/qa/extras/scindexenumeration_datapilotitemsenumeration.cxx +++ b/sc/qa/extras/scindexenumeration_datapilotitemsenumeration.cxx @@ -42,7 +42,6 @@ public: virtual uno::Reference<uno::XInterface> init() override; virtual void setUp() override; - virtual void tearDown() override; CPPUNIT_TEST_SUITE(ScIndexEnumeration_DataPilotItemsEnumeration); @@ -126,12 +125,6 @@ void ScIndexEnumeration_DataPilotItemsEnumeration::setUp() mxComponent = loadFromDesktop("private:factory/scalc"); } -void ScIndexEnumeration_DataPilotItemsEnumeration::tearDown() -{ - closeDocument(mxComponent); - CalcUnoApiTest::tearDown(); -} - CPPUNIT_TEST_SUITE_REGISTRATION(ScIndexEnumeration_DataPilotItemsEnumeration); } // namespace sc_apitest diff --git a/sc/qa/extras/scindexenumeration_datapilottablesenumeration.cxx b/sc/qa/extras/scindexenumeration_datapilottablesenumeration.cxx index c8b93349b622..0fd5b80037a5 100644 --- a/sc/qa/extras/scindexenumeration_datapilottablesenumeration.cxx +++ b/sc/qa/extras/scindexenumeration_datapilottablesenumeration.cxx @@ -38,7 +38,6 @@ public: virtual uno::Reference<uno::XInterface> init() override; virtual void setUp() override; - virtual void tearDown() override; CPPUNIT_TEST_SUITE(ScIndexEnumeration_DataPilotTablesEnumeration); @@ -91,12 +90,6 @@ void ScIndexEnumeration_DataPilotTablesEnumeration::setUp() mxComponent = loadFromDesktop("private:factory/scalc"); } -void ScIndexEnumeration_DataPilotTablesEnumeration::tearDown() -{ - closeDocument(mxComponent); - CalcUnoApiTest::tearDown(); -} - CPPUNIT_TEST_SUITE_REGISTRATION(ScIndexEnumeration_DataPilotTablesEnumeration); } // namespace sc_apitest diff --git a/sc/qa/extras/scindexenumeration_ddelinksenumeration.cxx b/sc/qa/extras/scindexenumeration_ddelinksenumeration.cxx index e0e5d335d60d..d94028e4b118 100644 --- a/sc/qa/extras/scindexenumeration_ddelinksenumeration.cxx +++ b/sc/qa/extras/scindexenumeration_ddelinksenumeration.cxx @@ -35,7 +35,6 @@ public: virtual uno::Reference<uno::XInterface> init() override; virtual void setUp() override; - virtual void tearDown() override; CPPUNIT_TEST_SUITE(ScIndexEnumeration_DDELinksEnumeration); @@ -80,12 +79,6 @@ void ScIndexEnumeration_DDELinksEnumeration::setUp() mxComponent = loadFromDesktop("private:factory/scalc"); } -void ScIndexEnumeration_DDELinksEnumeration::tearDown() -{ - closeDocument(mxComponent); - CalcUnoApiTest::tearDown(); -} - CPPUNIT_TEST_SUITE_REGISTRATION(ScIndexEnumeration_DDELinksEnumeration); } // namespace sc_apitest diff --git a/sc/qa/extras/scindexenumeration_functiondescriptionenumeration.cxx b/sc/qa/extras/scindexenumeration_functiondescriptionenumeration.cxx index 99c88d0e929c..02dab8c87ccc 100644 --- a/sc/qa/extras/scindexenumeration_functiondescriptionenumeration.cxx +++ b/sc/qa/extras/scindexenumeration_functiondescriptionenumeration.cxx @@ -31,7 +31,6 @@ public: virtual uno::Reference<uno::XInterface> init() override; virtual void setUp() override; - virtual void tearDown() override; CPPUNIT_TEST_SUITE(ScIndexEnumeration_FunctionDescriptionEnumeration); @@ -66,12 +65,6 @@ void ScIndexEnumeration_FunctionDescriptionEnumeration::setUp() mxComponent = loadFromDesktop("private:factory/scalc"); } -void ScIndexEnumeration_FunctionDescriptionEnumeration::tearDown() -{ - closeDocument(mxComponent); - CalcUnoApiTest::tearDown(); -} - CPPUNIT_TEST_SUITE_REGISTRATION(ScIndexEnumeration_FunctionDescriptionEnumeration); } // namespace sc_apitest diff --git a/sc/qa/extras/scindexenumeration_labelrangesenumeration.cxx b/sc/qa/extras/scindexenumeration_labelrangesenumeration.cxx index 3727a0741ba0..0272075e2853 100644 --- a/sc/qa/extras/scindexenumeration_labelrangesenumeration.cxx +++ b/sc/qa/extras/scindexenumeration_labelrangesenumeration.cxx @@ -34,7 +34,6 @@ public: virtual uno::Reference<uno::XInterface> init() override; virtual void setUp() override; - virtual void tearDown() override; CPPUNIT_TEST_SUITE(ScIndexEnumeration_LabelRangesEnumeration); @@ -72,12 +71,6 @@ void ScIndexEnumeration_LabelRangesEnumeration::setUp() mxComponent = loadFromDesktop("private:factory/scalc"); } -void ScIndexEnumeration_LabelRangesEnumeration::tearDown() -{ - closeDocument(mxComponent); - CalcUnoApiTest::tearDown(); -} - CPPUNIT_TEST_SUITE_REGISTRATION(ScIndexEnumeration_LabelRangesEnumeration); } // namespace sc_apitest diff --git a/sc/qa/extras/scindexenumeration_namedrangesenumeration.cxx b/sc/qa/extras/scindexenumeration_namedrangesenumeration.cxx index d439653ed6b9..fcc1b3eee6d8 100644 --- a/sc/qa/extras/scindexenumeration_namedrangesenumeration.cxx +++ b/sc/qa/extras/scindexenumeration_namedrangesenumeration.cxx @@ -35,7 +35,6 @@ public: virtual uno::Reference<uno::XInterface> init() override; virtual void setUp() override; - virtual void tearDown() override; CPPUNIT_TEST_SUITE(ScIndexEnumeration_NamedRangesEnumeration); @@ -77,12 +76,6 @@ void ScIndexEnumeration_NamedRangesEnumeration::setUp() mxComponent = loadFromDesktop("private:factory/scalc"); } -void ScIndexEnumeration_NamedRangesEnumeration::tearDown() -{ - closeDocument(mxComponent); - CalcUnoApiTest::tearDown(); -} - CPPUNIT_TEST_SUITE_REGISTRATION(ScIndexEnumeration_NamedRangesEnumeration); } // namespace sc_apitest diff --git a/sc/qa/extras/scindexenumeration_scenariosenumeration.cxx b/sc/qa/extras/scindexenumeration_scenariosenumeration.cxx index 7f8f674ecb48..677a7bf26b9b 100644 --- a/sc/qa/extras/scindexenumeration_scenariosenumeration.cxx +++ b/sc/qa/extras/scindexenumeration_scenariosenumeration.cxx @@ -36,7 +36,6 @@ public: virtual uno::Reference<uno::XInterface> init() override; virtual void setUp() override; - virtual void tearDown() override; CPPUNIT_TEST_SUITE(ScIndexEnumeration_ScenariosEnumeration); @@ -85,12 +84,6 @@ void ScIndexEnumeration_ScenariosEnumeration::setUp() mxComponent = loadFromDesktop("private:factory/scalc"); } -void ScIndexEnumeration_ScenariosEnumeration::tearDown() -{ - closeDocument(mxComponent); - CalcUnoApiTest::tearDown(); -} - CPPUNIT_TEST_SUITE_REGISTRATION(ScIndexEnumeration_ScenariosEnumeration); } // namespace sc_apitest diff --git a/sc/qa/extras/scindexenumeration_sheetcellrangesenumeration.cxx b/sc/qa/extras/scindexenumeration_sheetcellrangesenumeration.cxx index dbb54e0c52d4..1ec9f9d5c687 100644 --- a/sc/qa/extras/scindexenumeration_sheetcellrangesenumeration.cxx +++ b/sc/qa/extras/scindexenumeration_sheetcellrangesenumeration.cxx @@ -37,7 +37,6 @@ public: virtual uno::Reference<uno::XInterface> init() override; virtual void setUp() override; - virtual void tearDown() override; CPPUNIT_TEST_SUITE(ScIndexEnumeration_SheetCellRangesEnumeration); @@ -103,12 +102,6 @@ void ScIndexEnumeration_SheetCellRangesEnumeration::setUp() mxComponent = loadFromDesktop("private:factory/scalc"); } -void ScIndexEnumeration_SheetCellRangesEnumeration::tearDown() -{ - closeDocument(mxComponent); - CalcUnoApiTest::tearDown(); -} - CPPUNIT_TEST_SUITE_REGISTRATION(ScIndexEnumeration_SheetCellRangesEnumeration); } // namespace sc_apitest diff --git a/sc/qa/extras/scindexenumeration_sheetlinksenumeration.cxx b/sc/qa/extras/scindexenumeration_sheetlinksenumeration.cxx index cde30856dca5..2cda4ef722c6 100644 --- a/sc/qa/extras/scindexenumeration_sheetlinksenumeration.cxx +++ b/sc/qa/extras/scindexenumeration_sheetlinksenumeration.cxx @@ -37,7 +37,6 @@ public: virtual uno::Reference<uno::XInterface> init() override; virtual void setUp() override; - virtual void tearDown() override; CPPUNIT_TEST_SUITE(ScIndexEnumeration_SheetLinksEnumeration); @@ -81,12 +80,6 @@ void ScIndexEnumeration_SheetLinksEnumeration::setUp() mxComponent = loadFromDesktop("private:factory/scalc"); } -void ScIndexEnumeration_SheetLinksEnumeration::tearDown() -{ - closeDocument(mxComponent); - CalcUnoApiTest::tearDown(); -} - CPPUNIT_TEST_SUITE_REGISTRATION(ScIndexEnumeration_SheetLinksEnumeration); } // namespace sc_apitest diff --git a/sc/qa/extras/scindexenumeration_spreadsheetsenumeration.cxx b/sc/qa/extras/scindexenumeration_spreadsheetsenumeration.cxx index 08662c9f8d46..1e3e70780068 100644 --- a/sc/qa/extras/scindexenumeration_spreadsheetsenumeration.cxx +++ b/sc/qa/extras/scindexenumeration_spreadsheetsenumeration.cxx @@ -31,7 +31,6 @@ public: virtual uno::Reference<uno::XInterface> init() override; virtual void setUp() override; - virtual void tearDown() override; CPPUNIT_TEST_SUITE(ScIndexEnumeration_SpreadsheetsEnumeration); @@ -64,12 +63,6 @@ void ScIndexEnumeration_SpreadsheetsEnumeration::setUp() mxComponent = loadFromDesktop("private:factory/scalc"); } -void ScIndexEnumeration_SpreadsheetsEnumeration::tearDown() -{ - closeDocument(mxComponent); - CalcUnoApiTest::tearDown(); -} - CPPUNIT_TEST_SUITE_REGISTRATION(ScIndexEnumeration_SpreadsheetsEnumeration); } // namespace sc_apitest diff --git a/sc/qa/extras/scindexenumeration_spreadsheetviewpanesenumeration.cxx b/sc/qa/extras/scindexenumeration_spreadsheetviewpanesenumeration.cxx index 96c645c38bb0..01d138ee1c89 100644 --- a/sc/qa/extras/scindexenumeration_spreadsheetviewpanesenumeration.cxx +++ b/sc/qa/extras/scindexenumeration_spreadsheetviewpanesenumeration.cxx @@ -33,7 +33,6 @@ public: virtual uno::Reference<uno::XInterface> init() override; virtual void setUp() override; - virtual void tearDown() override; CPPUNIT_TEST_SUITE(ScIndexEnumeration_SpreadsheetViewPanesEnumeration); @@ -72,12 +71,6 @@ void ScIndexEnumeration_SpreadsheetViewPanesEnumeration::setUp() mxComponent = loadFromDesktop("private:factory/scalc"); } -void ScIndexEnumeration_SpreadsheetViewPanesEnumeration::tearDown() -{ - closeDocument(mxComponent); - CalcUnoApiTest::tearDown(); -} - CPPUNIT_TEST_SUITE_REGISTRATION(ScIndexEnumeration_SpreadsheetViewPanesEnumeration); } // namespace sc_apitest diff --git a/sc/qa/extras/scindexenumeration_subtotalfieldsenumeration.cxx b/sc/qa/extras/scindexenumeration_subtotalfieldsenumeration.cxx index 12eb4e795620..d7a1f4bbde92 100644 --- a/sc/qa/extras/scindexenumeration_subtotalfieldsenumeration.cxx +++ b/sc/qa/extras/scindexenumeration_subtotalfieldsenumeration.cxx @@ -37,7 +37,6 @@ public: virtual uno::Reference<uno::XInterface> init() override; virtual void setUp() override; - virtual void tearDown() override; CPPUNIT_TEST_SUITE(ScIndexEnumeration_SubTotalFieldsEnumeration); @@ -80,12 +79,6 @@ void ScIndexEnumeration_SubTotalFieldsEnumeration::setUp() mxComponent = loadFromDesktop("private:factory/scalc"); } -void ScIndexEnumeration_SubTotalFieldsEnumeration::tearDown() -{ - closeDocument(mxComponent); - CalcUnoApiTest::tearDown(); -} - CPPUNIT_TEST_SUITE_REGISTRATION(ScIndexEnumeration_SubTotalFieldsEnumeration); } // namespace sc_apitest diff --git a/sc/qa/extras/scindexenumeration_tableautoformatenumeration.cxx b/sc/qa/extras/scindexenumeration_tableautoformatenumeration.cxx index d2bc0373f183..d3694c543692 100644 --- a/sc/qa/extras/scindexenumeration_tableautoformatenumeration.cxx +++ b/sc/qa/extras/scindexenumeration_tableautoformatenumeration.cxx @@ -31,7 +31,6 @@ public: virtual uno::Reference<uno::XInterface> init() override; virtual void setUp() override; - virtual void tearDown() override; CPPUNIT_TEST_SUITE(ScIndexEnumeration_TableAutoFormatEnumeration); @@ -65,12 +64,6 @@ void ScIndexEnumeration_TableAutoFormatEnumeration::setUp() mxComponent = loadFromDesktop("private:factory/scalc"); } -void ScIndexEnumeration_TableAutoFormatEnumeration::tearDown() -{ - closeDocument(mxComponent); - CalcUnoApiTest::tearDown(); -} - CPPUNIT_TEST_SUITE_REGISTRATION(ScIndexEnumeration_TableAutoFormatEnumeration); } // namespace sc_apitest diff --git a/sc/qa/extras/scindexenumeration_tablechartsenumeration.cxx b/sc/qa/extras/scindexenumeration_tablechartsenumeration.cxx index 3cee5eac1876..46b9176876fe 100644 --- a/sc/qa/extras/scindexenumeration_tablechartsenumeration.cxx +++ b/sc/qa/extras/scindexenumeration_tablechartsenumeration.cxx @@ -39,7 +39,6 @@ public: virtual uno::Reference<uno::XInterface> init() override; virtual void setUp() override; - virtual void tearDown() override; CPPUNIT_TEST_SUITE(ScIndexEnumeration_TableChartsEnumeration); @@ -144,12 +143,6 @@ void ScIndexEnumeration_TableChartsEnumeration::setUp() mxComponent = loadFromDesktop("private:factory/scalc"); } -void ScIndexEnumeration_TableChartsEnumeration::tearDown() -{ - closeDocument(mxComponent); - CalcUnoApiTest::tearDown(); -} - CPPUNIT_TEST_SUITE_REGISTRATION(ScIndexEnumeration_TableChartsEnumeration); } // namespace sc_apitest diff --git a/sc/qa/extras/scindexenumeration_tablecolumnsenumeration.cxx b/sc/qa/extras/scindexenumeration_tablecolumnsenumeration.cxx index 0b7e89415953..c0b1d8ea0c4a 100644 --- a/sc/qa/extras/scindexenumeration_tablecolumnsenumeration.cxx +++ b/sc/qa/extras/scindexenumeration_tablecolumnsenumeration.cxx @@ -35,7 +35,6 @@ public: virtual uno::Reference<uno::XInterface> init() override; virtual void setUp() override; - virtual void tearDown() override; CPPUNIT_TEST_SUITE(ScIndexEnumeration_TableColumnsEnumeration); @@ -75,12 +74,6 @@ void ScIndexEnumeration_TableColumnsEnumeration::setUp() mxComponent = loadFromDesktop("private:factory/scalc"); } -void ScIndexEnumeration_TableColumnsEnumeration::tearDown() -{ - closeDocument(mxComponent); - CalcUnoApiTest::tearDown(); -} - CPPUNIT_TEST_SUITE_REGISTRATION(ScIndexEnumeration_TableColumnsEnumeration); } // namespace sc_apitest diff --git a/sc/qa/extras/scindexenumeration_tableconditionalentryenumeration.cxx b/sc/qa/extras/scindexenumeration_tableconditionalentryenumeration.cxx index 977dd8fde6ab..9eeffdb2bb0f 100644 --- a/sc/qa/extras/scindexenumeration_tableconditionalentryenumeration.cxx +++ b/sc/qa/extras/scindexenumeration_tableconditionalentryenumeration.cxx @@ -42,7 +42,6 @@ public: virtual uno::Reference<uno::XInterface> init() override; virtual void setUp() override; - virtual void tearDown() override; CPPUNIT_TEST_SUITE(ScIndexEnumeration_TableConditionalEntryEnumeration); @@ -100,12 +99,6 @@ void ScIndexEnumeration_TableConditionalEntryEnumeration::setUp() mxComponent = loadFromDesktop("private:factory/scalc"); } -void ScIndexEnumeration_TableConditionalEntryEnumeration::tearDown() -{ - closeDocument(mxComponent); - CalcUnoApiTest::tearDown(); -} - CPPUNIT_TEST_SUITE_REGISTRATION(ScIndexEnumeration_TableConditionalEntryEnumeration); } // namespace sc_apitest diff --git a/sc/qa/extras/scindexenumeration_tablerowsenumeration.cxx b/sc/qa/extras/scindexenumeration_tablerowsenumeration.cxx index 69684cd03c2e..e6058d75dea1 100644 --- a/sc/qa/extras/scindexenumeration_tablerowsenumeration.cxx +++ b/sc/qa/extras/scindexenumeration_tablerowsenumeration.cxx @@ -35,7 +35,6 @@ public: virtual uno::Reference<uno::XInterface> init() override; virtual void setUp() override; - virtual void tearDown() override; CPPUNIT_TEST_SUITE(ScIndexEnumeration_TableRowsEnumeration); @@ -77,12 +76,6 @@ void ScIndexEnumeration_TableRowsEnumeration::setUp() mxComponent = loadFromDesktop("private:factory/scalc"); } -void ScIndexEnumeration_TableRowsEnumeration::tearDown() -{ - closeDocument(mxComponent); - CalcUnoApiTest::tearDown(); -} - CPPUNIT_TEST_SUITE_REGISTRATION(ScIndexEnumeration_TableRowsEnumeration); } // namespace sc_apitest diff --git a/sc/qa/extras/scindexenumeration_textfieldenumeration.cxx b/sc/qa/extras/scindexenumeration_textfieldenumeration.cxx index 479bf0c32d0a..f82977249de8 100644 --- a/sc/qa/extras/scindexenumeration_textfieldenumeration.cxx +++ b/sc/qa/extras/scindexenumeration_textfieldenumeration.cxx @@ -38,7 +38,6 @@ public: virtual uno::Reference<uno::XInterface> init() override; virtual void setUp() override; - virtual void tearDown() override; CPPUNIT_TEST_SUITE(ScIndexEnumeration_TextFieldEnumeration); @@ -83,12 +82,6 @@ void ScIndexEnumeration_TextFieldEnumeration::setUp() mxComponent = loadFromDesktop("private:factory/scalc"); } -void ScIndexEnumeration_TextFieldEnumeration::tearDown() -{ - closeDocument(mxComponent); - CalcUnoApiTest::tearDown(); -} - CPPUNIT_TEST_SUITE_REGISTRATION(ScIndexEnumeration_TextFieldEnumeration); } // namespace sc_apitest diff --git a/sc/qa/extras/sclabelrangeobj.cxx b/sc/qa/extras/sclabelrangeobj.cxx index 576dee4b0237..c0a22abd6c8a 100644 --- a/sc/qa/extras/sclabelrangeobj.cxx +++ b/sc/qa/extras/sclabelrangeobj.cxx @@ -33,7 +33,6 @@ public: virtual uno::Reference<uno::XInterface> init() override; virtual void setUp() override; - virtual void tearDown() override; CPPUNIT_TEST_SUITE(ScLabelRangeObj); @@ -73,12 +72,6 @@ void ScLabelRangeObj::setUp() mxComponent = loadFromDesktop("private:factory/scalc"); } -void ScLabelRangeObj::tearDown() -{ - closeDocument(mxComponent); - CalcUnoApiTest::tearDown(); -} - CPPUNIT_TEST_SUITE_REGISTRATION(ScLabelRangeObj); } // end namespace diff --git a/sc/qa/extras/sclabelrangesobj.cxx b/sc/qa/extras/sclabelrangesobj.cxx index 612b19b2d0bd..11dfcb8b6f9d 100644 --- a/sc/qa/extras/sclabelrangesobj.cxx +++ b/sc/qa/extras/sclabelrangesobj.cxx @@ -42,7 +42,6 @@ public: virtual uno::Reference<uno::XInterface> init() override; virtual void setUp() override; - virtual void tearDown() override; CPPUNIT_TEST_SUITE(ScLabelRangesObj); @@ -93,12 +92,6 @@ void ScLabelRangesObj::setUp() mxComponent = loadFromDesktop("private:factory/scalc"); } -void ScLabelRangesObj::tearDown() -{ - closeDocument(mxComponent); - CalcUnoApiTest::tearDown(); -} - CPPUNIT_TEST_SUITE_REGISTRATION(ScLabelRangesObj); } // namespace sc_apitest diff --git a/sc/qa/extras/scmodelobj.cxx b/sc/qa/extras/scmodelobj.cxx index 18323ad05ceb..869e93734a25 100644 --- a/sc/qa/extras/scmodelobj.cxx +++ b/sc/qa/extras/scmodelobj.cxx @@ -40,7 +40,6 @@ class ScModelObj : public CalcUnoApiTest, { public: virtual void setUp() override; - virtual void tearDown() override; virtual uno::Reference<uno::XInterface> init() override; virtual uno::Reference<uno::XInterface> getXMSF() override; @@ -114,12 +113,6 @@ void ScModelObj::setUp() mxComponent = loadFromDesktop(aFileURL, "com.sun.star.sheet.SpreadsheetDocument"); } -void ScModelObj::tearDown() -{ - closeDocument(mxComponent); - CalcUnoApiTest::tearDown(); -} - CPPUNIT_TEST_SUITE_REGISTRATION(ScModelObj); } diff --git a/sc/qa/extras/scnamedrangeobj.cxx b/sc/qa/extras/scnamedrangeobj.cxx index ecc750487608..c50861077b4c 100644 --- a/sc/qa/extras/scnamedrangeobj.cxx +++ b/sc/qa/extras/scnamedrangeobj.cxx @@ -29,7 +29,6 @@ public: ScNamedRangeObj(); virtual void setUp() override; - virtual void tearDown() override; virtual uno::Reference< uno::XInterface > init() override; virtual uno::Reference< sheet::XNamedRange > getNamedRange(const OUString& rRangeName) override; @@ -98,12 +97,6 @@ void ScNamedRangeObj::setUp() mxComponent = loadFromDesktop(aFileURL, "com.sun.star.sheet.SpreadsheetDocument"); } -void ScNamedRangeObj::tearDown() -{ - closeDocument(mxComponent); - CalcUnoApiTest::tearDown(); -} - CPPUNIT_TEST_SUITE_REGISTRATION(ScNamedRangeObj); } diff --git a/sc/qa/extras/scnamedrangesobj.cxx b/sc/qa/extras/scnamedrangesobj.cxx index 84d5782a210d..a0ac40308713 100644 --- a/sc/qa/extras/scnamedrangesobj.cxx +++ b/sc/qa/extras/scnamedrangesobj.cxx @@ -46,7 +46,6 @@ public: ScNamedRangesObj(); virtual void setUp() override; - virtual void tearDown() override; virtual uno::Reference<uno::XInterface> init() override; virtual uno::Reference<uno::XInterface> getXNamedRanges(sal_Int32 nSheet = 0) override; @@ -140,12 +139,6 @@ void ScNamedRangesObj::setUp() mxComponent = loadFromDesktop(aFileURL, "com.sun.star.sheet.SpreadsheetDocument"); } -void ScNamedRangesObj::tearDown() -{ - closeDocument(mxComponent); - CalcUnoApiTest::tearDown(); -} - CPPUNIT_TEST_SUITE_REGISTRATION(ScNamedRangesObj); } // namespace sc_apitest diff --git a/sc/qa/extras/scoutlineobj.cxx b/sc/qa/extras/scoutlineobj.cxx index f85dc7f8722d..2d3d0617c82e 100644 --- a/sc/qa/extras/scoutlineobj.cxx +++ b/sc/qa/extras/scoutlineobj.cxx @@ -25,7 +25,6 @@ public: ScOutlineObj(); virtual void setUp() override; - virtual void tearDown() override; virtual uno::Reference<uno::XInterface> init() override; @@ -68,12 +67,6 @@ void ScOutlineObj::setUp() mxComponent = loadFromDesktop(aFileURL); } -void ScOutlineObj::tearDown() -{ - closeDocument(mxComponent); - CalcUnoApiTest::tearDown(); -} - CPPUNIT_TEST_SUITE_REGISTRATION(ScOutlineObj); } diff --git a/sc/qa/extras/screcentfunctionsobj.cxx b/sc/qa/extras/screcentfunctionsobj.cxx index ac6b6df350c4..0ec7deb350fe 100644 --- a/sc/qa/extras/screcentfunctionsobj.cxx +++ b/sc/qa/extras/screcentfunctionsobj.cxx @@ -30,7 +30,6 @@ public: virtual uno::Reference<uno::XInterface> init() override; virtual void setUp() override; - virtual void tearDown() override; CPPUNIT_TEST_SUITE(ScRecentFunctionsObj); @@ -61,12 +60,6 @@ void ScRecentFunctionsObj::setUp() mxComponent = loadFromDesktop("private:factory/scalc"); } -void ScRecentFunctionsObj::tearDown() -{ - closeDocument(mxComponent); - CalcUnoApiTest::tearDown(); -} - CPPUNIT_TEST_SUITE_REGISTRATION(ScRecentFunctionsObj); } // end namespace diff --git a/sc/qa/extras/scscenariosobj.cxx b/sc/qa/extras/scscenariosobj.cxx index 74212b7ada9f..81b6be267b32 100644 --- a/sc/qa/extras/scscenariosobj.cxx +++ b/sc/qa/extras/scscenariosobj.cxx @@ -50,7 +50,6 @@ public: virtual uno::Reference<uno::XInterface> init() override; virtual void setUp() override; - virtual void tearDown() override; CPPUNIT_TEST_SUITE(ScScenariosObj); @@ -120,12 +119,6 @@ void ScScenariosObj::setUp() mxComponent = loadFromDesktop("private:factory/scalc"); } -void ScScenariosObj::tearDown() -{ - closeDocument(mxComponent); - CalcUnoApiTest::tearDown(); -} - CPPUNIT_TEST_SUITE_REGISTRATION(ScScenariosObj); } // end namespace diff --git a/sc/qa/extras/scshapeobj.cxx b/sc/qa/extras/scshapeobj.cxx index 704718bb826a..5299817e2cee 100644 --- a/sc/qa/extras/scshapeobj.cxx +++ b/sc/qa/extras/scshapeobj.cxx @@ -46,7 +46,6 @@ public: virtual uno::Reference<uno::XInterface> getXSheetDocument() override; virtual void triggerDesktopTerminate() override{}; virtual void setUp() override; - virtual void tearDown() override; CPPUNIT_TEST_SUITE(ScShapeObj); @@ -117,12 +116,6 @@ void ScShapeObj::setUp() mxComponent = loadFromDesktop("private:factory/scalc"); } -void ScShapeObj::tearDown() -{ - closeDocument(mxComponent); - CalcUnoApiTest::tearDown(); -} - CPPUNIT_TEST_SUITE_REGISTRATION(ScShapeObj); } // namespace sc_apitest diff --git a/sc/qa/extras/scsheetlinkobj.cxx b/sc/qa/extras/scsheetlinkobj.cxx index 4fd5f965f5bf..cd45843f24ee 100644 --- a/sc/qa/extras/scsheetlinkobj.cxx +++ b/sc/qa/extras/scsheetlinkobj.cxx @@ -40,7 +40,6 @@ public: virtual uno::Reference<uno::XInterface> init() override; virtual void setUp() override; - virtual void tearDown() override; CPPUNIT_TEST_SUITE(ScSheetLinkObj); @@ -93,12 +92,6 @@ void ScSheetLinkObj::setUp() mxComponent = loadFromDesktop("private:factory/scalc"); } -void ScSheetLinkObj::tearDown() -{ - closeDocument(mxComponent); - CalcUnoApiTest::tearDown(); -} - CPPUNIT_TEST_SUITE_REGISTRATION(ScSheetLinkObj); } // namespace sc_apitest diff --git a/sc/qa/extras/scsheetlinksobj.cxx b/sc/qa/extras/scsheetlinksobj.cxx index 45e2887b4d4f..79384265fa6e 100644 --- a/sc/qa/extras/scsheetlinksobj.cxx +++ b/sc/qa/extras/scsheetlinksobj.cxx @@ -44,7 +44,6 @@ public: virtual uno::Reference<uno::XInterface> init() override; virtual void setUp() override; - virtual void tearDown() override; CPPUNIT_TEST_SUITE(ScSheetLinksObj); @@ -107,12 +106,6 @@ void ScSheetLinksObj::setUp() mxComponent = loadFromDesktop("private:factory/scalc"); } -void ScSheetLinksObj::tearDown() -{ - closeDocument(mxComponent); - CalcUnoApiTest::tearDown(); -} - CPPUNIT_TEST_SUITE_REGISTRATION(ScSheetLinksObj); } // namespace sc_apitest diff --git a/sc/qa/extras/scsortdescriptorbaseobj.cxx b/sc/qa/extras/scsortdescriptorbaseobj.cxx index 52b4af100b21..e4e8c3e6c90e 100644 --- a/sc/qa/extras/scsortdescriptorbaseobj.cxx +++ b/sc/qa/extras/scsortdescriptorbaseobj.cxx @@ -33,7 +33,6 @@ public: virtual uno::Reference<uno::XInterface> init() override; virtual void setUp() override; - virtual void tearDown() override; CPPUNIT_TEST_SUITE(ScSortDescriptorBaseObj); @@ -66,12 +65,6 @@ void ScSortDescriptorBaseObj::setUp() mxComponent = loadFromDesktop("private:factory/scalc"); } -void ScSortDescriptorBaseObj::tearDown() -{ - closeDocument(mxComponent); - CalcUnoApiTest::tearDown(); -} - CPPUNIT_TEST_SUITE_REGISTRATION(ScSortDescriptorBaseObj); } // namespace sc_apitest diff --git a/sc/qa/extras/scspreadsheetsettings.cxx b/sc/qa/extras/scspreadsheetsettings.cxx index 07cb0e0fa19a..7dd91a5b6eee 100644 --- a/sc/qa/extras/scspreadsheetsettings.cxx +++ b/sc/qa/extras/scspreadsheetsettings.cxx @@ -35,7 +35,6 @@ public: virtual uno::Reference<uno::XInterface> init() override; virtual void setUp() override; - virtual void tearDown() override; CPPUNIT_TEST_SUITE(ScSpreadsheetSettings); @@ -79,12 +78,6 @@ void ScSpreadsheetSettings::setUp() mxComponent = loadFromDesktop("private:factory/scalc"); } -void ScSpreadsheetSettings::tearDown() -{ - closeDocument(mxComponent); - CalcUnoApiTest::tearDown(); -} - CPPUNIT_TEST_SUITE_REGISTRATION(ScSpreadsheetSettings); } // namespace sc_apitest diff --git a/sc/qa/extras/scspreadsheetsettingsobj.cxx b/sc/qa/extras/scspreadsheetsettingsobj.cxx index 9304b63c4c32..9d157a53cb98 100644 --- a/sc/qa/extras/scspreadsheetsettingsobj.cxx +++ b/sc/qa/extras/scspreadsheetsettingsobj.cxx @@ -30,7 +30,6 @@ public: virtual uno::Reference<uno::XInterface> init() override; virtual void setUp() override; - virtual void tearDown() override; CPPUNIT_TEST_SUITE(ScSpreadsheetSettingsObj); @@ -80,12 +79,6 @@ void ScSpreadsheetSettingsObj::setUp() mxComponent = loadFromDesktop("private:factory/scalc"); } -void ScSpreadsheetSettingsObj::tearDown() -{ - closeDocument(mxComponent); - CalcUnoApiTest::tearDown(); -} - CPPUNIT_TEST_SUITE_REGISTRATION(ScSpreadsheetSettingsObj); } // namespace sc_apitest diff --git a/sc/qa/extras/scstylefamiliesobj.cxx b/sc/qa/extras/scstylefamiliesobj.cxx index 618d499439cf..cdf417427775 100644 --- a/sc/qa/extras/scstylefamiliesobj.cxx +++ b/sc/qa/extras/scstylefamiliesobj.cxx @@ -130,7 +130,6 @@ void ScStyleFamiliesObj::setUp() void ScStyleFamiliesObj::tearDown() { - closeDocument(mxComponent); closeDocument(m_xSrcComponent); CalcUnoApiTest::tearDown(); } diff --git a/sc/qa/extras/scstylefamilyobj.cxx b/sc/qa/extras/scstylefamilyobj.cxx index 3351959c1022..9966ca65f545 100644 --- a/sc/qa/extras/scstylefamilyobj.cxx +++ b/sc/qa/extras/scstylefamilyobj.cxx @@ -45,7 +45,6 @@ public: virtual uno::Reference<uno::XInterface> init() override; virtual void setUp() override; - virtual void tearDown() override; CPPUNIT_TEST_SUITE(ScStyleFamilyObj); @@ -125,12 +124,6 @@ void ScStyleFamilyObj::setUp() mxComponent = loadFromDesktop("private:factory/scalc"); } -void ScStyleFamilyObj::tearDown() -{ - closeDocument(mxComponent); - CalcUnoApiTest::tearDown(); -} - CPPUNIT_TEST_SUITE_REGISTRATION(ScStyleFamilyObj); } // namespace sc_apitest diff --git a/sc/qa/extras/scstyleobj.cxx b/sc/qa/extras/scstyleobj.cxx index d5d2bdb57fe3..20d7858597d5 100644 --- a/sc/qa/extras/scstyleobj.cxx +++ b/sc/qa/extras/scstyleobj.cxx @@ -37,7 +37,6 @@ public: ScStyleObj(); virtual void setUp() override; - virtual void tearDown() override; virtual uno::Reference<uno::XInterface> init() override; @@ -110,12 +109,6 @@ void ScStyleObj::setUp() mxComponent = loadFromDesktop("private:factory/scalc"); } -void ScStyleObj::tearDown() -{ - closeDocument(mxComponent); - CalcUnoApiTest::tearDown(); -} - CPPUNIT_TEST_SUITE_REGISTRATION(ScStyleObj); } // namespace sc_apitest diff --git a/sc/qa/extras/scsubtotaldescriptorbase.cxx b/sc/qa/extras/scsubtotaldescriptorbase.cxx index 4f07e6c95e40..ca2be0e3d73b 100644 --- a/sc/qa/extras/scsubtotaldescriptorbase.cxx +++ b/sc/qa/extras/scsubtotaldescriptorbase.cxx @@ -49,7 +49,6 @@ public: virtual uno::Reference<uno::XInterface> init() override; virtual void setUp() override; - virtual void tearDown() override; CPPUNIT_TEST_SUITE(ScSubTotalDescriptorBase); @@ -118,12 +117,6 @@ void ScSubTotalDescriptorBase::setUp() mxComponent = loadFromDesktop("private:factory/scalc"); } -void ScSubTotalDescriptorBase::tearDown() -{ - closeDocument(mxComponent); - CalcUnoApiTest::tearDown(); -} - CPPUNIT_TEST_SUITE_REGISTRATION(ScSubTotalDescriptorBase); } // namespace sc_apitest diff --git a/sc/qa/extras/scsubtotalfieldobj.cxx b/sc/qa/extras/scsubtotalfieldobj.cxx index c500b4cc1b30..002f4f4c9083 100644 --- a/sc/qa/extras/scsubtotalfieldobj.cxx +++ b/sc/qa/extras/scsubtotalfieldobj.cxx @@ -37,7 +37,6 @@ public: virtual uno::Reference<uno::XInterface> init() override; virtual void setUp() override; - virtual void tearDown() override; CPPUNIT_TEST_SUITE(ScSubTotalFieldObj); @@ -81,12 +80,6 @@ void ScSubTotalFieldObj::setUp() mxComponent = loadFromDesktop("private:factory/scalc"); } -void ScSubTotalFieldObj::tearDown() -{ - closeDocument(mxComponent); - CalcUnoApiTest::tearDown(); -} - CPPUNIT_TEST_SUITE_REGISTRATION(ScSubTotalFieldObj); } // end namespace diff --git a/sc/qa/extras/sctablecolumnobj.cxx b/sc/qa/extras/sctablecolumnobj.cxx index b757424e401c..ba269dce2cb6 100644 --- a/sc/qa/extras/sctablecolumnobj.cxx +++ b/sc/qa/extras/sctablecolumnobj.cxx @@ -41,7 +41,6 @@ public: virtual uno::Reference<uno::XInterface> init() override; virtual void setUp() override; - virtual void tearDown() override; CPPUNIT_TEST_SUITE(ScTableColumnObj); @@ -139,12 +138,6 @@ void ScTableColumnObj::setUp() mxComponent = loadFromDesktop("private:factory/scalc"); } -void ScTableColumnObj::tearDown() -{ - closeDocument(mxComponent); - CalcUnoApiTest::tearDown(); -} - CPPUNIT_TEST_SUITE_REGISTRATION(ScTableColumnObj); } // namespace sc_apitest diff --git a/sc/qa/extras/sctablecolumnsobj.cxx b/sc/qa/extras/sctablecolumnsobj.cxx index 810474c834df..10c084cbac18 100644 --- a/sc/qa/extras/sctablecolumnsobj.cxx +++ b/sc/qa/extras/sctablecolumnsobj.cxx @@ -48,7 +48,6 @@ public: virtual uno::Reference<uno::XInterface> init() override; virtual void setUp() override; - virtual void tearDown() override; CPPUNIT_TEST_SUITE(ScTableColumnsObj); @@ -131,12 +130,6 @@ void ScTableColumnsObj::setUp() mxComponent = loadFromDesktop("private:factory/scalc"); } -void ScTableColumnsObj::tearDown() -{ - closeDocument(mxComponent); - CalcUnoApiTest::tearDown(); -} - CPPUNIT_TEST_SUITE_REGISTRATION(ScTableColumnsObj); } // namespace sc_apitest diff --git a/sc/qa/extras/sctableconditionalentryobj.cxx b/sc/qa/extras/sctableconditionalentryobj.cxx index 4c76df74153c..b64b0fb0785a 100644 --- a/sc/qa/extras/sctableconditionalentryobj.cxx +++ b/sc/qa/extras/sctableconditionalentryobj.cxx @@ -45,7 +45,6 @@ public: virtual uno::Reference<uno::XInterface> init() override; virtual void setUp() override; - virtual void tearDown() override; CPPUNIT_TEST_SUITE(ScTableConditionalEntryObj); @@ -103,12 +102,6 @@ void ScTableConditionalEntryObj::setUp() mxComponent = loadFromDesktop("private:factory/scalc"); } -void ScTableConditionalEntryObj::tearDown() -{ - closeDocument(mxComponent); - CalcUnoApiTest::tearDown(); -} - CPPUNIT_TEST_SUITE_REGISTRATION(ScTableConditionalEntryObj); } // end namespace diff --git a/sc/qa/extras/sctableconditionalformat.cxx b/sc/qa/extras/sctableconditionalformat.cxx index d64819401e24..261b23e99bb7 100644 --- a/sc/qa/extras/sctableconditionalformat.cxx +++ b/sc/qa/extras/sctableconditionalformat.cxx @@ -55,7 +55,6 @@ public: virtual uno::Reference<uno::XInterface> init() override; virtual uno::Sequence<beans::PropertyValue> createCondition(const sal_Int32 nr) override; virtual void setUp() override; - virtual void tearDown() override; CPPUNIT_TEST_SUITE(ScTableConditionalFormat); @@ -139,12 +138,6 @@ void ScTableConditionalFormat::setUp() mxComponent = loadFromDesktop("private:factory/scalc"); } -void ScTableConditionalFormat::tearDown() -{ - closeDocument(mxComponent); - CalcUnoApiTest::tearDown(); -} - CPPUNIT_TEST_SUITE_REGISTRATION(ScTableConditionalFormat); } // namespace sc_apitest diff --git a/sc/qa/extras/sctablerowobj.cxx b/sc/qa/extras/sctablerowobj.cxx index 3ab8bcc345a9..cd866c17e1bb 100644 --- a/sc/qa/extras/sctablerowobj.cxx +++ b/sc/qa/extras/sctablerowobj.cxx @@ -39,7 +39,6 @@ public: virtual uno::Reference<uno::XInterface> init() override; virtual void setUp() override; - virtual void tearDown() override; CPPUNIT_TEST_SUITE(ScTableRowObj); @@ -128,12 +127,6 @@ void ScTableRowObj::setUp() mxComponent = loadFromDesktop("private:factory/scalc"); } -void ScTableRowObj::tearDown() -{ - closeDocument(mxComponent); - CalcUnoApiTest::tearDown(); -} - CPPUNIT_TEST_SUITE_REGISTRATION(ScTableRowObj); } // namespace sc_apitest diff --git a/sc/qa/extras/sctablerowsobj.cxx b/sc/qa/extras/sctablerowsobj.cxx index 234b4dac63bc..c44b0300e480 100644 --- a/sc/qa/extras/sctablerowsobj.cxx +++ b/sc/qa/extras/sctablerowsobj.cxx @@ -48,7 +48,6 @@ public: virtual uno::Reference<uno::XInterface> init() override; virtual uno::Reference<uno::XInterface> getXCellRange() override; virtual void setUp() override; - virtual void tearDown() override; CPPUNIT_TEST_SUITE(ScTableRowsObj); @@ -119,12 +118,6 @@ void ScTableRowsObj::setUp() mxComponent = loadFromDesktop("private:factory/scalc"); } -void ScTableRowsObj::tearDown() -{ - closeDocument(mxComponent); - CalcUnoApiTest::tearDown(); -} - CPPUNIT_TEST_SUITE_REGISTRATION(ScTableRowsObj); } // namespace sc_apitest diff --git a/sc/qa/extras/sctablesheetobj.cxx b/sc/qa/extras/sctablesheetobj.cxx index f8e84a5852ba..46a3c2b013aa 100644 --- a/sc/qa/extras/sctablesheetobj.cxx +++ b/sc/qa/extras/sctablesheetobj.cxx @@ -95,7 +95,6 @@ public: ScTableSheetObj(); virtual void setUp() override; - virtual void tearDown() override; virtual OUString getFileURL() override; @@ -359,12 +358,6 @@ void ScTableSheetObj::setUp() mxComponent = loadFromDesktop(maFileURL, "com.sun.star.sheet.SpreadsheetDocument"); } -void ScTableSheetObj::tearDown() -{ - closeDocument(mxComponent); - CalcUnoApiTest::tearDown(); -} - CPPUNIT_TEST_SUITE_REGISTRATION(ScTableSheetObj); } diff --git a/sc/qa/extras/sctablesheetsobj.cxx b/sc/qa/extras/sctablesheetsobj.cxx index af1d0b56d123..e23a85966a1e 100644 --- a/sc/qa/extras/sctablesheetsobj.cxx +++ b/sc/qa/extras/sctablesheetsobj.cxx @@ -48,7 +48,6 @@ public: ScTableSheetsObj(); virtual void setUp() override; - virtual void tearDown() override; virtual uno::Reference<uno::XInterface> init() override; CPPUNIT_TEST_SUITE(ScTableSheetsObj); @@ -155,12 +154,6 @@ void ScTableSheetsObj::setUp() mxComponent = loadFromDesktop(aFileURL); } -void ScTableSheetsObj::tearDown() -{ - closeDocument(mxComponent); - CalcUnoApiTest::tearDown(); -} - CPPUNIT_TEST_SUITE_REGISTRATION(ScTableSheetsObj); } // namespace sc_apitest diff --git a/sc/qa/extras/sctablevalidationobj.cxx b/sc/qa/extras/sctablevalidationobj.cxx index 2d3584003306..8c7037b8a621 100644 --- a/sc/qa/extras/sctablevalidationobj.cxx +++ b/sc/qa/extras/sctablevalidationobj.cxx @@ -42,7 +42,6 @@ public: virtual uno::Reference<uno::XInterface> init() override; virtual void setUp() override; - virtual void tearDown() override; CPPUNIT_TEST_SUITE(ScTableValidationObj); @@ -106,12 +105,6 @@ void ScTableValidationObj::setUp() mxComponent = loadFromDesktop("private:factory/scalc"); } -void ScTableValidationObj::tearDown() -{ - closeDocument(mxComponent); - CalcUnoApiTest::tearDown(); -} - CPPUNIT_TEST_SUITE_REGISTRATION(ScTableValidationObj); } // namespace sc_apitest diff --git a/sc/qa/extras/sctabviewobj.cxx b/sc/qa/extras/sctabviewobj.cxx index aa522612deaa..fd6342cd4995 100644 --- a/sc/qa/extras/sctabviewobj.cxx +++ b/sc/qa/extras/sctabviewobj.cxx @@ -53,7 +53,6 @@ public: virtual uno::Reference<uno::XInterface> getXSpreadsheet(const sal_Int16 nNumber = 0) override; virtual void setUp() override; - virtual void tearDown() override; CPPUNIT_TEST_SUITE(ScTabViewObj); @@ -125,12 +124,6 @@ void ScTabViewObj::setUp() mxComponent = loadFromDesktop("private:factory/scalc"); } -void ScTabViewObj::tearDown() -{ - closeDocument(mxComponent); - CalcUnoApiTest::tearDown(); -} - CPPUNIT_TEST_SUITE_REGISTRATION(ScTabViewObj); } // namespace sc_apitest diff --git a/sc/qa/extras/scuniquecellformatsenumeration.cxx b/sc/qa/extras/scuniquecellformatsenumeration.cxx index a19015a29197..8fdff01c13c5 100644 --- a/sc/qa/extras/scuniquecellformatsenumeration.cxx +++ b/sc/qa/extras/scuniquecellformatsenumeration.cxx @@ -56,7 +56,6 @@ public: virtual uno::Reference<uno::XInterface> init() override; virtual void setUp() override; - virtual void tearDown() override; CPPUNIT_TEST_SUITE(ScUniqueCellFormatsEnumeration); @@ -105,12 +104,6 @@ void ScUniqueCellFormatsEnumeration::setUp() mxComponent = loadFromDesktop("private:factory/scalc"); } -void ScUniqueCellFormatsEnumeration::tearDown() -{ - closeDocument(mxComponent); - CalcUnoApiTest::tearDown(); -} - void ScUniqueCellFormatsEnumeration::changeColor(const uno::Reference<sheet::XSpreadsheet>& xSheet, const OUString& sRangeName, const RGBColor& rgb) { diff --git a/sc/qa/extras/scuniquecellformatsobj.cxx b/sc/qa/extras/scuniquecellformatsobj.cxx index 27bc64656268..0114a1c1f524 100644 --- a/sc/qa/extras/scuniquecellformatsobj.cxx +++ b/sc/qa/extras/scuniquecellformatsobj.cxx @@ -40,7 +40,6 @@ public: virtual uno::Reference<uno::XInterface> init() override; virtual void setUp() override; - virtual void tearDown() override; CPPUNIT_TEST_SUITE(ScUniqueCellFormatsObj); @@ -84,12 +83,6 @@ void ScUniqueCellFormatsObj::setUp() mxComponent = loadFromDesktop("private:factory/scalc"); } -void ScUniqueCellFormatsObj::tearDown() -{ - closeDocument(mxComponent); - CalcUnoApiTest::tearDown(); -} - CPPUNIT_TEST_SUITE_REGISTRATION(ScUniqueCellFormatsObj); } // namespace sc_apitest diff --git a/sc/qa/extras/scviewpaneobj.cxx b/sc/qa/extras/scviewpaneobj.cxx index 61bb46683c3b..157bb60d202f 100644 --- a/sc/qa/extras/scviewpaneobj.cxx +++ b/sc/qa/extras/scviewpaneobj.cxx @@ -48,7 +48,6 @@ public: virtual uno::Reference<uno::XInterface> init() override; virtual uno::Reference<uno::XInterface> getXComponent() override; virtual void setUp() override; - virtual void tearDown() override; CPPUNIT_TEST_SUITE(ScViewPaneObj); @@ -122,12 +121,6 @@ void ScViewPaneObj::setUp() mxComponent = loadFromDesktop("private:factory/scalc"); } -void ScViewPaneObj::tearDown() -{ - closeDocument(mxComponent); - CalcUnoApiTest::tearDown(); -} - CPPUNIT_TEST_SUITE_REGISTRATION(ScViewPaneObj); } // namespace sc_apitest diff --git a/sc/qa/extras/vba-macro-test.cxx b/sc/qa/extras/vba-macro-test.cxx index e4055073be33..c9b0ac800d4e 100644 --- a/sc/qa/extras/vba-macro-test.cxx +++ b/sc/qa/extras/vba-macro-test.cxx @@ -42,8 +42,6 @@ public: { } - virtual void tearDown() override; - void testSimpleCopyAndPaste(); void testMultiDocumentCopyAndPaste(); void testSheetAndColumnSelectAndHide(); @@ -89,12 +87,6 @@ public: CPPUNIT_TEST_SUITE_END(); }; -void VBAMacroTest::tearDown() -{ - closeDocument(mxComponent); - CalcUnoApiTest::tearDown(); -} - void VBAMacroTest::testSimpleCopyAndPaste() { // Copy-paste values in the same sheet diff --git a/sc/qa/perf/scperfobj.cxx b/sc/qa/perf/scperfobj.cxx index 28c2327a8153..662ad39f5550 100644 --- a/sc/qa/perf/scperfobj.cxx +++ b/sc/qa/perf/scperfobj.cxx @@ -58,8 +58,6 @@ public: ScPerfObj(); - virtual void tearDown() override; - uno::Reference< uno::XInterface > init(std::u16string_view aFileName); CPPUNIT_TEST_SUITE(ScPerfObj); @@ -118,16 +116,6 @@ uno::Reference< uno::XInterface > ScPerfObj::init(std::u16string_view aFileName) return mxComponent; } -void ScPerfObj::tearDown() -{ - if (mxComponent.is()) - { - closeDocument(mxComponent); - mxComponent.clear(); - } - CalcUnoApiTest::tearDown(); -} - void ScPerfObj::testSheetFindAll() { diff --git a/sc/qa/unit/cond_format_merge.cxx b/sc/qa/unit/cond_format_merge.cxx index 3ad2034343d1..495dee274379 100644 --- a/sc/qa/unit/cond_format_merge.cxx +++ b/sc/qa/unit/cond_format_merge.cxx @@ -27,8 +27,6 @@ class ScCondFormatMergeTest : public CalcUnoApiTest public: ScCondFormatMergeTest(); - virtual void tearDown() override; - void testCondFormatMerge(); CPPUNIT_TEST_SUITE(ScCondFormatMergeTest); @@ -41,12 +39,6 @@ ScCondFormatMergeTest::ScCondFormatMergeTest() { } -void ScCondFormatMergeTest::tearDown() -{ - closeDocument(mxComponent); - CalcUnoApiTest::tearDown(); -} - void ScCondFormatMergeTest::testCondFormatMerge() { OUString aFileURL; diff --git a/test/source/calc_unoapi_test.cxx b/test/source/calc_unoapi_test.cxx index 8d7e218d9cda..578ac9d97c2d 100644 --- a/test/source/calc_unoapi_test.cxx +++ b/test/source/calc_unoapi_test.cxx @@ -30,6 +30,7 @@ void CalcUnoApiTest::setUp() void CalcUnoApiTest::tearDown() { + closeDocument(mxComponent); uno::Reference< lang::XComponent >( m_xCalcComponent, UNO_QUERY_THROW )->dispose(); UnoApiTest::tearDown(); } |