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/inc/fmobj.hxx | |
| parent | fix for fdo#35596 - prevent name clashes with rtl functions in vba mode (diff) | |
| download | core-0527adbab1eca41ae6aeefa6e63c2e02a796c111.tar.gz core-0527adbab1eca41ae6aeefa6e63c2e02a796c111.zip | |
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/inc/fmobj.hxx')
| -rwxr-xr-x | svx/source/inc/fmobj.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/svx/source/inc/fmobj.hxx b/svx/source/inc/fmobj.hxx index 711f566edcf7..35297c2ad013 100755 --- a/svx/source/inc/fmobj.hxx +++ b/svx/source/inc/fmobj.hxx @@ -86,9 +86,9 @@ public: virtual sal_uInt16 GetObjIdentifier() const; virtual void NbcReformatText(); - virtual SdrObject* Clone() const; + virtual FmFormObj* Clone() const; // #116235# virtual SdrObject* Clone(SdrPage* pPage, SdrModel* pModel) const; - virtual void operator= (const SdrObject& rObj); + FmFormObj& operator= (const FmFormObj& rObj); virtual void SetModel(SdrModel* pNewModel); |