diff options
Diffstat (limited to 'reportdesign/inc/RptObject.hxx')
-rw-r--r-- | reportdesign/inc/RptObject.hxx | 55 |
1 files changed, 18 insertions, 37 deletions
diff --git a/reportdesign/inc/RptObject.hxx b/reportdesign/inc/RptObject.hxx index 17f433629c56..201782857e68 100644 --- a/reportdesign/inc/RptObject.hxx +++ b/reportdesign/inc/RptObject.hxx @@ -112,9 +112,7 @@ public: */ void releaseUnoShape() { m_xKeepShapeAlive.clear(); } - static SdrObject* createObject( - SdrModel& rTargetModel, - const css::uno::Reference< css::report::XReportComponent>& _xComponent); + static SdrObject* createObject(const css::uno::Reference< css::report::XReportComponent>& _xComponent); static sal_uInt16 getObjectType(const css::uno::Reference< css::report::XReportComponent>& _xComponent); }; @@ -125,11 +123,9 @@ class REPORTDESIGN_DLLPUBLIC OCustomShape final : public SdrObjCustomShape , pub friend class OReportPage; friend class DlgEdFactory; public: - static OCustomShape* Create( - SdrModel& rSdrModel, - const css::uno::Reference< css::report::XReportComponent>& _xComponent) + static OCustomShape* Create( const css::uno::Reference< css::report::XReportComponent>& _xComponent ) { - return new OCustomShape(rSdrModel, _xComponent ); + return new OCustomShape( _xComponent ); } virtual ~OCustomShape() override; @@ -143,12 +139,8 @@ public: private: virtual void impl_setUnoShape( const css::uno::Reference< css::uno::XInterface >& rxUnoShape ) override; - OCustomShape( - SdrModel& rSdrModel, - const css::uno::Reference< css::report::XReportComponent>& _xComponent); - OCustomShape( - SdrModel& rSdrModel, - const OUString& _sComponentName); + OCustomShape(const css::uno::Reference< css::report::XReportComponent>& _xComponent); + OCustomShape(const OUString& _sComponentName); virtual void NbcMove( const Size& rSize ) override; virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact) override; @@ -166,12 +158,9 @@ class REPORTDESIGN_DLLPUBLIC OOle2Obj final : public SdrOle2Obj , public OObject friend class OReportPage; friend class DlgEdFactory; public: - static OOle2Obj* Create( - SdrModel& rSdrModel, - const css::uno::Reference< css::report::XReportComponent>& _xComponent, - sal_uInt16 _nType) + static OOle2Obj* Create( const css::uno::Reference< css::report::XReportComponent>& _xComponent,sal_uInt16 _nType ) { - return new OOle2Obj(rSdrModel, _xComponent, _nType); + return new OOle2Obj( _xComponent,_nType ); } virtual ~OOle2Obj() override; @@ -182,7 +171,7 @@ public: virtual sal_uInt16 GetObjIdentifier() const override; virtual SdrInventor GetObjInventor() const override; // Clone() should make a complete copy of the object. - virtual OOle2Obj* Clone(SdrModel* pTargetModel = nullptr) const override; + virtual OOle2Obj* Clone() const override; virtual void initializeOle() override; OOle2Obj& operator=(const OOle2Obj& rObj); @@ -190,14 +179,9 @@ public: void initializeChart( const css::uno::Reference< css::frame::XModel>& _xModel); private: - OOle2Obj( - SdrModel& rSdrModel, - const css::uno::Reference< css::report::XReportComponent>& _xComponent, - sal_uInt16 _nType); - OOle2Obj( - SdrModel& rSdrModel, - const OUString& _sComponentName, - sal_uInt16 _nType); + OOle2Obj(const css::uno::Reference< css::report::XReportComponent>& _xComponent,sal_uInt16 _nType); + OOle2Obj(const OUString& _sComponentName,sal_uInt16 _nType); + virtual void NbcMove( const Size& rSize ) override; virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact) override; @@ -224,15 +208,12 @@ class REPORTDESIGN_DLLPUBLIC OUnoObject: public SdrUnoObj , public OObjectBase sal_uInt16 m_nObjectType; protected: - OUnoObject(SdrModel& rSdrModel, - const OUString& _sComponentName, - const OUString& rModelName, - sal_uInt16 _nObjectType); - OUnoObject( - SdrModel& rSdrModel, - const css::uno::Reference< css::report::XReportComponent>& _xComponent, - const OUString& rModelName, - sal_uInt16 _nObjectType); + OUnoObject(const OUString& _sComponentName + ,const OUString& rModelName + ,sal_uInt16 _nObjectType); + OUnoObject( const css::uno::Reference< css::report::XReportComponent>& _xComponent + ,const OUString& rModelName + ,sal_uInt16 _nObjectType); virtual ~OUnoObject() override; @@ -259,7 +240,7 @@ public: virtual css::uno::Reference< css::uno::XInterface > getUnoShape() override; virtual sal_uInt16 GetObjIdentifier() const override; virtual SdrInventor GetObjInventor() const override; - virtual OUnoObject* Clone(SdrModel* pTargetModel = nullptr) const override; + virtual OUnoObject* Clone() const override; OUnoObject& operator=(const OUnoObject& rObj); |