diff options
| author | Oliver Specht <os@openoffice.org> | 2000-11-13 10:53:55 +0000 |
|---|---|---|
| committer | Oliver Specht <os@openoffice.org> | 2000-11-13 10:53:55 +0000 |
| commit | a33f1712d4c3ff49c7b50102e9015fdb74e7a98a (patch) | |
| tree | ec3ddb5a913f4ab209aed54452591f04e072a1da /sw | |
| parent | 72c68cf946775dd4bf9868595ef4decdbe8930dd (diff) | |
SvxAddressItem changes
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/ui/app/apphdl.cxx | 8 | ||||
| -rw-r--r-- | sw/source/ui/envelp/envimg.cxx | 18 |
2 files changed, 13 insertions, 13 deletions
diff --git a/sw/source/ui/app/apphdl.cxx b/sw/source/ui/app/apphdl.cxx index 5c69093464f4..c0b11b0c7283 100644 --- a/sw/source/ui/app/apphdl.cxx +++ b/sw/source/ui/app/apphdl.cxx @@ -2,9 +2,9 @@ * * $RCSfile: apphdl.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: jp $ $Date: 2000-10-20 13:03:03 $ + * last change: $Author: os $ $Date: 2000-11-13 11:51:23 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -508,7 +508,7 @@ void SwModule::StateOther(SfxItemSet &rSet) break; case SID_ATTR_ADDRESS: { - SvxAddressItem aAddress( *SFX_APP()->GetIniManager() ); + SvxAddressItem aAddress; aAddress.SetWhich( nWhich ); rSet.Put( aAddress ); } @@ -862,7 +862,7 @@ void SwModule::ExecOther(SfxRequest& rReq) { if(pArgs && SFX_ITEM_SET == pArgs->GetItemState(nWhich, sal_False, &pItem)) { - ((SvxAddressItem*)pItem)->Store( *SFX_APP()->GetIniManager() ); + ((SvxAddressItem*)pItem)->Store(); } } break; diff --git a/sw/source/ui/envelp/envimg.cxx b/sw/source/ui/envelp/envimg.cxx index 5876cf0884c9..36a7b0542eea 100644 --- a/sw/source/ui/envelp/envimg.cxx +++ b/sw/source/ui/envelp/envimg.cxx @@ -2,9 +2,9 @@ * * $RCSfile: envimg.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: jp $ $Date: 2000-10-06 13:33:58 $ + * last change: $Author: os $ $Date: 2000-11-13 11:53:55 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -121,7 +121,7 @@ using namespace com::sun::star::uno; // -------------------------------------------------------------------------- String MakeSender() { - SvxAddressItem aAdr( *SFX_APP()->GetIniManager() ); + SvxAddressItem aAdr; String sRet; String sSenderToken(SW_RES(STR_SENDER_TOKENS)); @@ -133,7 +133,7 @@ String MakeSender() if(sToken.EqualsAscii("COMPANY")) { xub_StrLen nOldLen = sRet.Len(); - sRet += aAdr.GetToken( ADDRESS_COMPANY ); + sRet += aAdr.GetToken( POS_COMPANY ); bLastLength = sRet.Len() != nOldLen; } else if(sToken.EqualsAscii("CR")) @@ -147,15 +147,15 @@ String MakeSender() else if(sToken.EqualsAscii("LASTNAME")) sRet += aAdr.GetName(); else if(sToken.EqualsAscii("ADDRESS")) - sRet += aAdr.GetToken( ADDRESS_STREET ); + sRet += aAdr.GetToken( POS_STREET ); else if(sToken.EqualsAscii("COUNTRY")) - sRet += aAdr.GetToken( ADDRESS_COUNTRY ); + sRet += aAdr.GetToken( POS_COUNTRY ); else if(sToken.EqualsAscii("POSTALCODE")) - sRet += aAdr.GetToken( ADDRESS_PLZ ); + sRet += aAdr.GetToken( POS_PLZ ); else if(sToken.EqualsAscii("CITY")) - sRet += aAdr.GetToken( ADDRESS_CITY ); + sRet += aAdr.GetToken( POS_CITY ); else if(sToken.EqualsAscii("STATEPROV")) - sRet += aAdr.GetToken( ADDRESS_STATE ); + sRet += aAdr.GetToken( POS_STATE ); else if(sToken.Len()) //spaces sRet += sToken; } |