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

Markus Mohrhard markus.mohrhard at googlemail.com
Tue Mar 29 17:00:53 UTC 2016


 sc/source/core/data/fillinfo.cxx |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 789a3e61785a2458429890e28ad9a37fab8cdade
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Tue Mar 29 18:59:24 2016 +0200

    that should not have become part of the previous commit
    
    Change-Id: Ia116e5f9fdbd34cd1017ec1f2dabf6e581c4c707

diff --git a/sc/source/core/data/fillinfo.cxx b/sc/source/core/data/fillinfo.cxx
index e4437b3..ed5e9dc 100644
--- a/sc/source/core/data/fillinfo.cxx
+++ b/sc/source/core/data/fillinfo.cxx
@@ -444,16 +444,17 @@ void ScDocument::FillInfo(
 
                 ScColumn* pThisCol = &maTabs[nTab]->aCol[nX];                   // Column data
 
-                nArrRow = 0;
+                nArrRow = 1;
                 // Iterate between rows nY1 and nY2 and pick up non-empty
                 // cells that are not hidden.
                 RowInfoFiller aFunc(*this, nTab, pRowInfo, nArrCol, nArrRow);
                 sc::ParseAllNonEmpty(
-                    pThisCol->maCells.begin(), pThisCol->maCells, std::max<SCROW>(0 , nRow1 - 1), nYExtra, aFunc);
+                    pThisCol->maCells.begin(), pThisCol->maCells, nRow1, nRow2, aFunc);
 
                 if (nX+1 >= nCol1)                                // Attribute/Blockmark from nX1-1
                 {
                     ScAttrArray* pThisAttrArr = pThisCol->pAttrArray;       // Attribute
+                    nArrRow = 0;
 
                     const ScPatternAttr* pPattern;
                     SCROW nCurRow=nRow1;                  // single rows


More information about the Libreoffice-commits mailing list