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

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Mon Sep 24 14:15:05 PDT 2012


 sc/source/core/tool/rangelst.cxx |    8 --------
 1 file changed, 8 deletions(-)

New commits:
commit 5343c2fc6d00c75226ddb78b5300d3e34db53ddb
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Mon Sep 24 17:09:31 2012 +0200

    fix crash when updating conditional formats, fdo#54498
    
    This opens an old bug that deleting the last column/row will not work
    but this is a minor bug compared to the crash. A fix for all bugs will
    be hopefully available in 3.6.3
    
    Change-Id: Icc38e4987905062b9780292f0480428411db5f3a
    Signed-off-by: Fridrich Å trba <fridrich.strba at bluewin.ch>
    Signed-off-by: Kohei Yoshida <kohei.yoshida at gmail.com>
    Signed-off-by: Noel Power <noel.power at suse.com>

diff --git a/sc/source/core/tool/rangelst.cxx b/sc/source/core/tool/rangelst.cxx
index 88f9727..60505d7 100644
--- a/sc/source/core/tool/rangelst.cxx
+++ b/sc/source/core/tool/rangelst.cxx
@@ -407,14 +407,6 @@ bool ScRangeList::UpdateReference(
     SCTAB nTab2;
     rWhere.GetVars( nCol1, nRow1, nTab1, nCol2, nRow2, nTab2 );
 
-    // delete all entries that are fully deleted
-    if( eUpdateRefMode == URM_INSDEL && (nDx < 0 || nDy < 0) )
-    {
-        vector<ScRange*>::iterator itr = std::remove_if(maRanges.begin(), maRanges.end(), FindDeletedRange(nDx, nDy));
-        for_each(itr, maRanges.end(), ScDeleteObjectByPtr<ScRange>());
-        maRanges.erase(itr, maRanges.end());
-    }
-
     vector<ScRange*>::iterator itr = maRanges.begin(), itrEnd = maRanges.end();
     for (; itr != itrEnd; ++itr)
     {


More information about the Libreoffice-commits mailing list