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

Remove shared mxComponent in scdatapilotfieldobj

Change-Id: I96e733f14561037dd2ad1df080adfdb911b8243e
Reviewed-on: https://gerrit.libreoffice.org/48754Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarJens Carl <j.carl43@gmx.de>
üst 0ed15634
...@@ -24,8 +24,6 @@ using namespace css::uno; ...@@ -24,8 +24,6 @@ using namespace css::uno;
namespace sc_apitest { namespace sc_apitest {
#define NUMBER_OF_TESTS 7
class ScDataPilotFieldObj : public CalcUnoApiTest, public apitest::DataPilotField, class ScDataPilotFieldObj : public CalcUnoApiTest, public apitest::DataPilotField,
public apitest::XDataPilotField, public apitest::XDataPilotField,
public apitest::XDataPilotFieldGrouping public apitest::XDataPilotFieldGrouping
...@@ -57,13 +55,9 @@ public: ...@@ -57,13 +55,9 @@ public:
CPPUNIT_TEST_SUITE_END(); CPPUNIT_TEST_SUITE_END();
private: private:
static sal_Int32 nTest; uno::Reference< lang::XComponent > mxComponent;
static uno::Reference< lang::XComponent > mxComponent;
}; };
sal_Int32 ScDataPilotFieldObj::nTest = 0;
uno::Reference< lang::XComponent > ScDataPilotFieldObj::mxComponent;
ScDataPilotFieldObj::ScDataPilotFieldObj() ScDataPilotFieldObj::ScDataPilotFieldObj()
: CalcUnoApiTest("/sc/qa/extras/testdocuments") : CalcUnoApiTest("/sc/qa/extras/testdocuments")
{ {
...@@ -71,11 +65,6 @@ ScDataPilotFieldObj::ScDataPilotFieldObj() ...@@ -71,11 +65,6 @@ ScDataPilotFieldObj::ScDataPilotFieldObj()
uno::Reference< uno::XInterface > ScDataPilotFieldObj::init() uno::Reference< uno::XInterface > ScDataPilotFieldObj::init()
{ {
OUString aFileURL;
createFileURL("scdatapilotfieldobj.ods", aFileURL);
if(!mxComponent.is())
mxComponent = loadFromDesktop(aFileURL, "com.sun.star.sheet.SpreadsheetDocument");
uno::Reference< sheet::XSpreadsheetDocument > xDoc(mxComponent, UNO_QUERY_THROW); uno::Reference< sheet::XSpreadsheetDocument > xDoc(mxComponent, UNO_QUERY_THROW);
CPPUNIT_ASSERT_MESSAGE("no calc document", xDoc.is()); CPPUNIT_ASSERT_MESSAGE("no calc document", xDoc.is());
...@@ -100,19 +89,17 @@ uno::Reference< uno::XInterface > ScDataPilotFieldObj::init() ...@@ -100,19 +89,17 @@ uno::Reference< uno::XInterface > ScDataPilotFieldObj::init()
void ScDataPilotFieldObj::setUp() void ScDataPilotFieldObj::setUp()
{ {
nTest++;
CPPUNIT_ASSERT(nTest <= NUMBER_OF_TESTS);
CalcUnoApiTest::setUp(); CalcUnoApiTest::setUp();
OUString aFileURL;
createFileURL("scdatapilotfieldobj.ods", aFileURL);
mxComponent = loadFromDesktop(aFileURL, "com.sun.star.sheet.SpreadsheetDocument");
} }
void ScDataPilotFieldObj::tearDown() void ScDataPilotFieldObj::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