fdo#58539: Correctly set cached matrix formula result.

During the import, a cached matrix value only has an empty matrix
of correct geometry, plus the token type of the top-left cell.  The
rest of the elements are imported as hybrid values.  For now, this
seems to do the trick.

In the future we may want to change it to fully populate the matrix
cache value during the import, and skip setting the hybrid values for
the non-top-left elements.

This commit also make several other trivial changes:

* Mark pRawToken mutable so that we can mark those IsFoo() methods
  const.

* Move the ScCompiler instance from static instance to member of
  ScXMLImport. Since we don't need the instance to persist once the
  import is over, this is more appropriate.

Change-Id: I1abde03c0fcd91b02ef4dbf8b5526f7965eaf19c

1 files changed, 11 insertions, 0 deletions

diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx
index 7aae79ca597b..b7f229c9e4b9 100644
--- a/sc/source/filter/xml/xmlimprt.cxx
+++ b/sc/source/filter/xml/xmlimprt.cxx
@@ -2809,6 +2809,9 @@ throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::R
     if (!pDoc)
         throw lang::IllegalArgumentException();
 
+    mpComp.reset(new ScCompiler(pDoc, ScAddress()));
+    mpComp->SetGrammar(formula::FormulaGrammar::GRAM_ODFF);
+
     bFromWrapper = pDoc->IsXMLFromWrapper();    // UnlockSolarMutex below still works normally
 
     uno::Reference<document::XActionLockable> xActionLockable(xDoc, uno::UNO_QUERY);
@@ -3294,4 +3297,12 @@ void ScXMLImport::ExtractFormulaNamespaceGrammar(
     reGrammar = eDefaultGrammar;
 }
 
+bool ScXMLImport::IsFormulaErrorConstant( const OUString& rStr ) const
+{
+    if (!mpComp)
+        return false;
+
+    return mpComp->GetErrorConstant(rStr) > 0;
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */