diff options
| author | Jens Carl <j.carl43@gmx.de> | 2018-01-26 23:14:08 +0000 |
|---|---|---|
| committer | Jens Carl <j.carl43@gmx.de> | 2018-01-27 08:32:09 +0100 |
| commit | 06d3f998658c677a42934369a72b18d70165552b (patch) | |
| tree | bd2ecf65d4b2219b690c7e7a2e0d0fd8dd1399bf /sc | |
| parent | 2765189d8bca11a403fe5597f565964a4e6fe019 (diff) | |
Remove shared mxComponent in scarealinkobj
Change-Id: I5bcebbf203b86b7a3875643e66ddd0a783f55986
Reviewed-on: https://gerrit.libreoffice.org/48728
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Jens Carl <j.carl43@gmx.de>
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/qa/extras/scarealinkobj.cxx | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/sc/qa/extras/scarealinkobj.cxx b/sc/qa/extras/scarealinkobj.cxx index c84d0964dbb9..c0c8c6c9b188 100644 --- a/sc/qa/extras/scarealinkobj.cxx +++ b/sc/qa/extras/scarealinkobj.cxx @@ -27,8 +27,6 @@ using namespace css::uno; namespace sc_apitest { -#define NUMBER_OF_TESTS 9 - class ScAreaLinkObj : public CalcUnoApiTest, public apitest::CellAreaLink, public apitest::XAreaLink { public: @@ -56,14 +54,10 @@ public: CPPUNIT_TEST_SUITE_END(); private: - static sal_Int32 nTest; - static uno::Reference< lang::XComponent > mxComponent; + uno::Reference< lang::XComponent > mxComponent; }; -sal_Int32 ScAreaLinkObj::nTest = 0; -uno::Reference< lang::XComponent > ScAreaLinkObj::mxComponent; - ScAreaLinkObj::ScAreaLinkObj() : CalcUnoApiTest("/sc/qa/extras/testdocuments") { @@ -71,10 +65,6 @@ ScAreaLinkObj::ScAreaLinkObj() uno::Reference< uno::XInterface > ScAreaLinkObj::init() { - // create a calc document - if (!mxComponent.is()) - mxComponent = loadFromDesktop("private:factory/scalc"); - uno::Reference< sheet::XSpreadsheetDocument > xDoc(mxComponent, uno::UNO_QUERY_THROW); CPPUNIT_ASSERT_MESSAGE("no calc document", xDoc.is()); @@ -90,19 +80,13 @@ uno::Reference< uno::XInterface > ScAreaLinkObj::init() void ScAreaLinkObj::setUp() { - nTest++; - CPPUNIT_ASSERT(nTest <= NUMBER_OF_TESTS); CalcUnoApiTest::setUp(); + mxComponent = loadFromDesktop("private:factory/scalc"); } void ScAreaLinkObj::tearDown() { - if (nTest == NUMBER_OF_TESTS) - { - closeDocument(mxComponent); - mxComponent.clear(); - } - + closeDocument(mxComponent); CalcUnoApiTest::tearDown(); } |