diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2016-03-30 20:53:08 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2016-03-31 13:23:03 +0200 |
| commit | 77a5c97418112127ce8adb5aa902b7c5b7d8c3c3 (patch) | |
| tree | f30a1986b851db30187d4604576be122bb75c75d /sw/source/core/layout/ftnfrm.cxx | |
| parent | eb20c5c707e12780008c3a87803324f516a935e0 (diff) | |
tdf#84938 convert NA_ constants to scoped enum
Change-Id: Id348f202483d17b63c0762a60f8ddc5f01b8e01f
Diffstat (limited to 'sw/source/core/layout/ftnfrm.cxx')
| -rw-r--r-- | sw/source/core/layout/ftnfrm.cxx | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/sw/source/core/layout/ftnfrm.cxx b/sw/source/core/layout/ftnfrm.cxx index 0a88a25c1e52..ca12b249004f 100644 --- a/sw/source/core/layout/ftnfrm.cxx +++ b/sw/source/core/layout/ftnfrm.cxx @@ -336,12 +336,12 @@ SwTwips SwFootnoteContFrame::GrowFrame( SwTwips nDist, bool bTst, bool ) nReal = 0; if ( nGrow > 0 ) { - sal_uInt8 nAdjust = pBoss->NeighbourhoodAdjustment( this ); - if( NA_ONLY_ADJUST == nAdjust ) + SwNeighbourAdjust nAdjust = pBoss->NeighbourhoodAdjustment( this ); + if( SwNeighbourAdjust::OnlyAdjust == nAdjust ) nReal = AdjustNeighbourhood( nGrow, bTst ); else { - if( NA_GROW_ADJUST == nAdjust ) + if( SwNeighbourAdjust::GrowAdjust == nAdjust ) { SwFrame* pFootnote = Lower(); if( pFootnote ) @@ -351,12 +351,12 @@ SwTwips SwFootnoteContFrame::GrowFrame( SwTwips nDist, bool bTst, bool ) if( static_cast<SwFootnoteFrame*>(pFootnote)->GetAttr()->GetFootnote().IsEndNote() ) { nReal = AdjustNeighbourhood( nGrow, bTst ); - nAdjust = NA_GROW_SHRINK; // no more AdjustNeighbourhood + nAdjust = SwNeighbourAdjust::GrowShrink; // no more AdjustNeighbourhood } } } nReal += pBoss->Grow( nGrow - nReal, bTst ); - if( ( NA_GROW_ADJUST == nAdjust || NA_ADJUST_GROW == nAdjust ) + if( ( SwNeighbourAdjust::GrowAdjust == nAdjust || SwNeighbourAdjust::AdjustGrow == nAdjust ) && nReal < nGrow ) nReal += AdjustNeighbourhood( nGrow - nReal, bTst ); } @@ -2495,27 +2495,27 @@ SwTwips SwFootnoteBossFrame::GetVarSpace() const * @see Grow() * @see Shrink() */ -sal_uInt8 SwFootnoteBossFrame::_NeighbourhoodAdjustment( const SwFrame* ) const +SwNeighbourAdjust SwFootnoteBossFrame::_NeighbourhoodAdjustment( const SwFrame* ) const { - sal_uInt8 nRet = NA_ONLY_ADJUST; + SwNeighbourAdjust nRet = SwNeighbourAdjust::OnlyAdjust; if( GetUpper() && !GetUpper()->IsPageBodyFrame() ) { // column sections need grow/shrink if( GetUpper()->IsFlyFrame() ) - nRet = NA_GROW_SHRINK; + nRet = SwNeighbourAdjust::GrowShrink; else { OSL_ENSURE( GetUpper()->IsSctFrame(), "NeighbourhoodAdjustment: Unexpected Upper" ); if( !GetNext() && !GetPrev() ) - nRet = NA_GROW_ADJUST; // section with a single column (FootnoteAtEnd) + nRet = SwNeighbourAdjust::GrowAdjust; // section with a single column (FootnoteAtEnd) else { const SwFrame* pTmp = Lower(); OSL_ENSURE( pTmp, "NeighbourhoodAdjustment: Missing Lower()" ); if( !pTmp->GetNext() ) - nRet = NA_GROW_SHRINK; + nRet = SwNeighbourAdjust::GrowShrink; else if( !GetUpper()->IsColLocked() ) - nRet = NA_ADJUST_GROW; + nRet = SwNeighbourAdjust::AdjustGrow; OSL_ENSURE( !pTmp->GetNext() || pTmp->GetNext()->IsFootnoteContFrame(), "NeighbourhoodAdjustment: Who's that guy?" ); } |