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

Stephan Bergmann sbergman at redhat.com
Thu Jan 25 06:54:32 UTC 2018


 sw/source/core/unocore/unotbl.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1a95cd72d9cf5ff18a79eb8089a3a7e0a47be0e4
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Jan 23 22:52:13 2018 +0100

    USHRT_MAX -> SAL_MAX_UINT16
    
    ...presumably forgotten when the following cast of nRepeat in the
    SetRowsToRepeat call was changed from USHORT to sal_uInt16 in
    7f33ed417b2e29e5470724ea76967f64699a2662 "removetooltypes01: #i112600# Remove
    tools types from sw"
    
    Change-Id: I3d1932215778977e40cc68fd3aad73477715c214
    Reviewed-on: https://gerrit.libreoffice.org/48467
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
    Tested-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx
index 68d9863910f0..67a96acbe0f9 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -230,7 +230,7 @@ static void lcl_SetSpecialProperty(SwFrameFormat* pFormat,
             {
                 sal_Int32 nRepeat = 0;
                 aValue >>= nRepeat;
-                if( nRepeat >= 0 && nRepeat < USHRT_MAX )
+                if( nRepeat >= 0 && nRepeat < SAL_MAX_UINT16 )
                     pFormat->GetDoc()->SetRowsToRepeat( *pTable, static_cast<sal_uInt16>(nRepeat) );
             }
         }


More information about the Libreoffice-commits mailing list