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/flyincnt.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/flyincnt.cxx')
-rw-r--r-- | sw/source/core/layout/flyincnt.cxx | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sw/source/core/layout/flyincnt.cxx b/sw/source/core/layout/flyincnt.cxx index b8164d674a3d..af87a79ea1bd 100644 --- a/sw/source/core/layout/flyincnt.cxx +++ b/sw/source/core/layout/flyincnt.cxx @@ -36,7 +36,7 @@ SwFlyInContentFrame::SwFlyInContentFrame( SwFlyFrameFormat *pFormat, SwFrame* pS // OD 2004-05-27 #i26791# - member <aRelPos> moved to <SwAnchoredObject> Point aRelPos; if( pAnch && pAnch->IsVertical() ) - aRelPos.setX(pAnch->IsReverse() ? nRel : -nRel); + aRelPos.setX(-nRel); else aRelPos.setY(nRel); SetCurrRelPos( aRelPos ); @@ -163,11 +163,8 @@ void SwFlyInContentFrame::MakeObjPos() //Update the current values in the format if needed, during this we of //course must not send any Modify. const bool bVert = GetAnchorFrame()->IsVertical(); - const bool bRev = GetAnchorFrame()->IsReverse(); SwTwips nOld = rVert.GetPos(); SwTwips nAct = bVert ? -GetCurrRelPos().X() : GetCurrRelPos().Y(); - if( bRev ) - nAct = -nAct; if( nAct != nOld ) { SwFormatVertOrient aVert( rVert ); |