move terminate to fixture decorator

7 files changed, 0 insertions, 49 deletions

diff --git a/sc/qa/extras/sccellrangeobj.cxx b/sc/qa/extras/sccellrangeobj.cxx
index 2152a2d0926d..20a5c3aabd35 100644
--- a/sc/qa/extras/sccellrangeobj.cxx
+++ b/sc/qa/extras/sccellrangeobj.cxx
@@ -135,16 +135,9 @@ void ScCellRangeObj::setUp()
 void ScCellRangeObj::tearDown()
 {
     if (nTest == NUMBER_OF_TESTS)
-    {
         closeDocument(mxComponent);
-    }
 
     UnoApiTest::tearDown();
-
-    if (nTest == NUMBER_OF_TESTS)
-    {
-        mxDesktop->terminate();
-    }
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(ScCellRangeObj);
diff --git a/sc/qa/extras/scdatabaserangeobj.cxx b/sc/qa/extras/scdatabaserangeobj.cxx
index 03cf4d5b1d18..1f66f50a3f75 100644
--- a/sc/qa/extras/scdatabaserangeobj.cxx
+++ b/sc/qa/extras/scdatabaserangeobj.cxx
@@ -88,16 +88,9 @@ void ScDatabaseRangeObj::setUp()
 void ScDatabaseRangeObj::tearDown()
 {
     if (nTest == NUMBER_OF_TESTS)
-    {
         closeDocument(mxComponent);
-    }
 
     UnoApiTest::tearDown();
-
-    if (nTest == NUMBER_OF_TESTS)
-    {
-        mxDesktop->terminate();
-    }
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(ScDatabaseRangeObj);
diff --git a/sc/qa/extras/scdatapilotfieldobj.cxx b/sc/qa/extras/scdatapilotfieldobj.cxx
index ff67e4620b75..8e10a16a4f51 100644
--- a/sc/qa/extras/scdatapilotfieldobj.cxx
+++ b/sc/qa/extras/scdatapilotfieldobj.cxx
@@ -102,16 +102,9 @@ void ScDataPilotFieldObj::setUp()
 void ScDataPilotFieldObj::tearDown()
 {
     if (nTest == NUMBER_OF_TESTS)
-    {
         closeDocument(mxComponent);
-    }
 
     UnoApiTest::tearDown();
-
-    if (nTest == NUMBER_OF_TESTS)
-    {
-        mxDesktop->terminate();
-    }
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(ScDataPilotFieldObj);
diff --git a/sc/qa/extras/scdatapilottableobj.cxx b/sc/qa/extras/scdatapilottableobj.cxx
index 18a26d0c5def..99067b2f3a7a 100644
--- a/sc/qa/extras/scdatapilottableobj.cxx
+++ b/sc/qa/extras/scdatapilottableobj.cxx
@@ -164,16 +164,9 @@ void ScDataPilotTableObj::setUp()
 void ScDataPilotTableObj::tearDown()
 {
     if (nTest == NUMBER_OF_TESTS)
-    {
         closeDocument(mxComponent);
-    }
 
     UnoApiTest::tearDown();
-
-    if (nTest == NUMBER_OF_TESTS)
-    {
-        mxDesktop->terminate();
-    }
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(ScDataPilotTableObj);
diff --git a/sc/qa/extras/scnamedrangeobj.cxx b/sc/qa/extras/scnamedrangeobj.cxx
index cdc1f498082d..a9f971ff3b5c 100644
--- a/sc/qa/extras/scnamedrangeobj.cxx
+++ b/sc/qa/extras/scnamedrangeobj.cxx
@@ -118,16 +118,9 @@ void ScNamedRangeObj::setUp()
 void ScNamedRangeObj::tearDown()
 {
     if (nTest == NUMBER_OF_TESTS)
-    {
         closeDocument(mxComponent);
-    }
 
     UnoApiTest::tearDown();
-
-    if (nTest == NUMBER_OF_TESTS)
-    {
-        mxDesktop->terminate();
-    }
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(ScNamedRangeObj);
diff --git a/sc/qa/extras/scnamedrangesobj.cxx b/sc/qa/extras/scnamedrangesobj.cxx
index 7a44bf11d27b..c118d08df6b0 100644
--- a/sc/qa/extras/scnamedrangesobj.cxx
+++ b/sc/qa/extras/scnamedrangesobj.cxx
@@ -89,16 +89,9 @@ void ScNamedRangesObj::setUp()
 void ScNamedRangesObj::tearDown()
 {
     if (nTest == NUMBER_OF_TESTS)
-    {
         closeDocument(mxComponent);
-    }
 
     UnoApiTest::tearDown();
-
-    if (nTest == NUMBER_OF_TESTS)
-    {
-        mxDesktop->terminate();
-    }
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(ScNamedRangesObj);
diff --git a/sc/qa/extras/sctablesheetsobj.cxx b/sc/qa/extras/sctablesheetsobj.cxx
index 8b0b5e963f19..2d7de745d3b1 100644
--- a/sc/qa/extras/sctablesheetsobj.cxx
+++ b/sc/qa/extras/sctablesheetsobj.cxx
@@ -117,16 +117,9 @@ void ScTableSheetsObj::setUp()
 void ScTableSheetsObj::tearDown()
 {
     if (nTest == NUMBER_OF_TESTS)
-    {
         closeDocument(mxComponent);
-    }
 
     UnoApiTest::tearDown();
-
-    if (nTest == NUMBER_OF_TESTS)
-    {
-        mxDesktop->terminate();
-    }
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(ScTableSheetsObj);