sc/qa/unit/SparklineImportExportTest.cxx | 3 ---
sc/qa/unit/SparklineTest.cxx | 3 ---
sc/qa/unit/bugfix-test.cxx | 3 ---
sc/qa/unit/chart2dataprovider.cxx | 3 ---
sc/qa/unit/copy_paste_test.cxx | 1 -
sc/qa/unit/filters-test.cxx | 1 -
sc/qa/unit/functions_test.hxx | 3 ---
sc/qa/unit/helper/qahelper.hxx | 2 ++
sc/qa/unit/jumbosheets-test.cxx | 1 -
sc/qa/unit/opencl-test.cxx | 2 --
sc/qa/unit/pivottable_filters_test.cxx | 3 ---
sc/qa/unit/subsequent_export_test.cxx | 2 --
sc/qa/unit/subsequent_export_test2.cxx | 3 ---
sc/qa/unit/subsequent_filters_test.cxx | 2 --
sc/qa/unit/subsequent_filters_test2.cxx | 3 ---
15 files changed, 2 insertions(+), 33 deletions(-)
New commits:
commit daa85533cf377a8ec2585f5d45e4d0127f74cdf8
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Mon Oct 17 12:17:33 2022 +0200
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Mon Oct 17 14:10:53 2022 +0200
ScBootstrapFixture: Move m_xCalcComponent to parent and use it everywhere
Change-Id: I3422f907cd4ce30f0243eb28847e503446b60b86
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141452
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
diff --git a/sc/qa/unit/SparklineImportExportTest.cxx
b/sc/qa/unit/SparklineImportExportTest.cxx
index 1aefc64006a5..b87eecd5eb03 100644
--- a/sc/qa/unit/SparklineImportExportTest.cxx
+++ b/sc/qa/unit/SparklineImportExportTest.cxx
@@ -20,9 +20,6 @@ using namespace css;
/** Test import, export or roundtrip of sparklines for ODF and OOXML */
class SparklineImportExportTest : public ScBootstrapFixture, public
XmlTestTools
{
-private:
- uno::Reference<uno::XInterface> m_xCalcComponent;
-
public:
SparklineImportExportTest()
: ScBootstrapFixture("sc/qa/unit/data")
diff --git a/sc/qa/unit/SparklineTest.cxx b/sc/qa/unit/SparklineTest.cxx
index f22dfa84b76f..b70bb6a22e3f 100644
--- a/sc/qa/unit/SparklineTest.cxx
+++ b/sc/qa/unit/SparklineTest.cxx
@@ -23,9 +23,6 @@ using namespace css;
/** Test operation for sparklines, sparkline groups and attributes */
class SparklineTest : public ScBootstrapFixture
{
-private:
- uno::Reference<uno::XInterface> m_xCalcComponent;
-
public:
SparklineTest()
: ScBootstrapFixture("sc/qa/unit/data")
diff --git a/sc/qa/unit/bugfix-test.cxx b/sc/qa/unit/bugfix-test.cxx
index 2975b0b0a834..a1dc7b27c46a 100644
--- a/sc/qa/unit/bugfix-test.cxx
+++ b/sc/qa/unit/bugfix-test.cxx
@@ -91,9 +91,6 @@ public:
CPPUNIT_TEST(testTdf104502_hiddenColsCountedInPageCount);
CPPUNIT_TEST(testTdf108188_pagestyle);
CPPUNIT_TEST_SUITE_END();
-
-private:
- uno::Reference<uno::XInterface> m_xCalcComponent;
};
static void lcl_AssertRectEqualWithTolerance(std::string_view sInfo,
diff --git a/sc/qa/unit/chart2dataprovider.cxx
b/sc/qa/unit/chart2dataprovider.cxx
index b8afa19564ec..8bf955d41252 100644
--- a/sc/qa/unit/chart2dataprovider.cxx
+++ b/sc/qa/unit/chart2dataprovider.cxx
@@ -36,9 +36,6 @@ public:
CPPUNIT_TEST_SUITE(ScChart2DataProviderTest);
CPPUNIT_TEST(testHeaderExpansion);
CPPUNIT_TEST_SUITE_END();
-
-private:
- uno::Reference<uno::XInterface> m_xCalcComponent;
};
static void lcl_createAndCheckDataProvider(ScDocument& rDoc, const OUString&
cellRange,
diff --git a/sc/qa/unit/copy_paste_test.cxx b/sc/qa/unit/copy_paste_test.cxx
index f564f46edca1..91d54cdd06f9 100644
--- a/sc/qa/unit/copy_paste_test.cxx
+++ b/sc/qa/unit/copy_paste_test.cxx
@@ -76,7 +76,6 @@ public:
private:
void addToUserList(const OUString& rStr);
- uno::Reference<uno::XInterface> m_xCalcComponent;
};
// tdf#83366
diff --git a/sc/qa/unit/filters-test.cxx b/sc/qa/unit/filters-test.cxx
index 738f36e9828d..13f8662c50c2 100644
--- a/sc/qa/unit/filters-test.cxx
+++ b/sc/qa/unit/filters-test.cxx
@@ -117,7 +117,6 @@ public:
CPPUNIT_TEST_SUITE_END();
private:
- uno::Reference<uno::XInterface> m_xCalcComponent;
bool mbUpdateReferenceOnSort; ///< Remember the configuration option so
that we can set it back.
};
diff --git a/sc/qa/unit/functions_test.hxx b/sc/qa/unit/functions_test.hxx
index 0964214fbb4f..e33cdec76063 100644
--- a/sc/qa/unit/functions_test.hxx
+++ b/sc/qa/unit/functions_test.hxx
@@ -30,9 +30,6 @@ public:
SfxFilterFlags nFilterFlags,
SotClipboardFormatId nClipboardID,
unsigned int nFilterVersion) override;
-
-private:
- css::uno::Reference<css::uno::XInterface> m_xCalcComponent;
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/qa/unit/helper/qahelper.hxx b/sc/qa/unit/helper/qahelper.hxx
index 8b32859df57f..cf1257301d12 100644
--- a/sc/qa/unit/helper/qahelper.hxx
+++ b/sc/qa/unit/helper/qahelper.hxx
@@ -207,6 +207,8 @@ protected:
ScDocShellRef loadDoc(
std::u16string_view rFileName, sal_Int32 nFormat, bool bReadWrite =
false, bool bCheckErrorCode = true );
+ // reference to document interface that we are testing
+ css::uno::Reference<css::uno::XInterface> m_xCalcComponent;
public:
static const FileFormat* getFileFormats() { return aFileFormats; }
diff --git a/sc/qa/unit/jumbosheets-test.cxx b/sc/qa/unit/jumbosheets-test.cxx
index 9f9ab5c4ad7f..be39878118c6 100644
--- a/sc/qa/unit/jumbosheets-test.cxx
+++ b/sc/qa/unit/jumbosheets-test.cxx
@@ -72,7 +72,6 @@ protected:
private:
void testRoundtripColumn2000(std::u16string_view name, int format);
- uno::Reference<uno::XInterface> m_xCalcComponent;
};
void ScJumboSheetsTest::testRoundtripColumn2000Ods()
diff --git a/sc/qa/unit/opencl-test.cxx b/sc/qa/unit/opencl-test.cxx
index 71275ec2d6cf..81ed7bb57f18 100644
--- a/sc/qa/unit/opencl-test.cxx
+++ b/sc/qa/unit/opencl-test.cxx
@@ -504,8 +504,6 @@ public:
CPPUNIT_TEST_SUITE_END();
private:
- uno::Reference<uno::XInterface> m_xCalcComponent;
-
// Test env variables and methods
ScDocShellRef xDocSh;
ScDocShellRef xDocShRes;
diff --git a/sc/qa/unit/pivottable_filters_test.cxx
b/sc/qa/unit/pivottable_filters_test.cxx
index d62f49eb4fcf..3136966f2d34 100644
--- a/sc/qa/unit/pivottable_filters_test.cxx
+++ b/sc/qa/unit/pivottable_filters_test.cxx
@@ -156,9 +156,6 @@ public:
CPPUNIT_TEST(testTdf73845);
CPPUNIT_TEST_SUITE_END();
-
-private:
- uno::Reference<uno::XInterface> m_xCalcComponent;
};
ScPivotTableFiltersTest::ScPivotTableFiltersTest()
diff --git a/sc/qa/unit/subsequent_export_test.cxx
b/sc/qa/unit/subsequent_export_test.cxx
index 9c3709e51a67..c78d94d925f4 100644
--- a/sc/qa/unit/subsequent_export_test.cxx
+++ b/sc/qa/unit/subsequent_export_test.cxx
@@ -297,8 +297,6 @@ public:
private:
void testExcelCellBorders(sal_uLong nFormatType);
-
- uno::Reference<uno::XInterface> m_xCalcComponent;
};
void ScExportTest::registerNamespaces(xmlXPathContextPtr& pXmlXPathCtx)
diff --git a/sc/qa/unit/subsequent_export_test2.cxx
b/sc/qa/unit/subsequent_export_test2.cxx
index 71466d7ee720..ebc915a0aa96 100644
--- a/sc/qa/unit/subsequent_export_test2.cxx
+++ b/sc/qa/unit/subsequent_export_test2.cxx
@@ -320,9 +320,6 @@ public:
CPPUNIT_TEST(testEmbeddedTextInDecimal);
CPPUNIT_TEST_SUITE_END();
-
-private:
- uno::Reference<uno::XInterface> m_xCalcComponent;
};
ScExportTest2::ScExportTest2()
diff --git a/sc/qa/unit/subsequent_filters_test.cxx
b/sc/qa/unit/subsequent_filters_test.cxx
index d7a6ee45b616..96f1229e3268 100644
--- a/sc/qa/unit/subsequent_filters_test.cxx
+++ b/sc/qa/unit/subsequent_filters_test.cxx
@@ -287,8 +287,6 @@ public:
private:
void testImportCrash(std::u16string_view rFileName, sal_Int32 nFormat);
void testPassword_Impl(std::u16string_view rFileNameBase);
-
- uno::Reference<uno::XInterface> m_xCalcComponent;
};
namespace {
diff --git a/sc/qa/unit/subsequent_filters_test2.cxx
b/sc/qa/unit/subsequent_filters_test2.cxx
index 2a7bdb65f843..c11946da4a98 100644
--- a/sc/qa/unit/subsequent_filters_test2.cxx
+++ b/sc/qa/unit/subsequent_filters_test2.cxx
@@ -306,9 +306,6 @@ public:
CPPUNIT_TEST(testTooManyColsRows);
CPPUNIT_TEST_SUITE_END();
-
-private:
- uno::Reference<uno::XInterface> m_xCalcComponent;
};
ScFiltersTest2::ScFiltersTest2()
