diff options
author | Kohei Yoshida <kohei.yoshida@gmail.com> | 2013-04-29 17:30:23 -0400 |
---|---|---|
committer | Kohei Yoshida <kohei.yoshida@gmail.com> | 2013-04-30 13:10:43 -0400 |
commit | dfc3f290b5934326a8e042eb81c1b2c81ee0a1ec (patch) | |
tree | 9a136e82f806600ecb085467a4ea9fd8aceff781 /formula | |
parent | Some comment. (diff) | |
download | core-dfc3f290b5934326a8e042eb81c1b2c81ee0a1ec.tar.gz core-dfc3f290b5934326a8e042eb81c1b2c81ee0a1ec.zip |
Let's not use VectorArray struct. There is no use for it.
Change-Id: Ic011143206c13fcbc1b3403bf5b7df46c6934899
Diffstat (limited to 'formula')
-rw-r--r-- | formula/source/core/api/vectortoken.cxx | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/formula/source/core/api/vectortoken.cxx b/formula/source/core/api/vectortoken.cxx index 94a071cd02d7..e016fd3700b0 100644 --- a/formula/source/core/api/vectortoken.cxx +++ b/formula/source/core/api/vectortoken.cxx @@ -11,24 +11,26 @@ namespace formula { -VectorArray::VectorArray( const double* pArray, size_t nLength ) : - mpArray(pArray), mnLength(nLength) {} - SingleVectorRefToken::SingleVectorRefToken( const double* pArray, size_t nLength ) : - FormulaToken(svSingleVectorRef, ocPush), maArray(pArray, nLength) {} + FormulaToken(svSingleVectorRef, ocPush), mpArray(pArray), mnLength(nLength) {} FormulaToken* SingleVectorRefToken::Clone() const { - return new SingleVectorRefToken(maArray.mpArray, maArray.mnLength); + return new SingleVectorRefToken(mpArray, mnLength); +} + +const double* SingleVectorRefToken::GetArray() const +{ + return mpArray; } -const VectorArray& SingleVectorRefToken::GetArray() const +size_t SingleVectorRefToken::GetLength() const { - return maArray; + return mnLength; } DoubleVectorRefToken::DoubleVectorRefToken( - const std::vector<VectorArray>& rArrays, size_t nRowSize, bool bAbsStart, bool bAbsEnd ) : + const std::vector<const double*>& rArrays, size_t nRowSize, bool bAbsStart, bool bAbsEnd ) : FormulaToken(svDoubleVectorRef, ocPush), maArrays(rArrays), mnRowSize(nRowSize), mbAbsStart(bAbsStart), mbAbsEnd(bAbsEnd) {} @@ -37,7 +39,7 @@ FormulaToken* DoubleVectorRefToken::Clone() const return new DoubleVectorRefToken(maArrays, mnRowSize, mbAbsStart, mbAbsEnd); } -const std::vector<VectorArray>& DoubleVectorRefToken::GetArrays() const +const std::vector<const double*>& DoubleVectorRefToken::GetArrays() const { return maArrays; } |