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 --- svx/source/inc/fmobj.hxx | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'svx/source/inc') diff --git a/svx/source/inc/fmobj.hxx b/svx/source/inc/fmobj.hxx index da9f7c6fbfd7..0533327d6aee 100644 --- a/svx/source/inc/fmobj.hxx +++ b/svx/source/inc/fmobj.hxx @@ -46,6 +46,10 @@ class SVX_DLLPUBLIC FmFormObj : public SdrUnoObj // the last ref device we know, as set at the model // only to be used for comparison with the current ref device! +protected: + // protected destructor + SAL_DLLPRIVATE virtual ~FmFormObj() override; + public: FmFormObj( SdrModel& rSdrModel, @@ -66,15 +70,13 @@ public: SAL_DLLPRIVATE void ClearObjEnv(); public: - SAL_DLLPRIVATE virtual ~FmFormObj() override; SAL_DLLPRIVATE virtual void SetPage(SdrPage* pNewPage) override; SAL_DLLPRIVATE virtual SdrInventor GetObjInventor() const override; SAL_DLLPRIVATE virtual sal_uInt16 GetObjIdentifier() const override; SAL_DLLPRIVATE virtual void NbcReformatText() override; - SAL_DLLPRIVATE virtual FmFormObj* Clone(SdrModel* pTargetModel = nullptr) const override; - // #116235# virtual SdrObject* Clone(SdrPage* pPage, SdrModel* pModel) const; + SAL_DLLPRIVATE virtual FmFormObj* CloneSdrObject(SdrModel& rTargetModel) const override; SAL_DLLPRIVATE FmFormObj& operator= (const FmFormObj& rObj); SAL_DLLPRIVATE void clonedFrom(const FmFormObj* _pSource); -- cgit