summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Luth <justin_luth@sil.org>2016-12-24 12:00:21 +0300
committerJustin Luth <justin_luth@sil.org>2016-12-24 09:56:40 +0000
commit604cf7024fce29143150ab77b2f14b59a45e61eb (patch)
treec8782209ee342fe7c2ea981cbc6263a3e240c7d1
parent79995e832d10721422c4dfe0ff394d6efb11f367 (diff)
tdf#81263 ww8par6: only use valid sal_uInt16 values for ULSpace
VerticalOrient position returns a signed SwTwips number, but ULSpace uses unsigned int16, so negative numbers were creating huge margins. fixes commit 3755c87d0426a499d4755e82d8fbc77caa240764 Change-Id: I23daea9a913ef73efc42a65e0adfc393eaf4e775 Reviewed-on: https://gerrit.libreoffice.org/32400 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Justin Luth <justin_luth@sil.org>
-rw-r--r--sw/source/filter/ww8/ww8par6.cxx5
1 files changed, 3 insertions, 2 deletions
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 68b017e09b6d..0477795fe412 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -2355,8 +2355,9 @@ bool SwWW8ImplReader::StartApo(const ApoTestResults &rApo,
if (aFlySet.HasItem(RES_VERT_ORIENT, &pItem))
{
const SwFormatVertOrient* pOrient = static_cast<const SwFormatVertOrient*>(pItem);
- if (pOrient->GetPos() != 0)
- pULSpaceItem->SetUpper(pOrient->GetPos());
+ SwTwips nPos = pOrient->GetPos();
+ if( 0 < nPos && nPos <= SAL_MAX_UINT16 )
+ pULSpaceItem->SetUpper( sal_uInt16(nPos) );
}
}
}