summaryrefslogtreecommitdiff
path: root/reportdesign
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2021-12-09 11:53:47 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2021-12-10 08:05:11 +0100
commitb3d6e6ade172f90b546cab6ee7a7441080fa3a41 (patch)
treee8b0fa532fc42e607dba50074d3664b89f9d8d1e /reportdesign
parent9a115a254171d702a56a93c5c7e320de755dc8e8 (diff)
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>
Diffstat (limited to 'reportdesign')
-rw-r--r--reportdesign/inc/RptObject.hxx6
-rw-r--r--reportdesign/source/core/sdr/RptObject.cxx18
2 files changed, 12 insertions, 12 deletions
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();
}