[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - sw/source

Bjoern Michaelsen bjoern.michaelsen at canonical.com
Tue Mar 29 11:11:13 UTC 2016


 sw/source/core/layout/flycnt.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit ba51ea100176ec862370a559969a1e12afc7e656
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Fri Mar 25 01:44:19 2016 +0100

    fix another involuntary behaviour change from 0c5cbcd7
    
    Change-Id: Idd8e48777b2a5e8e91754ec0afa9dd5b50d8bf00
    Reviewed-on: https://gerrit.libreoffice.org/23506
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/sw/source/core/layout/flycnt.cxx b/sw/source/core/layout/flycnt.cxx
index c3740e5..00adb5b 100644
--- a/sw/source/core/layout/flycnt.cxx
+++ b/sw/source/core/layout/flycnt.cxx
@@ -1217,6 +1217,8 @@ void SwFlyAtContentFrame::SetAbsPos( const Point &rNew )
             nY = pCnt->Frame().Left() - rNew.X();
             if ( bVertL2R )
                 nY = -nY;
+            else
+                nY += pCnt->Frame().Width() - Frame().Width();
             nY -= pCnt->GetUpperSpaceAmountConsideredForPrevFrameAndPageGrid();
         }
         else


More information about the Libreoffice-commits mailing list