diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2003-12-01 08:45:38 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2003-12-01 08:45:38 +0000 |
| commit | 8a3baba84aa42f63ae91ec1ae5eee919ff7b8331 (patch) | |
| tree | 3d1cb1df09f065d1ab695cee011c90f3b5e5bd1a /sw/source/ui/fldui/fldedt.cxx | |
| parent | e7d74a2292de529db8eb7657cc9f15e9a6cab3d6 (diff) | |
INTEGRATION: CWS geordi2q10 (1.6.298); FILE MERGED
2003/11/27 12:40:34 rt 1.6.298.1: #111934#: join CWS os21
Diffstat (limited to 'sw/source/ui/fldui/fldedt.cxx')
| -rw-r--r-- | sw/source/ui/fldui/fldedt.cxx | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/sw/source/ui/fldui/fldedt.cxx b/sw/source/ui/fldui/fldedt.cxx index c10961ad61a5..8af478ea7aeb 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.6 $ + * $Revision: 1.7 $ * - * last change: $Author: vg $ $Date: 2003-04-17 16:10:57 $ + * last change: $Author: rt $ $Date: 2003-12-01 09:45:38 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -271,6 +271,7 @@ SfxTabPage* SwFldEditDlg::CreatePage(USHORT nGroup) break; case GRP_DB: pPage = SwFldDBPage::Create(this, *(SfxItemSet*)0); + static_cast<SwFldDBPage*>(pPage)->SetWrtShell(*pSh); nHelpId = HID_EDIT_FLD_DB; break; case GRP_VAR: @@ -362,15 +363,17 @@ IMPL_LINK( SwFldEditDlg, NextPrevHdl, Button *, pButton ) SwFieldType *pOldTyp = 0; SwFldPage* pPage = (SwFldPage*)GetTabPage(); + + //#112462# FillItemSet may delete the current field + //that's why it has to be called before accessing the current field + if( GetOKButton()->IsEnabled() ) + pPage->FillItemSet(*(SfxItemSet*)0); + SwFldMgr& rMgr = pPage->GetFldMgr(); SwField *pCurFld = rMgr.GetCurFld(); - if (pCurFld->GetTypeId() == TYP_DBFLD) pOldTyp = (SwDBFieldType*)pCurFld->GetTyp(); - if( GetOKButton()->IsEnabled() ) - pPage->FillItemSet(*(SfxItemSet*)0); - rMgr.GoNextPrev( bNext, pOldTyp ); pCurFld = rMgr.GetCurFld(); |