mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fdo#75718: Correctly count the length of trailing empty range.

Browse Source 
This affects auto fill, apparently.

Change-Id: I653918d374122bc9bb938231934c149da79a3306
This commit is contained in:
Kohei Yoshida
2014-03-07 14:23:46 -05:00
parent 9d54a7f671
commit 01de94471c
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sc/source/core/data/column2.cxx
View File

@@ -1214,13 +1214,13 @@ bool ScColumn::IsNotesEmptyBlock(SCROW nStartRow, SCROW nEndRow) const
SCSIZE ScColumn::GetEmptyLinesInBlock( SCROW nStartRow, SCROW nEndRow, ScDirection eDir ) const SCSIZE ScColumn::GetEmptyLinesInBlock( SCROW nStartRow, SCROW nEndRow, ScDirection eDir ) const
{ {
// Given a range of rows, find a top or bottom empty segment. // Given a range of rows, find a top or bottom empty segment. Skip the start row.
switch (eDir) switch (eDir)
{ {
case DIR_TOP: case DIR_TOP:
{ {
// Determine the length of empty head segment. // Determine the length of empty head segment.
size_t nLength = nEndRow - nStartRow + 1; size_t nLength = nEndRow - nStartRow;
std::pair<sc::CellStoreType::const_iterator,size_t> aPos = maCells.position(nStartRow); std::pair<sc::CellStoreType::const_iterator,size_t> aPos = maCells.position(nStartRow);
sc::CellStoreType::const_iterator it = aPos.first; sc::CellStoreType::const_iterator it = aPos.first;
if (it->type != sc::element_type_empty) if (it->type != sc::element_type_empty)
@@ -1234,8 +1234,8 @@ SCSIZE ScColumn::GetEmptyLinesInBlock( SCROW nStartRow, SCROW nEndRow, ScDirecti
break; break;
case DIR_BOTTOM: case DIR_BOTTOM:
{ {
// Determine the length empty tail segment. // Determine the length of empty tail segment.
size_t nLength = nEndRow - nStartRow + 1; size_t nLength = nEndRow - nStartRow;
std::pair<sc::CellStoreType::const_iterator,size_t> aPos = maCells.position(nEndRow); std::pair<sc::CellStoreType::const_iterator,size_t> aPos = maCells.position(nEndRow);
sc::CellStoreType::const_iterator it = aPos.first; sc::CellStoreType::const_iterator it = aPos.first;
if (it->type != sc::element_type_empty) if (it->type != sc::element_type_empty)
@@ -1243,7 +1243,7 @@ SCSIZE ScColumn::GetEmptyLinesInBlock( SCROW nStartRow, SCROW nEndRow, ScDirecti
return 0; return 0;
// length of this empty block from the tip to the end row position. // length of this empty block from the tip to the end row position.
size_t nThisLen = aPos.second; size_t nThisLen = aPos.second + 1;
return std::min(nThisLen, nLength); return std::min(nThisLen, nLength);
} }
break; break;