summaryrefslogtreecommitdiff
path: root/sc/source/core/data/column2.cxx
diff options
context:
space:
mode:
authorKohei Yoshida <kohei.yoshida@collabora.com>2013-10-15 22:27:32 -0400
committerKohei Yoshida <kohei.yoshida@collabora.com>2013-10-18 23:22:40 -0400
commit1a77aeb0ac6dbd8814bb7fdc34a49548a16fd110 (patch)
treeaca4f8f582fae6bc8e06cf953b26793d897470a3 /sc/source/core/data/column2.cxx
parenta6f8102ba55d06ead9bf6e72be0985dcc1086ef5 (diff)
Cleanup.
Change-Id: I3d6e3bceda23255a138340dcea3d847481216e73
Diffstat (limited to 'sc/source/core/data/column2.cxx')
-rw-r--r--sc/source/core/data/column2.cxx9
1 files changed, 5 insertions, 4 deletions
diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index 8fbfd1b016bb..32a4ded13fc3 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -2178,7 +2178,7 @@ bool appendDouble(
return false;
}
-formula::VectorRefArray appendBlocks(
+formula::VectorRefArray appendToStringBlock(
ScDocument* pDoc, sc::FormulaGroupContext& rCxt, size_t nPos,
size_t nLenRequested, sc::CellStoreType::iterator it, const sc::CellStoreType::iterator& itEnd )
{
@@ -2338,6 +2338,9 @@ formula::VectorRefArray ScColumn::FetchVectorRefArray( sc::FormulaGroupContext&
if (nRow1 > nRow2)
return formula::VectorRefArray();
+ double fNan;
+ rtl::math::setNan(&fNan);
+
size_t nLenRequested = nRow2 - nRow1 + 1;
sc::CellStoreType::position_type aPos = maCells.position(nRow1);
size_t nLen = aPos.first->size - aPos.second;
@@ -2450,7 +2453,7 @@ formula::VectorRefArray ScColumn::FetchVectorRefArray( sc::FormulaGroupContext&
// Fill the remaining array with values from the following blocks.
++aPos.first;
- return appendBlocks(pDocument, rCxt, nLen, nLenRequested, aPos.first, maCells.end());
+ return appendToStringBlock(pDocument, rCxt, nLen, nLenRequested, aPos.first, maCells.end());
}
break;
case sc::element_type_empty:
@@ -2458,8 +2461,6 @@ formula::VectorRefArray ScColumn::FetchVectorRefArray( sc::FormulaGroupContext&
if (nLenRequested <= nLen)
{
// Fill the whole length with NaN's.
- double fNan;
- rtl::math::setNan(&fNan);
rCxt.maNumArrays.push_back(new sc::FormulaGroupContext::NumArrayType(nLenRequested, fNan));
return formula::VectorRefArray(&rCxt.maNumArrays.back()[0]);
}