CalcUnoApiTest: Move mxComponent to parent and use it everywhere

Change-Id: Ibea7a300b7f302936f872d7133aadafeb13d6d82 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141350 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
author: Xisco Fauli <xiscofauli@libreoffice.org> 2022-10-14 00:28:18 +0200
committer: Xisco Fauli <xiscofauli@libreoffice.org> 2022-10-14 16:09:37 +0200
commit: a96b911c112386b1af89115c9a96d4ace9d68326 (patch)
tree: b73ec43df26c760f10aba907d2fbaddccf1e4ad0 /sc
parent: 99e019708609a52ea6b2ad29fc945c4dc4160351 (diff)
109 files changed, 169 insertions, 459 deletions
diff --git a/sc/qa/extras/anchor.cxx b/sc/qa/extras/anchor.cxx
index 880f6ae57be9..1948356e5e7e 100644
--- a/sc/qa/extras/anchor.cxx
+++ b/sc/qa/extras/anchor.cxx
@@ -58,9 +58,6 @@ public:
     CPPUNIT_TEST(testTdf130556);
     CPPUNIT_TEST(testTdf134161);
     CPPUNIT_TEST_SUITE_END();
-
-private:
-    uno::Reference<lang::XComponent> mxComponent;
 };
 
 ScAnchorTest::ScAnchorTest()
diff --git a/sc/qa/extras/check_data_pilot_field.cxx b/sc/qa/extras/check_data_pilot_field.cxx
index bd21856c15c3..ca5e59ae7be6 100644
--- a/sc/qa/extras/check_data_pilot_field.cxx
+++ b/sc/qa/extras/check_data_pilot_field.cxx
@@ -58,7 +58,6 @@ protected:
     virtual bool isPropertyIgnored(const OUString& rName) override;
 
 private:
-    uno::Reference<lang::XComponent> mxComponent;
     uno::Reference<uno::XInterface> mxObject;
     int mMaxFieldIndex = 6;
 };
diff --git a/sc/qa/extras/check_data_pilot_table.cxx b/sc/qa/extras/check_data_pilot_table.cxx
index a38185bb97a1..381b3c550a0c 100644
--- a/sc/qa/extras/check_data_pilot_table.cxx
+++ b/sc/qa/extras/check_data_pilot_table.cxx
@@ -62,7 +62,6 @@ public:
     CPPUNIT_TEST_SUITE_END();
 
 private:
-    uno::Reference<lang::XComponent> mxComponent;
     uno::Reference<uno::XInterface> mxObject;
     static constexpr int MAX_FIELD_INDEX = 6;
 };
diff --git a/sc/qa/extras/check_xcell_ranges_query.cxx b/sc/qa/extras/check_xcell_ranges_query.cxx
index e2d216dc22a0..25fbf7e0e1e6 100644
--- a/sc/qa/extras/check_xcell_ranges_query.cxx
+++ b/sc/qa/extras/check_xcell_ranges_query.cxx
@@ -43,7 +43,6 @@ public:
     CPPUNIT_TEST_SUITE_END();
 
 private:
-    uno::Reference<lang::XComponent> mxComponent;
     uno::Reference< sheet::XCellRangesQuery > m_xCell;
     OUString sSheetName;
 };
diff --git a/sc/qa/extras/macros-test.cxx b/sc/qa/extras/macros-test.cxx
index 7b0d5873976a..587eb454f3eb 100644
--- a/sc/qa/extras/macros-test.cxx
+++ b/sc/qa/extras/macros-test.cxx
@@ -112,8 +112,6 @@ public:
     CPPUNIT_TEST(testFunctionAccessIndirect);
 
     CPPUNIT_TEST_SUITE_END();
-private:
-    uno::Reference<lang::XComponent> mxComponent;
 };
 
 void ScMacrosTest::registerNamespaces(xmlXPathContextPtr& pXmlXPathCtx)
diff --git a/sc/qa/extras/new_cond_format.cxx b/sc/qa/extras/new_cond_format.cxx
index 257d2e7f92be..2ddf9e639e0e 100644
--- a/sc/qa/extras/new_cond_format.cxx
+++ b/sc/qa/extras/new_cond_format.cxx
@@ -55,9 +55,6 @@ public:
     CPPUNIT_TEST(testDataBarProperties);
     CPPUNIT_TEST(testColorScaleProperties);
     CPPUNIT_TEST_SUITE_END();
-private:
-
-    uno::Reference< lang::XComponent > mxComponent;
 };
 
 ScConditionalFormatTest::ScConditionalFormatTest()
diff --git a/sc/qa/extras/recordchanges-test.cxx b/sc/qa/extras/recordchanges-test.cxx
index b8f77b4dd5aa..e8e2337a2475 100644
--- a/sc/qa/extras/recordchanges-test.cxx
+++ b/sc/qa/extras/recordchanges-test.cxx
@@ -33,9 +33,6 @@ public:
     CPPUNIT_TEST(testSetRecordChanges);
     CPPUNIT_TEST(testCheckRecordChangesProtection);
     CPPUNIT_TEST_SUITE_END();
-
-private:
-    uno::Reference<lang::XComponent> mxComponent;
 };
 
 void ScRecordChangesTest::tearDown()
diff --git a/sc/qa/extras/scannotationobj.cxx b/sc/qa/extras/scannotationobj.cxx
index 0e849f5edc3b..edcef85b6296 100644
--- a/sc/qa/extras/scannotationobj.cxx
+++ b/sc/qa/extras/scannotationobj.cxx
@@ -79,9 +79,6 @@ public:
     CPPUNIT_TEST(testGetText);
 
     CPPUNIT_TEST_SUITE_END();
-
-private:
-    uno::Reference<lang::XComponent> mxComponent;
 };
 
 ScAnnontationObj::ScAnnontationObj()
diff --git a/sc/qa/extras/scannotationshapeobj.cxx b/sc/qa/extras/scannotationshapeobj.cxx
index 5a7a7258e04a..5cc09f9f3468 100644
--- a/sc/qa/extras/scannotationshapeobj.cxx
+++ b/sc/qa/extras/scannotationshapeobj.cxx
@@ -87,7 +87,6 @@ public:
     CPPUNIT_TEST_SUITE_END();
 
 private:
-    uno::Reference<lang::XComponent> m_xComponent;
     static uno::Reference<text::XTextContent> m_xField;
 };
 
@@ -102,20 +101,20 @@ ScAnnotationShapeObj::ScAnnotationShapeObj()
 void ScAnnotationShapeObj::setUp()
 {
     CalcUnoApiTest::setUp();
-    m_xComponent = loadFromDesktop("private:factory/scalc");
+    mxComponent = loadFromDesktop("private:factory/scalc");
 }
 
 void ScAnnotationShapeObj::tearDown()
 {
     m_xField.clear();
-    closeDocument(m_xComponent);
+    closeDocument(mxComponent);
 
     CalcUnoApiTest::tearDown();
 }
 
 uno::Reference<uno::XInterface> ScAnnotationShapeObj::init()
 {
-    uno::Reference<sheet::XSpreadsheetDocument> xDoc(m_xComponent, uno::UNO_QUERY_THROW);
+    uno::Reference<sheet::XSpreadsheetDocument> xDoc(mxComponent, uno::UNO_QUERY_THROW);
 
     uno::Reference<container::XIndexAccess> xIA(xDoc->getSheets(), uno::UNO_QUERY_THROW);
     uno::Reference<sheet::XSpreadsheet> xSheet(xIA->getByIndex(0), uno::UNO_QUERY_THROW);
@@ -146,7 +145,7 @@ uno::Reference<text::XTextContent> ScAnnotationShapeObj::getTextContent()
 {
     if (!m_xField.is())
     {
-        uno::Reference<lang::XMultiServiceFactory> xSM(m_xComponent, uno::UNO_QUERY_THROW);
+        uno::Reference<lang::XMultiServiceFactory> xSM(mxComponent, uno::UNO_QUERY_THROW);
         m_xField.set(xSM->createInstance("com.sun.star.text.TextField.DateTime"),
                      uno::UNO_QUERY_THROW);
     }
diff --git a/sc/qa/extras/scannotationsobj.cxx b/sc/qa/extras/scannotationsobj.cxx
index 4e993977200a..ffd369d7df2e 100644
--- a/sc/qa/extras/scannotationsobj.cxx
+++ b/sc/qa/extras/scannotationsobj.cxx
@@ -65,10 +65,6 @@ public:
     CPPUNIT_TEST(testRemoveByIndex);
 
     CPPUNIT_TEST_SUITE_END();
-
-private:
-
-    uno::Reference< lang::XComponent > mxComponent;
 };
 
 
diff --git a/sc/qa/extras/scarealinkobj.cxx b/sc/qa/extras/scarealinkobj.cxx
index d28161f140bf..6acb22aa3db6 100644
--- a/sc/qa/extras/scarealinkobj.cxx
+++ b/sc/qa/extras/scarealinkobj.cxx
@@ -66,9 +66,6 @@ public:
     CPPUNIT_TEST(testRefreshListener);
 
     CPPUNIT_TEST_SUITE_END();
-
-private:
-    uno::Reference<lang::XComponent> m_xComponent;
 };
 
 ScAreaLinkObj::ScAreaLinkObj()
@@ -79,7 +76,7 @@ ScAreaLinkObj::ScAreaLinkObj()
 
 uno::Reference<uno::XInterface> ScAreaLinkObj::init()
 {
-    uno::Reference<sheet::XSpreadsheetDocument> xDoc(m_xComponent, uno::UNO_QUERY_THROW);
+    uno::Reference<sheet::XSpreadsheetDocument> xDoc(mxComponent, uno::UNO_QUERY_THROW);
 
     uno::Reference<beans::XPropertySet> xPropSet(xDoc, uno::UNO_QUERY_THROW);
     uno::Reference<sheet::XAreaLinks> xLinks(xPropSet->getPropertyValue("AreaLinks"),
@@ -97,12 +94,12 @@ uno::Reference<uno::XInterface> ScAreaLinkObj::init()
 void ScAreaLinkObj::setUp()
 {
     CalcUnoApiTest::setUp();
-    m_xComponent = loadFromDesktop("private:factory/scalc");
+    mxComponent = loadFromDesktop("private:factory/scalc");
 }
 
 void ScAreaLinkObj::tearDown()
 {
-    closeDocument(m_xComponent);
+    closeDocument(mxComponent);
     CalcUnoApiTest::tearDown();
 }
 
diff --git a/sc/qa/extras/scarealinksobj.cxx b/sc/qa/extras/scarealinksobj.cxx
index 6e14ccf22b01..67ff77fecf78 100644
--- a/sc/qa/extras/scarealinksobj.cxx
+++ b/sc/qa/extras/scarealinksobj.cxx
@@ -61,9 +61,6 @@ public:
     CPPUNIT_TEST(testGetCount);
 
     CPPUNIT_TEST_SUITE_END();
-
-private:
-    uno::Reference<lang::XComponent> m_xComponent;
 };
 
 ScAreaLinksObj::ScAreaLinksObj()
@@ -75,7 +72,7 @@ ScAreaLinksObj::ScAreaLinksObj()
 
 uno::Reference<uno::XInterface> ScAreaLinksObj::init()
 {
-    uno::Reference<sheet::XSpreadsheetDocument> xDoc(m_xComponent, uno::UNO_QUERY_THROW);
+    uno::Reference<sheet::XSpreadsheetDocument> xDoc(mxComponent, uno::UNO_QUERY_THROW);
     CPPUNIT_ASSERT_MESSAGE("no calc document", xDoc.is());
 
     uno::Reference<beans::XPropertySet> xPropSet(xDoc, uno::UNO_QUERY_THROW);
@@ -90,12 +87,12 @@ uno::Reference<uno::XInterface> ScAreaLinksObj::init()
 void ScAreaLinksObj::setUp()
 {
     CalcUnoApiTest::setUp();
-    m_xComponent = loadFromDesktop("private:factory/scalc");
+    mxComponent = loadFromDesktop("private:factory/scalc");
 }
 
 void ScAreaLinksObj::tearDown()
 {
-    closeDocument(m_xComponent);
+    closeDocument(mxComponent);
     CalcUnoApiTest::tearDown();
 }
 
diff --git a/sc/qa/extras/scautoformatobj.cxx b/sc/qa/extras/scautoformatobj.cxx
index 76db8c6a3592..c5ef48d7bf16 100644
--- a/sc/qa/extras/scautoformatobj.cxx
+++ b/sc/qa/extras/scautoformatobj.cxx
@@ -79,9 +79,6 @@ public:
     CPPUNIT_TEST(testSupportsService);
 
     CPPUNIT_TEST_SUITE_END();
-
-private:
-    uno::Reference<lang::XComponent> mxComponent;
 };
 
 ScAutoFormatObj::ScAutoFormatObj()
diff --git a/sc/qa/extras/scautoformatsobj.cxx b/sc/qa/extras/scautoformatsobj.cxx
index a51bd76ab9af..7dfd54eb1a62 100644
--- a/sc/qa/extras/scautoformatsobj.cxx
+++ b/sc/qa/extras/scautoformatsobj.cxx
@@ -80,9 +80,6 @@ public:
     CPPUNIT_TEST(testSupportsService);
 
     CPPUNIT_TEST_SUITE_END();
-
-private:
-    uno::Reference<lang::XComponent> m_xComponent;
 };
 
 ScAutoFormatsObj::ScAutoFormatsObj()
@@ -98,7 +95,7 @@ ScAutoFormatsObj::ScAutoFormatsObj()
 
 uno::Reference<uno::XInterface> ScAutoFormatsObj::init()
 {
-    uno::Reference<lang::XMultiServiceFactory> xMSF(m_xComponent, uno::UNO_QUERY_THROW);
+    uno::Reference<lang::XMultiServiceFactory> xMSF(mxComponent, uno::UNO_QUERY_THROW);
     uno::Reference<uno::XInterface> xTAF(
         xMSF->createInstance("com.sun.star.sheet.TableAutoFormats"), uno::UNO_SET_THROW);
 
@@ -121,12 +118,12 @@ void ScAutoFormatsObj::setUp()
 {
     CalcUnoApiTest::setUp();
     // create calc document
-    m_xComponent = loadFromDesktop("private:factory/scalc");
+    mxComponent = loadFromDesktop("private:factory/scalc");
 }
 
 void ScAutoFormatsObj::tearDown()
 {
-    closeDocument(m_xComponent);
+    closeDocument(mxComponent);
     CalcUnoApiTest::tearDown();
 }
 
diff --git a/sc/qa/extras/sccellcursorobj.cxx b/sc/qa/extras/sccellcursorobj.cxx
index f0092c707d67..5ae195f168b2 100644
--- a/sc/qa/extras/sccellcursorobj.cxx
+++ b/sc/qa/extras/sccellcursorobj.cxx
@@ -154,9 +154,6 @@ public:
     CPPUNIT_TEST(testGetUniqueCellFormatRanges);
 
     CPPUNIT_TEST_SUITE_END();
-
-private:
-    uno::Reference< lang::XComponent > mxComponent;
 };
 
 ScCellCursorObj::ScCellCursorObj():
diff --git a/sc/qa/extras/sccellfieldsobj.cxx b/sc/qa/extras/sccellfieldsobj.cxx
index 573942b4028b..3f0d086a0ad6 100644
--- a/sc/qa/extras/sccellfieldsobj.cxx
+++ b/sc/qa/extras/sccellfieldsobj.cxx
@@ -59,9 +59,6 @@ public:
     CPPUNIT_TEST(testRefreshListener);
 
     CPPUNIT_TEST_SUITE_END();
-
-private:
-    uno::Reference<lang::XComponent> m_xComponent;
 };
 
 ScCellFieldsObj::ScCellFieldsObj()
@@ -72,7 +69,7 @@ ScCellFieldsObj::ScCellFieldsObj()
 
 uno::Reference<uno::XInterface> ScCellFieldsObj::init()
 {
-    uno::Reference<sheet::XSpreadsheetDocument> xDoc(m_xComponent, uno::UNO_QUERY_THROW);
+    uno::Reference<sheet::XSpreadsheetDocument> xDoc(mxComponent, uno::UNO_QUERY_THROW);
     CPPUNIT_ASSERT_MESSAGE("no calc document", xDoc.is());
 
     uno::Reference<lang::XMultiServiceFactory> xMSF(xDoc, uno::UNO_QUERY_THROW);
@@ -94,12 +91,12 @@ uno::Reference<uno::XInterface> ScCellFieldsObj::init()
 void ScCellFieldsObj::setUp()
 {
     CalcUnoApiTest::setUp();
-    m_xComponent = loadFromDesktop("private:factory/scalc");
+    mxComponent = loadFromDesktop("private:factory/scalc");
 }
 
 void ScCellFieldsObj::tearDown()
 {
-    closeDocument(m_xComponent);
+    closeDocument(mxComponent);
     CalcUnoApiTest::tearDown();
 }
 
diff --git a/sc/qa/extras/sccellformatsenumeration.cxx b/sc/qa/extras/sccellformatsenumeration.cxx
index 0ecb6aea359d..6dd9ca2693d2 100644
--- a/sc/qa/extras/sccellformatsenumeration.cxx
+++ b/sc/qa/extras/sccellformatsenumeration.cxx
@@ -42,9 +42,6 @@ public:
     CPPUNIT_TEST(testNextElement);
 
     CPPUNIT_TEST_SUITE_END();
-
-private:
-    uno::Reference<lang::XComponent> m_xComponent;
 };
 
 ScCellFormatsEnumeration::ScCellFormatsEnumeration()
