diff options
| author | Armin Le Grand <Armin.Le.Grand@cib.de> | 2017-11-30 17:13:12 +0100 |
|---|---|---|
| committer | Armin Le Grand <Armin.Le.Grand@cib.de> | 2017-12-07 16:03:52 +0100 |
| commit | f894af6d67510ade1447197833a36151bd778214 (patch) | |
| tree | f16396cf3e3360798871de480814d8d1652844df /sw/source/core/layout/wsfrm.cxx | |
| parent | 6285dbda3aa80b0b98ac67f5438d6bab612cdac6 (diff) | |
SwFrameBorder: Removed IsInverse() from SwFrame
IsInverse was always false and never set, elliminating it
from SwFrame makes the code cleaner and reduces cases for
SwRectFnSet from 5 to 3, making it also more understandable.
Cleaned up all the code using it, ran all UnitTests, works
well. In question, this single commit can be re-applied.
Change-Id: If077c65a6dacd83de61d259cddbb3cd4c5e25a2f
Diffstat (limited to 'sw/source/core/layout/wsfrm.cxx')
| -rw-r--r-- | sw/source/core/layout/wsfrm.cxx | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx index 01952039d9ee..f26626d7d746 100644 --- a/sw/source/core/layout/wsfrm.cxx +++ b/sw/source/core/layout/wsfrm.cxx @@ -300,7 +300,6 @@ SwFrame::SwFrame( SwModify *pMod, SwFrame* pSib ) mpDrawObjs(nullptr), mnFrameType(SwFrameType::None), mbInDtor(false), - mbReverse(false), mbInvalidR2L(true), mbDerivedR2L(false), mbRightToLeft(false), @@ -1787,7 +1786,7 @@ SwTwips SwFrame::AdjustNeighbourhood( SwTwips nDiff, bool bTst ) SwFrameAreaDefinition::FrameAreaWriteAccess aFrm(*pFrame->GetNext()); aRectFnSet.SetHeight(aFrm, nAddMax-nAdd); - if( aRectFnSet.IsVert() && !aRectFnSet.IsVertL2R() && !aRectFnSet.IsRev() ) + if( aRectFnSet.IsVert() && !aRectFnSet.IsVertL2R() ) { aFrm.Pos().X() += nAdd; } @@ -1812,7 +1811,7 @@ SwTwips SwFrame::AdjustNeighbourhood( SwTwips nDiff, bool bTst ) SwFrameAreaDefinition::FrameAreaWriteAccess aFrm(*pFrame); aRectFnSet.SetHeight( aFrm, nTmp - nReal ); - if( aRectFnSet.IsVert() && !aRectFnSet.IsVertL2R() && !aRectFnSet.IsRev() ) + if( aRectFnSet.IsVert() && !aRectFnSet.IsVertL2R() ) { aFrm.Pos().X() += nReal; } @@ -2047,7 +2046,7 @@ SwTwips SwContentFrame::GrowFrame( SwTwips nDist, bool bTst, bool bInfo ) SwFrameAreaDefinition::FrameAreaWriteAccess aFrm(*this); aRectFnSet.SetHeight( aFrm, nFrameHeight + nDist ); - if( IsVertical() && !IsVertLR() && !IsReverse() ) + if( IsVertical() && !IsVertLR() ) { aFrm.Pos().X() -= nDist; } @@ -2087,7 +2086,7 @@ SwTwips SwContentFrame::GrowFrame( SwTwips nDist, bool bTst, bool bInfo ) aRectFnSet.SetHeight( aFrm, nOld + nDist ); - if( IsVertical()&& !IsVertLR() && !IsReverse() ) + if( IsVertical()&& !IsVertLR() ) { aFrm.Pos().X() -= nDist; } @@ -2574,7 +2573,7 @@ SwTwips SwLayoutFrame::GrowFrame( SwTwips nDist, bool bTst, bool bInfo ) SwRect aOldFrame( getFrameArea() ); bool bMoveAccFrame = false; - bool bChgPos = IsVertical() && !IsReverse(); + bool bChgPos = IsVertical(); if ( !bTst ) { SwFrameAreaDefinition::FrameAreaWriteAccess aFrm(*this); @@ -2745,7 +2744,7 @@ SwTwips SwLayoutFrame::ShrinkFrame( SwTwips nDist, bool bTst, bool bInfo ) nDist = nFrameHeight; SwTwips nMin = 0; - bool bChgPos = IsVertical() && !IsReverse(); + bool bChgPos = IsVertical(); if ( Lower() ) { if( !Lower()->IsNeighbourFrame() ) |