From 6cf1f3c09c43bd3bbcda611a9476ff5e64c5164f Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@collabora.com>
Date: Tue, 26 Jul 2022 08:50:03 +0200
Subject: crashtest: fix crash on ODT export of forum-mso-de-84211.docx

XMLTextParagraphExport::ExportContentControl() disables the export of
the <loext:list-item> XML element in autostyle mode, then it should also
disable the export of the matching attributes.

Change-Id: Ia65fc8bd3398df0ab1b71973695c9bc8d10deaa4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137452
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins
---
 xmloff/qa/unit/data/content-control-dropdown.docx | Bin 0 -> 65391 bytes
 xmloff/qa/unit/text.cxx                           |  19 +++++++++++
 xmloff/source/text/txtparae.cxx                   |  37 ++++++++++++----------
 3 files changed, 39 insertions(+), 17 deletions(-)
 create mode 100644 xmloff/qa/unit/data/content-control-dropdown.docx

(limited to 'xmloff')

diff --git a/xmloff/qa/unit/data/content-control-dropdown.docx b/xmloff/qa/unit/data/content-control-dropdown.docx
new file mode 100644
index 000000000000..1391c90f1a63
Binary files /dev/null and b/xmloff/qa/unit/data/content-control-dropdown.docx differ
diff --git a/xmloff/qa/unit/text.cxx b/xmloff/qa/unit/text.cxx
index 3bc6cd668135..53f1de102fc3 100644
--- a/xmloff/qa/unit/text.cxx
+++ b/xmloff/qa/unit/text.cxx
@@ -862,6 +862,25 @@ CPPUNIT_TEST_FIXTURE(XmloffStyleTest, testPlainTextContentControlImport)
     CPPUNIT_ASSERT(bPlainText);
 }
 
+CPPUNIT_TEST_FIXTURE(XmloffStyleTest, testDropdownContentControlAutostyleExport)
+{
+    // Given a document with a dropdown content control, and formatting that forms an autostyle in
+    // ODT:
+    OUString aURL = m_directories.getURLFromSrc(DATA_DIRECTORY) + "content-control-dropdown.docx";
+    getComponent() = loadFromDesktop(aURL);
+
+    // When saving that document to ODT, then make sure no assertion failure happens:
+    uno::Reference<frame::XStorable> xStorable(getComponent(), uno::UNO_QUERY);
+    uno::Sequence<beans::PropertyValue> aStoreProps = comphelper::InitPropertySequence({
+        { "FilterName", uno::Any(OUString("writer8")) },
+    });
+    utl::TempFile aTempFile;
+    aTempFile.EnableKillingFile();
+    // Without the accompanying fix in place, this test would have failed, we had duplicated XML
+    // attributes.
+    xStorable->storeToURL(aTempFile.GetURL(), aStoreProps);
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx
index 7305d5a20842..78390194ba69 100644
--- a/xmloff/source/text/txtparae.cxx
+++ b/xmloff/source/text/txtparae.cxx
@@ -4022,27 +4022,30 @@ void XMLTextParagraphExport::ExportContentControl(
     SvXMLElementExport aElem(GetExport(), bExport, XML_NAMESPACE_LO_EXT, XML_CONTENT_CONTROL, false,
                              false);
 
-    // Export list items of dropdowns.
-    uno::Sequence<beans::PropertyValues> aListItems;
-    xPropertySet->getPropertyValue("ListItems") >>= aListItems;
-    for (const auto& rListItem : aListItems)
+    if (bExport)
     {
-        comphelper::SequenceAsHashMap aMap(rListItem);
-        auto it = aMap.find("DisplayText");
-        OUString aValue;
-        if (it != aMap.end() && (it->second >>= aValue) && !aValue.isEmpty())
+        // Export list items of dropdowns.
+        uno::Sequence<beans::PropertyValues> aListItems;
+        xPropertySet->getPropertyValue("ListItems") >>= aListItems;
+        for (const auto& rListItem : aListItems)
         {
-            GetExport().AddAttribute(XML_NAMESPACE_LO_EXT, XML_DISPLAY_TEXT, aValue);
-        }
+            comphelper::SequenceAsHashMap aMap(rListItem);
+            auto it = aMap.find("DisplayText");
+            OUString aValue;
+            if (it != aMap.end() && (it->second >>= aValue) && !aValue.isEmpty())
+            {
+                GetExport().AddAttribute(XML_NAMESPACE_LO_EXT, XML_DISPLAY_TEXT, aValue);
+            }
 
-        it = aMap.find("Value");
-        if (it != aMap.end() && (it->second >>= aValue))
-        {
-            GetExport().AddAttribute(XML_NAMESPACE_LO_EXT, XML_VALUE, aValue);
-        }
+            it = aMap.find("Value");
+            if (it != aMap.end() && (it->second >>= aValue))
+            {
+                GetExport().AddAttribute(XML_NAMESPACE_LO_EXT, XML_VALUE, aValue);
+            }
 
-        SvXMLElementExport aItem(GetExport(), bExport, XML_NAMESPACE_LO_EXT, XML_LIST_ITEM, false,
-                                 false);
+            SvXMLElementExport aItem(GetExport(), bExport, XML_NAMESPACE_LO_EXT, XML_LIST_ITEM, false,
+                    false);
+        }
     }
 
     // Recurse to export content.
-- 
cgit