diff options
| author | Jens Carl <j.carl43@gmx.de> | 2018-01-27 01:35:49 +0000 |
|---|---|---|
| committer | Jens Carl <j.carl43@gmx.de> | 2018-01-27 18:48:27 +0100 |
| commit | 6a36c66dd18db6507d66bdaed822e513d92e8127 (patch) | |
| tree | ab76f90fd3ea20c418cfa5fee50a223def86cca6 | |
| parent | Remove shared mxComponent in sccellrangeobj (diff) | |
| download | core-6a36c66dd18db6507d66bdaed822e513d92e8127.tar.gz core-6a36c66dd18db6507d66bdaed822e513d92e8127.zip | |
Remove shared mxComponent in sccellrangesobj
Change-Id: If357e94566440276bb1df88a4b899125beffe148
Reviewed-on: https://gerrit.libreoffice.org/48735
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Jens Carl <j.carl43@gmx.de>
| -rw-r--r-- | sc/qa/extras/sccellrangesobj.cxx | 23 |
1 files changed, 4 insertions, 19 deletions
diff --git a/sc/qa/extras/sccellrangesobj.cxx b/sc/qa/extras/sccellrangesobj.cxx index 7ebe5d876842..17dbe4f9b614 100644 --- a/sc/qa/extras/sccellrangesobj.cxx +++ b/sc/qa/extras/sccellrangesobj.cxx @@ -27,8 +27,6 @@ using namespace css::uno; namespace sc_apitest { -#define NUMBER_OF_TESTS 7 - class ScCellRangesObj : public CalcUnoApiTest, public apitest::XSheetCellRangeContainer, public apitest::XSheetCellRanges, @@ -60,13 +58,9 @@ public: CPPUNIT_TEST_SUITE_END(); private: - static sal_Int32 nTest; - static uno::Reference< lang::XComponent > mxComponent; + uno::Reference< lang::XComponent > mxComponent; }; -sal_Int32 ScCellRangesObj::nTest = 0; -uno::Reference< lang::XComponent > ScCellRangesObj::mxComponent; - ScCellRangesObj::ScCellRangesObj(): CalcUnoApiTest("/sc/qa/extras/testdocuments") { @@ -74,10 +68,6 @@ ScCellRangesObj::ScCellRangesObj(): uno::Reference< uno::XInterface > ScCellRangesObj::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()); @@ -109,19 +99,14 @@ uno::Reference< uno::XInterface > ScCellRangesObj::init() void ScCellRangesObj::setUp() { - nTest++; - CPPUNIT_ASSERT(nTest <= NUMBER_OF_TESTS); CalcUnoApiTest::setUp(); + // create a calc document + mxComponent = loadFromDesktop("private:factory/scalc"); } void ScCellRangesObj::tearDown() { - if (nTest == NUMBER_OF_TESTS) - { - closeDocument(mxComponent); - mxComponent.clear(); - } - + closeDocument(mxComponent); CalcUnoApiTest::tearDown(); } |