diff options
| author | Oliver Bolte <obo@openoffice.org> | 2004-04-29 15:56:01 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2004-04-29 15:56:01 +0000 |
| commit | e961c8b15a42d30369309ba82266eddf32f2368d (patch) | |
| tree | 8b908e4dc1a647c20512a82be01e1f2ccdf90492 /sw/source/ui/fldui/fldedt.cxx | |
| parent | 7ef66aa1ce4ac591874fbd84849d919cf9a3a0ea (diff) | |
INTEGRATION: CWS os12 (1.6.100); FILE MERGED
2004/02/19 18:47:46 os 1.6.100.2: RESYNC: (1.6-1.7); FILE MERGED
2003/07/09 12:49:23 os 1.6.100.1: #103299# SvxAddressItem removed
Diffstat (limited to 'sw/source/ui/fldui/fldedt.cxx')
| -rw-r--r-- | sw/source/ui/fldui/fldedt.cxx | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/sw/source/ui/fldui/fldedt.cxx b/sw/source/ui/fldui/fldedt.cxx index 8af478ea7aeb..4b9c7a06ff4f 100644 --- a/sw/source/ui/fldui/fldedt.cxx +++ b/sw/source/ui/fldui/fldedt.cxx @@ -2,9 +2,9 @@ * * $RCSfile: fldedt.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: rt $ $Date: 2003-12-01 09:45:38 $ + * last change: $Author: obo $ $Date: 2004-04-29 16:56:01 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -77,9 +77,6 @@ #ifndef _SFXAPP_HXX //autogen #include <sfx2/app.hxx> #endif -#ifndef _SVX_ADRITEM_HXX //autogen -#include <svx/adritem.hxx> -#endif #ifndef _SVX_OPTGENRL_HXX //autogen #include <svx/optgenrl.hxx> #endif @@ -407,12 +404,9 @@ IMPL_LINK( SwFldEditDlg, AddressHdl, PushButton *, pButton ) SwField *pCurFld = rMgr.GetCurFld(); SfxItemSet aSet( pSh->GetAttrPool(), - SID_ATTR_ADDRESS, SID_ATTR_ADDRESS, SID_FIELD_GRABFOCUS, SID_FIELD_GRABFOCUS, 0L ); - SvxAddressItem aAddress; - aAddress.SetWhich(SID_ATTR_ADDRESS); - aSet.Put( aAddress ); + USHORT nEditPos = UNKNOWN_EDIT; switch(pCurFld->GetSubType()) @@ -438,16 +432,8 @@ IMPL_LINK( SwFldEditDlg, AddressHdl, PushButton *, pButton ) } aSet.Put(SfxUInt16Item(SID_FIELD_GRABFOCUS, nEditPos)); SwAddrDlg aDlg( this, aSet ); - aDlg.Execute(); - - const SfxItemSet* pSfxItemSet = aDlg.GetOutputItemSet(); - const SfxPoolItem* pItem; - if( pSfxItemSet && SFX_ITEM_SET == pSfxItemSet->GetItemState( - SID_ATTR_ADDRESS, FALSE, &pItem ) ) - { - ((SvxAddressItem*)pItem)->Store(); + if(RET_OK == aDlg.Execute()) pSh->UpdateFlds( *pCurFld ); - } return 0; } |