[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sc/source

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Fri Oct 12 06:45:43 PDT 2012


 sc/source/core/data/dpcache.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 14a24950c56d85e275ea2b2fd13e5cefc25d6635
Author: Michael Meeks <michael.meeks at suse.com>
Date:   Tue Sep 18 10:17:48 2012 +0100

    WaE: calm android tinderboxen
    
    Change-Id: Iaeb809770acec4b3c38e42038fe2820b2da2051d
    (cherry picked from commit 0edc04d2d659456f5c22406a79901d54c530a979)
    
    Signed-off-by: Eike Rathke <erack at redhat.com>

diff --git a/sc/source/core/data/dpcache.cxx b/sc/source/core/data/dpcache.cxx
index c754fba..44af011 100644
--- a/sc/source/core/data/dpcache.cxx
+++ b/sc/source/core/data/dpcache.cxx
@@ -756,11 +756,11 @@ void ScDPCache::PostInit()
 
     maEmptyRows.build_tree();
     typedef mdds::flat_segment_tree<SCROW, bool>::const_reverse_iterator itr_type;
-    itr_type it = maEmptyRows.rbegin(), itEnd = maEmptyRows.rend();
-    OSL_ENSURE(it != itEnd, "corrupt flat_segment_tree instance!");
+    itr_type it = maEmptyRows.rbegin();
+    OSL_ENSURE(it != maEmptyRows.rend(), "corrupt flat_segment_tree instance!");
     mnDataSize = maFields[0].maData.size();
     ++it; // Skip the first position.
-    OSL_ENSURE(it != itEnd, "buggy version of flat_segment_tree is used.");
+    OSL_ENSURE(it != maEmptyRows.rend(), "buggy version of flat_segment_tree is used.");
     if (it->second)
     {
         SCROW nLastNonEmpty = it->first - 1;


More information about the Libreoffice-commits mailing list