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

[Bjoern Michaelsen]

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

New commits:
commit 39bdff845fb4cb87958db712e6f1add0a073b38b
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Tue Mar 22 15:41:04 2016 +0100

    tdf#95977: fix fly positioning regression from 0c5cbcd7
    
    Change-Id: I7e11c7072ba0ec82237985da79f8572fdda05778
    Reviewed-on: https://gerrit.libreoffice.org/23429
    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 4754314..c3740e5 100644
--- a/sw/source/core/layout/flycnt.cxx
+++ b/sw/source/core/layout/flycnt.cxx
@@ -1220,7 +1220,7 @@ void SwFlyAtContentFrame::SetAbsPos( const Point &rNew )
             nY -= pCnt->GetUpperSpaceAmountConsideredForPrevFrameAndPageGrid();
         }
         else
-            nY = rNew.Y() - pCnt->Frame().Top() + pCnt->GetUpperSpaceAmountConsideredForPrevFrameAndPageGrid();
+            nY = rNew.Y() - pCnt->Frame().Top() - pCnt->GetUpperSpaceAmountConsideredForPrevFrameAndPageGrid();
     }
     else
     {