do not write MM_REFERENCE formulas to OOXML, tdf#61908 follow-up

The array range is covered by MM_FORMULA.
Excel even complained when loading such a document.

Change-Id: I10e1b19fbfb8ea849ffe3d46504fdf3389633c5f

sc/source/filter/excel/xetable.cxx

@@ -932,10 +932,20 @@ void XclExpFormulaCell::SaveXml( XclExpXmlStream& rStrm )
             // OOXTODO: XML_cm, XML_vm, XML_ph
             FSEND );
 
+    bool bWriteFormula = true;
     bool bTagStarted = false;
-    ScAddress aScPos( static_cast< SCCOL >( GetXclPos().mnCol ), static_cast< SCROW >( GetXclPos().mnRow ), rStrm.GetRoot().GetCurrScTab() );
+    ScAddress aScPos( static_cast< SCCOL >( GetXclPos().mnCol ),
+            static_cast< SCROW >( GetXclPos().mnRow ), rStrm.GetRoot().GetCurrScTab() );
 
-    if ( mrScFmlaCell.GetMatrixFlag() == MM_FORMULA)
+    switch (mrScFmlaCell.GetMatrixFlag())
+    {
+        case MM_NONE:
+            break;
+        case MM_REFERENCE:
+            bWriteFormula = false;
+            break;
+        case MM_FORMULA:
+        case MM_FAKE:
             {
                 // origin of the matrix - find the used matrix range
                 SCCOL nMatWidth;
@@ -953,15 +963,19 @@ void XclExpFormulaCell::SaveXml( XclExpXmlStream& rStrm )
                 if (ValidRange(aMatScRange))
                 {
                     // calculate the cell range.
-            sFmlaCellRange.append(XclXmlUtils::ToOString( rStrm.GetRoot().GetStringBuf(), aMatScRange.aStart ).getStr());
+                    sFmlaCellRange.append( XclXmlUtils::ToOString(
+                                rStrm.GetRoot().GetStringBuf(), aMatScRange.aStart ).getStr());
                     sFmlaCellRange.append(":");
-            sFmlaCellRange.append(XclXmlUtils::ToOString( rStrm.GetRoot().GetStringBuf(), aMatScRange.aEnd ).getStr());
+                    sFmlaCellRange.append( XclXmlUtils::ToOString(
+                                rStrm.GetRoot().GetStringBuf(), aMatScRange.aEnd ).getStr());
                 }
 
-        if (aMatScRange.aStart.Col() == GetXclPos().mnCol && aMatScRange.aStart.Row() == static_cast<SCROW>(GetXclPos().mnRow))
+                if (    aMatScRange.aStart.Col() == GetXclPos().mnCol &&
+                        aMatScRange.aStart.Row() == static_cast<SCROW>(GetXclPos().mnRow))
                 {
                     rWorksheet->startElement( XML_f,
-                        XML_aca,    XclXmlUtils::ToPsz( (mxTokArr && mxTokArr->IsVolatile()) || (mxAddRec && mxAddRec->IsVolatile()) ),
+                            XML_aca, XclXmlUtils::ToPsz( (mxTokArr && mxTokArr->IsVolatile()) ||
+                                (mxAddRec && mxAddRec->IsVolatile())),
                             XML_t, mxAddRec ? "array" : NULL,
                             XML_ref, !sFmlaCellRange.isEmpty()? sFmlaCellRange.getStr() : NULL,
                             // OOXTODO: XML_dt2D,   bool
@@ -977,15 +991,22 @@ void XclExpFormulaCell::SaveXml( XclExpXmlStream& rStrm )
                     bTagStarted = true;
                 }
             }
+            break;
+    }
+
+    if (bWriteFormula)
+    {
         if (!bTagStarted)
         {
             rWorksheet->startElement( XML_f,
-                                  XML_aca,    XclXmlUtils::ToPsz( (mxTokArr && mxTokArr->IsVolatile()) || (mxAddRec && mxAddRec->IsVolatile()) ),
+                    XML_aca, XclXmlUtils::ToPsz( (mxTokArr && mxTokArr->IsVolatile()) ||
+                        (mxAddRec && mxAddRec->IsVolatile()) ),
                     FSEND );
         }
         rWorksheet->writeEscaped( XclXmlUtils::ToOUString(
                     rStrm.GetRoot().GetCompileFormulaContext(), mrScFmlaCell.aPos, mrScFmlaCell.GetCode()));
         rWorksheet->endElement( XML_f );
+    }
 
     if( strcmp( sType, "inlineStr" ) == 0 )
     {