Allow vector array tokens to store both numeric and string values.

This is achieved by storing two physical arrays in each vector
reference array.

Change-Id: Iafb9e57b86e57e75eed8ff692a6d882c2049f710

1 files changed, 20 insertions, 6 deletions

diff --git a/include/formula/vectortoken.hxx b/include/formula/vectortoken.hxx
index 9bc82f345e33..54043b114990 100644
--- a/include/formula/vectortoken.hxx
+++ b/include/formula/vectortoken.hxx
@@ -14,14 +14,28 @@
 
 namespace formula {
 
+/**
+ * Single unit of vector reference consists of two physical arrays.
+ *
+ * <p>If the whole data array consists of only numeric values, mpStringArray
+ * will be NULL, and NaN values in the numeric array represent empty
+ * cells.</p>
+ *
+ * <p>If the whole data array consists of only string values, mpNumericArray
+ * will be NULL, and NULL values in the string array represent empty
+ * cells.</p>
+ *
+ * <p>If the data array consists of numeric and string values, then both
+ * mpNumericArray and mpStringArray will be non-NULL, and a string cell will
+ * be represented by a non-NULL pointer value in the string array.  If the
+ * string value is NULL, check the corresponding value in the numeric array.
+ * If the value in the numeric array is NaN, it's an empty cell, otherwise
+ * it's a numeric cell.</p>
+ */
 struct FORMULA_DLLPUBLIC VectorRefArray
 {
-    union {
-        const double* mpNumericArray;
-        rtl_uString** mpStringArray;
-    };
-
-    bool mbNumeric;
+    const double* mpNumericArray;
+    rtl_uString** mpStringArray;
 
     VectorRefArray();
     VectorRefArray( const double* pArray );