[Libreoffice-commits] core.git: include/test sc/qa

[Jens Carl (via logerrit)]

 include/test/container/xnamereplace.hxx |    2 +-
 sc/qa/extras/scautoformatsobj.cxx       |    6 ++++--
 sc/qa/extras/scstylefamilyobj.cxx       |    4 ++--
 sc/qa/extras/sctablesheetsobj.cxx       |    2 +-
 4 files changed, 8 insertions(+), 6 deletions(-)

New commits:
commit 70d40d57f46afd593a86a12281546b570c2fd330
Author:     Jens Carl <j.carl43 at gmx.de>
AuthorDate: Sat Feb 29 12:05:41 2020 -0800
Commit:     Jens Carl <j.carl43 at gmx.de>
CommitDate: Thu Mar 5 06:28:53 2020 +0100

    Rename method setReplacementElement()
    
    ... to setElement() to have a uniform interface with
    similar classes like XNameContainer.
    
    Change-Id: I2058e3ea9f14a5792a07f23f4bd13c4708dccdfc
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89784
    Tested-by: Jens Carl <j.carl43 at gmx.de>
    Reviewed-by: Jens Carl <j.carl43 at gmx.de>

diff --git a/include/test/container/xnamereplace.hxx b/include/test/container/xnamereplace.hxx
index ddfbb4027eb7..a5e7fe516657 100644
--- a/include/test/container/xnamereplace.hxx
+++ b/include/test/container/xnamereplace.hxx
@@ -31,7 +31,7 @@ public:
     virtual css::uno::Reference<css::uno::XInterface> init() = 0;
     void testReplaceByName();
 
-    void setReplacementElement(const css::uno::Any& rElement) { m_aReplacementElement = rElement; }
+    void setElement(const css::uno::Any& rElement) { m_aReplacementElement = rElement; }
 
 protected:
     ~XNameReplace() {}
diff --git a/sc/qa/extras/scautoformatsobj.cxx b/sc/qa/extras/scautoformatsobj.cxx
index 42cee493c9e2..ed799c018ef4 100644
--- a/sc/qa/extras/scautoformatsobj.cxx
+++ b/sc/qa/extras/scautoformatsobj.cxx
@@ -109,9 +109,11 @@ uno::Reference<uno::XInterface> ScAutoFormatsObj::init()
                           uno::makeAny(xMSF->createInstance("com.sun.star.sheet.TableAutoFormat")));
     }
     // XNameContainer
-    setElement(uno::makeAny(xMSF->createInstance("com.sun.star.sheet.TableAutoFormat")));
+    XNameContainer::setElement(
+        uno::makeAny(xMSF->createInstance("com.sun.star.sheet.TableAutoFormat")));
     // XNameReplace
-    setReplacementElement(uno::makeAny(xMSF->createInstance("com.sun.star.sheet.TableAutoFormat")));
+    XNameReplace::setElement(
+        uno::makeAny(xMSF->createInstance("com.sun.star.sheet.TableAutoFormat")));
 
     return xTAF;
 }
diff --git a/sc/qa/extras/scstylefamilyobj.cxx b/sc/qa/extras/scstylefamilyobj.cxx
index fe5d8fb2ec19..a5843a8f3a1f 100644
--- a/sc/qa/extras/scstylefamilyobj.cxx
+++ b/sc/qa/extras/scstylefamilyobj.cxx
@@ -107,9 +107,9 @@ uno::Reference<uno::XInterface> ScStyleFamilyObj::init()
     uno::Reference<uno::XInterface> xCS(xMSF->createInstance("com.sun.star.style.CellStyle"),
                                         uno::UNO_SET_THROW);
     // XNameContainer
-    setElement(uno::makeAny(xMSF->createInstance("com.sun.star.style.CellStyle")));
+    XNameContainer::setElement(uno::makeAny(xMSF->createInstance("com.sun.star.style.CellStyle")));
     // XNameReplace
-    setReplacementElement(uno::makeAny(xMSF->createInstance("com.sun.star.style.CellStyle")));
+    XNameReplace::setElement(uno::makeAny(xMSF->createInstance("com.sun.star.style.CellStyle")));
 
     uno::Reference<container::XNameContainer> xNC(xNA_SF, uno::UNO_QUERY_THROW);
     xNC->insertByName("ScStyleFamilyObj", uno::makeAny(xCS));
diff --git a/sc/qa/extras/sctablesheetsobj.cxx b/sc/qa/extras/sctablesheetsobj.cxx
index 286ff839622c..a8ffa36b2ed8 100644
--- a/sc/qa/extras/sctablesheetsobj.cxx
+++ b/sc/qa/extras/sctablesheetsobj.cxx
@@ -145,7 +145,7 @@ uno::Reference<uno::XInterface> ScTableSheetsObj::init()
     XNameContainer::setElement(
         uno::makeAny(xMSF->createInstance("com.sun.star.sheet.Spreadsheet")));
     // XNameReplace
-    setReplacementElement(uno::makeAny(xMSF->createInstance("com.sun.star.sheet.Spreadsheet")));
+    XNameReplace::setElement(uno::makeAny(xMSF->createInstance("com.sun.star.sheet.Spreadsheet")));
 
     return xReturn;
 }