diff options
author | Noel <noel.grandin@collabora.co.uk> | 2021-02-09 13:42:22 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-02-10 07:35:41 +0100 |
commit | 09cb778b6eb7d3a5b9029965a1320b49c90e7295 (patch) | |
tree | 63d75bc66ddbe4af5f6a52f4a0d65e9b199dbae7 /include/svx/svdoole2.hxx | |
parent | ccdee8eebaa56619248e35001017226eecfe4e83 (diff) |
clean up SdrObject cloning
using operator= implies that overwriting an SdrObject is a
useful operation, but that is not at all true - they are typically
linked into and referred to by many other things.
So rather use a copy-constructor.
Also clean up a couple of weird "do some stuff after the clone"
code into the main copy constructor.
Change-Id: Iefc1481b527602748b5f3abed06e7cca66c0581c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110633
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include/svx/svdoole2.hxx')
-rw-r--r-- | include/svx/svdoole2.hxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/svx/svdoole2.hxx b/include/svx/svdoole2.hxx index 8c209ce7f281..5b08652e3e40 100644 --- a/include/svx/svdoole2.hxx +++ b/include/svx/svdoole2.hxx @@ -74,6 +74,8 @@ public: SdrOle2Obj( SdrModel& rSdrModel, bool bFrame_ = false); + // Copy constructor + SdrOle2Obj(SdrModel& rSdrModel, SdrOle2Obj const & rSource); SdrOle2Obj( SdrModel& rSdrModel, const svt::EmbeddedObjectRef& rNewObjRef, @@ -140,9 +142,6 @@ public: virtual SdrOle2Obj* CloneSdrObject(SdrModel& rTargetModel) const override; - SdrOle2Obj& assignFrom(const SdrOle2Obj& rObj); - SdrOle2Obj& operator=(const SdrOle2Obj& rObj); - virtual void NbcMove(const Size& rSize) override; virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact) override; virtual void NbcSetSnapRect(const tools::Rectangle& rRect) override; |