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/calcmove.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/calcmove.cxx')
| -rw-r--r-- | sw/source/core/layout/calcmove.cxx | 30 |
1 files changed, 8 insertions, 22 deletions
diff --git a/sw/source/core/layout/calcmove.cxx b/sw/source/core/layout/calcmove.cxx index 00703c236c16..6057b2115b28 100644 --- a/sw/source/core/layout/calcmove.cxx +++ b/sw/source/core/layout/calcmove.cxx @@ -519,27 +519,20 @@ void SwFrame::MakePos() } // cells may now leave their uppers - if( aRectFnSet.IsVert() && SwFrameType::Cell & nMyType && !mbReverse ) + if( aRectFnSet.IsVert() && SwFrameType::Cell & nMyType ) { aFrm.Pos().setX(aFrm.Pos().getX() - aFrm.Width() + pPrv->getFrameArea().Width()); } } else if( aRectFnSet.IsVert() && FRM_NOTE_VERT & nMyType ) { - if( mbReverse ) + if ( aRectFnSet.IsVertL2R() ) { aFrm.Pos().setX(aFrm.Pos().getX() + pPrv->getFrameArea().Width()); } else { - if ( aRectFnSet.IsVertL2R() ) - { - aFrm.Pos().setX(aFrm.Pos().getX() + pPrv->getFrameArea().Width()); - } - else - { - aFrm.Pos().setX(aFrm.Pos().getX() - aFrm.Width()); - } + aFrm.Pos().setX(aFrm.Pos().getX() - aFrm.Width()); } } else @@ -588,21 +581,14 @@ void SwFrame::MakePos() } // cells may now leave their uppers - if( aRectFnSet.IsVert() && SwFrameType::Cell & nMyType && !mbReverse ) + if( aRectFnSet.IsVert() && SwFrameType::Cell & nMyType ) { aFrm.Pos().setX(aFrm.Pos().getX() - aFrm.Width() + pPrv->getFrameArea().Width()); } } else if( aRectFnSet.IsVert() && FRM_NOTE_VERT & nMyType ) { - if( mbReverse ) - { - aFrm.Pos().setX(aFrm.Pos().getX() + pPrv->getFrameArea().Width()); - } - else - { - aFrm.Pos().setX(aFrm.Pos().getX() - aFrm.Width()); - } + aFrm.Pos().setX(aFrm.Pos().getX() - aFrm.Width()); } else { @@ -634,7 +620,7 @@ void SwFrame::MakePos() aFrm.Pos().setX(aFrm.Pos().getX() + GetUpper()->getFramePrintArea().Width() - aFrm.Width()); } } - else if( aRectFnSet.IsVert() && !aRectFnSet.IsVertL2R() && FRM_NOTE_VERT & nMyType && !mbReverse ) + else if( aRectFnSet.IsVert() && !aRectFnSet.IsVertL2R() && FRM_NOTE_VERT & nMyType ) { aFrm.Pos().setX(aFrm.Pos().getX() - aFrm.Width() + GetUpper()->getFramePrintArea().Width()); } @@ -647,7 +633,7 @@ void SwFrame::MakePos() aFrm.Pos().setY(0); } - if( IsBodyFrame() && aRectFnSet.IsVert() && !aRectFnSet.IsVertL2R() && !mbReverse && GetUpper() ) + if( IsBodyFrame() && aRectFnSet.IsVert() && !aRectFnSet.IsVertL2R() && GetUpper() ) { SwFrameAreaDefinition::FrameAreaWriteAccess aFrm(*this); aFrm.Pos().setX(aFrm.Pos().getX() + GetUpper()->getFramePrintArea().Width() - aFrm.Width()); @@ -1138,7 +1124,7 @@ bool SwContentFrame::MakePrtArea( const SwBorderAttrs &rAttrs ) { SwFrameAreaDefinition::FramePrintAreaWriteAccess aPrt(*this); - aRectFnSet.SetPosY( aPrt, (!aRectFnSet.IsVert() || mbReverse) ? nUpper : nLower); + aRectFnSet.SetPosY( aPrt, !aRectFnSet.IsVert() ? nUpper : nLower); } nUpper += nLower; |