summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@googlemail.com>2012-01-18 10:25:53 +0100
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2012-01-18 18:12:11 +0100
commit206b748f884da6b3bd9628a0e1f3ed6fa38918f6 (patch)
tree851cea80fd2a4cf175cac39750cba94c3ac6b560
parentterminate xcellrangesquery correctly (diff)
downloadcore-206b748f884da6b3bd9628a0e1f3ed6fa38918f6.tar.gz
core-206b748f884da6b3bd9628a0e1f3ed6fa38918f6.zip
it is not possible to start/terminate libreoffice twice in the same program
we have a static variable that prevents us from terminating libreoffice in this case here
-rw-r--r--sc/qa/extras/cellproperties.cxx5
-rw-r--r--sc/qa/extras/xcellrangesquery.cxx5
2 files changed, 0 insertions, 10 deletions
diff --git a/sc/qa/extras/cellproperties.cxx b/sc/qa/extras/cellproperties.cxx
index c86d33ad0c0d..29379153c54a 100644
--- a/sc/qa/extras/cellproperties.cxx
+++ b/sc/qa/extras/cellproperties.cxx
@@ -139,11 +139,6 @@ void ScCellProperties::tearDown()
UnoApiTest::tearDown();
- if (nTest == NUMBER_OF_TESTS)
- {
- mxDesktop->terminate();
- uno::Reference< lang::XComponent>(m_xContext, UNO_QUERY_THROW)->dispose();
- }
}
CPPUNIT_TEST_SUITE_REGISTRATION(ScCellProperties);
diff --git a/sc/qa/extras/xcellrangesquery.cxx b/sc/qa/extras/xcellrangesquery.cxx
index 78654e37ef08..a5a5a6fb926c 100644
--- a/sc/qa/extras/xcellrangesquery.cxx
+++ b/sc/qa/extras/xcellrangesquery.cxx
@@ -185,11 +185,6 @@ void ScXCellRangesQuery::tearDown()
UnoApiTest::tearDown();
- if (nTest == NUMBER_OF_TESTS)
- {
- mxDesktop->terminate();
- uno::Reference< lang::XComponent>(m_xContext, UNO_QUERY_THROW)->dispose();
- }
}
CPPUNIT_TEST_SUITE_REGISTRATION(ScXCellRangesQuery);