[Libreoffice-commits] core.git: 2 commits - sc/source xmloff/source

[Markus Mohrhard]

 sc/source/core/data/column2.cxx            |    4 ++--
 xmloff/source/chart/SchXMLTableContext.hxx |    5 -----
 2 files changed, 2 insertions(+), 7 deletions(-)

New commits:
commit c688919620fb22e27471d222d99c0599ee0872e7
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Tue Jun 11 16:36:22 2013 +0200

    a few more fixes for crashes around cell text attr storage
    
    Change-Id: If5d6f4baf49b5828a1765b638eb4d2225f7b5400

diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index 5e490bd..d25d5ba 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
commit 52fcfa07078a24fc2229c87f928e2a39ac5635f0
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Tue Jun 11 14:43:43 2013 +0200

    remove method without definition
    
    Change-Id: Ia41f28ed31fc254a6785c6444a78822eb969f2f9

diff --git a/xmloff/source/chart/SchXMLTableContext.hxx b/xmloff/source/chart/SchXMLTableContext.hxx
index 1d06dd5..20b87b5 100644
--- a/xmloff/source/chart/SchXMLTableContext.hxx
+++ b/xmloff/source/chart/SchXMLTableContext.hxx
@@ -73,11 +73,6 @@ class SchXMLTableHelper
 private:
     static void GetCellAddress( const OUString& rStr, sal_Int32& rCol, sal_Int32& rRow );
     static sal_Bool GetCellRangeAddress( const OUString& rStr, SchNumericCellRangeAddress& rResult );
-    static void PutTableContentIntoSequence(
-        const SchXMLTable& rTable,
-        SchNumericCellRangeAddress& rAddress,
-        sal_Int32 nSeriesIndex,
-        com::sun::star::uno::Sequence< com::sun::star::uno::Sequence< double > >& aSequence );
     static void AdjustMax( const SchNumericCellRangeAddress& rAddr,
                            sal_Int32& nRows, sal_Int32& nColumns );