summaryrefslogtreecommitdiff
path: root/sw/source/core/unocore/unosett.cxx
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2018-01-23 22:44:15 +0100
committerStephan Bergmann <sbergman@redhat.com>2018-01-24 11:20:25 +0100
commit7e15b28bc60f85c449a7ac1f64d1c02d5b43399c (patch)
treec728d468348bfd72029b2c70603f0fc1c99221b0 /sw/source/core/unocore/unosett.cxx
parentcca67d26b6d503ab7dcf3a05fb77fe648cd25f2c (diff)
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 <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'sw/source/core/unocore/unosett.cxx')
-rw-r--r--sw/source/core/unocore/unosett.cxx4
1 files changed, 2 insertions, 2 deletions
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;