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

Remove shared mxComponent in scdatabaserangesobj

Change-Id: I55eda7486ebadb02569c5ce21e709704dbf1d795
Reviewed-on: https://gerrit.libreoffice.org/48753Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarJens Carl <j.carl43@gmx.de>
üst cbe054d7
......@@ -25,8 +25,6 @@ using namespace com::sun::star;
namespace sc_apitest
{
#define NUMBER_OF_TESTS 1
class ScDatabaseRangesObj : public CalcUnoApiTest, public apitest::XDatabaseRanges
{
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 ScDatabaseRangesObj::nTest = 0;
uno::Reference<lang::XComponent> ScDatabaseRangesObj::mxComponent;
ScDatabaseRangesObj::ScDatabaseRangesObj()
: CalcUnoApiTest("/sc/qa/extras/testdocuments")
{
......@@ -58,10 +52,6 @@ ScDatabaseRangesObj::ScDatabaseRangesObj()
uno::Reference<uno::XInterface> ScDatabaseRangesObj::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());
......@@ -77,19 +67,14 @@ uno::Reference<uno::XInterface> ScDatabaseRangesObj::init()
void ScDatabaseRangesObj::setUp()
{
nTest++;
CPPUNIT_ASSERT(nTest <= NUMBER_OF_TESTS);
CalcUnoApiTest::setUp();
// create a calc document
mxComponent = loadFromDesktop("private:factory/scalc");
}
void ScDatabaseRangesObj::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