diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2016-03-30 22:25:26 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2016-03-31 13:23:03 +0200 |
| commit | e15299b327734a622cab29bd682803a86b5a8c9e (patch) | |
| tree | ee75f3c1ad1d802ef68318c2f8b4b35dab487a2d /sw/source/core/layout/flylay.cxx | |
| parent | 77a5c97418112127ce8adb5aa902b7c5b7d8c3c3 (diff) | |
tdf#84938 convert FRM_ constants to scoped enum
Change-Id: I785d154a5df9a33b7d513dee1d3d859e5e800e7a
Diffstat (limited to 'sw/source/core/layout/flylay.cxx')
| -rw-r--r-- | sw/source/core/layout/flylay.cxx | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/sw/source/core/layout/flylay.cxx b/sw/source/core/layout/flylay.cxx index ddee9c7bac43..c88e49cf205f 100644 --- a/sw/source/core/layout/flylay.cxx +++ b/sw/source/core/layout/flylay.cxx @@ -1032,10 +1032,11 @@ bool CalcClipRect( const SdrObject *pSdrObj, SwRect &rRect, bool bMove ) SWRECTFN( pClip ) const SwLayoutFrame *pUp = pClip->GetUpper(); const SwFrame *pCell = pUp->IsCellFrame() ? pUp : nullptr; - const sal_uInt16 nType = bMove ? FRM_ROOT | FRM_FLY | FRM_HEADER | - FRM_FOOTER | FRM_FTN - : FRM_BODY | FRM_FLY | FRM_HEADER | - FRM_FOOTER | FRM_CELL| FRM_FTN; + const SwFrameType nType = bMove + ? SwFrameType::Root | SwFrameType::Fly | SwFrameType::Header | + SwFrameType::Footer | SwFrameType::Ftn + : SwFrameType::Body | SwFrameType::Fly | SwFrameType::Header | + SwFrameType::Footer | SwFrameType::Cell| SwFrameType::Ftn; while ( !(pUp->GetType() & nType) || pUp->IsColBodyFrame() ) { @@ -1054,7 +1055,7 @@ bool CalcClipRect( const SdrObject *pSdrObj, SwRect &rRect, bool bMove ) } if ( pUp ) { - if ( pUp->GetType() & FRM_BODY ) + if ( pUp->GetType() & SwFrameType::Body ) { const SwPageFrame *pPg; if ( pUp->GetUpper() != (pPg = pFly->FindPageFrame()) ) @@ -1068,7 +1069,7 @@ bool CalcClipRect( const SdrObject *pSdrObj, SwRect &rRect, bool bMove ) } else { - if( ( pUp->GetType() & (FRM_FLY | FRM_FTN ) ) && + if( ( pUp->GetType() & (SwFrameType::Fly | SwFrameType::Ftn ) ) && !pUp->Frame().IsInside( pFly->Frame().Pos() ) ) { if( pUp->IsFlyFrame() ) @@ -1096,7 +1097,7 @@ bool CalcClipRect( const SdrObject *pSdrObj, SwRect &rRect, bool bMove ) } rRect = pUp->Prt(); rRect.Pos() += pUp->Frame().Pos(); - if ( pUp->GetType() & (FRM_HEADER | FRM_FOOTER) ) + if ( pUp->GetType() & (SwFrameType::Header | SwFrameType::Footer) ) { rRect.Left ( pUp->GetUpper()->Frame().Left() ); rRect.Width( pUp->GetUpper()->Frame().Width()); |