sw/source/core/layout/pagechg.cxx | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
New commits:
commit e75804276d1351795add46be77658b53a25117f0
Author: Caolán McNamara <caol...@redhat.com>
Date: Thu Feb 5 16:25:04 2015 +0000
don't relatively move FAR_AWAY things away from FAR_AWAY
to avoid the dread 64bit
vcl/source/outdev/map.cxx:391: long int ImplLogicToPixel(long int, long
int, long int, long int, long int): Assertion `std::abs(n) <
std::numeric_limits<long>::max() / nMapNum / nDPI'
assert on executing...
soffice.bin abi10619-1.doc --convert-to pdf
Change-Id: Id81d8e7eb9a962a5bc7f50d9c02da052cee24da1
diff --git a/sw/source/core/layout/pagechg.cxx
b/sw/source/core/layout/pagechg.cxx
index d23c4f9..0f677c5 100644
--- a/sw/source/core/layout/pagechg.cxx
+++ b/sw/source/core/layout/pagechg.cxx
@@ -1815,7 +1815,11 @@ static void lcl_MoveAllLowers( SwFrm* pFrm, const Point&
rOffset )
const SwRect aFrm( pFrm->Frm() );
// first move the current frame
- pFrm->Frm().Pos() += rOffset;
+ Point &rPoint = pFrm->Frm().Pos();
+ if (rPoint.X() != FAR_AWAY)
+ rPoint.X() += rOffset.X();
+ if (rPoint.Y() != FAR_AWAY)
+ rPoint.Y() += rOffset.Y();
// Don't forget accessibility:
if( pFrm->IsAccessibleFrm() )
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
