[Libreoffice-commits] core.git: xmloff/source

[Stephan Bergmann]

 xmloff/source/text/txtparai.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 859b91cb8ad29ff416e10da85ad493d05b10b83d
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Jan 22 16:05:51 2018 +0100

    USHRT_MAX -> SAL_MAX_UINT16 for XMLCharContext::m_nCount
    
    ...which is of type sal_uInt16 ever since the class got introduced with
    0e3ff5db960cdf907c03445220f1e29d37fc367f "INTEGRATION: CWS oj14: #i77059# export
    char content helper for example line break"
    
    Change-Id: I1dcb2894861ea5b6104932d896b7166c5c0b4689
    Reviewed-on: https://gerrit.libreoffice.org/48347
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/xmloff/source/text/txtparai.cxx b/xmloff/source/text/txtparai.cxx
index 67fb156aff9a..534ec5df005a 100644
--- a/xmloff/source/text/txtparai.cxx
+++ b/xmloff/source/text/txtparai.cxx
@@ -119,8 +119,8 @@ XMLCharContext::XMLCharContext(
                 sal_Int32 nTmp = xAttrList->getValueByIndex(i).toInt32();
                 if( nTmp > 0 )
                 {
-                    if( nTmp > USHRT_MAX )
-                        m_nCount = USHRT_MAX;
+                    if( nTmp > SAL_MAX_UINT16 )
+                        m_nCount = SAL_MAX_UINT16;
                     else
                         m_nCount = static_cast<sal_uInt16>(nTmp);
                 }