merge setUnoShape and impl_setUnoShape

since the one purely forwards to the other

Change-Id: I5f614cc1eb819572a55da57d9d6c9ae56b9139c2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126608
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

6 files changed, 30 insertions, 39 deletions

diff --git a/include/svx/svdoashp.hxx b/include/svx/svdoashp.hxx
index 2411931e4a39..783f36ad2e91 100644
--- a/include/svx/svdoashp.hxx
+++ b/include/svx/svdoashp.hxx
@@ -80,7 +80,7 @@ private:
 
 protected:
     virtual std::unique_ptr<sdr::contact::ViewContact> CreateObjectSpecificViewContact() override;
-    virtual void impl_setUnoShape(const css::uno::Reference<css::drawing::XShape>& rxUnoShape) override;
+    virtual void setUnoShape(const css::uno::Reference<css::drawing::XShape>& rxUnoShape) override;
 
 public:
     virtual std::unique_ptr<sdr::properties::BaseProperties> CreateObjectSpecificProperties() override;
diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx
index fe050c0d0157..772c46308eb5 100644
--- a/include/svx/svdobj.hxx
+++ b/include/svx/svdobj.hxx
@@ -857,12 +857,19 @@ public:
     // Use SdrObjList::SetObjectNavigationPosition() instead.
     void SetNavigationPosition (const sal_uInt32 nPosition);
 
-    // sets a new UNO representation of the shape
-    // This is only a public interface function. The actual work is
-    // done by impl_setUnoShape().
-    // Calling this function is only allowed for the UNO representation
-    // itself!
-    void setUnoShape( const css::uno::Reference<css::drawing::XShape>& _rxUnoShape);
+    /// Sets a new UNO representation of the shape
+    ///
+    /// Calling this function is only allowed for the UNO representation
+    /// itself!
+    ///
+    /// The default implementation of this function sets the new UNO
+    /// shape. Derived classes should override the function to handle
+    /// any other actions that are needed when the shape is being
+    /// changed.
+    ///
+    /// The implementation _must_ call the same method of its parent
+    /// class (preferably as the first step)!
+    virtual void setUnoShape( const css::uno::Reference< css::drawing::XShape >& _rxUnoShape );
 
     const css::uno::WeakReference< css::drawing::XShape >& getWeakUnoShape() const { return maWeakUnoShape; }
 
@@ -936,17 +943,6 @@ protected:
         return static_cast<const T&>(GetObjectItem(sal_uInt16(nWhich)));
     }
 
-    /// Sets a new UNO shape
-    ///
-    /// The default implementation of this function sets the new UNO
-    /// shape. Derived classes should override the function to handle
-    /// any other actions that are needed when the shape is being
-    /// changed.
-    ///
-    /// The implementation _must_ call the same method of its parent
-    /// class (preferably as the first step)!
-    virtual void impl_setUnoShape( const css::uno::Reference< css::drawing::XShape >& _rxUnoShape );
-
     const SfxItemSet* getBackgroundFillSet() const;
 
 private:
diff --git a/reportdesign/inc/RptObject.hxx b/reportdesign/inc/RptObject.hxx
index db60d2ba9ff8..2c89dc6d49c8 100644
--- a/reportdesign/inc/RptObject.hxx
+++ b/reportdesign/inc/RptObject.hxx
@@ -143,7 +143,7 @@ public:
     virtual SdrInventor GetObjInventor() const override;
 
 private:
-    virtual void impl_setUnoShape( const css::uno::Reference< css::drawing::XShape >& rxUnoShape ) override;
+    virtual void setUnoShape( const css::uno::Reference< css::drawing::XShape >& rxUnoShape ) override;
 
     OCustomShape(
         SdrModel& rSdrModel,
@@ -212,7 +212,7 @@ private:
     virtual SdrPage* GetImplPage() const override;
 
     void impl_createDataProvider_nothrow( const css::uno::Reference< css::frame::XModel>& _xModel);
-    virtual void impl_setUnoShape( const css::uno::Reference< css::drawing::XShape >& rxUnoShape ) override;
+    virtual void setUnoShape( const css::uno::Reference< css::drawing::XShape >& rxUnoShape ) override;
 
     SdrObjKind m_nType;
     bool    m_bOnlyOnce;
@@ -272,7 +272,7 @@ public:
     virtual OUnoObject* CloneSdrObject(SdrModel& rTargetModel) const override;
 
 private:
-    virtual void impl_setUnoShape( const css::uno::Reference< css::drawing::XShape >& rxUnoShape ) override;
+    virtual void setUnoShape( const css::uno::Reference< css::drawing::XShape >& rxUnoShape ) override;
     void    impl_initializeModel_nothrow();
 };
 
diff --git a/reportdesign/source/core/sdr/RptObject.cxx b/reportdesign/source/core/sdr/RptObject.cxx
index b4bc3b4fb28c..8bb3246639db 100644
--- a/reportdesign/source/core/sdr/RptObject.cxx
+++ b/reportdesign/source/core/sdr/RptObject.cxx
@@ -458,7 +458,7 @@ OCustomShape::OCustomShape(
 :   SdrObjCustomShape(rSdrModel)
     ,OObjectBase(_xComponent)
 {
-    impl_setUnoShape( uno::Reference< drawing::XShape >(_xComponent,uno::UNO_QUERY_THROW) );
+    setUnoShape( uno::Reference< drawing::XShape >(_xComponent,uno::UNO_QUERY_THROW) );
     m_bIsListening = true;
 }
 
@@ -563,9 +563,9 @@ uno::Reference< drawing::XShape > OCustomShape::getUnoShape()
     return xShape;
 }
 
