summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2016-03-22 15:41:04 +0100
committerMichael Stahl <mstahl@redhat.com>2016-03-22 17:03:39 +0000
commit39bdff845fb4cb87958db712e6f1add0a073b38b (patch)
tree40c3057f0a482c51b3e19957b44b1334bd99cad4
parentc4e6705c72be40764baa6d47e3f45140da3f1ab9 (diff)
tdf#95977: fix fly positioning regression from 0c5cbcd7
Change-Id: I7e11c7072ba0ec82237985da79f8572fdda05778 Reviewed-on: https://gerrit.libreoffice.org/23429 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
-rw-r--r--sw/source/core/layout/flycnt.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/source/core/layout/flycnt.cxx b/sw/source/core/layout/flycnt.cxx
index 475431451304..c3740e5365f6 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
{