[Libreoffice-commits] .: svl/source

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Wed Nov 14 00:26:11 PST 2012


 svl/source/items/nranges.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit cc6798946dd8ab54d3fac1e49e9a201724e6d747
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Nov 14 09:24:12 2012 +0100

    Turn "odd number of Which-IDs" into a true assert
    
    ...as it leads to crashes anyway (as witnessed with what got fixed with
    09ee17974f31ca188df532a2fea33a79ca367ebe "Fix Which-ID range of
    OfaTreeOptionsDialog item set").
    
    Change-Id: I9ad24d3dd11530ad002a5277d22b60e651e67d70

diff --git a/svl/source/items/nranges.cxx b/svl/source/items/nranges.cxx
index b3a7210..c2c08cd 100644
--- a/svl/source/items/nranges.cxx
+++ b/svl/source/items/nranges.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-
+#include <cassert>
 #include <vector>
 // compiled via include from itemset.cxx only!
 
@@ -86,7 +86,7 @@ NUMTYPE InitializeRanges_Impl( NUMTYPE *&rpRanges, va_list pArgs,
         aNumArr.push_back( nIns );
     }
 
-    DBG_ASSERT( bEndOfRange, "ungerade Anzahl von Which-Paaren!" );
+    assert( bEndOfRange ); // odd number of Which-IDs
 
     // so, jetzt sind alle Bereiche vorhanden und
     rpRanges = new NUMTYPE[ aNumArr.size() + 1 ];


More information about the Libreoffice-commits mailing list