diff options
author | Luboš Luňák <l.lunak@suse.cz> | 2011-03-25 17:33:24 +0100 |
---|---|---|
committer | Luboš Luňák <l.lunak@suse.cz> | 2011-03-25 17:33:24 +0100 |
commit | 0527adbab1eca41ae6aeefa6e63c2e02a796c111 (patch) | |
tree | 7e010b157c25b63f38a1999047d3891e6c3b77fc /svx/source/svdraw/svdovirt.cxx | |
parent | e71901089adf1ec3d62fef0c6c07559381e5a551 (diff) |
more sensible SdrObject::Clone() and SdrObject::operator=()
Virtual operator=() is IMO pointless, and especially in a class hierarchy
like SdrObject it's pretty unlikely one could reasonably assign any
SdrObject-based object to any other one. Moreover, it was actually
only used in Clone(), which was almost never reimplemented, so the
more sensible choice is to have non-virtual operator= and virtual
Clone() always being reimplemented and using that.
This commit also fixes various smaller or bigger, er, interesting
details in the various operator= implementations.
Diffstat (limited to 'svx/source/svdraw/svdovirt.cxx')
-rwxr-xr-x | svx/source/svdraw/svdovirt.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/svx/source/svdraw/svdovirt.cxx b/svx/source/svdraw/svdovirt.cxx index 844316e08245..bfe7199001de 100755 --- a/svx/source/svdraw/svdovirt.cxx +++ b/svx/source/svdraw/svdovirt.cxx @@ -160,16 +160,16 @@ void SdrVirtObj::SetChanged() SdrObject::SetChanged(); } -SdrObject* SdrVirtObj::Clone() const +SdrVirtObj* SdrVirtObj::Clone() const { - SdrObject* pObj=new SdrVirtObj(((SdrVirtObj*)this)->rRefObj); // Nur eine weitere Referenz - return pObj; + return new SdrVirtObj(this->rRefObj); // Nur eine weitere Referenz } -void SdrVirtObj::operator=(const SdrObject& rObj) +SdrVirtObj& SdrVirtObj::operator=(const SdrVirtObj& rObj) { // ???anderes Objekt referenzieren??? SdrObject::operator=(rObj); - aAnchor=((SdrVirtObj&)rObj).aAnchor; + aAnchor=rObj.aAnchor; + return *this; } void SdrVirtObj::TakeObjNameSingul(XubString& rName) const |