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

Remove shared mxComponent (test document) in sctableconditionalformatobj

Change-Id: I9a255067cce2ae013d1054fbad7efa10bce4378b
Reviewed-on: https://gerrit.libreoffice.org/48939Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarJens Carl <j.carl43@gmx.de>
üst ef52c5bf
......@@ -34,8 +34,6 @@ using namespace com::sun::star;
namespace sc_apitest
{
#define NUMBER_OF_TESTS 3
class ScTableConditionalFormatObj : public CalcUnoApiTest, public apitest::XSheetConditionalEntries
{
public:
......@@ -56,13 +54,9 @@ public:
CPPUNIT_TEST_SUITE_END();
private:
static sal_Int32 nTest;
static uno::Reference<lang::XComponent> mxComponent;
uno::Reference<lang::XComponent> mxComponent;
};
sal_Int32 ScTableConditionalFormatObj::nTest = 0;
uno::Reference<lang::XComponent> ScTableConditionalFormatObj::mxComponent;
ScTableConditionalFormatObj::ScTableConditionalFormatObj()
: CalcUnoApiTest("/sc/qa/extras/testdocuments")
{
......@@ -70,10 +64,6 @@ ScTableConditionalFormatObj::ScTableConditionalFormatObj()
uno::Reference<uno::XInterface> ScTableConditionalFormatObj::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());
......@@ -114,19 +104,14 @@ uno::Sequence<beans::PropertyValue> ScTableConditionalFormatObj::createCondition
void ScTableConditionalFormatObj::setUp()
{
nTest++;
CPPUNIT_ASSERT(nTest <= NUMBER_OF_TESTS);
CalcUnoApiTest::setUp();
// create a calc document
mxComponent = loadFromDesktop("private:factory/scalc");
}
void ScTableConditionalFormatObj::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