Kaydet (Commit) dd4bd0ee authored tarafından László Németh's avatar László Németh

tdf#89436 ScHorizontalAttrIterator - fix condition + cleanup

Change-Id: I0e2d467044fc46f56bd52083d4365357033cb1b8
üst b0979fb2
...@@ -2313,6 +2313,8 @@ const ScPatternAttr* ScHorizontalAttrIterator::GetNext( SCCOL& rCol1, SCCOL& rCo ...@@ -2313,6 +2313,8 @@ const ScPatternAttr* ScHorizontalAttrIterator::GetNext( SCCOL& rCol1, SCCOL& rCo
++nCol; // Count up for next call ++nCol; // Count up for next call
return pPat; // Found it! return pPat; // Found it!
} }
bRepeatedRow = true; // we can use the stored row data next time
} }
// Next row // Next row
...@@ -2321,10 +2323,10 @@ const ScPatternAttr* ScHorizontalAttrIterator::GetNext( SCCOL& rCol1, SCCOL& rCo ...@@ -2321,10 +2323,10 @@ const ScPatternAttr* ScHorizontalAttrIterator::GetNext( SCCOL& rCol1, SCCOL& rCo
return NULL; // Found nothing return NULL; // Found nothing
nCol = nStartCol; // Start at the left again nCol = nStartCol; // Start at the left again
if ( !bRowEmpty && bRepeatedRow && ! nMinNextEnd < nRow ) // use the data of the previous row if ( bRepeatedRow && nRow <= nMinNextEnd ) // use only the stored data of the previous row
continue; continue;
bRepeatedRow = true; // ppPatterns is not modified bRepeatedRow = false;
nMinNextEnd = MAXROW; nMinNextEnd = MAXROW;
bool bEmpty = true; bool bEmpty = true;
SCCOL i; SCCOL i;
...@@ -2335,7 +2337,6 @@ const ScPatternAttr* ScHorizontalAttrIterator::GetNext( SCCOL& rCol1, SCCOL& rCo ...@@ -2335,7 +2337,6 @@ const ScPatternAttr* ScHorizontalAttrIterator::GetNext( SCCOL& rCol1, SCCOL& rCo
if ( pNextEnd[nPos] < nRow ) if ( pNextEnd[nPos] < nRow )
{ {
const ScAttrArray* pArray = pDoc->maTabs[nTab]->aCol[i].pAttrArray; const ScAttrArray* pArray = pDoc->maTabs[nTab]->aCol[i].pAttrArray;
bRepeatedRow = false;
SCSIZE nIndex = ++pIndices[nPos]; SCSIZE nIndex = ++pIndices[nPos];
if ( nIndex < pArray->nCount ) if ( nIndex < pArray->nCount )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment