[Libreoffice-commits] core.git: sc/source

[Caolán McNamara]

 sc/source/filter/excel/xetable.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 103b619401f06697255167c788192601e87758b9
Author: Caolán McNamara <caol...@redhat.com>
Date:   Tue Jun 16 10:12:12 2015 +0100

    fix 176 unbalanced XML_f xlsx export failuires
    
    regression from
    
    commit beb8e2830dc9e1c771e196fcaf08cdfd6bf3dde3
    Author: yogesh.bharate001 <yogesh.bhar...@synerzip.com>
    Date:   Tue Jun 2 16:39:09 2015 +0530
    
        tdf#61908:XLSX formula cell range is not exported for MMULT.
    
    Change-Id: Ia54ce5ce437e592378fe930b779c518de9670995

diff --git a/sc/source/filter/excel/xetable.cxx 
b/sc/source/filter/excel/xetable.cxx
index 38bb673..02a9d91 100644
--- a/sc/source/filter/excel/xetable.cxx
+++ b/sc/source/filter/excel/xetable.cxx
@@ -932,6 +932,7 @@ void XclExpFormulaCell::SaveXml( XclExpXmlStream& rStrm )
             // OOXTODO: XML_cm, XML_vm, XML_ph
             FSEND );
 
+    bool bTagStarted = false;
     ScAddress aScPos( static_cast< SCCOL >( GetXclPos().mnCol ), static_cast< 
SCROW >( GetXclPos().mnRow ), rStrm.GetRoot().GetCurrScTab() );
 
     if ( mrScFmlaCell.GetMatrixFlag() == MM_FORMULA)
@@ -973,9 +974,10 @@ void XclExpFormulaCell::SaveXml( XclExpXmlStream& rStrm )
                         // OOXTODO: XML_si,     uint
                         // OOXTODO: XML_bx      bool
                         FSEND );
+            bTagStarted = true;
         }
     }
-    else
+    if (!bTagStarted)
     {
         rWorksheet->startElement( XML_f,
                                   XML_aca,    XclXmlUtils::ToPsz( (mxTokArr && 
mxTokArr->IsVolatile()) || (mxAddRec && mxAddRec->IsVolatile()) ),

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits