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

[Kohei Yoshida]

 sc/source/core/data/dociter.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit b4bba09ba98cfa40d559f98aaf8ae4730c6f075a
Author: Kohei Yoshida <kohei.yoshida at collabora.com>
Date:   Thu Mar 13 10:22:25 2014 -0400

    fdo#75642: Check the high position block correctly.
    
    Change-Id: I25deabf69e78c6e0354e8a528ab88891a30f9aec
    (cherry picked from commit c078d5fef98ba77751b7a9593691d88dfc1c9ba1)
    Reviewed-on: https://gerrit.libreoffice.org/8573
    Tested-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    Reviewed-on: https://gerrit.libreoffice.org/8576
    Reviewed-by: Norbert Thiebaud <nthiebaud at gmail.com>
    Reviewed-by: Eike Rathke <erack at redhat.com>

diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx
index 5758c52..1461472 100644
--- a/sc/source/core/data/dociter.cxx
+++ b/sc/source/core/data/dociter.cxx
@@ -1554,7 +1554,9 @@ public:
             // Move to the last position of the previous block.
             decBlock(aHiPos);
 
-            if (aHiPos.first == mrCells.begin())
+            // Check the row postion of the end of the previous block, and make sure it's valid.
+            SCROW nBlockEndRow = aHiPos.first->position + aHiPos.first->size - 1;
+            if (nBlockEndRow < nStartRow)
             {
                 mbValid = false;
                 return;