Kaydet (Commit) 6e641f93 authored tarafından Jens Carl's avatar Jens Carl

Remove shared mxComponent in scdatapilotitemobj

Change-Id: I9e1b98f203e5e85c25947d6b26f62f36672264c8
Reviewed-on: https://gerrit.libreoffice.org/48755Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarJens Carl <j.carl43@gmx.de>
üst c2bc993e
...@@ -31,8 +31,6 @@ using namespace css::uno; ...@@ -31,8 +31,6 @@ using namespace css::uno;
namespace sc_apitest { namespace sc_apitest {
#define NUMBER_OF_TESTS 1
class ScDataPilotItemObj : public CalcUnoApiTest, public apitest::DataPilotItem class ScDataPilotItemObj : public CalcUnoApiTest, public apitest::DataPilotItem
{ {
public: public:
...@@ -50,14 +48,11 @@ public: ...@@ -50,14 +48,11 @@ public:
CPPUNIT_TEST_SUITE_END(); CPPUNIT_TEST_SUITE_END();
private: private:
static sal_Int32 nTest;
static sal_Int32 nMaxFieldIndex; static sal_Int32 nMaxFieldIndex;
static uno::Reference< lang::XComponent > mxComponent; uno::Reference< lang::XComponent > mxComponent;
}; };
sal_Int32 ScDataPilotItemObj::nTest = 0;
sal_Int32 ScDataPilotItemObj::nMaxFieldIndex = 6; sal_Int32 ScDataPilotItemObj::nMaxFieldIndex = 6;
uno::Reference< lang::XComponent > ScDataPilotItemObj::mxComponent;
ScDataPilotItemObj::ScDataPilotItemObj() ScDataPilotItemObj::ScDataPilotItemObj()
: CalcUnoApiTest("/sc/qa/extras/testdocuments") : CalcUnoApiTest("/sc/qa/extras/testdocuments")
...@@ -69,10 +64,6 @@ uno::Reference< uno::XInterface > ScDataPilotItemObj::init() ...@@ -69,10 +64,6 @@ uno::Reference< uno::XInterface > ScDataPilotItemObj::init()
table::CellRangeAddress sCellRangeAddress(0, 1, 0, nMaxFieldIndex - 1, nMaxFieldIndex - 1); table::CellRangeAddress sCellRangeAddress(0, 1, 0, nMaxFieldIndex - 1, nMaxFieldIndex - 1);
table::CellAddress sCellAddress(0, 7, 8); table::CellAddress sCellAddress(0, 7, 8);
// create calc document
if (!mxComponent.is())
mxComponent = loadFromDesktop("private:factory/scalc");
uno::Reference< sheet::XSpreadsheetDocument > xDoc(mxComponent, uno::UNO_QUERY_THROW); uno::Reference< sheet::XSpreadsheetDocument > xDoc(mxComponent, uno::UNO_QUERY_THROW);
CPPUNIT_ASSERT_MESSAGE("no calc document", xDoc.is()); CPPUNIT_ASSERT_MESSAGE("no calc document", xDoc.is());
...@@ -125,19 +116,14 @@ uno::Reference< uno::XInterface > ScDataPilotItemObj::init() ...@@ -125,19 +116,14 @@ uno::Reference< uno::XInterface > ScDataPilotItemObj::init()
void ScDataPilotItemObj::setUp() void ScDataPilotItemObj::setUp()
{ {
nTest++;
CPPUNIT_ASSERT(nTest <= NUMBER_OF_TESTS);
CalcUnoApiTest::setUp(); CalcUnoApiTest::setUp();
// create calc document
mxComponent = loadFromDesktop("private:factory/scalc");
} }
void ScDataPilotItemObj::tearDown() void ScDataPilotItemObj::tearDown()
{ {
if (nTest == NUMBER_OF_TESTS) closeDocument(mxComponent);
{
closeDocument(mxComponent);
mxComponent.clear();
}
CalcUnoApiTest::tearDown(); CalcUnoApiTest::tearDown();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment