summaryrefslogtreecommitdiff
path: root/sw/source
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2016-03-22 15:41:04 +0100
committerBjörn Michaelsen <bjoern.michaelsen@canonical.com>2016-03-22 14:57:10 +0000
commitf47f49449cc69561906410a10dd574ab170aece9 (patch)
tree6f56e988c8c322a7f2ee01b93f5a57c21675662d /sw/source
parentd9e3a8d65a056596e1f5490c8813d2543eb95153 (diff)
tdf#95977: fix fly positioning regression from 0c5cbcd7
Change-Id: I7e11c7072ba0ec82237985da79f8572fdda05778 Reviewed-on: https://gerrit.libreoffice.org/23428 Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Diffstat (limited to 'sw/source')
-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 4aedeb46e2eb..f95b4a6e13ac 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
{