diff options
| author | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-05-27 14:47:24 -0400 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-06-04 14:17:20 +0000 |
| commit | 6de7b5b8c948082532a0e72f496e99438bac0a0b (patch) | |
| tree | 95533cfb553dd9dd709f01147f75007e2a6bc728 | |
| parent | eb3709fd1f94213336d9bbd444b6e054721632a5 (diff) | |
fdo#78976: Correct way to determine the end position for matrix check.
Change-Id: Ifd6acd85a9bf33742cb62327a3b8a4320f35d0f3
(cherry picked from commit 054213e86b8f3b1084474b0447cc7ffaf82178c5)
Reviewed-on: https://gerrit.libreoffice.org/9512
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
(cherry picked from commit 20857b5d7536b3fcafa16ca6527ba459032933d7)
Reviewed-on: https://gerrit.libreoffice.org/9528
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | sc/source/core/data/column.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx index 9835a6dc21af..5e5cf430f0b2 100644 --- a/sc/source/core/data/column.cxx +++ b/sc/source/core/data/column.cxx @@ -152,7 +152,7 @@ sal_uInt16 ScColumn::GetBlockMatrixEdges( SCROW nRow1, SCROW nRow2, sal_uInt16 n } size_t nRowsToRead = nRow2 - nRow + 1; - size_t nEnd = std::min(it->size, nRowsToRead); + size_t nEnd = std::min(it->size, nOffset+nRowsToRead); // last row + 1 sc::formula_block::const_iterator itCell = sc::formula_block::begin(*it->data); std::advance(itCell, nOffset); for (size_t i = nOffset; i < nEnd; ++itCell, ++i) |