@@ -54,7 +51,7 @@ ScCellFormatsEnumeration::ScCellFormatsEnumeration()
 
 uno::Reference<uno::XInterface> ScCellFormatsEnumeration::init()
 {
-    uno::Reference<sheet::XSpreadsheetDocument> xDoc(m_xComponent, uno::UNO_QUERY_THROW);
+    uno::Reference<sheet::XSpreadsheetDocument> xDoc(mxComponent, uno::UNO_QUERY_THROW);
     CPPUNIT_ASSERT_MESSAGE("no calc document", xDoc.is());
 
     uno::Reference<sheet::XSpreadsheets> xSheets(xDoc->getSheets(), uno::UNO_SET_THROW);
@@ -72,12 +69,12 @@ uno::Reference<uno::XInterface> ScCellFormatsEnumeration::init()
 void ScCellFormatsEnumeration::setUp()
 {
     CalcUnoApiTest::setUp();
-    m_xComponent = loadFromDesktop("private:factory/scalc");
+    mxComponent = loadFromDesktop("private:factory/scalc");
 }
 
 void ScCellFormatsEnumeration::tearDown()
 {
-    closeDocument(m_xComponent);
+    closeDocument(mxComponent);
     CalcUnoApiTest::tearDown();
 }
 
diff --git a/sc/qa/extras/sccellformatsobj.cxx b/sc/qa/extras/sccellformatsobj.cxx
index 58d570f8be26..7a0fa4ad59d1 100644
--- a/sc/qa/extras/sccellformatsobj.cxx
+++ b/sc/qa/extras/sccellformatsobj.cxx
@@ -56,9 +56,6 @@ public:
     CPPUNIT_TEST(testGetCount);
 
     CPPUNIT_TEST_SUITE_END();
-
-private:
-    uno::Reference<lang::XComponent> m_xComponent;
 };
 
 ScCellFormatsObj::ScCellFormatsObj()
@@ -70,7 +67,7 @@ ScCellFormatsObj::ScCellFormatsObj()
 
 uno::Reference<uno::XInterface> ScCellFormatsObj::init()
 {
-    uno::Reference<sheet::XSpreadsheetDocument> xDoc(m_xComponent, uno::UNO_QUERY_THROW);
+    uno::Reference<sheet::XSpreadsheetDocument> xDoc(mxComponent, uno::UNO_QUERY_THROW);
     CPPUNIT_ASSERT_MESSAGE("no calc document", xDoc.is());
 
     uno::Reference<sheet::XSpreadsheets> xSheets(xDoc->getSheets(), uno::UNO_SET_THROW);
@@ -85,12 +82,12 @@ uno::Reference<uno::XInterface> ScCellFormatsObj::init()
 void ScCellFormatsObj::setUp()
 {
     CalcUnoApiTest::setUp();
-    m_xComponent = loadFromDesktop("private:factory/scalc");
+    mxComponent = loadFromDesktop("private:factory/scalc");
 }
 
 void ScCellFormatsObj::tearDown()
 {
-    closeDocument(m_xComponent);
+    closeDocument(mxComponent);
     CalcUnoApiTest::tearDown();
 }
 
diff --git a/sc/qa/extras/sccellobj.cxx b/sc/qa/extras/sccellobj.cxx
index 590dad2eb0f4..11631f79f4c2 100644
--- a/sc/qa/extras/sccellobj.cxx
+++ b/sc/qa/extras/sccellobj.cxx
@@ -90,9 +90,6 @@ public:
     CPPUNIT_TEST(testInsertControlCharacter);
 
     CPPUNIT_TEST_SUITE_END();
-
-private:
-    uno::Reference<lang::XComponent> mxComponent;
 };
 
 ScCellObj::ScCellObj()
diff --git a/sc/qa/extras/sccellrangeobj.cxx b/sc/qa/extras/sccellrangeobj.cxx
index 41731973ef78..0781638e1bf3 100644
--- a/sc/qa/extras/sccellrangeobj.cxx
+++ b/sc/qa/extras/sccellrangeobj.cxx
@@ -175,9 +175,6 @@ public:
     CPPUNIT_TEST(testSortOOB);
 
     CPPUNIT_TEST_SUITE_END();
-
-private:
-    uno::Reference<lang::XComponent> mxComponent;
 };
 
 ScCellRangeObj::ScCellRangeObj()
diff --git a/sc/qa/extras/sccellrangesobj.cxx b/sc/qa/extras/sccellrangesobj.cxx
index e87f6792e9e9..69a4339c8743 100644
--- a/sc/qa/extras/sccellrangesobj.cxx
+++ b/sc/qa/extras/sccellrangesobj.cxx
@@ -78,9 +78,6 @@ public:
     CPPUNIT_TEST(testClearContents);
 
     CPPUNIT_TEST_SUITE_END();
-
-private:
-    uno::Reference<lang::XComponent> mxComponent;
 };
 
 ScCellRangesObj::ScCellRangesObj()
diff --git a/sc/qa/extras/sccellsearchobj.cxx b/sc/qa/extras/sccellsearchobj.cxx
index e0ee5c3bba3c..470f31f258a5 100644
--- a/sc/qa/extras/sccellsearchobj.cxx
+++ b/sc/qa/extras/sccellsearchobj.cxx
@@ -66,9 +66,6 @@ public:
     CPPUNIT_TEST(testSupportsService);
 
     CPPUNIT_TEST_SUITE_END();
-
-private:
-    uno::Reference<lang::XComponent> m_xComponent;
 };
 
 ScCellSearchObj::ScCellSearchObj()
@@ -80,7 +77,7 @@ ScCellSearchObj::ScCellSearchObj()
 
 uno::Reference<uno::XInterface> ScCellSearchObj::init()
 {
-    uno::Reference<sheet::XSpreadsheetDocument> xDoc(m_xComponent, uno::UNO_QUERY_THROW);
+    uno::Reference<sheet::XSpreadsheetDocument> xDoc(mxComponent, uno::UNO_QUERY_THROW);
     uno::Reference<sheet::XSpreadsheets> xSheets(xDoc->getSheets(), uno::UNO_SET_THROW);
     uno::Reference<container::XIndexAccess> xIA(xSheets, uno::UNO_QUERY_THROW);
     uno::Reference<sheet::XSpreadsheet> xSheet0(xIA->getByIndex(0), uno::UNO_QUERY_THROW);
@@ -93,12 +90,12 @@ void ScCellSearchObj::setUp()
 {
     CalcUnoApiTest::setUp();
     // create calc document
-    m_xComponent = loadFromDesktop("private:factory/scalc");
+    mxComponent = loadFromDesktop("private:factory/scalc");
 }
 
 void ScCellSearchObj::tearDown()
 {
-    closeDocument(m_xComponent);
+    closeDocument(mxComponent);
     CalcUnoApiTest::tearDown();
 }
 
diff --git a/sc/qa/extras/sccellsenumeration.cxx b/sc/qa/extras/sccellsenumeration.cxx
index 8961d1e2063e..a6c594a59e9e 100644
--- a/sc/qa/extras/sccellsenumeration.cxx
+++ b/sc/qa/extras/sccellsenumeration.cxx
@@ -45,9 +45,6 @@ public:
     CPPUNIT_TEST(testNextElement);
 
     CPPUNIT_TEST_SUITE_END();
-
-private:
-    uno::Reference<lang::XComponent> m_xComponent;
 };
 
 ScCellsEnumeration::ScCellsEnumeration()
@@ -57,7 +54,7 @@ ScCellsEnumeration::ScCellsEnumeration()
 
 uno::Reference<uno::XInterface> ScCellsEnumeration::init()
 {
-    uno::Reference<sheet::XSpreadsheetDocument> xDoc(m_xComponent, uno::UNO_QUERY_THROW);
+    uno::Reference<sheet::XSpreadsheetDocument> xDoc(mxComponent, uno::UNO_QUERY_THROW);
     CPPUNIT_ASSERT_MESSAGE("no calc document", xDoc.is());
 
     uno::Reference<sheet::XSpreadsheets> xSheets(xDoc->getSheets(), uno::UNO_SET_THROW);
@@ -85,12 +82,12 @@ uno::Reference<uno::XInterface> ScCellsEnumeration::init()
 void ScCellsEnumeration::setUp()
 {
     CalcUnoApiTest::setUp();
-    m_xComponent = loadFromDesktop("private:factory/scalc");
+    mxComponent = loadFromDesktop("private:factory/scalc");
 }
 
 void ScCellsEnumeration::tearDown()
 {
-    closeDocument(m_xComponent);
+    closeDocument(mxComponent);
     CalcUnoApiTest::tearDown();
 }
 
diff --git a/sc/qa/extras/sccellsobj.cxx b/sc/qa/extras/sccellsobj.cxx
index bf7bb687008f..b96d214d1184 100644
--- a/sc/qa/extras/sccellsobj.cxx
+++ b/sc/qa/extras/sccellsobj.cxx
@@ -52,9 +52,6 @@ public:
     CPPUNIT_TEST(testCreateEnumeration);
 
     CPPUNIT_TEST_SUITE_END();
-
-private:
-    uno::Reference<lang::XComponent> m_xComponent;
 };
 
 ScCellsObj::ScCellsObj()
@@ -65,7 +62,7 @@ ScCellsObj::ScCellsObj()
 
 uno::Reference<uno::XInterface> ScCellsObj::init()
 {
-    uno::Reference<sheet::XSpreadsheetDocument> xDoc(m_xComponent, uno::UNO_QUERY_THROW);
+    uno::Reference<sheet::XSpreadsheetDocument> xDoc(mxComponent, uno::UNO_QUERY_THROW);
     CPPUNIT_ASSERT_MESSAGE("no calc document", xDoc.is());
 
     uno::Reference<sheet::XSpreadsheets> xSheets(xDoc->getSheets(), uno::UNO_SET_THROW);
@@ -92,12 +89,12 @@ uno::Reference<uno::XInterface> ScCellsObj::init()
 void ScCellsObj::setUp()
 {
     CalcUnoApiTest::setUp();
-    m_xComponent = loadFromDesktop("private:factory/scalc");
+    mxComponent = loadFromDesktop("private:factory/scalc");
 }
 
 void ScCellsObj::tearDown()
 {
-    closeDocument(m_xComponent);
+    closeDocument(mxComponent);
     CalcUnoApiTest::tearDown();
 }
 
diff --git a/sc/qa/extras/scchartobj.cxx b/sc/qa/extras/scchartobj.cxx
index 04eaeba8131d..ef45d628c223 100644
--- a/sc/qa/extras/scchartobj.cxx
+++ b/sc/qa/extras/scchartobj.cxx
@@ -74,9 +74,6 @@ public:
     CPPUNIT_TEST(testGetSetRanges);
 
     CPPUNIT_TEST_SUITE_END();
-
-private:
-    uno::Reference<lang::XComponent> m_xComponent;
 };
 
 ScChartObj::ScChartObj()
@@ -88,7 +85,7 @@ ScChartObj::ScChartObj()
 
 uno::Reference<uno::XInterface> ScChartObj::init()
 {
-    uno::Reference<sheet::XSpreadsheetDocument> xDoc(m_xComponent, uno::UNO_QUERY_THROW);
+    uno::Reference<sheet::XSpreadsheetDocument> xDoc(mxComponent, uno::UNO_QUERY_THROW);
     uno::Reference<sheet::XSpreadsheets> xSheets(xDoc->getSheets(), uno::UNO_SET_THROW);
     uno::Reference<container::XIndexAccess> xIA(xSheets, uno::UNO_QUERY_THROW);
     uno::Reference<sheet::XSpreadsheet> xSheet0(xIA->getByIndex(0), uno::UNO_QUERY_THROW);
@@ -172,12 +169,12 @@ void ScChartObj::setUp()
 {
     CalcUnoApiTest::setUp();
     // create a calc document
-    m_xComponent = loadFromDesktop("private:factory/scalc");
+    mxComponent = loadFromDesktop("private:factory/scalc");
 }
 
 void ScChartObj::tearDown()
 {
-    closeDocument(m_xComponent);
+    closeDocument(mxComponent);
     CalcUnoApiTest::tearDown();
 }
 
diff --git a/sc/qa/extras/scchartsobj.cxx b/sc/qa/extras/scchartsobj.cxx
index 57b0c584ee07..e0a6be045d65 100644
--- a/sc/qa/extras/scchartsobj.cxx
+++ b/sc/qa/extras/scchartsobj.cxx
@@ -79,9 +79,6 @@ public:
     CPPUNIT_TEST(testAddNewRemoveByName);
 
     CPPUNIT_TEST_SUITE_END();
-
-private:
-    uno::Reference<lang::XComponent> m_xComponent;
 };
 
 ScChartsObj::ScChartsObj()
@@ -95,7 +92,7 @@ ScChartsObj::ScChartsObj()
 
 uno::Reference<uno::XInterface> ScChartsObj::init()
 {
-    uno::Reference<sheet::XSpreadsheetDocument> xDoc(m_xComponent, uno::UNO_QUERY_THROW);
+    uno::Reference<sheet::XSpreadsheetDocument> xDoc(mxComponent, uno::UNO_QUERY_THROW);
     uno::Reference<sheet::XSpreadsheets> xSheets(xDoc->getSheets(), uno::UNO_SET_THROW);
     uno::Reference<container::XIndexAccess> xIA(xSheets, uno::UNO_QUERY_THROW);
     uno::Reference<sheet::XSpreadsheet> xSheet0(xIA->getByIndex(0), uno::UNO_QUERY_THROW);
@@ -176,12 +173,12 @@ void ScChartsObj::setUp()
 {
     CalcUnoApiTest::setUp();
     // create calc document
-    m_xComponent = loadFromDesktop("private:factory/scalc");
+    mxComponent = loadFromDesktop("private:factory/scalc");
 }
 
 void ScChartsObj::tearDown()
 {
-    closeDocument(m_xComponent);
+    closeDocument(mxComponent);
     CalcUnoApiTest::tearDown();
 }
 
diff --git a/sc/qa/extras/scconsolidationdescriptorobj.cxx b/sc/qa/extras/scconsolidationdescriptorobj.cxx
index e229ade7e5a8..259368ace8cd 100644
--- a/sc/qa/extras/scconsolidationdescriptorobj.cxx
+++ b/sc/qa/extras/scconsolidationdescriptorobj.cxx
@@ -49,9 +49,6 @@ public:
     CPPUNIT_TEST(testSetInsertLinks);
 
     CPPUNIT_TEST_SUITE_END();
-
-private:
-    uno::Reference<lang::XComponent> mxComponent;
 };
 
 ScConsolidationDescriptorObj::ScConsolidationDescriptorObj()
diff --git a/sc/qa/extras/scdatabaserangeobj.cxx b/sc/qa/extras/scdatabaserangeobj.cxx
index 246ac3680bdb..7eeaa6948c64 100644
--- a/sc/qa/extras/scdatabaserangeobj.cxx
+++ b/sc/qa/extras/scdatabaserangeobj.cxx
@@ -65,8 +65,6 @@ public:
     CPPUNIT_TEST(testRefresh);
 
     CPPUNIT_TEST_SUITE_END();
-private:
-    uno::Reference< lang::XComponent > mxComponent;
 };
 
 ScDatabaseRangeObj::ScDatabaseRangeObj()
diff --git a/sc/qa/extras/scdatabaserangesobj.cxx b/sc/qa/extras/scdatabaserangesobj.cxx
index 39c190f310d7..7e387c39c42f 100644
--- a/sc/qa/extras/scdatabaserangesobj.cxx
+++ b/sc/qa/extras/scdatabaserangesobj.cxx
@@ -75,9 +75,6 @@ public:
     CPPUNIT_TEST(testSupportsService);
 
     CPPUNIT_TEST_SUITE_END();
-
-private:
-    uno::Reference<lang::XComponent> mxComponent;
 };
 
 ScDatabaseRangesObj::ScDatabaseRangesObj()
diff --git a/sc/qa/extras/scdatapilotfieldgroupitemobj.cxx b/sc/qa/extras/scdatapilotfieldgroupitemobj.cxx
index 8b31050d729d..7982c4763449 100644
--- a/sc/qa/extras/scdatapilotfieldgroupitemobj.cxx
+++ b/sc/qa/extras/scdatapilotfieldgroupitemobj.cxx
@@ -64,7 +64,6 @@ public:
 
 private:
     static const int m_nMaxFieldIndex = 6;
-    uno::Reference<lang::XComponent> m_xComponent;
 };
 
 ScDataPilotFieldGroupItemObj::ScDataPilotFieldGroupItemObj()
@@ -79,7 +78,7 @@ uno::Reference<uno::XInterface> ScDataPilotFieldGroupItemObj::init()
     table::CellRangeAddress aCellRangeAddress(0, 1, 0, m_nMaxFieldIndex - 1, m_nMaxFieldIndex - 1);
     table::CellAddress aCellAddress(0, 7, 8);
 
-    uno::Reference<sheet::XSpreadsheetDocument> xDoc(m_xComponent, uno::UNO_QUERY_THROW);
+    uno::Reference<sheet::XSpreadsheetDocument> xDoc(mxComponent, uno::UNO_QUERY_THROW);
     uno::Reference<sheet::XSpreadsheets> xSheets(xDoc->getSheets(), uno::UNO_SET_THROW);
     uno::Reference<container::XIndexAccess> xIA(xSheets, uno::UNO_QUERY_THROW);
     xSheets->insertNewByName("Some Sheet", 0);
@@ -174,12 +173,12 @@ void ScDataPilotFieldGroupItemObj::setUp()
 {
     CalcUnoApiTest::setUp();
     // create a calc document
-    m_xComponent = loadFromDesktop("private:factory/scalc");
+    mxComponent = loadFromDesktop("private:factory/scalc");
 }
 
 void ScDataPilotFieldGroupItemObj::tearDown()
 {
-    closeDocument(m_xComponent);
+    closeDocument(mxComponent);
     CalcUnoApiTest::tearDown();
 }
 
diff --git a/sc/qa/extras/scdatapilotfieldgroupobj.cxx b/sc/qa/extras/scdatapilotfieldgroupobj.cxx
index c7b73da5772b..ac8bead1b67b 100644
--- a/sc/qa/extras/scdatapilotfieldgroupobj.cxx
+++ b/sc/qa/extras/scdatapilotfieldgroupobj.cxx
@@ -87,7 +87,6 @@ public:
 
 private:
     static const int m_nMaxFieldIndex = 6;
-    uno::Reference<lang::XComponent> m_xComponent;
 };
 
 ScDataPilotFieldGroupObj::ScDataPilotFieldGroupObj()
@@ -105,7 +104,7 @@ uno::Reference<uno::XInterface> ScDataPilotFieldGroupObj::init()
     table::CellRangeAddress aCellRangeAddress(0, 1, 0, m_nMaxFieldIndex - 1, m_nMaxFieldIndex - 1);
     table::CellAddress aCellAddress(0, 7, 8);
 
