From e75804276d1351795add46be77658b53a25117f0 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Thu, 5 Feb 2015 16:25:04 +0000 Subject: 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::max() / nMapNum / nDPI' assert on executing... soffice.bin abi10619-1.doc --convert-to pdf Change-Id: Id81d8e7eb9a962a5bc7f50d9c02da052cee24da1 --- sw/source/core/layout/pagechg.cxx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'sw') diff --git a/sw/source/core/layout/pagechg.cxx b/sw/source/core/layout/pagechg.cxx index d23c4f9b3c8d..0f677c5852ae 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() ) -- cgit