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/svdopage.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/svdopage.cxx')
-rwxr-xr-x | svx/source/svdraw/svdopage.cxx | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/svx/source/svdraw/svdopage.cxx b/svx/source/svdraw/svdopage.cxx index 0da2aebfa408..5aa2e7bb34d4 100755 --- a/svx/source/svdraw/svdopage.cxx +++ b/svx/source/svdraw/svdopage.cxx @@ -168,10 +168,18 @@ void SdrPageObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const rInfo.bCanConvToPolyLineToArea=sal_False; } -void SdrPageObj::operator=(const SdrObject& rObj) +SdrPageObj* SdrPageObj::Clone() const { + return CloneHelper< SdrPageObj >(); +} + +SdrPageObj& SdrPageObj::operator=(const SdrPageObj& rObj) +{ + if( this == &rObj ) + return *this; SdrObject::operator=(rObj); - SetReferencedPage(((const SdrPageObj&)rObj).GetReferencedPage()); + SetReferencedPage( rObj.GetReferencedPage()); + return *this; } void SdrPageObj::TakeObjNameSingul(XubString& rName) const |