-    uno::Reference<sheet::XSpreadsheetDocument> xDoc(m_xComponent, uno::UNO_QUERY_THROW);
+    uno::Reference<sheet::XSpreadsheetDocument> xDoc(mxComponent, uno::UNO_QUERY_THROW);
     uno::Reference<sheet::XSpreadsheets> xSheets(xDoc->getSheets(), uno::UNO_SET_THROW);
     uno::Reference<container::XIndexAccess> xIA(xSheets, uno::UNO_QUERY_THROW);
     xSheets->insertNewByName("Some Sheet", 0);
@@ -199,12 +198,12 @@ void ScDataPilotFieldGroupObj::setUp()
 {
     CalcUnoApiTest::setUp();
     // create calc document
-    m_xComponent = loadFromDesktop("private:factory/scalc");
+    mxComponent = loadFromDesktop("private:factory/scalc");
 }
 
 void ScDataPilotFieldGroupObj::tearDown()
 {
-    closeDocument(m_xComponent);
+    closeDocument(mxComponent);
     CalcUnoApiTest::tearDown();
 }
 
diff --git a/sc/qa/extras/scdatapilotfieldgroupsobj.cxx b/sc/qa/extras/scdatapilotfieldgroupsobj.cxx
index 3b05bc0ded65..ad0d015dd882 100644
--- a/sc/qa/extras/scdatapilotfieldgroupsobj.cxx
+++ b/sc/qa/extras/scdatapilotfieldgroupsobj.cxx
@@ -91,7 +91,6 @@ public:
 
 private:
     static const int m_nMaxFieldIndex = 6;
-    uno::Reference<lang::XComponent> m_xComponent;
 };
 
 ScDataPilotFieldGroupsObj::ScDataPilotFieldGroupsObj()
@@ -109,7 +108,7 @@ uno::Reference<uno::XInterface> ScDataPilotFieldGroupsObj::init()
     table::CellRangeAddress aCellRangeAddress(0, 1, 0, m_nMaxFieldIndex - 1, m_nMaxFieldIndex - 1);
     table::CellAddress aCellAddress(0, 7, 8);
 
-    uno::Reference<sheet::XSpreadsheetDocument> xDoc(m_xComponent, uno::UNO_QUERY_THROW);
+    uno::Reference<sheet::XSpreadsheetDocument> xDoc(mxComponent, uno::UNO_QUERY_THROW);
     uno::Reference<sheet::XSpreadsheets> xSheets(xDoc->getSheets(), uno::UNO_SET_THROW);
     uno::Reference<container::XIndexAccess> xIA(xSheets, uno::UNO_QUERY_THROW);
     xSheets->insertNewByName("Some Sheet", 0);
@@ -204,12 +203,12 @@ void ScDataPilotFieldGroupsObj::setUp()
 {
     CalcUnoApiTest::setUp();
     // create a calc document
-    m_xComponent = loadFromDesktop("private:factory/scalc");
+    mxComponent = loadFromDesktop("private:factory/scalc");
 }
 
 void ScDataPilotFieldGroupsObj::tearDown()
 {
-    closeDocument(m_xComponent);
+    closeDocument(mxComponent);
     CalcUnoApiTest::tearDown();
 }
 
diff --git a/sc/qa/extras/scdatapilotfieldobj.cxx b/sc/qa/extras/scdatapilotfieldobj.cxx
index 969f07b2b9b6..51fa3f13aead 100644
--- a/sc/qa/extras/scdatapilotfieldobj.cxx
+++ b/sc/qa/extras/scdatapilotfieldobj.cxx
@@ -78,9 +78,6 @@ public:
     CPPUNIT_TEST(testSupportsService);
 
     CPPUNIT_TEST_SUITE_END();
-
-private:
-    uno::Reference<lang::XComponent> mxComponent;
 };
 
 ScDataPilotFieldObj::ScDataPilotFieldObj()
diff --git a/sc/qa/extras/scdatapilotfieldsobj.cxx b/sc/qa/extras/scdatapilotfieldsobj.cxx
index 54e1df298c4a..1677942df9d6 100644
--- a/sc/qa/extras/scdatapilotfieldsobj.cxx
+++ b/sc/qa/extras/scdatapilotfieldsobj.cxx
@@ -70,9 +70,6 @@ public:
     CPPUNIT_TEST(testSupportsService);
 
     CPPUNIT_TEST_SUITE_END();
-
-private:
-    uno::Reference<lang::XComponent> m_xComponent;
 };
 
 ScDataPilotFieldsObj::ScDataPilotFieldsObj()
@@ -86,7 +83,7 @@ ScDataPilotFieldsObj::ScDataPilotFieldsObj()
 
 uno::Reference<uno::XInterface> ScDataPilotFieldsObj::init()
 {
-    uno::Reference<sheet::XSpreadsheetDocument> xDoc(m_xComponent, uno::UNO_QUERY_THROW);
+    uno::Reference<sheet::XSpreadsheetDocument> xDoc(mxComponent, uno::UNO_QUERY_THROW);
     uno::Reference<sheet::XSpreadsheets> xSheets(xDoc->getSheets(), uno::UNO_SET_THROW);
     uno::Reference<container::XIndexAccess> xIA(xSheets, uno::UNO_QUERY_THROW);
 
@@ -121,12 +118,12 @@ void ScDataPilotFieldsObj::setUp()
 {
     CalcUnoApiTest::setUp();
     // create a calc document
-    m_xComponent = loadFromDesktop("private:factory/scalc");
+    mxComponent = loadFromDesktop("private:factory/scalc");
 }
 
 void ScDataPilotFieldsObj::tearDown()
 {
-    closeDocument(m_xComponent);
+    closeDocument(mxComponent);
     CalcUnoApiTest::tearDown();
 }
 
diff --git a/sc/qa/extras/scdatapilotitemobj.cxx b/sc/qa/extras/scdatapilotitemobj.cxx
index 6abf684566bd..57bb666b5e31 100644
--- a/sc/qa/extras/scdatapilotitemobj.cxx
+++ b/sc/qa/extras/scdatapilotitemobj.cxx
@@ -54,7 +54,6 @@ public:
 
 private:
     static const int m_nMaxFieldIndex = 6;
-    uno::Reference<lang::XComponent> m_xComponent;
 };
 
 ScDataPilotItemObj::ScDataPilotItemObj()
@@ -68,7 +67,7 @@ uno::Reference<uno::XInterface> ScDataPilotItemObj::init()
     table::CellRangeAddress aCellRangeAddress(0, 1, 0, m_nMaxFieldIndex - 1, m_nMaxFieldIndex - 1);
     table::CellAddress aCellAddress(0, 7, 8);
 
-    uno::Reference<sheet::XSpreadsheetDocument> xDoc(m_xComponent, uno::UNO_QUERY_THROW);
+    uno::Reference<sheet::XSpreadsheetDocument> xDoc(mxComponent, uno::UNO_QUERY_THROW);
     uno::Reference<sheet::XSpreadsheets> xSheets(xDoc->getSheets(), uno::UNO_SET_THROW);
 
     xSheets->insertNewByName("Some Sheet", 0);
@@ -122,12 +121,12 @@ void ScDataPilotItemObj::setUp()
 {
     CalcUnoApiTest::setUp();
     // create calc document
-    m_xComponent = loadFromDesktop("private:factory/scalc");
+    mxComponent = loadFromDesktop("private:factory/scalc");
 }
 
 void ScDataPilotItemObj::tearDown()
 {
-    closeDocument(m_xComponent);
+    closeDocument(mxComponent);
     CalcUnoApiTest::tearDown();
 }
 
diff --git a/sc/qa/extras/scdatapilotitemsobj.cxx b/sc/qa/extras/scdatapilotitemsobj.cxx
index c59e76a020b5..c8390924dd63 100644
--- a/sc/qa/extras/scdatapilotitemsobj.cxx
+++ b/sc/qa/extras/scdatapilotitemsobj.cxx
@@ -77,7 +77,6 @@ public:
 
 private:
     static const int m_nMaxFieldIndex = 6;
-    uno::Reference<lang::XComponent> m_xComponent;
 };
 
 ScDataPilotItemsObj::ScDataPilotItemsObj()
@@ -94,7 +93,7 @@ uno::Reference<uno::XInterface> ScDataPilotItemsObj::init()
     table::CellRangeAddress aCellRangeAddress(0, 1, 0, m_nMaxFieldIndex - 1, m_nMaxFieldIndex - 1);
     table::CellAddress aCellAddress(0, 7, 8);
 
-    uno::Reference<sheet::XSpreadsheetDocument> xDoc(m_xComponent, uno::UNO_QUERY_THROW);
+    uno::Reference<sheet::XSpreadsheetDocument> xDoc(mxComponent, uno::UNO_QUERY_THROW);
     uno::Reference<sheet::XSpreadsheets> xSheets(xDoc->getSheets(), uno::UNO_SET_THROW);
     uno::Reference<container::XIndexAccess> xIA(xSheets, uno::UNO_QUERY_THROW);
     xSheets->insertNewByName("Some Sheet", 0);
@@ -146,12 +145,12 @@ void ScDataPilotItemsObj::setUp()
 {
     CalcUnoApiTest::setUp();
     // create a calc document
-    m_xComponent = loadFromDesktop("private:factory/scalc");
+    mxComponent = loadFromDesktop("private:factory/scalc");
 }
 
 void ScDataPilotItemsObj::tearDown()
 {
-    closeDocument(m_xComponent);
+    closeDocument(mxComponent);
     CalcUnoApiTest::tearDown();
 }
 
diff --git a/sc/qa/extras/scdatapilottableobj.cxx b/sc/qa/extras/scdatapilottableobj.cxx
index 4963c05d70f4..5f4ce9712597 100644
--- a/sc/qa/extras/scdatapilottableobj.cxx
+++ b/sc/qa/extras/scdatapilottableobj.cxx
@@ -68,9 +68,6 @@ public:
     CPPUNIT_TEST(testSetName);
 
     CPPUNIT_TEST_SUITE_END();
-
-private:
-    uno::Reference< lang::XComponent > mxComponent;
 };
 
 ScDataPilotTableObj::ScDataPilotTableObj()
diff --git a/sc/qa/extras/scdatapilottablesobj.cxx b/sc/qa/extras/scdatapilottablesobj.cxx
index 3095feee7e63..1847c5db2576 100644
--- a/sc/qa/extras/scdatapilottablesobj.cxx
+++ b/sc/qa/extras/scdatapilottablesobj.cxx
@@ -81,9 +81,6 @@ public:
     CPPUNIT_TEST(testSupportsService);
 
     CPPUNIT_TEST_SUITE_END();
-
-private:
-    uno::Reference<lang::XComponent> mxComponent;
 };
 
 ScDataPilotTablesObj::ScDataPilotTablesObj()
diff --git a/sc/qa/extras/scddelinkobj.cxx b/sc/qa/extras/scddelinkobj.cxx
index bc46bc1449d5..89855263d14d 100644
--- a/sc/qa/extras/scddelinkobj.cxx
+++ b/sc/qa/extras/scddelinkobj.cxx
@@ -86,9 +86,6 @@ public:
     CPPUNIT_TEST(testRefreshListener);
 
     CPPUNIT_TEST_SUITE_END();
-
-private:
-    uno::Reference<lang::XComponent> mxComponent;
 };
 
 ScDDELinkObj::ScDDELinkObj()
diff --git a/sc/qa/extras/scddelinksobj.cxx b/sc/qa/extras/scddelinksobj.cxx
index d546c47dd440..6b628861d0dc 100644
--- a/sc/qa/extras/scddelinksobj.cxx
+++ b/sc/qa/extras/scddelinksobj.cxx
@@ -78,9 +78,6 @@ public:
     CPPUNIT_TEST(testSupportsService);
 
     CPPUNIT_TEST_SUITE_END();
-
-private:
-    uno::Reference<lang::XComponent> m_xComponent;
 };
 
 ScDDELinksObj::ScDDELinksObj()
@@ -97,7 +94,7 @@ ScDDELinksObj::ScDDELinksObj()
 
 uno::Reference<uno::XInterface> ScDDELinksObj::init()
 {
-    uno::Reference<sheet::XSpreadsheetDocument> xDoc(m_xComponent, uno::UNO_QUERY_THROW);
+    uno::Reference<sheet::XSpreadsheetDocument> xDoc(mxComponent, uno::UNO_QUERY_THROW);
 
     uno::Reference<sheet::XSpreadsheets> xSheets(xDoc->getSheets(), uno::UNO_SET_THROW);
     uno::Reference<container::XIndexAccess> xIA(xSheets, uno::UNO_QUERY_THROW);
@@ -125,12 +122,12 @@ void ScDDELinksObj::setUp()
     Application::SetAppName("soffice"); // Enable DDE
     CalcUnoApiTest::setUp();
     // create a calc document
-    m_xComponent = loadFromDesktop("private:factory/scalc");
+    mxComponent = loadFromDesktop("private:factory/scalc");
 }
 
 void ScDDELinksObj::tearDown()
 {
-    closeDocument(m_xComponent);
+    closeDocument(mxComponent);
     CalcUnoApiTest::tearDown();
 }
 
diff --git a/sc/qa/extras/scdocumentconfigurationobj.cxx b/sc/qa/extras/scdocumentconfigurationobj.cxx
index 132e9b79287d..af650fe0a56d 100644
--- a/sc/qa/extras/scdocumentconfigurationobj.cxx
+++ b/sc/qa/extras/scdocumentconfigurationobj.cxx
@@ -39,9 +39,6 @@ public:
     CPPUNIT_TEST(testDocumentSettingsProperties);
 
     CPPUNIT_TEST_SUITE_END();
-
-private:
-    uno::Reference<lang::XComponent> mxComponent;
 };
 
 ScDocumentConfigurationObj::ScDocumentConfigurationObj()
diff --git a/sc/qa/extras/scdrawpageobj.cxx b/sc/qa/extras/scdrawpageobj.cxx
index d7f54a0865a6..7400493bf8e0 100644
--- a/sc/qa/extras/scdrawpageobj.cxx
+++ b/sc/qa/extras/scdrawpageobj.cxx
@@ -68,9 +68,6 @@ public:
     CPPUNIT_TEST(testAddRemove);
 
     CPPUNIT_TEST_SUITE_END();
-
-private:
-    uno::Reference<lang::XComponent> m_xComponent;
 };
 
 ScDrawPageObj::ScDrawPageObj()
@@ -83,7 +80,7 @@ ScDrawPageObj::ScDrawPageObj()
 
 uno::Reference<uno::XInterface> ScDrawPageObj::init()
 {
-    uno::Reference<sheet::XSpreadsheetDocument> xDoc(m_xComponent, uno::UNO_QUERY_THROW);
+    uno::Reference<sheet::XSpreadsheetDocument> xDoc(mxComponent, uno::UNO_QUERY_THROW);
     uno::Reference<drawing::XDrawPagesSupplier> xDPS(xDoc, uno::UNO_QUERY_THROW);
     uno::Reference<drawing::XDrawPages> xDP(xDPS->getDrawPages(), uno::UNO_SET_THROW);
     xDP->insertNewByIndex(0);
@@ -93,18 +90,18 @@ uno::Reference<uno::XInterface> ScDrawPageObj::init()
     uno::Reference<drawing::XShapes> xShapes(xDrawPage, uno::UNO_QUERY_THROW);
 
     uno::Reference<drawing::XShape> xRectangle0(
-        apitest::helper::shape::createRectangle(m_xComponent, 7500, 5000, 5000, 3500),
+        apitest::helper::shape::createRectangle(mxComponent, 7500, 5000, 5000, 3500),
         uno::UNO_SET_THROW);
     xShapes->add(xRectangle0);
     uno::Reference<drawing::XShape> xRectangle1(
-        apitest::helper::shape::createRectangle(m_xComponent, 5000, 5000, 5000, 5500),
+        apitest::helper::shape::createRectangle(mxComponent, 5000, 5000, 5000, 5500),
         uno::UNO_SET_THROW);
     xShapes->add(xRectangle1);
 
     // needed for XShapeGrouper tests
     setDrawPage(xDrawPage);
     // needed for XShapes tests
-    setShape(apitest::helper::shape::createLine(m_xComponent, 7500, 10000, 5000, 3500));
+    setShape(apitest::helper::shape::createLine(mxComponent, 7500, 10000, 5000, 3500));
     return xDrawPage;
 }
 
@@ -112,12 +109,12 @@ void ScDrawPageObj::setUp()
 {
     CalcUnoApiTest::setUp();
     // create calc document
-    m_xComponent = loadFromDesktop("private:factory/scalc");
+    mxComponent = loadFromDesktop("private:factory/scalc");
 }
 
 void ScDrawPageObj::tearDown()
 {
-    closeDocument(m_xComponent);
+    closeDocument(mxComponent);
     CalcUnoApiTest::tearDown();
 }
 
diff --git a/sc/qa/extras/scdrawpagesobj.cxx b/sc/qa/extras/scdrawpagesobj.cxx
index 59a78e618314..c4d53761b11e 100644
--- a/sc/qa/extras/scdrawpagesobj.cxx
+++ b/sc/qa/extras/scdrawpagesobj.cxx
@@ -62,9 +62,6 @@ public:
     CPPUNIT_TEST(testSupportsService);
 
     CPPUNIT_TEST_SUITE_END();
-
-private:
-    uno::Reference<lang::XComponent> m_xComponent;
 };
 
 ScDrawPagesObj::ScDrawPagesObj()
