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

[Bjoern Michaelsen]

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

New commits:
commit 01ba19094272cb661f781c091fd11f3a01dc1ea0
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/23430
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>

diff --git a/sw/source/core/layout/flycnt.cxx b/sw/source/core/layout/flycnt.cxx
index a500fe3..0423ea7 100644
--- a/sw/source/core/layout/flycnt.cxx
+++ b/sw/source/core/layout/flycnt.cxx
@@ -1221,7 +1221,7 @@ void SwFlyAtCntFrm::SetAbsPos( const Point &rNew )
             nY -= pCnt->GetUpperSpaceAmountConsideredForPrevFrmAndPageGrid();
         }
         else
-            nY = rNew.Y() - pCnt->Frm().Top() + pCnt->GetUpperSpaceAmountConsideredForPrevFrmAndPageGrid();
+            nY = rNew.Y() - pCnt->Frm().Top() - pCnt->GetUpperSpaceAmountConsideredForPrevFrmAndPageGrid();
     }
     else
     {