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

Remove shared mxComponent in scarealinkobj

Change-Id: I5bcebbf203b86b7a3875643e66ddd0a783f55986
Reviewed-on: https://gerrit.libreoffice.org/48728Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarJens Carl <j.carl43@gmx.de>
üst 2765189d
......@@ -27,8 +27,6 @@ using namespace css::uno;
namespace sc_apitest {
#define NUMBER_OF_TESTS 9
class ScAreaLinkObj : public CalcUnoApiTest, public apitest::CellAreaLink, public apitest::XAreaLink
{
public:
......@@ -56,14 +54,10 @@ public:
CPPUNIT_TEST_SUITE_END();
private:
static sal_Int32 nTest;
static uno::Reference< lang::XComponent > mxComponent;
uno::Reference< lang::XComponent > mxComponent;
};
sal_Int32 ScAreaLinkObj::nTest = 0;
uno::Reference< lang::XComponent > ScAreaLinkObj::mxComponent;
ScAreaLinkObj::ScAreaLinkObj()
: CalcUnoApiTest("/sc/qa/extras/testdocuments")
{
......@@ -71,10 +65,6 @@ ScAreaLinkObj::ScAreaLinkObj()
uno::Reference< uno::XInterface > ScAreaLinkObj::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());
......@@ -90,19 +80,13 @@ uno::Reference< uno::XInterface > ScAreaLinkObj::init()
void ScAreaLinkObj::setUp()
{
nTest++;
CPPUNIT_ASSERT(nTest <= NUMBER_OF_TESTS);
CalcUnoApiTest::setUp();
mxComponent = loadFromDesktop("private:factory/scalc");
}
void ScAreaLinkObj::tearDown()
{
if (nTest == NUMBER_OF_TESTS)
{
closeDocument(mxComponent);
mxComponent.clear();
}
closeDocument(mxComponent);
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