@@ -77,7 +74,7 @@ ScDrawPagesObj::ScDrawPagesObj()
 
 uno::Reference<uno::XInterface> ScDrawPagesObj::init()
 {
-    uno::Reference<sheet::XSpreadsheetDocument> xDoc(m_xComponent, uno::UNO_QUERY_THROW);
+    uno::Reference<sheet::XSpreadsheetDocument> xDoc(mxComponent, uno::UNO_QUERY_THROW);
 
     uno::Reference<drawing::XDrawPagesSupplier> xDPS(xDoc, uno::UNO_QUERY_THROW);
     uno::Reference<drawing::XDrawPages> xDP(xDPS->getDrawPages(), uno::UNO_SET_THROW);
@@ -92,12 +89,12 @@ void ScDrawPagesObj::setUp()
 {
     CalcUnoApiTest::setUp();
     // create a calc document
-    m_xComponent = loadFromDesktop("private:factory/scalc");
+    mxComponent = loadFromDesktop("private:factory/scalc");
 }
 
 void ScDrawPagesObj::tearDown()
 {
-    closeDocument(m_xComponent);
+    closeDocument(mxComponent);
     CalcUnoApiTest::tearDown();
 }
 
diff --git a/sc/qa/extras/sceditfieldobj-cell.cxx b/sc/qa/extras/sceditfieldobj-cell.cxx
index c01a40c47a81..ae7c23fcf995 100644
--- a/sc/qa/extras/sceditfieldobj-cell.cxx
+++ b/sc/qa/extras/sceditfieldobj-cell.cxx
@@ -84,7 +84,6 @@ public:
     CPPUNIT_TEST_SUITE_END();
 
 private:
-    uno::Reference<lang::XComponent> mxComponent;
     static uno::Reference<text::XTextField> mxField;
 };
 
diff --git a/sc/qa/extras/sceditfieldobj-header.cxx b/sc/qa/extras/sceditfieldobj-header.cxx
index 6e8721ed7304..320b82a07353 100644
--- a/sc/qa/extras/sceditfieldobj-header.cxx
+++ b/sc/qa/extras/sceditfieldobj-header.cxx
@@ -79,7 +79,6 @@ public:
     CPPUNIT_TEST_SUITE_END();
 
 private:
-    uno::Reference<lang::XComponent> mxComponent;
     static uno::Reference<text::XTextField> mxField;
     static uno::Reference<text::XText> mxRightText;
 };
diff --git a/sc/qa/extras/scfilterdescriptorbase.cxx b/sc/qa/extras/scfilterdescriptorbase.cxx
index 7811d6c83bf1..51a3e3bf2490 100644
--- a/sc/qa/extras/scfilterdescriptorbase.cxx
+++ b/sc/qa/extras/scfilterdescriptorbase.cxx
@@ -72,9 +72,6 @@ public:
     CPPUNIT_TEST(testGetSetFilterFields3);
 
     CPPUNIT_TEST_SUITE_END();
-
-private:
-    uno::Reference<lang::XComponent> mxComponent;
 };
 
 ScFilterDescriptorBase::ScFilterDescriptorBase()
diff --git a/sc/qa/extras/scfunctiondescriptionobj.cxx b/sc/qa/extras/scfunctiondescriptionobj.cxx
index ee6456be1a99..a30a89d1aea2 100644
--- a/sc/qa/extras/scfunctiondescriptionobj.cxx
+++ b/sc/qa/extras/scfunctiondescriptionobj.cxx
@@ -42,9 +42,6 @@ public:
     CPPUNIT_TEST(testFunctionDescriptionProperties);
 
     CPPUNIT_TEST_SUITE_END();
-
-private:
-    uno::Reference<lang::XComponent> mxComponent;
 };
 
 ScFunctionDescriptionObj::ScFunctionDescriptionObj()
diff --git a/sc/qa/extras/scfunctionlistobj.cxx b/sc/qa/extras/scfunctionlistobj.cxx
index 385ea7d8962a..1a5ba0363416 100644
--- a/sc/qa/extras/scfunctionlistobj.cxx
+++ b/sc/qa/extras/scfunctionlistobj.cxx
@@ -74,9 +74,6 @@ public:
     CPPUNIT_TEST(testSupportsService);
 
     CPPUNIT_TEST_SUITE_END();
-
-private:
-    uno::Reference<lang::XComponent> mxComponent;
 };
 
 ScFunctionListObj::ScFunctionListObj()
diff --git a/sc/qa/extras/scheaderfieldsobj.cxx b/sc/qa/extras/scheaderfieldsobj.cxx
index 4333ef6a5061..6fbd7d1b56a2 100644
--- a/sc/qa/extras/scheaderfieldsobj.cxx
+++ b/sc/qa/extras/scheaderfieldsobj.cxx
@@ -59,7 +59,6 @@ public:
     CPPUNIT_TEST_SUITE_END();
 
 private:
-    uno::Reference<lang::XComponent> m_xComponent;
     // We need a long living reference to css::text::XText to make the
     // XElementAccess::hasElements() test work as ScHeaderFooterEditSource holds
     // only (weak) references and they sometimes are gone.
@@ -76,7 +75,7 @@ ScHeaderFieldsObj::ScHeaderFieldsObj()
 
 uno::Reference<uno::XInterface> ScHeaderFieldsObj::init()
 {
-    uno::Reference<sheet::XSpreadsheetDocument> xDoc(m_xComponent, uno::UNO_QUERY_THROW);
+    uno::Reference<sheet::XSpreadsheetDocument> xDoc(mxComponent, uno::UNO_QUERY_THROW);
 
     uno::Reference<style::XStyleFamiliesSupplier> xSFS(xDoc, uno::UNO_QUERY_THROW);
     uno::Reference<container::XNameAccess> xNA(xSFS->getStyleFamilies(), uno::UNO_SET_THROW);
@@ -102,14 +101,14 @@ void ScHeaderFieldsObj::setUp()
 {
     CalcUnoApiTest::setUp();
     // create calc document
-    m_xComponent = loadFromDesktop("private:factory/scalc");
+    mxComponent = loadFromDesktop("private:factory/scalc");
 }
 
 void ScHeaderFieldsObj::tearDown()
 {
     m_xText.clear();
 
-    closeDocument(m_xComponent);
+    closeDocument(mxComponent);
     CalcUnoApiTest::tearDown();
 }
 
diff --git a/sc/qa/extras/scheaderfootercontentobj.cxx b/sc/qa/extras/scheaderfootercontentobj.cxx
index 454a402da4d7..b48d98de6fb9 100644
--- a/sc/qa/extras/scheaderfootercontentobj.cxx
+++ b/sc/qa/extras/scheaderfootercontentobj.cxx
@@ -44,9 +44,6 @@ public:
     CPPUNIT_TEST(testGetRightText);
 
     CPPUNIT_TEST_SUITE_END();
-
-private:
-    uno::Reference<lang::XComponent> mxComponent;
 };
 
 ScHeaderFooterContentObj::ScHeaderFooterContentObj()
diff --git a/sc/qa/extras/scimportdescriptorbaseobj.cxx b/sc/qa/extras/scimportdescriptorbaseobj.cxx
index b4812096e02f..1d750f26cf3d 100644
--- a/sc/qa/extras/scimportdescriptorbaseobj.cxx
+++ b/sc/qa/extras/scimportdescriptorbaseobj.cxx
@@ -43,9 +43,6 @@ public:
     CPPUNIT_TEST(testDatabaseImportDescriptorProperties);
 
     CPPUNIT_TEST_SUITE_END();
-
-private:
-    uno::Reference<lang::XComponent> mxComponent;
 };
 
 ScImportDescriptorBaseObj::ScImportDescriptorBaseObj()
diff --git a/sc/qa/extras/scindexenumeration_cellannotationsenumeration.cxx b/sc/qa/extras/scindexenumeration_cellannotationsenumeration.cxx
index 30c2cc891af8..b40b68383109 100644
--- a/sc/qa/extras/scindexenumeration_cellannotationsenumeration.cxx
+++ b/sc/qa/extras/scindexenumeration_cellannotationsenumeration.cxx
@@ -46,9 +46,6 @@ public:
     CPPUNIT_TEST(testNextElement);
 
     CPPUNIT_TEST_SUITE_END();
-
-private:
-    uno::Reference<lang::XComponent> m_xComponent;
 };
 
 ScIndexEnumeration_CellAnnotationsEnumeration::ScIndexEnumeration_CellAnnotationsEnumeration()
@@ -58,7 +55,7 @@ ScIndexEnumeration_CellAnnotationsEnumeration::ScIndexEnumeration_CellAnnotation
 
 uno::Reference<uno::XInterface> ScIndexEnumeration_CellAnnotationsEnumeration::init()
 {
-    uno::Reference<sheet::XSpreadsheetDocument> xDoc(m_xComponent, uno::UNO_QUERY_THROW);
+    uno::Reference<sheet::XSpreadsheetDocument> xDoc(mxComponent, uno::UNO_QUERY_THROW);
     CPPUNIT_ASSERT_MESSAGE("no calc document", xDoc.is());
 
     uno::Reference<sheet::XSpreadsheets> xSheets(xDoc->getSheets(), uno::UNO_SET_THROW);
@@ -78,12 +75,12 @@ uno::Reference<uno::XInterface> ScIndexEnumeration_CellAnnotationsEnumeration::i
 void ScIndexEnumeration_CellAnnotationsEnumeration::setUp()
 {
     CalcUnoApiTest::setUp();
-    m_xComponent = loadFromDesktop("private:factory/scalc");
+    mxComponent = loadFromDesktop("private:factory/scalc");
 }
 
 void ScIndexEnumeration_CellAnnotationsEnumeration::tearDown()
 {
-    closeDocument(m_xComponent);
+    closeDocument(mxComponent);
     CalcUnoApiTest::tearDown();
 }
 
diff --git a/sc/qa/extras/scindexenumeration_cellarealinksenumeration.cxx b/sc/qa/extras/scindexenumeration_cellarealinksenumeration.cxx
index 63446d4f80b8..a226862c5e88 100644
--- a/sc/qa/extras/scindexenumeration_cellarealinksenumeration.cxx
+++ b/sc/qa/extras/scindexenumeration_cellarealinksenumeration.cxx
@@ -42,9 +42,6 @@ public:
     CPPUNIT_TEST(testNextElement);
 
     CPPUNIT_TEST_SUITE_END();
-
-private:
-    uno::Reference<lang::XComponent> m_xComponent;
 };
 
 ScIndexEnumeration_CellAreaLinksEnumeration::ScIndexEnumeration_CellAreaLinksEnumeration()
@@ -54,7 +51,7 @@ ScIndexEnumeration_CellAreaLinksEnumeration::ScIndexEnumeration_CellAreaLinksEnu
 
 uno::Reference<uno::XInterface> ScIndexEnumeration_CellAreaLinksEnumeration::init()
 {
-    uno::Reference<sheet::XSpreadsheetDocument> xDoc(m_xComponent, uno::UNO_QUERY_THROW);
+    uno::Reference<sheet::XSpreadsheetDocument> xDoc(mxComponent, uno::UNO_QUERY_THROW);
     CPPUNIT_ASSERT_MESSAGE("no calc document", xDoc.is());
 
     uno::Reference<beans::XPropertySet> xPropertySet(xDoc, uno::UNO_QUERY_THROW);
@@ -71,12 +68,12 @@ uno::Reference<uno::XInterface> ScIndexEnumeration_CellAreaLinksEnumeration::ini
 void ScIndexEnumeration_CellAreaLinksEnumeration::setUp()
 {
     CalcUnoApiTest::setUp();
-    m_xComponent = loadFromDesktop("private:factory/scalc");
+    mxComponent = loadFromDesktop("private:factory/scalc");
 }
 
 void ScIndexEnumeration_CellAreaLinksEnumeration::tearDown()
 {
-    closeDocument(m_xComponent);
+    closeDocument(mxComponent);
     CalcUnoApiTest::tearDown();
 }
 
diff --git a/sc/qa/extras/scindexenumeration_databaserangesenumeration.cxx b/sc/qa/extras/scindexenumeration_databaserangesenumeration.cxx
index 08a6805f821d..730c079d834d 100644
--- a/sc/qa/extras/scindexenumeration_databaserangesenumeration.cxx
+++ b/sc/qa/extras/scindexenumeration_databaserangesenumeration.cxx
@@ -42,9 +42,6 @@ public:
     CPPUNIT_TEST(testNextElement);
 
     CPPUNIT_TEST_SUITE_END();
-
-private:
-    uno::Reference<lang::XComponent> m_xComponent;
 };
 
 ScIndexEnumeration_DatabaseRangesEnumeration::ScIndexEnumeration_DatabaseRangesEnumeration()
@@ -54,7 +51,7 @@ ScIndexEnumeration_DatabaseRangesEnumeration::ScIndexEnumeration_DatabaseRangesE
 
 uno::Reference<uno::XInterface> ScIndexEnumeration_DatabaseRangesEnumeration::init()
 {
-    uno::Reference<sheet::XSpreadsheetDocument> xDoc(m_xComponent, uno::UNO_QUERY_THROW);
+    uno::Reference<sheet::XSpreadsheetDocument> xDoc(mxComponent, uno::UNO_QUERY_THROW);
     CPPUNIT_ASSERT_MESSAGE("no calc document", xDoc.is());
 
     uno::Reference<beans::XPropertySet> xPropertySet(xDoc, uno::UNO_QUERY_THROW);
@@ -70,12 +67,12 @@ uno::Reference<uno::XInterface> ScIndexEnumeration_DatabaseRangesEnumeration::in
 void ScIndexEnumeration_DatabaseRangesEnumeration::setUp()
 {
     CalcUnoApiTest::setUp();
-    m_xComponent = loadFromDesktop("private:factory/scalc");
+    mxComponent = loadFromDesktop("private:factory/scalc");
 }
 
 void ScIndexEnumeration_DatabaseRangesEnumeration::tearDown()
 {
-    closeDocument(m_xComponent);
+    closeDocument(mxComponent);
     CalcUnoApiTest::tearDown();
 }
 
diff --git a/sc/qa/extras/scindexenumeration_datapilotfieldsenumeration.cxx b/sc/qa/extras/scindexenumeration_datapilotfieldsenumeration.cxx
index d29b35220304..bcf0b962c853 100644
--- a/sc/qa/extras/scindexenumeration_datapilotfieldsenumeration.cxx
+++ b/sc/qa/extras/scindexenumeration_datapilotfieldsenumeration.cxx
@@ -47,9 +47,6 @@ public:
     CPPUNIT_TEST(testNextElement);
 
     CPPUNIT_TEST_SUITE_END();
-
-private:
-    uno::Reference<lang::XComponent> m_xComponent;
 };
 
 ScIndexEnumeration_DataPilotFieldsEnumeration::ScIndexEnumeration_DataPilotFieldsEnumeration()
@@ -59,7 +56,7 @@ ScIndexEnumeration_DataPilotFieldsEnumeration::ScIndexEnumeration_DataPilotField
 
 uno::Reference<uno::XInterface> ScIndexEnumeration_DataPilotFieldsEnumeration::init()
 {
-    uno::Reference<sheet::XSpreadsheetDocument> xDoc(m_xComponent, uno::UNO_QUERY_THROW);
+    uno::Reference<sheet::XSpreadsheetDocument> xDoc(mxComponent, uno::UNO_QUERY_THROW);
     CPPUNIT_ASSERT_MESSAGE("no calc document", xDoc.is());
 
     uno::Reference<sheet::XSpreadsheets> xSheets(xDoc->getSheets(), uno::UNO_SET_THROW);
@@ -92,12 +89,12 @@ uno::Reference<uno::XInterface> ScIndexEnumeration_DataPilotFieldsEnumeration::i
 void ScIndexEnumeration_DataPilotFieldsEnumeration::setUp()
 {
     CalcUnoApiTest::setUp();
-    m_xComponent = loadFromDesktop("private:factory/scalc");
+    mxComponent = loadFromDesktop("private:factory/scalc");
 }
 
 void ScIndexEnumeration_DataPilotFieldsEnumeration::tearDown()
 {
-    closeDocument(m_xComponent);
+    closeDocument(mxComponent);
     CalcUnoApiTest::tearDown();
 }
 
diff --git a/sc/qa/extras/scindexenumeration_datapilotitemsenumeration.cxx b/sc/qa/extras/scindexenumeration_datapilotitemsenumeration.cxx
index 05ce7ffdd760..1ea9ac71737e 100644
--- a/sc/qa/extras/scindexenumeration_datapilotitemsenumeration.cxx
+++ b/sc/qa/extras/scindexenumeration_datapilotitemsenumeration.cxx
@@ -54,7 +54,6 @@ public:
 
 private:
     static const int m_nMaxFieldIndex = 6;
-    uno::Reference<lang::XComponent> m_xComponent;
 };
 
 ScIndexEnumeration_DataPilotItemsEnumeration::ScIndexEnumeration_DataPilotItemsEnumeration()
@@ -67,7 +66,7 @@ uno::Reference<uno::XInterface> ScIndexEnumeration_DataPilotItemsEnumeration::in
     table::CellRangeAddress aCellRangeAddress(0, 1, 0, m_nMaxFieldIndex - 1, m_nMaxFieldIndex - 1);
     table::CellAddress aCellAddress(0, 7, 8);
 
-    uno::Reference<sheet::XSpreadsheetDocument> xDoc(m_xComponent, uno::UNO_QUERY_THROW);
+    uno::Reference<sheet::XSpreadsheetDocument> xDoc(mxComponent, uno::UNO_QUERY_THROW);
     CPPUNIT_ASSERT_MESSAGE("no document", xDoc.is());
     uno::Reference<sheet::XSpreadsheets> xSheets(xDoc->getSheets(), uno::UNO_SET_THROW);
 
@@ -124,12 +123,12 @@ void ScIndexEnumeration_DataPilotItemsEnumeration::setUp()
 {
     CalcUnoApiTest::setUp();
     // create a calc document
-    m_xComponent = loadFromDesktop("private:factory/scalc");
+    mxComponent = loadFromDesktop("private:factory/scalc");
 }
 
 void ScIndexEnumeration_DataPilotItemsEnumeration::tearDown()
 {
-    closeDocument(m_xComponent);
+    closeDocument(mxComponent);
     CalcUnoApiTest::tearDown();
 }
 
diff --git a/sc/qa/extras/scindexenumeration_datapilottablesenumeration.cxx b/sc/qa/extras/scindexenumeration_datapilottablesenumeration.cxx
index 7f59857847e6..c8b93349b622 100644
--- a/sc/qa/extras/scindexenumeration_datapilottablesenumeration.cxx
+++ b/sc/qa/extras/scindexenumeration_datapilottablesenumeration.cxx
@@ -47,9 +47,6 @@ public:
     CPPUNIT_TEST(testNextElement);
 
     CPPUNIT_TEST_SUITE_END();
