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/engine3d/polygn3d.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/engine3d/polygn3d.cxx')
-rwxr-xr-x | svx/source/engine3d/polygn3d.cxx | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/svx/source/engine3d/polygn3d.cxx b/svx/source/engine3d/polygn3d.cxx index 30bc7111f7bc..00f3c4432c85 100755 --- a/svx/source/engine3d/polygn3d.cxx +++ b/svx/source/engine3d/polygn3d.cxx @@ -324,24 +324,9 @@ SdrObject *E3dPolygonObj::DoConvertToPolyObj(sal_Bool /*bBezier*/) const return NULL; } -/************************************************************************* -|* -|* Zuweisungsoperator -|* -\************************************************************************/ - -void E3dPolygonObj::operator=(const SdrObject& rObj) +E3dPolygonObj* E3dPolygonObj::Clone() const { - // erstmal alle Childs kopieren - E3dCompoundObject::operator=(rObj); - - // weitere Parameter kopieren - const E3dPolygonObj& r3DObj = (const E3dPolygonObj&)rObj; - - aPolyPoly3D = r3DObj.aPolyPoly3D; - aPolyNormals3D = r3DObj.aPolyNormals3D; - aPolyTexture2D = r3DObj.aPolyTexture2D; - bLineOnly = r3DObj.bLineOnly; + return CloneHelper< E3dPolygonObj >(); } /************************************************************************* |