sw/source/core/unocore/unosett.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
New commits: commit 7e15b28bc60f85c449a7ac1f64d1c02d5b43399c Author: Stephan Bergmann <sberg...@redhat.com> Date: Tue Jan 23 22:44:15 2018 +0100 USHRT_MAX -> SAL_MAX_UINT16 ...presumably forgotten when the following cast of nTmp in the SetPosFromLeft call was changed from USHORT to sal_uInt16 in 7f33ed417b2e29e5470724ea76967f64699a2662 "removetooltypes01: #i112600# Remove tools types from sw" Change-Id: I42d93aeb86473d6ff69251035dc22bbadcd5ae0f Reviewed-on: https://gerrit.libreoffice.org/48466 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Stephan Bergmann <sberg...@redhat.com> diff --git a/sw/source/core/unocore/unosett.cxx b/sw/source/core/unocore/unosett.cxx index 8841f50de1db..6c607767c781 100644 --- a/sw/source/core/unocore/unosett.cxx +++ b/sw/source/core/unocore/unosett.cxx @@ -858,8 +858,8 @@ void SwXLineNumberingProperties::setPropertyValue( sal_Int32 nVal = 0; aValue >>= nVal; sal_Int32 nTmp = convertMm100ToTwip(nVal); - if (nTmp > USHRT_MAX) - nTmp = USHRT_MAX; + if (nTmp > SAL_MAX_UINT16) + nTmp = SAL_MAX_UINT16; aFontMetric.SetPosFromLeft( static_cast< sal_uInt16 >(nTmp) ); } break; _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits