summaryrefslogtreecommitdiffstats
path: root/reportdesign/inc/RptObject.hxx
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2021-11-06 20:58:54 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2021-11-07 07:29:38 +0100
commit7a61256f9e68201ef7b331ca3e1b4c3302104631 (patch)
tree42c6908cdbe521be795224fb912ca4229ba4b706 /reportdesign/inc/RptObject.hxx
parentofz40766 Null-dereference (diff)
downloadcore-7a61256f9e68201ef7b331ca3e1b4c3302104631.tar.gz
core-7a61256f9e68201ef7b331ca3e1b4c3302104631.zip
return XShape from SdrObject::getUnoShape
instead of XInterface, to make it obvious what the reality of the requirement is Change-Id: Icdd4113f2a0ece930305f4d8ba010b81d24f43c3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124802 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'reportdesign/inc/RptObject.hxx')
-rw-r--r--reportdesign/inc/RptObject.hxx14
1 files changed, 7 insertions, 7 deletions
diff --git a/reportdesign/inc/RptObject.hxx b/reportdesign/inc/RptObject.hxx
index 732d70947654..db60d2ba9ff8 100644
--- a/reportdesign/inc/RptObject.hxx
+++ b/reportdesign/inc/RptObject.hxx
@@ -83,7 +83,7 @@ protected:
/** called by instances of derived classes to implement their overriding of getUnoShape
*/
- css::uno::Reference< css::uno::XInterface >
+ css::uno::Reference< css::drawing::XShape >
getUnoShapeOf( SdrObject& _rSdrObject );
private:
@@ -138,12 +138,12 @@ public:
virtual css::uno::Reference< css::beans::XPropertySet> getAwtComponent() override;
- virtual css::uno::Reference< css::uno::XInterface > getUnoShape() override;
+ virtual css::uno::Reference< css::drawing::XShape > getUnoShape() override;
virtual SdrObjKind GetObjIdentifier() const override;
virtual SdrInventor GetObjInventor() const override;
private:
- virtual void impl_setUnoShape( const css::uno::Reference< css::uno::XInterface >& rxUnoShape ) override;
+ virtual void impl_setUnoShape( const css::uno::Reference< css::drawing::XShape >& rxUnoShape ) override;
OCustomShape(
SdrModel& rSdrModel,
@@ -183,7 +183,7 @@ public:
virtual css::uno::Reference< css::beans::XPropertySet> getAwtComponent() override;
- virtual css::uno::Reference< css::uno::XInterface > getUnoShape() override;
+ virtual css::uno::Reference< css::drawing::XShape > getUnoShape() override;
virtual SdrObjKind GetObjIdentifier() const override;
virtual SdrInventor GetObjInventor() const override;
// Clone() should make a complete copy of the object.
@@ -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::uno::XInterface >& rxUnoShape ) override;
+ virtual void impl_setUnoShape( const css::uno::Reference< css::drawing::XShape >& rxUnoShape ) override;
SdrObjKind m_nType;
bool m_bOnlyOnce;
@@ -266,13 +266,13 @@ public:
static OUString GetDefaultName(const OUnoObject* _pObj);
- virtual css::uno::Reference< css::uno::XInterface > getUnoShape() override;
+ virtual css::uno::Reference< css::drawing::XShape > getUnoShape() override;
virtual SdrObjKind GetObjIdentifier() const override;
virtual SdrInventor GetObjInventor() const override;
virtual OUnoObject* CloneSdrObject(SdrModel& rTargetModel) const override;
private:
- virtual void impl_setUnoShape( const css::uno::Reference< css::uno::XInterface >& rxUnoShape ) override;
+ virtual void impl_setUnoShape( const css::uno::Reference< css::drawing::XShape >& rxUnoShape ) override;
void impl_initializeModel_nothrow();
};