summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2016-03-22 15:41:04 +0100
committerAndras Timar <andras.timar@collabora.com>2016-04-04 23:54:45 +0200
commit0b4c612c5100eb8300f434b8d5d7ad5cec8bcbee (patch)
tree015f49459845f3ae3dfae53fc0096a9176ac0370 /sw
parent8987a2351031d5dc9d3c89b25723e26b4db4ed91 (diff)
tdf#95977: fix fly positioning regression from 0c5cbcd7
Change-Id: I7e11c7072ba0ec82237985da79f8572fdda05778 Reviewed-on: https://gerrit.libreoffice.org/23430 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 01ba19094272cb661f781c091fd11f3a01dc1ea0)
Diffstat (limited to 'sw')
-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 a500fe3779ab..0423ea72eb2c 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
{