-
-private:
-    uno::Reference<lang::XComponent> m_xComponent;
 };
 
 ScIndexEnumeration_DataPilotTablesEnumeration::ScIndexEnumeration_DataPilotTablesEnumeration()
@@ -59,7 +56,7 @@ ScIndexEnumeration_DataPilotTablesEnumeration::ScIndexEnumeration_DataPilotTable
 
 uno::Reference<uno::XInterface> ScIndexEnumeration_DataPilotTablesEnumeration::init()
 {
-    uno::Reference<sheet::XSpreadsheetDocument> xDoc(m_xComponent, uno::UNO_QUERY_THROW);
+    uno::Reference<sheet::XSpreadsheetDocument> xDoc(mxComponent, uno::UNO_QUERY_THROW);
     CPPUNIT_ASSERT_MESSAGE("no calc document", xDoc.is());
 
     uno::Reference<sheet::XSpreadsheets> xSheets(xDoc->getSheets(), uno::UNO_SET_THROW);
@@ -91,12 +88,12 @@ uno::Reference<uno::XInterface> ScIndexEnumeration_DataPilotTablesEnumeration::i
 void ScIndexEnumeration_DataPilotTablesEnumeration::setUp()
 {
     CalcUnoApiTest::setUp();
-    m_xComponent = loadFromDesktop("private:factory/scalc");
+    mxComponent = loadFromDesktop("private:factory/scalc");
 }
 
 void ScIndexEnumeration_DataPilotTablesEnumeration::tearDown()
 {
-    closeDocument(m_xComponent);
+    closeDocument(mxComponent);
     CalcUnoApiTest::tearDown();
 }
 
diff --git a/sc/qa/extras/scindexenumeration_ddelinksenumeration.cxx b/sc/qa/extras/scindexenumeration_ddelinksenumeration.cxx
index d229dd59796d..e0e5d335d60d 100644
--- a/sc/qa/extras/scindexenumeration_ddelinksenumeration.cxx
+++ b/sc/qa/extras/scindexenumeration_ddelinksenumeration.cxx
@@ -44,9 +44,6 @@ public:
     CPPUNIT_TEST(testNextElement);
 
     CPPUNIT_TEST_SUITE_END();
-
-private:
-    uno::Reference<lang::XComponent> m_xComponent;
 };
 
 ScIndexEnumeration_DDELinksEnumeration::ScIndexEnumeration_DDELinksEnumeration()
@@ -56,7 +53,7 @@ ScIndexEnumeration_DDELinksEnumeration::ScIndexEnumeration_DDELinksEnumeration()
 
 uno::Reference<uno::XInterface> ScIndexEnumeration_DDELinksEnumeration::init()
 {
-    uno::Reference<sheet::XSpreadsheetDocument> xDoc(m_xComponent, uno::UNO_QUERY_THROW);
+    uno::Reference<sheet::XSpreadsheetDocument> xDoc(mxComponent, uno::UNO_QUERY_THROW);
     CPPUNIT_ASSERT_MESSAGE("no calc document", xDoc.is());
 
     uno::Reference<sheet::XSpreadsheets> xSheets(xDoc->getSheets(), uno::UNO_SET_THROW);
@@ -80,12 +77,12 @@ uno::Reference<uno::XInterface> ScIndexEnumeration_DDELinksEnumeration::init()
 void ScIndexEnumeration_DDELinksEnumeration::setUp()
 {
     CalcUnoApiTest::setUp();
-    m_xComponent = loadFromDesktop("private:factory/scalc");
+    mxComponent = loadFromDesktop("private:factory/scalc");
 }
 
 void ScIndexEnumeration_DDELinksEnumeration::tearDown()
 {
-    closeDocument(m_xComponent);
+    closeDocument(mxComponent);
     CalcUnoApiTest::tearDown();
 }
 
diff --git a/sc/qa/extras/scindexenumeration_functiondescriptionenumeration.cxx b/sc/qa/extras/scindexenumeration_functiondescriptionenumeration.cxx
index 91408ddbf862..99c88d0e929c 100644
--- a/sc/qa/extras/scindexenumeration_functiondescriptionenumeration.cxx
+++ b/sc/qa/extras/scindexenumeration_functiondescriptionenumeration.cxx
@@ -40,9 +40,6 @@ public:
     CPPUNIT_TEST(testNextElement);
 
     CPPUNIT_TEST_SUITE_END();
-
-private:
-    uno::Reference<lang::XComponent> m_xComponent;
 };
 
 ScIndexEnumeration_FunctionDescriptionEnumeration::
@@ -53,7 +50,7 @@ ScIndexEnumeration_FunctionDescriptionEnumeration::
 
 uno::Reference<uno::XInterface> ScIndexEnumeration_FunctionDescriptionEnumeration::init()
 {
-    uno::Reference<sheet::XSpreadsheetDocument> xDoc(m_xComponent, uno::UNO_QUERY_THROW);
+    uno::Reference<sheet::XSpreadsheetDocument> xDoc(mxComponent, uno::UNO_QUERY_THROW);
     CPPUNIT_ASSERT_MESSAGE("no calc document", xDoc.is());
 
     uno::Reference<lang::XMultiServiceFactory> xMSF(xDoc, uno::UNO_QUERY_THROW);
@@ -66,12 +63,12 @@ uno::Reference<uno::XInterface> ScIndexEnumeration_FunctionDescriptionEnumeratio
 void ScIndexEnumeration_FunctionDescriptionEnumeration::setUp()
 {
     CalcUnoApiTest::setUp();
-    m_xComponent = loadFromDesktop("private:factory/scalc");
+    mxComponent = loadFromDesktop("private:factory/scalc");
 }
 
 void ScIndexEnumeration_FunctionDescriptionEnumeration::tearDown()
 {
-    closeDocument(m_xComponent);
+    closeDocument(mxComponent);
     CalcUnoApiTest::tearDown();
 }
 
diff --git a/sc/qa/extras/scindexenumeration_labelrangesenumeration.cxx b/sc/qa/extras/scindexenumeration_labelrangesenumeration.cxx
index 284436242d0e..3727a0741ba0 100644
--- a/sc/qa/extras/scindexenumeration_labelrangesenumeration.cxx
+++ b/sc/qa/extras/scindexenumeration_labelrangesenumeration.cxx
@@ -43,9 +43,6 @@ public:
     CPPUNIT_TEST(testNextElement);
 
     CPPUNIT_TEST_SUITE_END();
-
-private:
-    uno::Reference<lang::XComponent> m_xComponent;
 };
 
 ScIndexEnumeration_LabelRangesEnumeration::ScIndexEnumeration_LabelRangesEnumeration()
