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/svdpage.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/svdpage.cxx')
-rwxr-xr-x | svx/source/svdraw/svdpage.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx index 3b13fb9981f8..776d5f8589ca 100755 --- a/svx/source/svdraw/svdpage.cxx +++ b/svx/source/svdraw/svdpage.cxx @@ -1422,8 +1422,10 @@ SdrPage::~SdrPage() DBG_DTOR(SdrPage,NULL); } -void SdrPage::operator=(const SdrPage& rSrcPage) +SdrPage& SdrPage::operator=(const SdrPage& rSrcPage) { + if( this == &rSrcPage ) + return *this; if(mpViewContact) { delete mpViewContact; @@ -1490,6 +1492,7 @@ void SdrPage::operator=(const SdrPage& rSrcPage) // Now copy the contained obejcts (by cloning them) SdrObjList::operator=(rSrcPage); + return *this; } SdrPage* SdrPage::Clone() const |