diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-05-10 13:29:43 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-05-10 13:29:43 +0000 |
| commit | 9c9da9193977832f14022ab7239bf0078324ed80 (patch) | |
| tree | 10ee98cc0b2e024181ae9155ed1d8b42a1e1952e /svx/source/inc/fmobj.hxx | |
| parent | 925a70b94e56b90643d5ae0bbcb3b09d6f9b7f0a (diff) | |
INTEGRATION: CWS aw009 (1.2.696); FILE MERGED
2004/04/22 12:36:32 aw 1.2.696.1: #116235#
Removed Clone(...) command with 2 parameters, removed some involved problems
Diffstat (limited to 'svx/source/inc/fmobj.hxx')
| -rw-r--r-- | svx/source/inc/fmobj.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/svx/source/inc/fmobj.hxx b/svx/source/inc/fmobj.hxx index 86f07abb0316..69d5e3b74275 100644 --- a/svx/source/inc/fmobj.hxx +++ b/svx/source/inc/fmobj.hxx @@ -2,9 +2,9 @@ * * $RCSfile: fmobj.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: rt $ $Date: 2004-05-07 15:49:25 $ + * last change: $Author: hr $ $Date: 2004-05-10 14:29:43 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -129,7 +129,7 @@ public: virtual void ReformatText(); virtual SdrObject* Clone() const; - virtual SdrObject* Clone(SdrPage* pPage, SdrModel* pModel) const; + // #116235# virtual SdrObject* Clone(SdrPage* pPage, SdrModel* pModel) const; virtual void operator= (const SdrObject& rObj); virtual void clonedFrom(const FmFormObj* _pSource); |