[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sc/source

[Serge Krot (via logerrit)]

 sc/source/filter/xcl97/xcl97rec.cxx |   15 +++++++++++++++
 1 file changed, 15 insertions(+)

New commits:
commit ed0225b36ca31bb40a20de92cd1f988f94143ad1
Author:     Serge Krot <Serge.Krot at cib.de>
AuthorDate: Thu Jun 4 11:14:39 2020 +0200
Commit:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Tue Jun 9 16:33:51 2020 +0200

    tdf#133595 FILESAVE XLSX: invalid content when opening file with shape
    
    Change-Id: I67fe29bbc9b982328a3efe63874922e7ed1a5854
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95490
    Tested-by: Jenkins
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    (cherry picked from commit 2081ab036bfd203d4d3be07064ef783baae97c3b)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95671
    Reviewed-by: Xisco Fauli <xiscofauli at libreoffice.org>
    (cherry picked from commit 23506180a82bae5c77bd1df4bef73dd4f687dae2)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95880

diff --git a/sc/source/filter/xcl97/xcl97rec.cxx b/sc/source/filter/xcl97/xcl97rec.cxx
index 277f3157afd7..37c55e9d629c 100644
--- a/sc/source/filter/xcl97/xcl97rec.cxx
+++ b/sc/source/filter/xcl97/xcl97rec.cxx
@@ -277,6 +277,21 @@ void SaveDrawingMLObjects( XclExpObjList& rList, XclExpXmlStream& rStrm )
 
 void SaveFormControlObjects(XclExpObjList& rList, XclExpXmlStream& rStrm)
 {
+    bool hasControls = false;
+    for (const auto& rxObj : rList)
+    {
+        if (IsFormControlObject(rxObj.get()))
+        {
+            hasControls = true;
+            break;
+        }
+    }
+
+    if (!hasControls)
+    {
+        return;
+    }
+
     sax_fastparser::FSHelperPtr& rWorksheet = rStrm.GetCurrentStream();
 
     rWorksheet->startElement(FSNS(XML_mc, XML_AlternateContent),