@@ -55,7 +52,7 @@ ScIndexEnumeration_LabelRangesEnumeration::ScIndexEnumeration_LabelRangesEnumera
 
 uno::Reference<uno::XInterface> ScIndexEnumeration_LabelRangesEnumeration::init()
 {
-    uno::Reference<sheet::XSpreadsheetDocument> xDoc(m_xComponent, uno::UNO_QUERY_THROW);
+    uno::Reference<sheet::XSpreadsheetDocument> xDoc(mxComponent, uno::UNO_QUERY_THROW);
     CPPUNIT_ASSERT_MESSAGE("no calc document", xDoc.is());
 
     uno::Reference<beans::XPropertySet> xPropertySet(xDoc, uno::UNO_QUERY_THROW);
@@ -72,12 +69,12 @@ uno::Reference<uno::XInterface> ScIndexEnumeration_LabelRangesEnumeration::init(
 void ScIndexEnumeration_LabelRangesEnumeration::setUp()
 {
     CalcUnoApiTest::setUp();
-    m_xComponent = loadFromDesktop("private:factory/scalc");
+    mxComponent = loadFromDesktop("private:factory/scalc");
 }
 
 void ScIndexEnumeration_LabelRangesEnumeration::tearDown()
 {
-    closeDocument(m_xComponent);
+    closeDocument(mxComponent);
     CalcUnoApiTest::tearDown();
 }
 
diff --git a/sc/qa/extras/scindexenumeration_namedrangesenumeration.cxx b/sc/qa/extras/scindexenumeration_namedrangesenumeration.cxx
index d508f4fe148d..d439653ed6b9 100644
--- a/sc/qa/extras/scindexenumeration_namedrangesenumeration.cxx
+++ b/sc/qa/extras/scindexenumeration_namedrangesenumeration.cxx
@@ -44,9 +44,6 @@ public:
     CPPUNIT_TEST(testNextElement);
 
     CPPUNIT_TEST_SUITE_END();
-
-private:
-    uno::Reference<lang::XComponent> m_xComponent;
 };
 
 ScIndexEnumeration_NamedRangesEnumeration::ScIndexEnumeration_NamedRangesEnumeration()
@@ -56,7 +53,7 @@ ScIndexEnumeration_NamedRangesEnumeration::ScIndexEnumeration_NamedRangesEnumera
 
 uno::Reference<uno::XInterface> ScIndexEnumeration_NamedRangesEnumeration::init()
 {
-    uno::Reference<sheet::XSpreadsheetDocument> xDoc(m_xComponent, uno::UNO_QUERY_THROW);
+    uno::Reference<sheet::XSpreadsheetDocument> xDoc(mxComponent, uno::UNO_QUERY_THROW);
     CPPUNIT_ASSERT_MESSAGE("no calc document", xDoc.is());
 
     uno::Reference<beans::XPropertySet> xPropertySet(xDoc, uno::UNO_QUERY_THROW);
@@ -77,12 +74,12 @@ uno::Reference<uno::XInterface> ScIndexEnumeration_NamedRangesEnumeration::init(
 void ScIndexEnumeration_NamedRangesEnumeration::setUp()
 {
     CalcUnoApiTest::setUp();
-    m_xComponent = loadFromDesktop("private:factory/scalc");
+    mxComponent = loadFromDesktop("private:factory/scalc");
 }
 
 void ScIndexEnumeration_NamedRangesEnumeration::tearDown()
 {
-    closeDocument(m_xComponent);
+    closeDocument(mxComponent);
     CalcUnoApiTest::tearDown();
 }
 
diff --git a/sc/qa/extras/scindexenumeration_scenariosenumeration.cxx b/sc/qa/extras/scindexenumeration_scenariosenumeration.cxx
index 9de0bbb98f03..7f8f674ecb48 100644
--- a/sc/qa/extras/scindexenumeration_scenariosenumeration.cxx
+++ b/sc/qa/extras/scindexenumeration_scenariosenumeration.cxx
@@ -45,9 +45,6 @@ public:
     CPPUNIT_TEST(testNextElement);
 
     CPPUNIT_TEST_SUITE_END();
-
-private:
-    uno::Reference<lang::XComponent> m_xComponent;
 };
 
 ScIndexEnumeration_ScenariosEnumeration::ScIndexEnumeration_ScenariosEnumeration()
@@ -57,7 +54,7 @@ ScIndexEnumeration_ScenariosEnumeration::ScIndexEnumeration_ScenariosEnumeration
 
 uno::Reference<uno::XInterface> ScIndexEnumeration_ScenariosEnumeration::init()
 {
-    uno::Reference<sheet::XSpreadsheetDocument> xDoc(m_xComponent, uno::UNO_QUERY_THROW);
+    uno::Reference<sheet::XSpreadsheetDocument> xDoc(mxComponent, uno::UNO_QUERY_THROW);
     CPPUNIT_ASSERT_MESSAGE("no calc document", xDoc.is());
 
     uno::Reference<sheet::XSpreadsheets> xSheets(xDoc->getSheets(), uno::UNO_SET_THROW);
@@ -85,12 +82,12 @@ uno::Reference<uno::XInterface> ScIndexEnumeration_ScenariosEnumeration::init()
 void ScIndexEnumeration_ScenariosEnumeration::setUp()
 {
     CalcUnoApiTest::setUp();
-    m_xComponent = loadFromDesktop("private:factory/scalc");
+    mxComponent = loadFromDesktop("private:factory/scalc");
 }
 
 void ScIndexEnumeration_ScenariosEnumeration::tearDown()
 {
-    closeDocument(m_xComponent);
+    closeDocument(mxComponent);
     CalcUnoApiTest::tearDown();
 }
 
diff --git a/sc/qa/extras/scindexenumeration_sheetcellrangesenumeration.cxx b/sc/qa/extras/scindexenumeration_sheetcellrangesenumeration.cxx
index 1ce69f621fbc..dbb54e0c52d4 100644
--- a/sc/qa/extras/scindexenumeration_sheetcellrangesenumeration.cxx
+++ b/sc/qa/extras/scindexenumeration_sheetcellrangesenumeration.cxx
@@ -46,9 +46,6 @@ public:
     CPPUNIT_TEST(testNextElement);
 
     CPPUNIT_TEST_SUITE_END();
-
-private:
-    uno::Reference<lang::XComponent> m_xComponent;
 };
 
 ScIndexEnumeration_SheetCellRangesEnumeration::ScIndexEnumeration_SheetCellRangesEnumeration()
@@ -58,7 +55,7 @@ ScIndexEnumeration_SheetCellRangesEnumeration::ScIndexEnumeration_SheetCellRange
 
 uno::Reference<uno::XInterface> ScIndexEnumeration_SheetCellRangesEnumeration::init()
 {
-    uno::Reference<sheet::XSpreadsheetDocument> xDoc(m_xComponent, uno::UNO_QUERY_THROW);
+    uno::Reference<sheet::XSpreadsheetDocument> xDoc(mxComponent, uno::UNO_QUERY_THROW);
     CPPUNIT_ASSERT_MESSAGE("no calc document", xDoc.is());
 
     uno::Reference<sheet::XSpreadsheets> xSheets(xDoc->getSheets(), uno::UNO_SET_THROW);
@@ -103,12 +100,12 @@ uno::Reference<uno::XInterface> ScIndexEnumeration_SheetCellRangesEnumeration::i
 void ScIndexEnumeration_SheetCellRangesEnumeration::setUp()
 {
     CalcUnoApiTest::setUp();
-    m_xComponent = loadFromDesktop("private:factory/scalc");
+    mxComponent = loadFromDesktop("private:factory/scalc");
 }
 
 void ScIndexEnumeration_SheetCellRangesEnumeration::tearDown()
 {
-    closeDocument(m_xComponent);
+    closeDocument(mxComponent);
     CalcUnoApiTest::tearDown();
 }
 
diff --git a/sc/qa/extras/scindexenumeration_sheetlinksenumeration.cxx b/sc/qa/extras/scindexenumeration_sheetlinksenumeration.cxx
index e0a3b5cd2393..cde30856dca5 100644
--- a/sc/qa/extras/scindexenumeration_sheetlinksenumeration.cxx
+++ b/sc/qa/extras/scindexenumeration_sheetlinksenumeration.cxx
@@ -46,9 +46,6 @@ public:
     CPPUNIT_TEST(testNextElement);
 
     CPPUNIT_TEST_SUITE_END();
-
-private:
-    uno::Reference<lang::XComponent> m_xComponent;
 };
 
 ScIndexEnumeration_SheetLinksEnumeration::ScIndexEnumeration_SheetLinksEnumeration()
@@ -58,7 +55,7 @@ ScIndexEnumeration_SheetLinksEnumeration::ScIndexEnumeration_SheetLinksEnumerati
 
 uno::Reference<uno::XInterface> ScIndexEnumeration_SheetLinksEnumeration::init()
 {
-    uno::Reference<sheet::XSpreadsheetDocument> xDoc(m_xComponent, uno::UNO_QUERY_THROW);
+    uno::Reference<sheet::XSpreadsheetDocument> xDoc(mxComponent, uno::UNO_QUERY_THROW);
     CPPUNIT_ASSERT_MESSAGE("no calc document", xDoc.is());
 
     uno::Reference<sheet::XSpreadsheets> xSheets(xDoc->getSheets(), uno::UNO_SET_THROW);
@@ -81,12 +78,12 @@ uno::Reference<uno::XInterface> ScIndexEnumeration_SheetLinksEnumeration::init()
 void ScIndexEnumeration_SheetLinksEnumeration::setUp()
 {
     CalcUnoApiTest::setUp();
-    m_xComponent = loadFromDesktop("private:factory/scalc");
+    mxComponent = loadFromDesktop("private:factory/scalc");
 }
 
 void ScIndexEnumeration_SheetLinksEnumeration::tearDown()
 {
-    closeDocument(m_xComponent);
+    closeDocument(mxComponent);
     CalcUnoApiTest::tearDown();
 }
 
diff --git a/sc/qa/extras/scindexenumeration_spreadsheetsenumeration.cxx b/sc/qa/extras/scindexenumeration_spreadsheetsenumeration.cxx
index faf8878a2b83..08662c9f8d46 100644
--- a/sc/qa/extras/scindexenumeration_spreadsheetsenumeration.cxx
+++ b/sc/qa/extras/scindexenumeration_spreadsheetsenumeration.cxx
@@ -40,9 +40,6 @@ public:
     CPPUNIT_TEST(testNextElement);
 
     CPPUNIT_TEST_SUITE_END();
-
-private:
-    uno::Reference<lang::XComponent> m_xComponent;
 };
 
 ScIndexEnumeration_SpreadsheetsEnumeration::ScIndexEnumeration_SpreadsheetsEnumeration()
@@ -52,7 +49,7 @@ ScIndexEnumeration_SpreadsheetsEnumeration::ScIndexEnumeration_SpreadsheetsEnume
 
 uno::Reference<uno::XInterface> ScIndexEnumeration_SpreadsheetsEnumeration::init()
 {
-    uno::Reference<sheet::XSpreadsheetDocument> xDoc(m_xComponent, uno::UNO_QUERY_THROW);
+    uno::Reference<sheet::XSpreadsheetDocument> xDoc(mxComponent, uno::UNO_QUERY_THROW);
     CPPUNIT_ASSERT_MESSAGE("no calc document", xDoc.is());
 
     uno::Reference<sheet::XSpreadsheets> xSheets(xDoc->getSheets(), uno::UNO_SET_THROW);
@@ -64,12 +61,12 @@ uno::Reference<uno::XInterface> ScIndexEnumeration_SpreadsheetsEnumeration::init
 void ScIndexEnumeration_SpreadsheetsEnumeration::setUp()
 {
     CalcUnoApiTest::setUp();
-    m_xComponent = loadFromDesktop("private:factory/scalc");
+    mxComponent = loadFromDesktop("private:factory/scalc");
 }
 
 void ScIndexEnumeration_SpreadsheetsEnumeration::tearDown()
 {
-    closeDocument(m_xComponent);
+    closeDocument(mxComponent);
     CalcUnoApiTest::tearDown();
 }
 
diff --git a/sc/qa/extras/scindexenumeration_spreadsheetviewpanesenumeration.cxx b/sc/qa/extras/scindexenumeration_spreadsheetviewpanesenumeration.cxx
index a34207b9b8c7..96c645c38bb0 100644
--- a/sc/qa/extras/scindexenumeration_spreadsheetviewpanesenumeration.cxx
+++ b/sc/qa/extras/scindexenumeration_spreadsheetviewpanesenumeration.cxx
@@ -42,9 +42,6 @@ public:
     CPPUNIT_TEST(testNextElement);
 
     CPPUNIT_TEST_SUITE_END();
-
-private:
-    uno::Reference<lang::XComponent> m_xComponent;
 };
 
 ScIndexEnumeration_SpreadsheetViewPanesEnumeration::
@@ -55,7 +52,7 @@ ScIndexEnumeration_SpreadsheetViewPanesEnumeration::
 
 uno::Reference<uno::XInterface> ScIndexEnumeration_SpreadsheetViewPanesEnumeration::init()
 {
-    uno::Reference<sheet::XSpreadsheetDocument> xDoc(m_xComponent, uno::UNO_QUERY_THROW);
+    uno::Reference<sheet::XSpreadsheetDocument> xDoc(mxComponent, uno::UNO_QUERY_THROW);
     CPPUNIT_ASSERT_MESSAGE("no calc document", xDoc.is());
 
     uno::Reference<frame::XModel> xModel(xDoc, uno::UNO_QUERY_THROW);
@@ -72,12 +69,12 @@ uno::Reference<uno::XInterface> ScIndexEnumeration_SpreadsheetViewPanesEnumerati
 void ScIndexEnumeration_SpreadsheetViewPanesEnumeration::setUp()
 {
     CalcUnoApiTest::setUp();
-    m_xComponent = loadFromDesktop("private:factory/scalc");
+    mxComponent = loadFromDesktop("private:factory/scalc");
 }
 
 void ScIndexEnumeration_SpreadsheetViewPanesEnumeration::tearDown()
 {
-    closeDocument(m_xComponent);
+    closeDocument(mxComponent);
     CalcUnoApiTest::tearDown();
 }
 
diff --git a/sc/qa/extras/scindexenumeration_subtotalfieldsenumeration.cxx b/sc/qa/extras/scindexenumeration_subtotalfieldsenumeration.cxx
index 9adba41f6977..12eb4e795620 100644
--- a/sc/qa/extras/scindexenumeration_subtotalfieldsenumeration.cxx
+++ b/sc/qa/extras/scindexenumeration_subtotalfieldsenumeration.cxx
@@ -46,9 +46,6 @@ public:
     CPPUNIT_TEST(testNextElement);
 
     CPPUNIT_TEST_SUITE_END();
-
-private:
-    uno::Reference<lang::XComponent> m_xComponent;
 };
 
 ScIndexEnumeration_SubTotalFieldsEnumeration::ScIndexEnumeration_SubTotalFieldsEnumeration()
@@ -58,7 +55,7 @@ ScIndexEnumeration_SubTotalFieldsEnumeration::ScIndexEnumeration_SubTotalFieldsE
 
 uno::Reference<uno::XInterface> ScIndexEnumeration_SubTotalFieldsEnumeration::init()
 {
-    uno::Reference<sheet::XSpreadsheetDocument> xDoc(m_xComponent, uno::UNO_QUERY_THROW);
+    uno::Reference<sheet::XSpreadsheetDocument> xDoc(mxComponent, uno::UNO_QUERY_THROW);
     CPPUNIT_ASSERT_MESSAGE("no calc document", xDoc.is());
 
     uno::Reference<sheet::XSpreadsheets> xSheets(xDoc->getSheets(), uno::UNO_SET_THROW);
@@ -80,12 +77,12 @@ uno::Reference<uno::XInterface> ScIndexEnumeration_SubTotalFieldsEnumeration::in
 void ScIndexEnumeration_SubTotalFieldsEnumeration::setUp()
 {
     CalcUnoApiTest::setUp();
-    m_xComponent = loadFromDesktop("private:factory/scalc");
+    mxComponent = loadFromDesktop("private:factory/scalc");
 }
 
 void ScIndexEnumeration_SubTotalFieldsEnumeration::tearDown()
 {
-    closeDocument(m_xComponent);
+    closeDocument(mxComponent);
     CalcUnoApiTest::tearDown();
 }
 
diff --git a/sc/qa/extras/scindexenumeration_tableautoformatenumeration.cxx b/sc/qa/extras/scindexenumeration_tableautoformatenumeration.cxx
index 23f930af1ad6..d2bc0373f183 100644
--- a/sc/qa/extras/scindexenumeration_tableautoformatenumeration.cxx
+++ b/sc/qa/extras/scindexenumeration_tableautoformatenumeration.cxx
@@ -40,9 +40,6 @@ public:
     CPPUNIT_TEST(testNextElement);
 
     CPPUNIT_TEST_SUITE_END();
-
-private:
-    uno::Reference<lang::XComponent> m_xComponent;
 };
 
 ScIndexEnumeration_TableAutoFormatEnumeration::ScIndexEnumeration_TableAutoFormatEnumeration()
@@ -52,7 +49,7 @@ ScIndexEnumeration_TableAutoFormatEnumeration::ScIndexEnumeration_TableAutoForma
 
 uno::Reference<uno::XInterface> ScIndexEnumeration_TableAutoFormatEnumeration::init()
 {
-    uno::Reference<sheet::XSpreadsheetDocument> xDoc(m_xComponent, uno::UNO_QUERY_THROW);
+    uno::Reference<sheet::XSpreadsheetDocument> xDoc(mxComponent, uno::UNO_QUERY_THROW);
     CPPUNIT_ASSERT_MESSAGE("no calc document", xDoc.is());
 
     uno::Reference<lang::XMultiServiceFactory> xMSF(xDoc, uno::UNO_QUERY_THROW);
@@ -65,12 +62,12 @@ uno::Reference<uno::XInterface> ScIndexEnumeration_TableAutoFormatEnumeration::i
 void ScIndexEnumeration_TableAutoFormatEnumeration::setUp()
 {
     CalcUnoApiTest::setUp();
-    m_xComponent = loadFromDesktop("private:factory/scalc");
+    mxComponent = loadFromDesktop("private:factory/scalc");
 }
 
 void ScIndexEnumeration_TableAutoFormatEnumeration::tearDown()
 {
-    closeDocument(m_xComponent);
+    closeDocument(mxComponent);
     CalcUnoApiTest::tearDown();
 }
 
diff --git a/sc/qa/extras/scindexenumeration_tablechartsenumeration.cxx b/sc/qa/extras/scindexenumeration_tablechartsenumeration.cxx
index 55134be87936..3cee5eac1876 100644
--- a/sc/qa/extras/scindexenumeration_tablechartsenumeration.cxx
+++ b/sc/qa/extras/scindexenumeration_tablechartsenumeration.cxx
@@ -48,9 +48,6 @@ public:
     CPPUNIT_TEST(testNextElement);
 
     CPPUNIT_TEST_SUITE_END();
-
-private:
-    uno::Reference<lang::XComponent> m_xComponent;
 };
 
 ScIndexEnumeration_TableChartsEnumeration::ScIndexEnumeration_TableChartsEnumeration()
@@ -60,7 +57,7 @@ ScIndexEnumeration_TableChartsEnumeration::ScIndexEnumeration_TableChartsEnumera
 
 uno::Reference<uno::XInterface> ScIndexEnumeration_TableChartsEnumeration::init()
 {
-    uno::Reference<sheet::XSpreadsheetDocument> xDoc(m_xComponent, uno::UNO_QUERY_THROW);
+    uno::Reference<sheet::XSpreadsheetDocument> xDoc(mxComponent, uno::UNO_QUERY_THROW);
     CPPUNIT_ASSERT_MESSAGE("no calc document", xDoc.is());
 
     uno::Reference<sheet::XSpreadsheets> xSheets(xDoc->getSheets(), uno::UNO_SET_THROW);
@@ -144,12 +141,12 @@ uno::Reference<uno::XInterface> ScIndexEnumeration_TableChartsEnumeration::init(
 void ScIndexEnumeration_TableChartsEnumeration::setUp()
 {
     CalcUnoApiTest::setUp();
-    m_xComponent = loadFromDesktop("private:factory/scalc");
+    mxComponent = loadFromDesktop("private:factory/scalc");
 }
 
 void ScIndexEnumeration_TableChartsEnumeration::tearDown()
 {
-    closeDocument(m_xComponent);
+    closeDocument(mxComponent);
     CalcUnoApiTest::tearDown();
 }
 
diff --git a/sc/qa/extras/scindexenumeration_tablecolumnsenumeration.cxx b/sc/qa/extras/scindexenumeration_tablecolumnsenumeration.cxx
index 7ec0de3d2bb3..0b7e89415953 100644
--- a/sc/qa/extras/scindexenumeration_tablecolumnsenumeration.cxx
+++ b/sc/qa/extras/scindexenumeration_tablecolumnsenumeration.cxx
@@ -44,9 +44,6 @@ public:
     CPPUNIT_TEST(testNextElement);
 
     CPPUNIT_TEST_SUITE_END();
-
-private:
-    uno::Reference<lang::XComponent> m_xComponent;
 };
 
 ScIndexEnumeration_TableColumnsEnumeration::ScIndexEnumeration_TableColumnsEnumeration()
@@ -56,7 +53,7 @@ ScIndexEnumeration_TableColumnsEnumeration::ScIndexEnumeration_TableColumnsEnume
 
 uno::Reference<uno::XInterface> ScIndexEnumeration_TableColumnsEnumeration::init()
 {
-    uno::Reference<sheet::XSpreadsheetDocument> xDoc(m_xComponent, uno::UNO_QUERY_THROW);
+    uno::Reference<sheet::XSpreadsheetDocument> xDoc(mxComponent, uno::UNO_QUERY_THROW);
     CPPUNIT_ASSERT_MESSAGE("no calc document", xDoc.is());
 
     uno::Reference<sheet::XSpreadsheets> xSheets(xDoc->getSheets(), uno::UNO_SET_THROW);
@@ -75,12 +72,12 @@ uno::Reference<uno::XInterface> ScIndexEnumeration_TableColumnsEnumeration::init
 void ScIndexEnumeration_TableColumnsEnumeration::setUp()
 {
     CalcUnoApiTest::setUp();
-    m_xComponent = loadFromDesktop("private:factory/scalc");
+    mxComponent = loadFromDesktop("private:factory/scalc");
 }
 
 void ScIndexEnumeration_TableColumnsEnumeration::tearDown()
 {
-    closeDocument(m_xComponent);
+    closeDocument(mxComponent);
     CalcUnoApiTest::tearDown();
 }
 
diff --git a/sc/qa/extras/scindexenumeration_tableconditionalentryenumeration.cxx b/sc/qa/extras/scindexenumeration_tableconditionalentryenumeration.cxx
index bf3a03f8c715..977dd8fde6ab 100644
--- a/sc/qa/extras/scindexenumeration_tableconditionalentryenumeration.cxx
+++ b/sc/qa/extras/scindexenumeration_tableconditionalentryenumeration.cxx
@@ -51,9 +51,6 @@ public:
     CPPUNIT_TEST(testNextElement);
 
     CPPUNIT_TEST_SUITE_END();
-
-private:
-    uno::Reference<lang::XComponent> m_xComponent;
 };
 
 ScIndexEnumeration_TableConditionalEntryEnumeration::
@@ -64,7 +61,7 @@ ScIndexEnumeration_TableConditionalEntryEnumeration::
 
 uno::Reference<uno::XInterface> ScIndexEnumeration_TableConditionalEntryEnumeration::init()
 {
-    uno::Reference<sheet::XSpreadsheetDocument> xDoc(m_xComponent, uno::UNO_QUERY_THROW);
+    uno::Reference<sheet::XSpreadsheetDocument> xDoc(mxComponent, uno::UNO_QUERY_THROW);
     CPPUNIT_ASSERT_MESSAGE("no calc document", xDoc.is());
 
     uno::Reference<sheet::XSpreadsheets> xSheets(xDoc->getSheets(), uno::UNO_SET_THROW);
@@ -100,12 +97,12 @@ uno::Reference<uno::XInterface> ScIndexEnumeration_TableConditionalEntryEnumerat
 void ScIndexEnumeration_TableConditionalEntryEnumeration::setUp()
 {
     CalcUnoApiTest::setUp();
-    m_xComponent = loadFromDesktop("private:factory/scalc");
+    mxComponent = loadFromDesktop("private:factory/scalc");
 }
 
 void ScIndexEnumeration_TableConditionalEntryEnumeration::tearDown()
 {
-    closeDocument(m_xComponent);
+    closeDocument(mxComponent);
     CalcUnoApiTest::tearDown();
 }
 
diff --git a/sc/qa/extras/scindexenumeration_tablerowsenumeration.cxx b/sc/qa/extras/scindexenumeration_tablerowsenumeration.cxx
index 3d3ceefb893a..69684cd03c2e 100644
--- a/sc/qa/extras/scindexenumeration_tablerowsenumeration.cxx
+++ b/sc/qa/extras/scindexenumeration_tablerowsenumeration.cxx
@@ -44,9 +44,6 @@ public:
     CPPUNIT_TEST(testNextElement);
 
     CPPUNIT_TEST_SUITE_END();
-
-private:
-    uno::Reference<lang::XComponent> m_xComponent;
 };
 
 ScIndexEnumeration_TableRowsEnumeration::ScIndexEnumeration_TableRowsEnumeration()
@@ -56,7 +53,7 @@ ScIndexEnumeration_TableRowsEnumeration::ScIndexEnumeration_TableRowsEnumeration
 
 uno::Reference<uno::XInterface> ScIndexEnumeration_TableRowsEnumeration::init()
 {
-    uno::Reference<sheet::XSpreadsheetDocument> xDoc(m_xComponent, uno::UNO_QUERY_THROW);
+    uno::Reference<sheet::XSpreadsheetDocument> xDoc(mxComponent, uno::UNO_QUERY_THROW);
     CPPUNIT_ASSERT_MESSAGE("no calc document", xDoc.is());
 
     uno::Reference<sheet::XSpreadsheets> xSheets(xDoc->getSheets(), uno::UNO_SET_THROW);
@@ -77,12 +74,12 @@ uno::Reference<uno::XInterface> ScIndexEnumeration_TableRowsEnumeration::init()
 void ScIndexEnumeration_TableRowsEnumeration::setUp()
 {
     CalcUnoApiTest::setUp();
-    m_xComponent = loadFromDesktop("private:factory/scalc");
+    mxComponent = loadFromDesktop("private:factory/scalc");
 }
 
 void ScIndexEnumeration_TableRowsEnumeration::tearDown()
 {
-    closeDocument(m_xComponent);
+    closeDocument(mxComponent);
     CalcUnoApiTest::tearDown();
 }
 
diff --git a/sc/qa/extras/scindexenumeration_textfieldenumeration.cxx b/sc/qa/extras/scindexenumeration_textfieldenumeration.cxx
index a0dd65fc68b4..479bf0c32d0a 100644
--- a/sc/qa/extras/scindexenumeration_textfieldenumeration.cxx
+++ b/sc/qa/extras/scindexenumeration_textfieldenumeration.cxx
@@ -47,9 +47,6 @@ public:
     CPPUNIT_TEST(testNextElement);
 
     CPPUNIT_TEST_SUITE_END();
-
-private:
-    uno::Reference<lang::XComponent> m_xComponent;
 };
 
 ScIndexEnumeration_TextFieldEnumeration::ScIndexEnumeration_TextFieldEnumeration()
@@ -59,7 +56,7 @@ ScIndexEnumeration_TextFieldEnumeration::ScIndexEnumeration_TextFieldEnumeration
 
 uno::Reference<uno::XInterface> ScIndexEnumeration_TextFieldEnumeration::init()
 {
-    uno::Reference<sheet::XSpreadsheetDocument> xDoc(m_xComponent, uno::UNO_QUERY_THROW);
+    uno::Reference<sheet::XSpreadsheetDocument> xDoc(mxComponent, uno::UNO_QUERY_THROW);
     CPPUNIT_ASSERT_MESSAGE("no calc document", xDoc.is());
 
     uno::Reference<lang::XMultiServiceFactory> xMSF(xDoc, uno::UNO_QUERY_THROW);
@@ -83,12 +80,12 @@ uno::Reference<uno::XInterface> ScIndexEnumeration_TextFieldEnumeration::init()
 void ScIndexEnumeration_TextFieldEnumeration::setUp()
 {
     CalcUnoApiTest::setUp();
-    m_xComponent = loadFromDesktop("private:factory/scalc");
+    mxComponent = loadFromDesktop("private:factory/scalc");
 }
 
 void ScIndexEnumeration_TextFieldEnumeration::tearDown()
 {
-    closeDocument(m_xComponent);
+    closeDocument(mxComponent);
     CalcUnoApiTest::tearDown();
 }
 
diff --git a/sc/qa/extras/sclabelrangeobj.cxx b/sc/qa/extras/sclabelrangeobj.cxx
index 15b7ee494ba7..576dee4b0237 100644
--- a/sc/qa/extras/sclabelrangeobj.cxx
+++ b/sc/qa/extras/sclabelrangeobj.cxx
@@ -42,9 +42,6 @@ public:
     CPPUNIT_TEST(testGetSetLabelArea);
 
     CPPUNIT_TEST_SUITE_END();
-
-private:
-    uno::Reference<lang::XComponent> mxComponent;
 };
 
 ScLabelRangeObj::ScLabelRangeObj()
diff --git a/sc/qa/extras/sclabelrangesobj.cxx b/sc/qa/extras/sclabelrangesobj.cxx
index 9f720eeaadf7..612b19b2d0bd 100644
--- a/sc/qa/extras/sclabelrangesobj.cxx
+++ b/sc/qa/extras/sclabelrangesobj.cxx
@@ -62,9 +62,6 @@ public:
     CPPUNIT_TEST(testRemoveByIndex);
 
     CPPUNIT_TEST_SUITE_END();
-
-private:
-    uno::Reference<lang::XComponent> mxComponent;
 };
 
 ScLabelRangesObj::ScLabelRangesObj()
diff --git a/sc/qa/extras/scmodelobj.cxx b/sc/qa/extras/scmodelobj.cxx
index 6a876fe2c0f1..18323ad05ceb 100644
--- a/sc/qa/extras/scmodelobj.cxx
+++ b/sc/qa/extras/scmodelobj.cxx
@@ -74,7 +74,6 @@ public:
     CPPUNIT_TEST_SUITE_END();
 
 private:
-    uno::Reference<lang::XComponent> mxComponent;
     uno::Sequence<uno::Reference<table::XCell>> m_xCells;
 };
 
diff --git a/sc/qa/extras/scnamedrangeobj.cxx b/sc/qa/extras/scnamedrangeobj.cxx
index 7ba7ec222fb5..ecc750487608 100644
--- a/sc/qa/extras/scnamedrangeobj.cxx
+++ b/sc/qa/extras/scnamedrangeobj.cxx
@@ -54,7 +54,6 @@ public:
     CPPUNIT_TEST_SUITE_END();
 private:
     uno::Reference< sheet::XNamedRanges > init_impl();
-    uno::Reference< lang::XComponent > mxComponent;
 };
 
 ScNamedRangeObj::ScNamedRangeObj():
