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

Stephan Bergmann sbergman at redhat.com
Sun Jan 28 09:21:32 UTC 2018


 svx/source/accessibility/AccessibleTextHelper.cxx |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 6fd20e011e2f6dec4be9b9bfa041145169274a4f
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Jan 26 17:58:01 2018 +0100

    Remove redundant checks
    
    ...that date back to a909acb7009acadffa53e74ea05ddb88803490f1 "#98735#
    Refactored unoedit/unoedacc.cxx", before SvxTextForwarder::GetParaBounds was
    changed from sal_uInt16 to sal_Int32 with
    2af1f5691e8d64afd5246d245d7876b5a2cd5cd8 "resolved fdo#35756 import more than
    64k HTML table cells"
    
    Change-Id: Ia92dcf1fb6742779e5fd51ed3ba8f0db565f8965
    Reviewed-on: https://gerrit.libreoffice.org/48715
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/svx/source/accessibility/AccessibleTextHelper.cxx b/svx/source/accessibility/AccessibleTextHelper.cxx
index faadef3fc063..8f59f7ceee0d 100644
--- a/svx/source/accessibility/AccessibleTextHelper.cxx
+++ b/svx/source/accessibility/AccessibleTextHelper.cxx
@@ -21,7 +21,6 @@
 // Global header
 
 
-#include <limits.h>
 #include <memory>
 #include <utility>
 #include <algorithm>
@@ -782,7 +781,7 @@ namespace accessibility
 
             for( nCurrPara=0; nCurrPara<nParas; ++nCurrPara )
             {
-                DBG_ASSERT(nCurrPara >= 0 && nCurrPara <= USHRT_MAX,
+                DBG_ASSERT(nCurrPara >= 0,
                            "AccessibleTextHelper_Impl::UpdateVisibleChildren: index value overflow");
 
                 aTmpBB = rCacheTF.GetParaBounds( nCurrPara );
@@ -1577,7 +1576,7 @@ namespace accessibility
         sal_Int32 nChild;
         for( nChild=mnFirstVisibleChild; nChild <= mnLastVisibleChild; ++nChild )
         {
-            DBG_ASSERT(nChild >= 0 && nChild <= USHRT_MAX,
+            DBG_ASSERT(nChild >= 0,
                        "AccessibleTextHelper_Impl::getAccessibleAt: index value overflow");
 
             tools::Rectangle aParaBounds( rCacheTF.GetParaBounds( nChild ) );


More information about the Libreoffice-commits mailing list