diff options
author | Armin Le Grand <Armin.Le.Grand@cib.de> | 2018-04-06 22:32:24 +0200 |
---|---|---|
committer | Armin Le Grand <Armin.Le.Grand@cib.de> | 2018-04-06 22:32:24 +0200 |
commit | eba4d5b2b76cefde90cb3d6638c736f435023a45 (patch) | |
tree | 43befa620475c11f3dde00e5ea141e1efd95a334 /reportdesign/inc | |
parent | SOSAW080: Added first bunch of basic changes to helpers (diff) | |
download | core-eba4d5b2b76cefde90cb3d6638c736f435023a45.tar.gz core-eba4d5b2b76cefde90cb3d6638c736f435023a45.zip |
Revert "SOSAW080: Added first bunch of basic changes to helpers"
This reverts commit 6c14c27c75a03e2363f2b363ddf0a6f2f46cfa91.
Diffstat (limited to 'reportdesign/inc')
-rw-r--r-- | reportdesign/inc/ReportDefinition.hxx | 7 | ||||
-rw-r--r-- | reportdesign/inc/RptObject.hxx | 55 | ||||
-rw-r--r-- | reportdesign/inc/RptPage.hxx | 9 |
3 files changed, 23 insertions, 48 deletions
diff --git a/reportdesign/inc/ReportDefinition.hxx b/reportdesign/inc/ReportDefinition.hxx index 79c58c998600..6c0883c92a4a 100644 --- a/reportdesign/inc/ReportDefinition.hxx +++ b/reportdesign/inc/ReportDefinition.hxx @@ -186,14 +186,7 @@ namespace reportdesign css::uno::Reference< css::uno::XComponentContext > getContext(); - protected: - /** abstract SdrModel provider */ - virtual SdrModel* getSdrModelFromUnoModel() const override; - - public: - //TTTT Needed? Or same as above? static std::shared_ptr<rptui::OReportModel> getSdrModel(const css::uno::Reference< css::report::XReportDefinition >& _xReportDefinition); - private: DECLARE_XINTERFACE( ) DECLARE_XTYPEPROVIDER( ) 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); diff --git a/reportdesign/inc/RptPage.hxx b/reportdesign/inc/RptPage.hxx index 2c45c93a8331..c168cd5f942f 100644 --- a/reportdesign/inc/RptPage.hxx +++ b/reportdesign/inc/RptPage.hxx @@ -35,21 +35,20 @@ class OReportModel; class REPORTDESIGN_DLLPUBLIC OReportPage : public SdrPage { OReportPage& operator=(const OReportPage&) = delete; - OReportPage(const OReportPage&) = delete; OReportModel& rModel; css::uno::Reference< css::report::XSection > m_xSection; bool m_bSpecialInsertMode; std::vector<SdrObject*> m_aTemporaryObjectList; + OReportPage(const OReportPage&); + // method to remove temporary objects, created by 'special mode' // (BegDragObj) void removeTempObject(SdrObject const *_pToRemoveObj); virtual ~OReportPage() override; - OReportModel& getOReportModelFromOReportPage() const { return rModel; } - protected: virtual css::uno::Reference< css::uno::XInterface > createUnoPage() override; public: @@ -57,7 +56,9 @@ public: OReportPage( OReportModel& rModel ,const css::uno::Reference< css::report::XSection >& _xSection ); - virtual SdrPage* Clone(SdrModel* pNewModel = nullptr) const override; + + virtual SdrPage* Clone() const override; + virtual SdrPage* Clone( SdrModel* pNewModel ) const override; virtual void NbcInsertObject(SdrObject* pObj, size_t nPos=SAL_MAX_SIZE) override; virtual SdrObject* RemoveObject(size_t nObjNum) override; |