diff options
| author | Jens Carl <j.carl43@gmx.de> | 2018-01-27 01:09:24 +0000 |
|---|---|---|
| committer | Jens Carl <j.carl43@gmx.de> | 2018-01-27 08:32:17 +0100 |
| commit | 926ce174109c6e140012bf2dca92650f38d7e9ba (patch) | |
| tree | efbfcd9d84592bd182368d3af0e175ffc0898fa6 /sc | |
| parent | 06d3f998658c677a42934369a72b18d70165552b (diff) | |
Remove shared mxComponent in scarealinksobj
Change-Id: I86263b5d023b095759d572421d3ef1fc291c0cfd
Reviewed-on: https://gerrit.libreoffice.org/48730
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Jens Carl <j.carl43@gmx.de>
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/qa/extras/scarealinksobj.cxx | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/sc/qa/extras/scarealinksobj.cxx b/sc/qa/extras/scarealinksobj.cxx index 21a90ee6f6c0..df65526c8d0f 100644 --- a/sc/qa/extras/scarealinksobj.cxx +++ b/sc/qa/extras/scarealinksobj.cxx @@ -22,8 +22,6 @@ using namespace css::uno; namespace sc_apitest { -#define NUMBER_OF_TESTS 2 - class ScAreaLinksObj : public CalcUnoApiTest, public apitest::XAreaLinks { public: @@ -42,14 +40,10 @@ public: CPPUNIT_TEST_SUITE_END(); private: - static sal_Int32 nTest; - static uno::Reference< lang::XComponent > mxComponent; + uno::Reference< lang::XComponent > mxComponent; }; -sal_Int32 ScAreaLinksObj::nTest = 0; -uno::Reference< lang::XComponent > ScAreaLinksObj::mxComponent; - ScAreaLinksObj::ScAreaLinksObj() : CalcUnoApiTest("/sc/qa/extras/testdocuments") { @@ -57,10 +51,6 @@ ScAreaLinksObj::ScAreaLinksObj() uno::Reference< uno::XInterface > ScAreaLinksObj::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()); @@ -72,19 +62,13 @@ uno::Reference< uno::XInterface > ScAreaLinksObj::init() void ScAreaLinksObj::setUp() { - nTest++; - CPPUNIT_ASSERT(nTest <= NUMBER_OF_TESTS); CalcUnoApiTest::setUp(); + mxComponent = loadFromDesktop("private:factory/scalc"); } void ScAreaLinksObj::tearDown() { - if (nTest == NUMBER_OF_TESTS) - { - closeDocument(mxComponent); - mxComponent.clear(); - } - + closeDocument(mxComponent); CalcUnoApiTest::tearDown(); } |