diff options
Diffstat (limited to 'sw/source/core/layout/flypos.cxx')
| -rw-r--r-- | sw/source/core/layout/flypos.cxx | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/sw/source/core/layout/flypos.cxx b/sw/source/core/layout/flypos.cxx index f6dedb46a66f..655b5c4cba12 100644 --- a/sw/source/core/layout/flypos.cxx +++ b/sw/source/core/layout/flypos.cxx @@ -44,10 +44,10 @@ SV_IMPL_OP_PTRARR_SORT( SwPosFlyFrms, SwPosFlyFrmPtr ) SwPosFlyFrm::SwPosFlyFrm( const SwNodeIndex& rIdx, const SwFrmFmt* pFmt, - USHORT nArrPos ) + sal_uInt16 nArrPos ) : pFrmFmt( pFmt ), pNdIdx( (SwNodeIndex*) &rIdx ) { - BOOL bFnd = FALSE; + sal_Bool bFnd = sal_False; const SwFmtAnchor& rAnchor = pFmt->GetAnchor(); if (FLY_AT_PAGE == rAnchor.GetAnchorId()) { @@ -58,21 +58,33 @@ SwPosFlyFrm::SwPosFlyFrm( const SwNodeIndex& rIdx, const SwFrmFmt* pFmt, if( RES_FLYFRMFMT == pFmt->Which() ) { // Schauen, ob es ein SdrObject dafuer gibt +<<<<<<< local SwFlyFrm* pFly = SwIterator<SwFlyFrm,SwFmt>::FirstElement(*pFmt); if( pFly ) { nOrdNum = pFly->GetVirtDrawObj()->GetOrdNum(); bFnd = TRUE; +======= + if( aIter.First( TYPE( SwFlyFrm) ) ) + nOrdNum = ((SwFlyFrm*)aIter())->GetVirtDrawObj()->GetOrdNum(), + bFnd = sal_True; +>>>>>>> other } } else if( RES_DRAWFRMFMT == pFmt->Which() ) { // Schauen, ob es ein SdrObject dafuer gibt +<<<<<<< local SwDrawContact* pContact = SwIterator<SwDrawContact,SwFmt>::FirstElement(*pFmt); if( pContact ) { nOrdNum = pContact->GetMaster()->GetOrdNum(); bFnd = TRUE; +======= + if( aIter.First( TYPE(SwDrawContact) ) ) + nOrdNum = ((SwDrawContact*)aIter())->GetMaster()->GetOrdNum(), + bFnd = sal_True; +>>>>>>> other } } } @@ -93,12 +105,12 @@ SwPosFlyFrm::~SwPosFlyFrm() } } -BOOL SwPosFlyFrm::operator==( const SwPosFlyFrm& ) +sal_Bool SwPosFlyFrm::operator==( const SwPosFlyFrm& ) { - return FALSE; // FlyFrames koennen auf der gleichen Position stehen + return sal_False; // FlyFrames koennen auf der gleichen Position stehen } -BOOL SwPosFlyFrm::operator<( const SwPosFlyFrm& rPosFly ) +sal_Bool SwPosFlyFrm::operator<( const SwPosFlyFrm& rPosFly ) { if( pNdIdx->GetIndex() == rPosFly.pNdIdx->GetIndex() ) { |