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

Stephan Bergmann sbergman at redhat.com
Tue Sep 29 04:57:34 PDT 2015


 sc/source/filter/oox/pivotcachebuffer.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2bce2365e7d411c1673e709eb1abc89da9f651dc
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Sep 29 13:55:47 2015 +0200

    Work around odd -Werror=strict-overflow
    
    "sc/source/filter/oox/pivotcachebuffer.cxx:401:45: error: assuming signed
    overflow does not occur when assuming that (X + c) < X is always false" at least
    with "g++ (GCC) 5.1.1 20150618 (Red Hat 5.1.1-4)" and --disable-debug
    
    Change-Id: I1d267b2947f04b84f73da2b1458d316397e2374e

diff --git a/sc/source/filter/oox/pivotcachebuffer.cxx b/sc/source/filter/oox/pivotcachebuffer.cxx
index e7bad2d..64da525 100644
--- a/sc/source/filter/oox/pivotcachebuffer.cxx
+++ b/sc/source/filter/oox/pivotcachebuffer.cxx
@@ -408,7 +408,7 @@ void PivotCacheItemList::importArray( SequenceInputStream& rStrm )
             case BIFF12_PCITEM_ARRAY_DATE:   createItem().readDate( rStrm );     break;
             default:
                 OSL_FAIL( "PivotCacheItemList::importArray - unknown data type" );
-                nIdx = nCount;
+                return;
         }
     }
 }


More information about the Libreoffice-commits mailing list