diff options
Diffstat (limited to 'sw/source/ui/fldui/fldmgr.cxx')
| -rw-r--r-- | sw/source/ui/fldui/fldmgr.cxx | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sw/source/ui/fldui/fldmgr.cxx b/sw/source/ui/fldui/fldmgr.cxx index 2d001a8c9577..3e89baa7bf8d 100644 --- a/sw/source/ui/fldui/fldmgr.cxx +++ b/sw/source/ui/fldui/fldmgr.cxx @@ -1034,8 +1034,13 @@ sal_Bool SwFldMgr::InsertFld( const SwInsertFld_Data& rData ) sal_uInt16 nTmpPos = sCmd.SearchAndReplace( ' ', sfx2::cTokenSeperator ); sCmd.SearchAndReplace( ' ', sfx2::cTokenSeperator, nTmpPos ); +<<<<<<< local + SwDDEFieldType aTyp( rData.sPar1, sCmd, (USHORT)nFormatId ); + SwDDEFieldType* pTyp = (SwDDEFieldType*)pCurShell->InsertFldType( aTyp ); +======= SwDDEFieldType* pTyp = (SwDDEFieldType*)pCurShell->InsertFldType( SwDDEFieldType( rData.sPar1, sCmd, (sal_uInt16)nFormatId )); +>>>>>>> other pFld = new SwDDEField( pTyp ); break; } @@ -1405,7 +1410,7 @@ sal_Bool SwFldMgr::InsertFld( const SwInsertFld_Data& rData ) else if( bPageVar ) ((SwRefPageGetFieldType*)pCurShell->GetFldType( 0, RES_REFPAGEGETFLD ))->UpdateFlds(); else if( TYP_GETREFFLD == rData.nTypeId ) - pFld->GetTyp()->Modify( 0, 0 ); + pFld->GetTyp()->ModifyNotification( 0, 0 ); // temporaeres Feld loeschen delete pFld; |