diff options
| author | Kurt Zenker <kz@openoffice.org> | 2004-02-26 16:39:16 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2004-02-26 16:39:16 +0000 |
| commit | da2eabfe1c13679f0082de738383ac7dedeefe7e (patch) | |
| tree | 7dc55bc03030fd3a9cebbec10de99463359610f9 /sw/source/core/txtnode/atrfld.cxx | |
| parent | b60d20d6631af4ff0ec8851224c18c10b4dde207 (diff) | |
INTEGRATION: CWS aw008 (1.2.392); FILE MERGED
2004/02/26 10:33:21 aw 1.2.392.2: #i24434#
One more change was necessary from the OS code
2004/02/06 14:10:55 aw 1.2.392.1: #i24434#
Since Items are used in ItemPool and in default constructed ItemSets with
full pool range, all items need to be clonable. Thus, this one needed to be
corrected
Diffstat (limited to 'sw/source/core/txtnode/atrfld.cxx')
| -rw-r--r-- | sw/source/core/txtnode/atrfld.cxx | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/sw/source/core/txtnode/atrfld.cxx b/sw/source/core/txtnode/atrfld.cxx index 7c45146f3b0b..d77ef8918043 100644 --- a/sw/source/core/txtnode/atrfld.cxx +++ b/sw/source/core/txtnode/atrfld.cxx @@ -2,9 +2,9 @@ * * $RCSfile: atrfld.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: kz $ $Date: 2004-02-26 15:34:07 $ + * last change: $Author: kz $ $Date: 2004-02-26 17:39:16 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -105,12 +105,20 @@ SwFmtFld::SwFmtFld( const SwField &rFld ) pField = rFld.Copy(); } +// #i24434# +// Since Items are used in ItemPool and in default constructed ItemSets with +// full pool range, all items need to be clonable. Thus, this one needed to be +// corrected SwFmtFld::SwFmtFld( const SwFmtFld& rAttr ) : SfxPoolItem( RES_TXTATR_FIELD ), - SwClient( rAttr.GetFld()->GetTyp() ), - pTxtAttr( 0 ) + pTxtAttr( 0 ), + pField( 0 ) { - pField = rAttr.GetFld()->Copy(); + if(rAttr.GetFld()) + { + rAttr.GetFld()->GetTyp()->Add(this); + pField = rAttr.GetFld()->Copy(); + } } SwFmtFld::~SwFmtFld() |