diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-02-05 16:25:04 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-02-05 16:27:13 +0000 |
| commit | e75804276d1351795add46be77658b53a25117f0 (patch) | |
| tree | bbe3f8c47c74913f578cf1272c144078cf218062 /sw | |
| parent | 3bf543f12d7dc350ef43d65ac9defb4f500e29ec (diff) | |
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
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/layout/pagechg.cxx | 6 |
1 files changed, 5 insertions, 1 deletions
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() ) |