diff --git a/sc/qa/extras/scnamedrangesobj.cxx b/sc/qa/extras/scnamedrangesobj.cxx
index 34543cf5ea61..84d5782a210d 100644
--- a/sc/qa/extras/scnamedrangesobj.cxx
+++ b/sc/qa/extras/scnamedrangesobj.cxx
@@ -92,9 +92,6 @@ public:
     CPPUNIT_TEST(testSupportsService);
 
     CPPUNIT_TEST_SUITE_END();
-
-private:
-    uno::Reference<lang::XComponent> mxComponent;
 };
 
 ScNamedRangesObj::ScNamedRangesObj()
diff --git a/sc/qa/extras/scoutlineobj.cxx b/sc/qa/extras/scoutlineobj.cxx
index e47580238e03..f85dc7f8722d 100644
--- a/sc/qa/extras/scoutlineobj.cxx
+++ b/sc/qa/extras/scoutlineobj.cxx
@@ -41,9 +41,6 @@ public:
     CPPUNIT_TEST(testClearOutline);
 
     CPPUNIT_TEST_SUITE_END();
-
-private:
-    uno::Reference<lang::XComponent> mxComponent;
 };
 
 ScOutlineObj::ScOutlineObj()
diff --git a/sc/qa/extras/screcentfunctionsobj.cxx b/sc/qa/extras/screcentfunctionsobj.cxx
index 84fdc38578e1..ac6b6df350c4 100644
--- a/sc/qa/extras/screcentfunctionsobj.cxx
+++ b/sc/qa/extras/screcentfunctionsobj.cxx
@@ -40,9 +40,6 @@ public:
     CPPUNIT_TEST(testGetMaxRecentFunctions);
 
     CPPUNIT_TEST_SUITE_END();
-
-private:
-    uno::Reference<lang::XComponent> mxComponent;
 };
 
 ScRecentFunctionsObj::ScRecentFunctionsObj()
diff --git a/sc/qa/extras/scscenariosobj.cxx b/sc/qa/extras/scscenariosobj.cxx
index 2805772f1f01..74212b7ada9f 100644
--- a/sc/qa/extras/scscenariosobj.cxx
+++ b/sc/qa/extras/scscenariosobj.cxx
@@ -80,9 +80,6 @@ public:
     CPPUNIT_TEST(testSupportsService);
 
     CPPUNIT_TEST_SUITE_END();
-
-private:
-    uno::Reference<lang::XComponent> mxComponent;
 };
 
 ScScenariosObj::ScScenariosObj()
diff --git a/sc/qa/extras/scshapeobj.cxx b/sc/qa/extras/scshapeobj.cxx
index ef8761a657d9..704718bb826a 100644
--- a/sc/qa/extras/scshapeobj.cxx
+++ b/sc/qa/extras/scshapeobj.cxx
@@ -70,9 +70,6 @@ public:
     CPPUNIT_TEST(testGetShapeType);
 
     CPPUNIT_TEST_SUITE_END();
-
-private:
-    uno::Reference<lang::XComponent> mxComponent;
 };
 
 ScShapeObj::ScShapeObj()
diff --git a/sc/qa/extras/scsheetlinkobj.cxx b/sc/qa/extras/scsheetlinkobj.cxx
index c45c9b2db806..4fd5f965f5bf 100644
--- a/sc/qa/extras/scsheetlinkobj.cxx
+++ b/sc/qa/extras/scsheetlinkobj.cxx
@@ -55,9 +55,6 @@ public:
     CPPUNIT_TEST(testRefreshListener);
 
     CPPUNIT_TEST_SUITE_END();
-
-private:
-    uno::Reference<lang::XComponent> mxComponent;
 };
 
 ScSheetLinkObj::ScSheetLinkObj()
diff --git a/sc/qa/extras/scsheetlinksobj.cxx b/sc/qa/extras/scsheetlinksobj.cxx
index e61c71c6a9eb..45e2887b4d4f 100644
--- a/sc/qa/extras/scsheetlinksobj.cxx
+++ b/sc/qa/extras/scsheetlinksobj.cxx
@@ -70,9 +70,6 @@ public:
     CPPUNIT_TEST(testSupportsService);
 
     CPPUNIT_TEST_SUITE_END();
-
-private:
-    uno::Reference<lang::XComponent> m_xComponent;
 };
 
 ScSheetLinksObj::ScSheetLinksObj()
@@ -86,7 +83,7 @@ ScSheetLinksObj::ScSheetLinksObj()
 
 uno::Reference<uno::XInterface> ScSheetLinksObj::init()
 {
-    uno::Reference<sheet::XSpreadsheetDocument> xDoc(m_xComponent, uno::UNO_QUERY_THROW);
+    uno::Reference<sheet::XSpreadsheetDocument> xDoc(mxComponent, uno::UNO_QUERY_THROW);
     uno::Reference<sheet::XSpreadsheets> xSheets(xDoc->getSheets(), uno::UNO_SET_THROW);
     uno::Reference<container::XIndexAccess> xIA(xSheets, uno::UNO_QUERY_THROW);
     uno::Reference<sheet::XSpreadsheet> xSheet0(xIA->getByIndex(0), uno::UNO_QUERY_THROW);
@@ -107,12 +104,12 @@ void ScSheetLinksObj::setUp()
 {
     CalcUnoApiTest::setUp();
     // create a calc document
-    m_xComponent = loadFromDesktop("private:factory/scalc");
+    mxComponent = loadFromDesktop("private:factory/scalc");
 }
 
 void ScSheetLinksObj::tearDown()
 {
-    closeDocument(m_xComponent);
+    closeDocument(mxComponent);
     CalcUnoApiTest::tearDown();
 }
 
diff --git a/sc/qa/extras/scsortdescriptorbaseobj.cxx b/sc/qa/extras/scsortdescriptorbaseobj.cxx
index 439e906fa95c..52b4af100b21 100644
--- a/sc/qa/extras/scsortdescriptorbaseobj.cxx
+++ b/sc/qa/extras/scsortdescriptorbaseobj.cxx
@@ -41,9 +41,6 @@ public:
     CPPUNIT_TEST(testSheetSortDescriptor2Properties);
 
     CPPUNIT_TEST_SUITE_END();
-
-private:
-    uno::Reference<lang::XComponent> mxComponent;
 };
 
 ScSortDescriptorBaseObj::ScSortDescriptorBaseObj()
diff --git a/sc/qa/extras/scspreadsheetsettings.cxx b/sc/qa/extras/scspreadsheetsettings.cxx
index a06d65cd5060..07cb0e0fa19a 100644
--- a/sc/qa/extras/scspreadsheetsettings.cxx
+++ b/sc/qa/extras/scspreadsheetsettings.cxx
@@ -55,9 +55,6 @@ public:
     CPPUNIT_TEST(testSupportsService);
 
     CPPUNIT_TEST_SUITE_END();
-
-private:
-    uno::Reference<lang::XComponent> mxComponent;
 };
 
 ScSpreadsheetSettings::ScSpreadsheetSettings()
diff --git a/sc/qa/extras/scspreadsheetsettingsobj.cxx b/sc/qa/extras/scspreadsheetsettingsobj.cxx
index faf0b56055bf..9304b63c4c32 100644
--- a/sc/qa/extras/scspreadsheetsettingsobj.cxx
+++ b/sc/qa/extras/scspreadsheetsettingsobj.cxx
@@ -45,9 +45,6 @@ public:
     CPPUNIT_TEST(testVetoableChangeListener);
 
     CPPUNIT_TEST_SUITE_END();
-
-private:
-    uno::Reference<lang::XComponent> mxComponent;
 };
 
 ScSpreadsheetSettingsObj::ScSpreadsheetSettingsObj()
diff --git a/sc/qa/extras/scstylefamiliesobj.cxx b/sc/qa/extras/scstylefamiliesobj.cxx
index 9b789d9357b6..618d499439cf 100644
--- a/sc/qa/extras/scstylefamiliesobj.cxx
+++ b/sc/qa/extras/scstylefamiliesobj.cxx
@@ -76,7 +76,6 @@ public:
     CPPUNIT_TEST_SUITE_END();
 
 private:
-    uno::Reference<lang::XComponent> m_xComponent;
     uno::Reference<lang::XComponent> m_xSrcComponent;
 };
 
