From dfc3f290b5934326a8e042eb81c1b2c81ee0a1ec Mon Sep 17 00:00:00 2001
From: Kohei Yoshida <kohei.yoshida@gmail.com>
Date: Mon, 29 Apr 2013 17:30:23 -0400
Subject: Let's not use VectorArray struct. There is no use for it.

Change-Id: Ic011143206c13fcbc1b3403bf5b7df46c6934899
---
 include/formula/vectortoken.hxx | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

(limited to 'include/formula')

diff --git a/include/formula/vectortoken.hxx b/include/formula/vectortoken.hxx
index 82051d4275cc..db44355cf824 100644
--- a/include/formula/vectortoken.hxx
+++ b/include/formula/vectortoken.hxx
@@ -14,23 +14,18 @@
 
 namespace formula {
 
-struct VectorArray
+class FORMULA_DLLPUBLIC SingleVectorRefToken : public FormulaToken
 {
     const double* mpArray;
     size_t mnLength;
 
-    VectorArray( const double* pArray, size_t nLength );
-};
-
-class FORMULA_DLLPUBLIC SingleVectorRefToken : public FormulaToken
-{
-    const VectorArray maArray;
 public:
     SingleVectorRefToken( const double* pArray, size_t nLength );
 
     virtual FormulaToken* Clone() const;
 
-    const VectorArray& GetArray() const;
+    const double* GetArray() const;
+    size_t GetLength() const;
 };
 
 /**
@@ -39,7 +34,7 @@ public:
  */
 class FORMULA_DLLPUBLIC DoubleVectorRefToken : public FormulaToken
 {
-    std::vector<VectorArray> maArrays;
+    std::vector<const double*> maArrays;
 
     size_t mnRowSize;
 
@@ -48,11 +43,11 @@ class FORMULA_DLLPUBLIC DoubleVectorRefToken : public FormulaToken
 
 public:
     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 );
 
     virtual FormulaToken* Clone() const;
 
-    const std::vector<VectorArray>& GetArrays() const;
+    const std::vector<const double*>& GetArrays() const;
 };
 
 }
-- 
cgit