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/svdomedia.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/svdomedia.cxx')
-rwxr-xr-x | svx/source/svdraw/svdomedia.cxx | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/svx/source/svdraw/svdomedia.cxx b/svx/source/svdraw/svdomedia.cxx index f7da515d7dbf..0001cd518534 100755 --- a/svx/source/svdraw/svdomedia.cxx +++ b/svx/source/svdraw/svdomedia.cxx @@ -135,17 +135,20 @@ void SdrMediaObj::TakeObjNamePlural(XubString& rName) const // ------------------------------------------------------------------------------ -void SdrMediaObj::operator=(const SdrObject& rObj) +SdrMediaObj* SdrMediaObj::Clone() const { - SdrRectObj::operator=( rObj ); + return CloneHelper< SdrMediaObj >(); +} - if( rObj.ISA( SdrMediaObj ) ) - { - const SdrMediaObj& rMediaObj = static_cast< const SdrMediaObj& >( rObj ); +SdrMediaObj& SdrMediaObj::operator=(const SdrMediaObj& rObj) +{ + if( this == &rObj ) + return *this; + SdrRectObj::operator=( rObj ); - setMediaProperties( rMediaObj.getMediaProperties() ); - setGraphic( rMediaObj.mapGraphic.get() ); - } + setMediaProperties( rObj.getMediaProperties() ); + setGraphic( rObj.mapGraphic.get() ); + return *this; } // ------------------------------------------------------------------------------ |