Re-do fetching of vector ref array to support number / string mixture.

For now it only works when the range starts with string cell.  With this,
the test now passes.

Change-Id: I6f79415ce11233648cdb20c8075f500b8c3d2f76

1 files changed, 21 insertions, 0 deletions

diff --git a/sc/inc/formularesult.hxx b/sc/inc/formularesult.hxx
index 8a7b36543284..3708c8a7efe2 100644
--- a/sc/inc/formularesult.hxx
+++ b/sc/inc/formularesult.hxx
@@ -23,6 +23,26 @@
 #include "token.hxx"
 #include "scdllapi.h"
 
+namespace sc {
+
+struct FormulaResultValue
+{
+    enum Type { Invalid, Value, String, Error };
+
+    Type meType;
+
+    double mfValue;
+    svl::SharedString maString;
+    sal_uInt16 mnError;
+
+    FormulaResultValue();
+    FormulaResultValue( double fValue );
+    FormulaResultValue(const svl::SharedString& rStr );
+    FormulaResultValue( sal_uInt16 nErr );
+};
+
+}
+
 /** Store a variable formula cell result, balancing between runtime performance
     and memory consumption. */
 class ScFormulaResult
@@ -136,6 +156,7 @@ public:
 
     bool GetErrorOrDouble( sal_uInt16& rErr, double& rVal ) const;
     bool GetErrorOrString( sal_uInt16& rErr, svl::SharedString& rStr ) const;
+    sc::FormulaResultValue GetResult() const;
 
     /** Get error code if set or GetCellResultType() is formula::svError or svUnknown,
         else 0. */