diff options
| author | Jens Carl <j.carl43@gmx.de> | 2018-01-27 01:11:05 +0000 |
|---|---|---|
| committer | Jens Carl <j.carl43@gmx.de> | 2018-01-27 08:32:26 +0100 |
| commit | 05e4ffc1e67656c2c25caf9e51198127cafe363b (patch) | |
| tree | d22be1cb02712100d9afddc776dadb75a8ab637d | |
| parent | 926ce174109c6e140012bf2dca92650f38d7e9ba (diff) | |
Remove shared mxComponent in scautoformatobj
Change-Id: Iedd50a219f04d906573a5f7d9b3efe582f8ac9c4
Reviewed-on: https://gerrit.libreoffice.org/48731
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Jens Carl <j.carl43@gmx.de>
| -rw-r--r-- | sc/qa/extras/scautoformatobj.cxx | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/sc/qa/extras/scautoformatobj.cxx b/sc/qa/extras/scautoformatobj.cxx index bf5722e7159a..27d96f94f2fe 100644 --- a/sc/qa/extras/scautoformatobj.cxx +++ b/sc/qa/extras/scautoformatobj.cxx @@ -25,8 +25,6 @@ using namespace com::sun::star; namespace sc_apitest { -#define NUMBER_OF_TESTS 1 - class ScTableAutoFormatObj : public CalcUnoApiTest, public apitest::TableAutoFormat { public: @@ -44,13 +42,9 @@ public: CPPUNIT_TEST_SUITE_END(); private: - static sal_Int32 nTest; - static uno::Reference<lang::XComponent> mxComponent; + uno::Reference<lang::XComponent> mxComponent; }; -sal_Int32 ScTableAutoFormatObj::nTest = 0; -uno::Reference<lang::XComponent> ScTableAutoFormatObj::mxComponent; - ScTableAutoFormatObj::ScTableAutoFormatObj() : CalcUnoApiTest("/sc/qa/extras/testdocuments") { @@ -58,10 +52,6 @@ ScTableAutoFormatObj::ScTableAutoFormatObj() uno::Reference<uno::XInterface> ScTableAutoFormatObj::init() { - // create a calc document - if (!mxComponent.is()) - mxComponent = loadFromDesktop("private:factory/scalc"); - uno::Reference<sheet::XSpreadsheetDocument> xDoc(mxComponent, UNO_QUERY_THROW); CPPUNIT_ASSERT_MESSAGE("no calc document", xDoc.is()); @@ -76,19 +66,13 @@ uno::Reference<uno::XInterface> ScTableAutoFormatObj::init() void ScTableAutoFormatObj::setUp() { - nTest++; - CPPUNIT_ASSERT(nTest <= NUMBER_OF_TESTS); CalcUnoApiTest::setUp(); + mxComponent = loadFromDesktop("private:factory/scalc"); } void ScTableAutoFormatObj::tearDown() { - if (nTest == NUMBER_OF_TESTS) - { - closeDocument(mxComponent); - mxComponent.clear(); - } - + closeDocument(mxComponent); CalcUnoApiTest::tearDown(); } |