diff options
| author | Armin Le Grand <Armin.Le.Grand@cib.de> | 2018-05-07 11:44:26 +0200 |
|---|---|---|
| committer | Armin Le Grand <Armin.Le.Grand@cib.de> | 2018-05-08 01:53:46 +0200 |
| commit | 91b0d2122bdee361bf5412a42d48ff051159cbf2 (patch) | |
| tree | 003ef60b93668847803a812486534ebc805e6546 /include/svx/extrud3d.hxx | |
| parent | bdccb7e9991d83029eb2f2f11327b54534a00db8 (diff) | |
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 <ci@libreoffice.org>
Reviewed-by: Armin Le Grand <Armin.Le.Grand@cib.de>
Diffstat (limited to 'include/svx/extrud3d.hxx')
| -rw-r--r-- | include/svx/extrud3d.hxx | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/svx/extrud3d.hxx b/include/svx/extrud3d.hxx index 5c121343af4d..656a1114a3ee 100644 --- a/include/svx/extrud3d.hxx +++ b/include/svx/extrud3d.hxx @@ -42,6 +42,10 @@ private: virtual sdr::properties::BaseProperties* CreateObjectSpecificProperties() override; void SetDefaultAttributes(const E3dDefaultAttributes& rDefault); +private: + // protected destructor - due to final, make private + virtual ~E3dExtrudeObj() override; + public: E3dExtrudeObj( SdrModel& rSdrModel, @@ -84,7 +88,7 @@ public: virtual sal_uInt16 GetObjIdentifier() const override; - virtual E3dExtrudeObj* Clone(SdrModel* pTargetModel = nullptr) const override; + virtual E3dExtrudeObj* CloneSdrObject(SdrModel& rTargetModel) const override; // implemented mainly for the purposes of Clone() E3dExtrudeObj& operator=(const E3dExtrudeObj& rObj); |