summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@googlemail.com>2016-03-29 18:59:24 +0200
committerAshod Nakashian <ashnakash@gmail.com>2016-05-22 03:34:16 +0000
commit7c942ee446ff357d2cd874913b15b4d641ed1ba6 (patch)
treeef4379d4c4168302657fa22fdec1311176575b49
parentc8774715d10707989267b550841984cd50b07e74 (diff)
that should not have become part of the previous commit
Change-Id: Ia116e5f9fdbd34cd1017ec1f2dabf6e581c4c707 (cherry picked from commit 789a3e61785a2458429890e28ad9a37fab8cdade) Reviewed-on: https://gerrit.libreoffice.org/25284 Reviewed-by: Ashod Nakashian <ashnakash@gmail.com> Tested-by: Ashod Nakashian <ashnakash@gmail.com>
-rw-r--r--sc/source/core/data/fillinfo.cxx5
1 files changed, 3 insertions, 2 deletions
diff --git a/sc/source/core/data/fillinfo.cxx b/sc/source/core/data/fillinfo.cxx
index b8955b92ef7c..ca0ac9286b64 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