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

Stephan Bergmann sbergman at redhat.com
Sun Jan 28 20:50:07 UTC 2018


 editeng/source/items/frmitems.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 09a2eb4c26cb136c4b6933fb0c38613d407ea12d
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Sun Jan 28 11:37:48 2018 +0100

    USHRT_MAX -> SAL_MAX_UINT16
    
    Change-Id: I9909d8e125a16f9494ce431b62baf5d2507ad80d
    Reviewed-on: https://gerrit.libreoffice.org/48774
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx
index 5205e32b86df..1e76f58d4faa 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -488,7 +488,7 @@ bool SvxLRSpaceItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
         case MID_R_REL_MARGIN:
         {
             sal_Int32 nRel = 0;
-            if((rVal >>= nRel) && nRel >= 0 && nRel < USHRT_MAX)
+            if((rVal >>= nRel) && nRel >= 0 && nRel < SAL_MAX_UINT16)
             {
                 if(MID_L_REL_MARGIN== nMemberId)
                     nPropLeftMargin = static_cast<sal_uInt16>(nRel);


More information about the Libreoffice-commits mailing list