From 91b0d2122bdee361bf5412a42d48ff051159cbf2 Mon Sep 17 00:00:00 2001 From: Armin Le Grand Date: Mon, 7 May 2018 11:44:26 +0200 Subject: tdf#116977 secured ::Clone methods Renamed SdrPage::Clone -> SdrPage::CloneSdrPage Renamed SdrObject::Clone -> SdrObject::CloneSdrObject Giving SdrModel is no longer an option, but a must (as reference). This makes future changes more safe by force usage to think about it. Also equals the constructors which already require a target SdrModel. Done the same for ::CloneSdrPage. Change-Id: I06f0129e15140bd8693db27a445037d7e2f7f652 Reviewed-on: https://gerrit.libreoffice.org/53933 Tested-by: Jenkins Reviewed-by: Armin Le Grand --- include/svx/svdomedia.hxx | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'include/svx/svdomedia.hxx') diff --git a/include/svx/svdomedia.hxx b/include/svx/svdomedia.hxx index a45410f76bdf..f99fd2570133 100644 --- a/include/svx/svdomedia.hxx +++ b/include/svx/svdomedia.hxx @@ -34,16 +34,16 @@ class SVX_DLLPUBLIC SdrMediaObj final : public SdrRectObj { friend class sdr::contact::ViewContactOfSdrMediaObj; -public: - +private: + // protected destructor - due to final, make private + virtual ~SdrMediaObj() override; +public: SdrMediaObj(SdrModel& rSdrModel); SdrMediaObj( SdrModel& rSdrModel, const tools::Rectangle& rRect); - virtual ~SdrMediaObj() override; - virtual bool HasTextEdit() const override; virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const override; @@ -52,13 +52,11 @@ public: virtual OUString TakeObjNameSingul() const override; virtual OUString TakeObjNamePlural() const override; - virtual SdrMediaObj* Clone(SdrModel* pTargetModel = nullptr) const override; + virtual SdrMediaObj* CloneSdrObject(SdrModel& rTargetModel) const override; SdrMediaObj& operator=(const SdrMediaObj& rObj); virtual void AdjustToMaxRect( const tools::Rectangle& rMaxRect, bool bShrinkOnly = false ) override; -public: - void setURL( const OUString& rURL, const OUString& rReferer, const OUString& rMimeType = OUString() ); const OUString& getURL() const; @@ -74,7 +72,6 @@ public: virtual bool shouldKeepAspectRatio() const override { return true; } private: - void mediaPropertiesChanged( const ::avmedia::MediaItem& rNewState ); virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact() override; -- cgit