diff options
| author | Oliver Bolte <obo@openoffice.org> | 2004-04-29 15:15:02 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2004-04-29 15:15:02 +0000 |
| commit | c24f4da11726dacb98d97c7939a2114a67d5be0a (patch) | |
| tree | 113acc4388bdf873e9d354c016b4d81f9d788416 /sd/source/ui/app/sdpopup.cxx | |
| parent | 20165346a1adf1bf10cd2297274c683eac3cfd6e (diff) | |
INTEGRATION: CWS os12 (1.5.174); FILE MERGED
2004/02/19 22:01:38 os 1.5.174.2: RESYNC: (1.5-1.7); FILE MERGED
2003/07/09 13:07:28 os 1.5.174.1: #103299# SvxAddressItem removed
Diffstat (limited to 'sd/source/ui/app/sdpopup.cxx')
| -rw-r--r-- | sd/source/ui/app/sdpopup.cxx | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/sd/source/ui/app/sdpopup.cxx b/sd/source/ui/app/sdpopup.cxx index 0d0a5e681cf6..f0d2eb8363ef 100644 --- a/sd/source/ui/app/sdpopup.cxx +++ b/sd/source/ui/app/sdpopup.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sdpopup.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: obo $ $Date: 2004-01-20 10:37:46 $ + * last change: $Author: obo $ $Date: 2004-04-29 16:15:02 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -71,15 +71,15 @@ #ifndef _ZFORLIST_HXX #include <svtools/zforlist.hxx> #endif -#ifndef _SVX_ADRITEM_HXX -#include <svx/adritem.hxx> -#endif #ifndef _SFX_OBJSH_HXX #include <sfx2/objsh.hxx> #endif #ifndef _SFXDOCFILE_HXX #include <sfx2/docfile.hxx> #endif +#ifndef INCLUDED_SVTOOLS_USEROPTIONS_HXX +#include <svtools/useroptions.hxx> +#endif #include "strings.hrc" #include "sdpopup.hxx" @@ -371,7 +371,8 @@ SvxFieldData* SdFieldPopup::GetField() pAuthorField->GetType() != eType ) { // #91225# Get current state of address, not the old one - pNewField = new SvxAuthorField( SvxAddressItem() ); + SvtUserOptions aUserOptions; + pNewField = new SvxAuthorField( aUserOptions.GetFirstName(), aUserOptions.GetLastName(), aUserOptions.GetID() ); ( (SvxAuthorField*) pNewField )->SetType( eType ); ( (SvxAuthorField*) pNewField )->SetFormat( eFormat ); } |