sw/source/core/layout/atrfrm.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 182a3c7e12a0f56d664deaf67d17bc51eef6299d
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Tue Jan 23 17:13:21 2018 +0100
USHRT_MAX -> SAL_MAX_UINT16
...presumably forgotten when the following casts of nTmp in the
SetBaseHeight
etc. calls were changed from USHORT to sal_uInt16 in
7f33ed417b2e29e5470724ea76967f64699a2662 "removetooltypes01: #i112600#
Remove
tools types from sw"
Change-Id: I75809e677835910b09b366f755361a667d097402
Reviewed-on: https://gerrit.libreoffice.org/48442
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index dc16db754289..e8b8c79091cc 100644
--- a/sw/source/core/layout/atrfrm.cxx
+++ b/sw/source/core/layout/atrfrm.cxx
@@ -2322,7 +2322,7 @@ bool SwTextGridItem::PutValue( const uno::Any& rVal,
sal_uInt8 nMemberId )
sal_Int32 nTmp = 0;
bRet = (rVal >>= nTmp);
nTmp = convertMm100ToTwip( nTmp );
- if( bRet && (nTmp >= 0) && ( nTmp <= USHRT_MAX) )
+ if( bRet && (nTmp >= 0) && ( nTmp <= SAL_MAX_UINT16) )
{
// rhbz#1043551 round up to 5pt -- 0 causes divide-by-zero
// in layout; 1pt ties the painting code up in knots for
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