@@ -91,7 +90,7 @@ ScStyleFamiliesObj::ScStyleFamiliesObj()
 
 uno::Reference<uno::XInterface> ScStyleFamiliesObj::init()
 {
-    uno::Reference<sheet::XSpreadsheetDocument> xDoc(m_xComponent, uno::UNO_QUERY_THROW);
+    uno::Reference<sheet::XSpreadsheetDocument> xDoc(mxComponent, uno::UNO_QUERY_THROW);
     CPPUNIT_ASSERT_MESSAGE("no calc document", xDoc.is());
 
     uno::Reference<style::XStyleFamiliesSupplier> xSFS(xDoc, uno::UNO_QUERY_THROW);
@@ -102,7 +101,7 @@ uno::Reference<uno::XInterface> ScStyleFamiliesObj::init()
 
 uno::Reference<sheet::XSpreadsheetDocument> ScStyleFamiliesObj::getTargetDoc()
 {
-    uno::Reference<sheet::XSpreadsheetDocument> xDoc(m_xComponent, uno::UNO_QUERY_THROW);
+    uno::Reference<sheet::XSpreadsheetDocument> xDoc(mxComponent, uno::UNO_QUERY_THROW);
     CPPUNIT_ASSERT_MESSAGE("no calc document", xDoc.is());
 
     return xDoc;
@@ -124,14 +123,14 @@ void ScStyleFamiliesObj::setUp()
 {
     CalcUnoApiTest::setUp();
     // create a calc document
-    m_xComponent = loadFromDesktop("private:factory/scalc");
+    mxComponent = loadFromDesktop("private:factory/scalc");
 
     m_xSrcComponent = loadFromDesktop(getTestURL());
 }
 
 void ScStyleFamiliesObj::tearDown()
 {
-    closeDocument(m_xComponent);
+    closeDocument(mxComponent);
     closeDocument(m_xSrcComponent);
     CalcUnoApiTest::tearDown();
 }
diff --git a/sc/qa/extras/scstylefamilyobj.cxx b/sc/qa/extras/scstylefamilyobj.cxx
index c1edea68aef9..3351959c1022 100644
--- a/sc/qa/extras/scstylefamilyobj.cxx
+++ b/sc/qa/extras/scstylefamilyobj.cxx
@@ -78,9 +78,6 @@ public:
     CPPUNIT_TEST(testSupportsService);
 
     CPPUNIT_TEST_SUITE_END();
-
-private:
-    uno::Reference<lang::XComponent> m_xComponent;
 };
 
 /* TODO: this c/should be derived/defined from the real style count, default
@@ -100,14 +97,14 @@ ScStyleFamilyObj::ScStyleFamilyObj()
 
 uno::Reference<uno::XInterface> ScStyleFamilyObj::init()
 {
-    uno::Reference<sheet::XSpreadsheetDocument> xDoc(m_xComponent, uno::UNO_QUERY_THROW);
+    uno::Reference<sheet::XSpreadsheetDocument> xDoc(mxComponent, uno::UNO_QUERY_THROW);
 
     uno::Reference<style::XStyleFamiliesSupplier> xSFS(xDoc, uno::UNO_QUERY_THROW);
     uno::Reference<container::XNameAccess> xNA(xSFS->getStyleFamilies(), uno::UNO_SET_THROW);
     uno::Reference<container::XIndexAccess> xIA(xNA, uno::UNO_QUERY_THROW);
     uno::Reference<container::XNameAccess> xNA_SF(xIA->getByIndex(0), uno::UNO_QUERY_THROW);
 
-    uno::Reference<lang::XMultiServiceFactory> xMSF(m_xComponent, uno::UNO_QUERY_THROW);
+    uno::Reference<lang::XMultiServiceFactory> xMSF(mxComponent, uno::UNO_QUERY_THROW);
     uno::Reference<uno::XInterface> xCS(xMSF->createInstance("com.sun.star.style.CellStyle"),
                                         uno::UNO_SET_THROW);
     // XNameContainer
@@ -125,12 +122,12 @@ void ScStyleFamilyObj::setUp()
 {
     CalcUnoApiTest::setUp();
     // create calc document
-    m_xComponent = loadFromDesktop("private:factory/scalc");
+    mxComponent = loadFromDesktop("private:factory/scalc");
 }
 
 void ScStyleFamilyObj::tearDown()
 {
-    closeDocument(m_xComponent);
+    closeDocument(mxComponent);
     CalcUnoApiTest::tearDown();
 }
 
diff --git a/sc/qa/extras/scstyleobj.cxx b/sc/qa/extras/scstyleobj.cxx
index bf69fafba64a..d5d2bdb57fe3 100644
--- a/sc/qa/extras/scstyleobj.cxx
+++ b/sc/qa/extras/scstyleobj.cxx
@@ -55,9 +55,6 @@ public:
     CPPUNIT_TEST(testVetoableChangeListener);
 
     CPPUNIT_TEST_SUITE_END();
-
-private:
-    uno::Reference<lang::XComponent> m_xComponent;
 };
 
 ScStyleObj::ScStyleObj()
@@ -77,7 +74,7 @@ ScStyleObj::ScStyleObj()
 
 uno::Reference<uno::XInterface> ScStyleObj::init()
 {
-    uno::Reference<sheet::XSpreadsheetDocument> xDoc(m_xComponent, uno::UNO_QUERY_THROW);
+    uno::Reference<sheet::XSpreadsheetDocument> xDoc(mxComponent, uno::UNO_QUERY_THROW);
 
     uno::Reference<style::XStyleFamiliesSupplier> xSFS(xDoc, uno::UNO_QUERY_THROW);
     uno::Reference<container::XNameAccess> xNA_StyleFamilies(xSFS->getStyleFamilies(),
@@ -110,12 +107,12 @@ void ScStyleObj::setUp()
 {
     CalcUnoApiTest::setUp();
     // create calc document
-    m_xComponent = loadFromDesktop("private:factory/scalc");
+    mxComponent = loadFromDesktop("private:factory/scalc");
 }
 
 void ScStyleObj::tearDown()
 {
-    closeDocument(m_xComponent);
+    closeDocument(mxComponent);
     CalcUnoApiTest::tearDown();
 }
 
diff --git a/sc/qa/extras/scsubtotaldescriptorbase.cxx b/sc/qa/extras/scsubtotaldescriptorbase.cxx
index 0bae1c46d74e..4f07e6c95e40 100644
--- a/sc/qa/extras/scsubtotaldescriptorbase.cxx
+++ b/sc/qa/extras/scsubtotaldescriptorbase.cxx
@@ -84,9 +84,6 @@ public:
     CPPUNIT_TEST(testSupportsService);
 
     CPPUNIT_TEST_SUITE_END();
-
-private:
-    uno::Reference<lang::XComponent> mxComponent;
 };
 
 ScSubTotalDescriptorBase::ScSubTotalDescriptorBase()
diff --git a/sc/qa/extras/scsubtotalfieldobj.cxx b/sc/qa/extras/scsubtotalfieldobj.cxx
index ab1a9c377150..c500b4cc1b30 100644
--- a/sc/qa/extras/scsubtotalfieldobj.cxx
+++ b/sc/qa/extras/scsubtotalfieldobj.cxx
@@ -46,9 +46,6 @@ public:
     CPPUNIT_TEST(testGetSetTotalColumns);
 
     CPPUNIT_TEST_SUITE_END();
-
-private:
-    uno::Reference<lang::XComponent> mxComponent;
 };
 
 ScSubTotalFieldObj::ScSubTotalFieldObj()
diff --git a/sc/qa/extras/sctablecolumnobj.cxx b/sc/qa/extras/sctablecolumnobj.cxx
index 0dab1c6ab417..b757424e401c 100644
--- a/sc/qa/extras/sctablecolumnobj.cxx
+++ b/sc/qa/extras/sctablecolumnobj.cxx
@@ -71,9 +71,6 @@ public:
     CPPUNIT_TEST(testSupportsService);
 
     CPPUNIT_TEST_SUITE_END();
-
-private:
-    uno::Reference<lang::XComponent> m_xComponent;
 };
 
 ScTableColumnObj::ScTableColumnObj()
@@ -121,7 +118,7 @@ ScTableColumnObj::ScTableColumnObj()
 
 uno::Reference<uno::XInterface> ScTableColumnObj::init()
 {
-    uno::Reference<sheet::XSpreadsheetDocument> xDoc(m_xComponent, uno::UNO_QUERY_THROW);
+    uno::Reference<sheet::XSpreadsheetDocument> xDoc(mxComponent, uno::UNO_QUERY_THROW);
     uno::Reference<sheet::XSpreadsheets> xSheets(xDoc->getSheets(), uno::UNO_SET_THROW);
     uno::Reference<container::XIndexAccess> xIA(xSheets, uno::UNO_QUERY_THROW);
 
@@ -139,12 +136,12 @@ void ScTableColumnObj::setUp()
 {
     CalcUnoApiTest::setUp();
     // create calc document
-    m_xComponent = loadFromDesktop("private:factory/scalc");
+    mxComponent = loadFromDesktop("private:factory/scalc");
 }
 
 void ScTableColumnObj::tearDown()
 {
-    closeDocument(m_xComponent);
+    closeDocument(mxComponent);
     CalcUnoApiTest::tearDown();
 }
 
diff --git a/sc/qa/extras/sctablecolumnsobj.cxx b/sc/qa/extras/sctablecolumnsobj.cxx
index ccb96f7c786d..810474c834df 100644
--- a/sc/qa/extras/sctablecolumnsobj.cxx
+++ b/sc/qa/extras/sctablecolumnsobj.cxx
@@ -84,9 +84,6 @@ public:
     CPPUNIT_TEST(testRemoveByIndexWithOutOfBoundIndex);
 
     CPPUNIT_TEST_SUITE_END();
-
-private:
-    uno::Reference<lang::XComponent> m_xComponent;
 };
 
 ScTableColumnsObj::ScTableColumnsObj()
@@ -100,7 +97,7 @@ ScTableColumnsObj::ScTableColumnsObj()
 
 uno::Reference<uno::XInterface> ScTableColumnsObj::init()
 {
-    uno::Reference<sheet::XSpreadsheetDocument> xDoc(m_xComponent, uno::UNO_QUERY_THROW);
+    uno::Reference<sheet::XSpreadsheetDocument> xDoc(mxComponent, uno::UNO_QUERY_THROW);
     uno::Reference<sheet::XSpreadsheets> xSheets(xDoc->getSheets(), uno::UNO_SET_THROW);
     uno::Reference<container::XIndexAccess> xIA(xSheets, uno::UNO_QUERY_THROW);
     uno::Reference<sheet::XSpreadsheet> xSheet0(xIA->getByIndex(0), uno::UNO_QUERY_THROW);
@@ -131,12 +128,12 @@ void ScTableColumnsObj::setUp()
 {
     CalcUnoApiTest::setUp();
     // create calc document
-    m_xComponent = loadFromDesktop("private:factory/scalc");
+    mxComponent = loadFromDesktop("private:factory/scalc");
 }
 
 void ScTableColumnsObj::tearDown()
 {
-    closeDocument(m_xComponent);
+    closeDocument(mxComponent);
     CalcUnoApiTest::tearDown();
 }
 
diff --git a/sc/qa/extras/sctableconditionalentryobj.cxx b/sc/qa/extras/sctableconditionalentryobj.cxx
index cd5286745387..4c76df74153c 100644
--- a/sc/qa/extras/sctableconditionalentryobj.cxx
+++ b/sc/qa/extras/sctableconditionalentryobj.cxx
@@ -59,9 +59,6 @@ public:
     CPPUNIT_TEST(testGetSetSourcePosition);
 
     CPPUNIT_TEST_SUITE_END();
-
-private:
-    uno::Reference<lang::XComponent> mxComponent;
 };
 
 ScTableConditionalEntryObj::ScTableConditionalEntryObj()
diff --git a/sc/qa/extras/sctableconditionalformat.cxx b/sc/qa/extras/sctableconditionalformat.cxx
index 99e1ad04b56d..d64819401e24 100644
--- a/sc/qa/extras/sctableconditionalformat.cxx
+++ b/sc/qa/extras/sctableconditionalformat.cxx
@@ -86,9 +86,6 @@ public:
     CPPUNIT_TEST(testRemoveByIndex);
 
     CPPUNIT_TEST_SUITE_END();
-
-private:
-    uno::Reference<lang::XComponent> mxComponent;
 };
 
 ScTableConditionalFormat::ScTableConditionalFormat()
diff --git a/sc/qa/extras/sctablerowobj.cxx b/sc/qa/extras/sctablerowobj.cxx
index bb377646e3f0..3ab8bcc345a9 100644
--- a/sc/qa/extras/sctablerowobj.cxx
+++ b/sc/qa/extras/sctablerowobj.cxx
@@ -64,9 +64,6 @@ public:
     CPPUNIT_TEST(testSupportsService);
 
     CPPUNIT_TEST_SUITE_END();
-
-private:
-    uno::Reference<lang::XComponent> m_xComponent;
 };
 
 ScTableRowObj::ScTableRowObj()
@@ -111,7 +108,7 @@ ScTableRowObj::ScTableRowObj()
 
 uno::Reference<uno::XInterface> ScTableRowObj::init()
 {
-    uno::Reference<sheet::XSpreadsheetDocument> xDoc(m_xComponent, uno::UNO_QUERY_THROW);
+    uno::Reference<sheet::XSpreadsheetDocument> xDoc(mxComponent, uno::UNO_QUERY_THROW);
     uno::Reference<sheet::XSpreadsheets> xSheets(xDoc->getSheets(), uno::UNO_SET_THROW);
     uno::Reference<container::XIndexAccess> xIA(xSheets, uno::UNO_QUERY_THROW);
 
@@ -128,12 +125,12 @@ void ScTableRowObj::setUp()
 {
     CalcUnoApiTest::setUp();
     // create calc document
-    m_xComponent = loadFromDesktop("private:factory/scalc");
+    mxComponent = loadFromDesktop("private:factory/scalc");
 }
 
 void ScTableRowObj::tearDown()
 {
-    closeDocument(m_xComponent);
+    closeDocument(mxComponent);
     CalcUnoApiTest::tearDown();
 }
 
diff --git a/sc/qa/extras/sctablerowsobj.cxx b/sc/qa/extras/sctablerowsobj.cxx
index 419a326f48cd..234b4dac63bc 100644
--- a/sc/qa/extras/sctablerowsobj.cxx
+++ b/sc/qa/extras/sctablerowsobj.cxx
@@ -73,9 +73,6 @@ public:
     CPPUNIT_TEST(testRemoveByIndex);
 
     CPPUNIT_TEST_SUITE_END();
-
-private:
-    uno::Reference<lang::XComponent> m_xComponent;
 };
 
 ScTableRowsObj::ScTableRowsObj()
@@ -88,7 +85,7 @@ ScTableRowsObj::ScTableRowsObj()
 
 uno::Reference<uno::XInterface> ScTableRowsObj::init()
 {
-    uno::Reference<sheet::XSpreadsheetDocument> xDoc(m_xComponent, uno::UNO_QUERY_THROW);
+    uno::Reference<sheet::XSpreadsheetDocument> xDoc(mxComponent, uno::UNO_QUERY_THROW);
     CPPUNIT_ASSERT_MESSAGE("no calc document", xDoc.is());
 
     uno::Reference<sheet::XSpreadsheets> xSheets(xDoc->getSheets(), uno::UNO_SET_THROW);
@@ -104,7 +101,7 @@ uno::Reference<uno::XInterface> ScTableRowsObj::init()
 
 uno::Reference<uno::XInterface> ScTableRowsObj::getXCellRange()
 {
-    uno::Reference<sheet::XSpreadsheetDocument> xDoc(m_xComponent, uno::UNO_QUERY_THROW);
+    uno::Reference<sheet::XSpreadsheetDocument> xDoc(mxComponent, uno::UNO_QUERY_THROW);
     CPPUNIT_ASSERT_MESSAGE("no calc document", xDoc.is());
 
     uno::Reference<sheet::XSpreadsheets> xSheets(xDoc->getSheets(), uno::UNO_SET_THROW);
@@ -119,12 +116,12 @@ uno::Reference<uno::XInterface> ScTableRowsObj::getXCellRange()
 void ScTableRowsObj::setUp()
 {
     CalcUnoApiTest::setUp();
-    m_xComponent = loadFromDesktop("private:factory/scalc");
+    mxComponent = loadFromDesktop("private:factory/scalc");
 }
 
 void ScTableRowsObj::tearDown()
 {
-    closeDocument(m_xComponent);
+    closeDocument(mxComponent);
     CalcUnoApiTest::tearDown();
 }
 
diff --git a/sc/qa/extras/sctablesheetobj.cxx b/sc/qa/extras/sctablesheetobj.cxx
index 055de3babb2b..f8e84a5852ba 100644
--- a/sc/qa/extras/sctablesheetobj.cxx
+++ b/sc/qa/extras/sctablesheetobj.cxx
@@ -244,7 +244,6 @@ public:
 
 private:
     OUString maFileURL;
-    uno::Reference< lang::XComponent > mxComponent;
 };
 
 ScTableSheetObj::ScTableSheetObj():
diff --git a/sc/qa/extras/sctablesheetsobj.cxx b/sc/qa/extras/sctablesheetsobj.cxx
index de30ec26bff0..af1d0b56d123 100644
--- a/sc/qa/extras/sctablesheetsobj.cxx
+++ b/sc/qa/extras/sctablesheetsobj.cxx
@@ -108,9 +108,6 @@ public:
     virtual uno::Reference<lang::XComponent> getComponent() override;
     virtual void createFileURL(const OUString& rFileBase, OUString& rFileURL) override;
     virtual uno::Reference<lang::XComponent> loadFromDesktop(const OUString& rString) override;
-
-protected:
-    uno::Reference<lang::XComponent> mxComponent;
 };
 
 ScTableSheetsObj::ScTableSheetsObj()
diff --git a/sc/qa/extras/sctablevalidationobj.cxx b/sc/qa/extras/sctablevalidationobj.cxx
index 852738c227cf..2d3584003306 100644
--- a/sc/qa/extras/sctablevalidationobj.cxx
+++ b/sc/qa/extras/sctablevalidationobj.cxx
@@ -72,9 +72,6 @@ public:
     CPPUNIT_TEST(testGetSetSourcePosition);
 
     CPPUNIT_TEST_SUITE_END();
-
-private:
-    uno::Reference<lang::XComponent> mxComponent;
 };
 
 ScTableValidationObj::ScTableValidationObj()
diff --git a/sc/qa/extras/sctabviewobj.cxx b/sc/qa/extras/sctabviewobj.cxx
index 9fb100388653..aa522612deaa 100644
--- a/sc/qa/extras/sctabviewobj.cxx
+++ b/sc/qa/extras/sctabviewobj.cxx
@@ -88,9 +88,6 @@ public:
     CPPUNIT_TEST(testSplit);
 
     CPPUNIT_TEST_SUITE_END();
-
-private:
-    uno::Reference<lang::XComponent> mxComponent;
 };
 
 ScTabViewObj::ScTabViewObj()
diff --git a/sc/qa/extras/scuniquecellformatsenumeration.cxx b/sc/qa/extras/scuniquecellformatsenumeration.cxx
index e92ca14ffb00..a19015a29197 100644
--- a/sc/qa/extras/scuniquecellformatsenumeration.cxx
+++ b/sc/qa/extras/scuniquecellformatsenumeration.cxx
@@ -67,7 +67,6 @@ public:
     CPPUNIT_TEST_SUITE_END();
 
 private:
-    uno::Reference<lang::XComponent> m_xComponent;
     void changeColor(const uno::Reference<sheet::XSpreadsheet>& xSheet, const OUString& sRangeName,
                      const RGBColor& rgb);
 };
@@ -79,7 +78,7 @@ ScUniqueCellFormatsEnumeration::ScUniqueCellFormatsEnumeration()
 
 uno::Reference<uno::XInterface> ScUniqueCellFormatsEnumeration::init()
 {
-    uno::Reference<sheet::XSpreadsheetDocument> xDoc(m_xComponent, uno::UNO_QUERY_THROW);
+    uno::Reference<sheet::XSpreadsheetDocument> xDoc(mxComponent, uno::UNO_QUERY_THROW);
     CPPUNIT_ASSERT_MESSAGE("no calc document", xDoc.is());
 
     uno::Reference<sheet::XSpreadsheets> xSheets(xDoc->getSheets(), uno::UNO_SET_THROW);
@@ -103,12 +102,12 @@ uno::Reference<uno::XInterface> ScUniqueCellFormatsEnumeration::init()
 void ScUniqueCellFormatsEnumeration::setUp()
 {
     CalcUnoApiTest::setUp();
-    m_xComponent = loadFromDesktop("private:factory/scalc");
+    mxComponent = loadFromDesktop("private:factory/scalc");
 }
 
 void ScUniqueCellFormatsEnumeration::tearDown()
 {
-    closeDocument(m_xComponent);
+    closeDocument(mxComponent);
     CalcUnoApiTest::tearDown();
 }
 
diff --git a/sc/qa/extras/scuniquecellformatsobj.cxx b/sc/qa/extras/scuniquecellformatsobj.cxx
index e3050200e72f..27bc64656268 100644
--- a/sc/qa/extras/scuniquecellformatsobj.cxx
+++ b/sc/qa/extras/scuniquecellformatsobj.cxx
@@ -56,9 +56,6 @@ public:
     CPPUNIT_TEST(testGetCount);
 
     CPPUNIT_TEST_SUITE_END();
-
-private:
-    uno::Reference<lang::XComponent> m_xComponent;
 };
 
 ScUniqueCellFormatsObj::ScUniqueCellFormatsObj()
@@ -70,7 +67,7 @@ ScUniqueCellFormatsObj::ScUniqueCellFormatsObj()
 
 uno::Reference<uno::XInterface> ScUniqueCellFormatsObj::init()
 {
-    uno::Reference<sheet::XSpreadsheetDocument> xDoc(m_xComponent, uno::UNO_QUERY_THROW);
+    uno::Reference<sheet::XSpreadsheetDocument> xDoc(mxComponent, uno::UNO_QUERY_THROW);
     CPPUNIT_ASSERT_MESSAGE("no calc document", xDoc.is());
 
     uno::Reference<sheet::XSpreadsheets> xSheets(xDoc->getSheets(), uno::UNO_SET_THROW);
@@ -84,12 +81,12 @@ uno::Reference<uno::XInterface> ScUniqueCellFormatsObj::init()
 void ScUniqueCellFormatsObj::setUp()
 {
     CalcUnoApiTest::setUp();
-    m_xComponent = loadFromDesktop("private:factory/scalc");
+    mxComponent = loadFromDesktop("private:factory/scalc");
 }
 
 void ScUniqueCellFormatsObj::tearDown()
 {
-    closeDocument(m_xComponent);
+    closeDocument(mxComponent);
     CalcUnoApiTest::tearDown();
 }
 
diff --git a/sc/qa/extras/scviewpaneobj.cxx b/sc/qa/extras/scviewpaneobj.cxx
index 1956f4d5641c..61bb46683c3b 100644
--- a/sc/qa/extras/scviewpaneobj.cxx
+++ b/sc/qa/extras/scviewpaneobj.cxx
@@ -74,9 +74,6 @@ public:
     CPPUNIT_TEST(testVisibleRange);
 
     CPPUNIT_TEST_SUITE_END();
-
-private:
-    uno::Reference<lang::XComponent> mxComponent;
 };
 
 ScViewPaneObj::ScViewPaneObj()
diff --git a/sc/qa/extras/vba-macro-test.cxx b/sc/qa/extras/vba-macro-test.cxx
index a08377616887..e4055073be33 100644
--- a/sc/qa/extras/vba-macro-test.cxx
+++ b/sc/qa/extras/vba-macro-test.cxx
@@ -87,9 +87,6 @@ public:
     CPPUNIT_TEST(testTdf149531);
     CPPUNIT_TEST(testTdf118247);
     CPPUNIT_TEST_SUITE_END();
-
-private:
-    uno::Reference<lang::XComponent> mxComponent;
 };
 
 void VBAMacroTest::tearDown()
diff --git a/sc/qa/perf/scperfobj.cxx b/sc/qa/perf/scperfobj.cxx
index 33ddee7e2f38..28c2327a8153 100644
--- a/sc/qa/perf/scperfobj.cxx
+++ b/sc/qa/perf/scperfobj.cxx
@@ -83,9 +83,6 @@ public:
     CPPUNIT_TEST_SUITE_END();
 
 private:
-
-    uno::Reference< lang::XComponent > mxComponent;
-
     // tests
     void testSheetFindAll();
     void testSheetNamedRanges();
diff --git a/sc/qa/unit/cond_format_merge.cxx b/sc/qa/unit/cond_format_merge.cxx
index a0413fa1c3d1..3ad2034343d1 100644
--- a/sc/qa/unit/cond_format_merge.cxx
+++ b/sc/qa/unit/cond_format_merge.cxx
@@ -34,9 +34,6 @@ public:
     CPPUNIT_TEST_SUITE(ScCondFormatMergeTest);
     CPPUNIT_TEST(testCondFormatMerge);
     CPPUNIT_TEST_SUITE_END();
-
-private:
-    uno::Reference<lang::XComponent> mxComponent;
 };
 
 ScCondFormatMergeTest::ScCondFormatMergeTest()
diff --git a/sc/qa/unit/scshapetest.cxx b/sc/qa/unit/scshapetest.cxx
index ac01be437101..670f956862a0 100644
--- a/sc/qa/unit/scshapetest.cxx
+++ b/sc/qa/unit/scshapetest.cxx
@@ -96,9 +96,6 @@ public:
     CPPUNIT_TEST(testTdf144242_OpenBezier_noSwapWH);
     CPPUNIT_TEST(testLargeAnchorOffset);
     CPPUNIT_TEST_SUITE_END();
-
-private:
-    uno::Reference<lang::XComponent> mxComponent;
 };
 
 ScShapeTest::ScShapeTest()
author	Xisco Fauli <xiscofauli@libreoffice.org>	2022-10-14 00:28:18 +0200
committer	Xisco Fauli <xiscofauli@libreoffice.org>	2022-10-14 16:09:37 +0200
commit	a96b911c112386b1af89115c9a96d4ace9d68326 (patch)
tree	b73ec43df26c760f10aba907d2fbaddccf1e4ad0 /sc
parent	99e019708609a52ea6b2ad29fc945c4dc4160351 (diff)