[Libreoffice-commits] core.git: Branch 'private/kohei/calc-shared-string' - formula/source include/formula

[Kohei Yoshida]

 formula/source/core/api/vectortoken.cxx |    2 ++
 include/formula/vectortoken.hxx         |    1 +
 2 files changed, 3 insertions(+)

New commits:
commit 6ba3d3ec90bfd5841a9b383c6400bc71c424f645
Author: Kohei Yoshida <kohei.yoshida at collabora.com>
Date:   Tue Oct 15 16:37:14 2013 -0400

    New constructor that takes both numeric and string arrays.
    
    Change-Id: I9c48f340a0349e5f1ba772fcd783924c79b07616

diff --git a/formula/source/core/api/vectortoken.cxx b/formula/source/core/api/vectortoken.cxx
index 55ab18e..961eda6 100644
--- a/formula/source/core/api/vectortoken.cxx
+++ b/formula/source/core/api/vectortoken.cxx
@@ -14,6 +14,8 @@ namespace formula {
 VectorRefArray::VectorRefArray() : mpNumericArray(NULL), mpStringArray(NULL) {}
 VectorRefArray::VectorRefArray( const double* pArray ) : mpNumericArray(pArray), mpStringArray(NULL) {}
 VectorRefArray::VectorRefArray( rtl_uString** pArray ) : mpNumericArray(NULL), mpStringArray(pArray) {}
+VectorRefArray::VectorRefArray( const double* pNumArray, rtl_uString** pStrArray ) :
+    mpNumericArray(pNumArray), mpStringArray(pStrArray) {}
 
 bool VectorRefArray::isValid() const
 {
diff --git a/include/formula/vectortoken.hxx b/include/formula/vectortoken.hxx
index 3b1db68..0d3cbf7 100644
--- a/include/formula/vectortoken.hxx
+++ b/include/formula/vectortoken.hxx
@@ -40,6 +40,7 @@ struct FORMULA_DLLPUBLIC VectorRefArray
     VectorRefArray();
     VectorRefArray( const double* pArray );
     VectorRefArray( rtl_uString** pArray );
+    VectorRefArray( const double* pNumArray, rtl_uString** pStrArray );
 
     bool isValid() const;
 };