[Libreoffice-commits] core.git: Branch 'feature/calc-group-interpreter' - 2 commits - sc/source

[Kohei Yoshida]

 sc/source/core/data/column2.cxx     |    1 +
 sc/source/core/data/formulacell.cxx |    5 -----
 2 files changed, 1 insertion(+), 5 deletions(-)

New commits:
commit a1016af0d106ac831c75c6fb2c779a4e0de26f17
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date:   Fri Jul 12 15:11:19 2013 -0400

    Don't forget to shift to the right start element within the block!
    
    Else it would always start from element one of the block regardless of
    the requested start row position.
    
    Change-Id: I3843eab2a88b8361250346e3f9696be5086039ea

diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index 58abd53..14d6828 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -2247,6 +2247,7 @@ const double* ScColumn::FetchDoubleArray( sc::FormulaGroupContext& rCxt, SCROW n
             rArray.reserve(nLenRequested);
 
             sc::formula_block::const_iterator it = sc::formula_block::begin(*aPos.first->data);
+            std::advance(it, aPos.second);
             sc::formula_block::const_iterator itEnd;
             if (nLenRequested <= nLen)
             {
commit e2c3f0be3b2d3097a2b897788e3e01334b89637f
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date:   Fri Jul 12 15:11:04 2013 -0400

    This comment is no longer correct.
    
    Change-Id: I815016551ea979d27e1f402dc2badda0d856a229

diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx
index b693502..6277b9d 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -3020,11 +3020,6 @@ public:
                         // returned array equals or greater than the requested
                         // length.
 
-                        // TODO: For now, it returns an array pointer only when
-                        // the entire array is in contiguous memory space.  Once
-                        // we finish cell storage rework, we'll support temporary
-                        // generation of a double array which is a combination of
-                        // multiple cell array segments.
                         const double* pArray = mrDoc.FetchDoubleArray(mrCxt, aRefPos, mrCell.GetCellGroup()->mnLength);
                         if (!pArray)
                             return false;