diff options
| author | Jens Carl <j.carl43@gmx.de> | 2018-01-27 01:26:04 +0000 |
|---|---|---|
| committer | Jens Carl <j.carl43@gmx.de> | 2018-01-27 18:47:59 +0100 |
| commit | 241fe1be3b06d0c4c9cbfffd80a62465e485c1bd (patch) | |
| tree | c582be39587a246c2090f5dd7f51928a2fbe9ce0 | |
| parent | f0850acf53d866da52f527db023f0fbb72c80dbe (diff) | |
Remove shared mxComponent in sccellobj
Change-Id: I4b1fa30316c05cd0527ba429f8ad863db8be77a3
Reviewed-on: https://gerrit.libreoffice.org/48733
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Jens Carl <j.carl43@gmx.de>
| -rw-r--r-- | sc/qa/extras/sccellobj.cxx | 24 |
1 files changed, 3 insertions, 21 deletions
diff --git a/sc/qa/extras/sccellobj.cxx b/sc/qa/extras/sccellobj.cxx index bd572af4c4f5..996d8a9f4268 100644 --- a/sc/qa/extras/sccellobj.cxx +++ b/sc/qa/extras/sccellobj.cxx @@ -27,8 +27,6 @@ using namespace css::uno; namespace sc_apitest { -#define NUMBER_OF_TESTS 3 - class ScCellObj : public CalcUnoApiTest, public apitest::SheetCell, public apitest::XCellAddressable, public apitest::XSheetAnnotationAnchor @@ -54,15 +52,9 @@ public: CPPUNIT_TEST_SUITE_END(); private: - - static sal_Int32 nTest; - static uno::Reference< lang::XComponent > mxComponent; - + uno::Reference< lang::XComponent > mxComponent; }; -sal_Int32 ScCellObj::nTest = 0; -uno::Reference< lang::XComponent > ScCellObj::mxComponent; - ScCellObj::ScCellObj() : CalcUnoApiTest("/sc/qa/extras/testdocuments") { @@ -70,10 +62,6 @@ ScCellObj::ScCellObj() uno::Reference< uno::XInterface > ScCellObj::init() { - // create a calc document - if (!mxComponent.is()) - mxComponent = loadFromDesktop("private:factory/scalc"); - uno::Reference< sheet::XSpreadsheetDocument > xSheetDoc(mxComponent, uno::UNO_QUERY_THROW); CPPUNIT_ASSERT_MESSAGE("no calc document", xSheetDoc.is()); @@ -91,19 +79,13 @@ uno::Reference< uno::XInterface > ScCellObj::init() void ScCellObj::setUp() { - nTest++; - CPPUNIT_ASSERT(nTest <= NUMBER_OF_TESTS); CalcUnoApiTest::setUp(); + mxComponent = loadFromDesktop("private:factory/scalc"); } void ScCellObj::tearDown() { - if (nTest == NUMBER_OF_TESTS) - { - closeDocument(mxComponent); - mxComponent.clear(); - } - + closeDocument(mxComponent); CalcUnoApiTest::tearDown(); } |