[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/source

[Kohei Yoshida]

 sc/source/core/data/column.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 20857b5d7536b3fcafa16ca6527ba459032933d7
Author: Kohei Yoshida <kohei.yoshida at collabora.com>
Date:   Tue May 27 14:47:24 2014 -0400

    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 at redhat.com>
    Tested-by: Eike Rathke <erack at redhat.com>

diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index 9835a6d..5e5cf43 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)