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

Stephan Bergmann sbergman at redhat.com
Wed Jan 24 12:16:19 UTC 2018


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

New commits:
commit 1dcc7efc6f60084c80c4d7b0a5caf42c23f3be99
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Jan 23 23:10:25 2018 +0100

    Remove presumably dead < USHRT_MAX checks
    
    ...which are probably obsolete since 93cb1f8bb13e25586f61ba108e959376d90e91ed
    "INTEGRATION: CWS swwarnings" changed the parameters of lcl_CreateXCell from
    sal_Int16 to sal_Int32 (even though the < vs. <= and unsigned USHRT_MAX vs.
    signed sal_Int16 inconsistencies are suspicious).
    
    Change-Id: I14511cb7df1aa92630bf03d89d54609e7a440256
    Reviewed-on: https://gerrit.libreoffice.org/48469
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx
index db6e6e6bbd76..34d9e8766039 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -2218,7 +2218,7 @@ uno::Reference<table::XCell>  SwXTextTable::getCellByPosition(sal_Int32 nColumn,
     SolarMutexGuard aGuard;
     SwFrameFormat* pFormat(GetFrameFormat());
     // sheet is unimportant
-    if(nColumn >= 0 && nRow >= 0 && nColumn < USHRT_MAX && nRow < USHRT_MAX && pFormat)
+    if(nColumn >= 0 && nRow >= 0 && pFormat)
     {
         auto pXCell = lcl_CreateXCell(pFormat, nColumn, nRow);
         if(pXCell)


More information about the Libreoffice-commits mailing list