diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2018-01-23 17:13:21 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2018-01-24 07:55:41 +0100 |
| commit | 182a3c7e12a0f56d664deaf67d17bc51eef6299d (patch) | |
| tree | 51e13e542e61ab9e4ebdd680f051fc28c667e403 /sw/source/core | |
| parent | 58401e6c8a9f53df96e84d3e1b73c84150890102 (diff) | |
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 <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'sw/source/core')
| -rw-r--r-- | sw/source/core/layout/atrfrm.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
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 |