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

[Markus Mohrhard]

 sc/source/core/data/column2.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 3875218079cae6f94d938b810109de0222485af6
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date:   Sun Jun 9 23:33:38 2013 +0200

    don't crash during chart copying, fdo#66508
    
    (cherry picked from commit 92207231c3742873ad3b3a6fed2963d1bf924ad3)
    
    Change-Id: I3a4806fcae7b830e71cda0ab7e6d5ac6f180d4d3
    Reviewed-on: https://gerrit.libreoffice.org/4688
    Reviewed-by: Kohei Yoshida <kohei.yosh...@suse.de>
    Tested-by: Kohei Yoshida <kohei.yosh...@suse.de>

diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index b987a31..efb3a6a 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -1421,7 +1421,7 @@ void ScColumn::CopyCellTextAttrsToDocument(SCROW nRow1, 
SCROW nRow2, ScColumn& r
     for (; itBlk != itBlkEnd; ++itBlk)
     {
         nBlockEnd = nBlockStart + itBlk->size;
-        if (nBlockStart <= nRowPos && nRowPos <= nBlockEnd)
+        if (nBlockStart <= nRowPos && nRowPos < nBlockEnd)
         {
             // Found.
             nOffsetInBlock = nRowPos - nBlockStart;
@@ -1443,7 +1443,7 @@ void ScColumn::CopyCellTextAttrsToDocument(SCROW nRow1, 
SCROW nRow2, ScColumn& r
         if (!itBlk->data)
         {
             // Empty block.
-            if (nBlockStart <= nRowPos && nRowPos <= nBlockEnd)
+            if (nBlockStart <= nRowPos && nRowPos < nBlockEnd)
                 // This block contains the end row.
                 rDestCol.maCellTextAttrs.set_empty(nBlockStart + 
nOffsetInBlock, nRowPos);
             else
@@ -1457,7 +1457,7 @@ void ScColumn::CopyCellTextAttrsToDocument(SCROW nRow1, 
SCROW nRow2, ScColumn& r
         itDataEnd = sc::custom_celltextattr_block::end(*itBlk->data);
         std::advance(itData, nOffsetInBlock);
 
-        if (nBlockStart <= nRowPos && nRowPos <= nBlockEnd)
+        if (nBlockStart <= nRowPos && nRowPos < nBlockEnd)
         {
             // This block contains the end row. Only copy partially.
             size_t nOffset = nRowPos - nBlockStart + 1;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits