diff options
author | Oliver Bolte <obo@openoffice.org> | 2004-04-29 15:26:50 +0000 |
---|---|---|
committer | Oliver Bolte <obo@openoffice.org> | 2004-04-29 15:26:50 +0000 |
commit | 7786e710ddab055087cd2c7c656737e01bb37035 (patch) | |
tree | cc6c1698d39288af515f9ba655226c907de6515e /svx | |
parent | 188e104b8477cf3a00440ecc7cddbdf90a91b1f4 (diff) |
INTEGRATION: CWS os12 (1.11.302); FILE MERGED
2004/02/19 15:34:54 os 1.11.302.2: RESYNC: (1.11-1.14); FILE MERGED
2003/07/09 12:52:39 os 1.11.302.1: #103299# SvxAddressItem removed
Diffstat (limited to 'svx')
-rw-r--r-- | svx/source/items/flditem.cxx | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/svx/source/items/flditem.cxx b/svx/source/items/flditem.cxx index c654b191f87a..7daa1ddb50ed 100644 --- a/svx/source/items/flditem.cxx +++ b/svx/source/items/flditem.cxx @@ -2,9 +2,9 @@ * * $RCSfile: flditem.cxx,v $ * - * $Revision: 1.15 $ + * $Revision: 1.16 $ * - * last change: $Author: rt $ $Date: 2004-03-30 15:37:04 $ + * last change: $Author: obo $ $Date: 2004-04-29 16:26:50 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -81,7 +81,6 @@ #define ITEMID_FIELD 0 #include "flditem.hxx" -#include "adritem.hxx" #include "svdfield.hxx" @@ -1070,12 +1069,14 @@ SvxAuthorField::SvxAuthorField() //---------------------------------------------------------------------------- -SvxAuthorField::SvxAuthorField( const SvxAddressItem& rAdrItem, +SvxAuthorField::SvxAuthorField( const XubString& rFirstName, + const XubString& rLastName, + const XubString& rShortName, SvxAuthorType eT, SvxAuthorFormat eF ) { - aName = rAdrItem.GetName(); - aFirstName = rAdrItem.GetFirstName(); - aShortName = rAdrItem.GetShortName(); + aName = rLastName; + aFirstName = rFirstName; + aShortName = rShortName; eType = eT; eFormat = eF; } |