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

Remove shared mxComponent in scarealinksobj

Change-Id: I86263b5d023b095759d572421d3ef1fc291c0cfd
Reviewed-on: https://gerrit.libreoffice.org/48730Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarJens Carl <j.carl43@gmx.de>
üst 06d3f998
...@@ -22,8 +22,6 @@ using namespace css::uno; ...@@ -22,8 +22,6 @@ using namespace css::uno;
namespace sc_apitest { namespace sc_apitest {
#define NUMBER_OF_TESTS 2
class ScAreaLinksObj : public CalcUnoApiTest, public apitest::XAreaLinks class ScAreaLinksObj : public CalcUnoApiTest, public apitest::XAreaLinks
{ {
public: public:
...@@ -42,14 +40,10 @@ public: ...@@ -42,14 +40,10 @@ 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 ScAreaLinksObj::nTest = 0;
uno::Reference< lang::XComponent > ScAreaLinksObj::mxComponent;
ScAreaLinksObj::ScAreaLinksObj() ScAreaLinksObj::ScAreaLinksObj()
: CalcUnoApiTest("/sc/qa/extras/testdocuments") : CalcUnoApiTest("/sc/qa/extras/testdocuments")
{ {
...@@ -57,10 +51,6 @@ ScAreaLinksObj::ScAreaLinksObj() ...@@ -57,10 +51,6 @@ ScAreaLinksObj::ScAreaLinksObj()
uno::Reference< uno::XInterface > ScAreaLinksObj::init() 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); 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());
...@@ -72,19 +62,13 @@ uno::Reference< uno::XInterface > ScAreaLinksObj::init() ...@@ -72,19 +62,13 @@ uno::Reference< uno::XInterface > ScAreaLinksObj::init()
void ScAreaLinksObj::setUp() void ScAreaLinksObj::setUp()
{ {
nTest++;
CPPUNIT_ASSERT(nTest <= NUMBER_OF_TESTS);
CalcUnoApiTest::setUp(); CalcUnoApiTest::setUp();
mxComponent = loadFromDesktop("private:factory/scalc");
} }
void ScAreaLinksObj::tearDown() void ScAreaLinksObj::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