-void OCustomShape::impl_setUnoShape( const uno::Reference< drawing::XShape >& rxUnoShape )
+void OCustomShape::setUnoShape( const uno::Reference< drawing::XShape >& rxUnoShape )
 {
-    SdrObjCustomShape::impl_setUnoShape( rxUnoShape );
+    SdrObjCustomShape::setUnoShape( rxUnoShape );
     releaseUnoShape();
     m_xReportComponent.clear();
 }
@@ -612,7 +612,7 @@ OUnoObject::OUnoObject(
     // tdf#119067
     ,m_bSetDefaultLabel(false)
 {
-    impl_setUnoShape( uno::Reference< drawing::XShape >( _xComponent, uno::UNO_QUERY_THROW ) );
+    setUnoShape( uno::Reference< drawing::XShape >( _xComponent, uno::UNO_QUERY_THROW ) );
 
     if ( !rModelName.isEmpty() )
         impl_initializeModel_nothrow();
@@ -894,9 +894,9 @@ uno::Reference< drawing::XShape > OUnoObject::getUnoShape()
     return OObjectBase::getUnoShapeOf( *this );
 }
 
-void OUnoObject::impl_setUnoShape( const uno::Reference< drawing::XShape >& rxUnoShape )
+void OUnoObject::setUnoShape( const uno::Reference< drawing::XShape >& rxUnoShape )
 {
-    SdrUnoObj::impl_setUnoShape( rxUnoShape );
+    SdrUnoObj::setUnoShape( rxUnoShape );
     releaseUnoShape();
 }
 
@@ -915,7 +915,7 @@ OOle2Obj::OOle2Obj(
     ,m_nType(_nType)
     ,m_bOnlyOnce(true)
 {
-    impl_setUnoShape( uno::Reference< drawing::XShape >( _xComponent, uno::UNO_QUERY_THROW ) );
+    setUnoShape( uno::Reference< drawing::XShape >( _xComponent, uno::UNO_QUERY_THROW ) );
     m_bIsListening = true;
 }
 
@@ -1090,9 +1090,9 @@ uno::Reference< drawing::XShape > OOle2Obj::getUnoShape()
     return xShape;
 }
 
-void OOle2Obj::impl_setUnoShape( const uno::Reference< drawing::XShape >& rxUnoShape )
+void OOle2Obj::setUnoShape( const uno::Reference< drawing::XShape >& rxUnoShape )
 {
-    SdrOle2Obj::impl_setUnoShape( rxUnoShape );
+    SdrOle2Obj::setUnoShape( rxUnoShape );
     releaseUnoShape();
     m_xReportComponent.clear();
 }
diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index 52625388a32e..994772547c77 100644
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoashp.cxx
@@ -3213,9 +3213,9 @@ void SdrObjCustomShape::InvalidateRenderGeometry()
     mpLastShadowGeometry = nullptr;
 }
 
-void SdrObjCustomShape::impl_setUnoShape(const uno::Reference<drawing::XShape>& rxUnoShape)
+void SdrObjCustomShape::setUnoShape(const uno::Reference<drawing::XShape>& rxUnoShape)
 {
-    SdrTextObj::impl_setUnoShape(rxUnoShape);
+    SdrTextObj::setUnoShape(rxUnoShape);
 
     // The shape engine is created with _current_ shape. This means we
     // _must_ reset it when the shape changes.
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index fe43fa3ec5d4..e6582e597864 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -2800,7 +2800,7 @@ void SdrObject::SendUserCall(SdrUserCallType eUserCall, const tools::Rectangle&
     }
 }
 
-void SdrObject::impl_setUnoShape( const uno::Reference< drawing::XShape >& _rxUnoShape )
+void SdrObject::setUnoShape( const uno::Reference< drawing::XShape >& _rxUnoShape )
 {
     const uno::Reference< uno::XInterface>& xOldUnoShape( maWeakUnoShape );
     // the UNO shape would be gutted by the following code; return early
@@ -2929,7 +2929,7 @@ css::uno::Reference< css::drawing::XShape > SdrObject::getUnoShape()
             {
                 // create one
                 xShape = pDrawPage->CreateShape( this );
-                impl_setUnoShape( xShape );
+                setUnoShape( xShape );
             }
         }
     }
@@ -2947,11 +2947,6 @@ css::uno::Reference< css::drawing::XShape > SdrObject::getUnoShape()
     return xShape;
 }
 
-void SdrObject::setUnoShape(const uno::Reference<drawing::XShape >& _rxUnoShape)
-{
-    impl_setUnoShape( _rxUnoShape );
-}
-
 svx::PropertyChangeNotifier& SdrObject::getShapePropertyChangeNotifier()
 {
     DBG_TESTSOLARMUTEX();