diff options
Diffstat (limited to 'sw/source/core/layout/flycnt.cxx')
| -rw-r--r-- | sw/source/core/layout/flycnt.cxx | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/sw/source/core/layout/flycnt.cxx b/sw/source/core/layout/flycnt.cxx index e6f73c81c381..3d7391a3cf4e 100644 --- a/sw/source/core/layout/flycnt.cxx +++ b/sw/source/core/layout/flycnt.cxx @@ -195,11 +195,7 @@ void SwFlyAtCntFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) if ( !pCntnt ) { SwCntntNode *pNode = aNewIdx.GetNode().GetCntntNode(); -<<<<<<< local - pCntnt = pNode->getLayoutFrm( getRootFrm(), &pOldAnchor->Frm().Pos(), 0, FALSE ); -======= - pCntnt = pNode->GetFrm( &pOldAnchor->Frm().Pos(), 0, sal_False ); ->>>>>>> other + pCntnt = pNode->getLayoutFrm( getRootFrm(), &pOldAnchor->Frm().Pos(), 0, sal_False ); ASSERT( pCntnt, "Neuen Anker nicht gefunden" ); } //Flys haengen niemals an einem Follow sondern immer am |