Downloaded Files aren't opening in word (#101)

* M-1090 - Fix docx relationship export

document.xml.rels prevent duplicates and keep webSettings + stylesWithEffects
Clear customXML/itemN.xml.rels before writing

QA env: Ignore folders when unzipping docx files

* Bump version

---------

Co-authored-by: Chase <[email protected]>

Author: danielkweon

VERSION

@@ -1 +1 @@
-v0.2.0
+v0.2.1

libreoffice-core/include/oox/core/xmlfilterbase.hxx

@@ -175,6 +175,13 @@ public:
      */
     OUString     addRelation( const css::uno::Reference< css::io::XOutputStream >& rOutputStream, const OUString& rType, std::u16string_view rTarget, bool bExternal = false );
 
+// MACRO: M-1090 Fix custom XML relations {
+    void         clearRelations(const css::uno::Reference<css::io::XOutputStream>& rOutputStream);
+
+    bool         hasRelWithType(const css::uno::Reference<css::io::XOutputStream>& rOutputStream,
+                          const OUString& type);
+// MACRO: }
+
     /** Opens and returns the specified output stream from the base storage with specified media type.
 
         @param rStreamName

libreoffice-core/include/oox/token/relationship.hxx

@@ -65,7 +65,11 @@ enum class Relationship
     AUDIO,
     VMLDRAWING,
     WORDVBADATA,
-    WORKSHEET
+    WORKSHEET,
+// MACRO: Fix docx export {
+    STYLESWITHEFFECTS,
+    WEBSETTINGS,
+// MACRO: }
 };
 
 OUString OOX_DLLPUBLIC getRelationship(Relationship eRelationship);

libreoffice-core/oox/source/core/xmlfilterbase.cxx

@@ -561,6 +561,36 @@ OUString XmlFilterBase::addRelation( const Reference< XOutputStream >& rOutputSt
     return OUString();
 }
 
+// MACRO: M-1090 Fix custom XML relations {
+void XmlFilterBase::clearRelations(const Reference<XOutputStream>& rOutputStream)
+{
+    Reference<XRelationshipAccess> xRelations(rOutputStream, UNO_QUERY);
+    if (xRelations.is())
+        xRelations->clearRelationships();
+}
+
+bool XmlFilterBase::hasRelWithType(const css::uno::Reference<css::io::XOutputStream>& rOutputStream,
+                                   const OUString& type)
+{
+    Reference<XRelationshipAccess> xRelations(rOutputStream, UNO_QUERY);
+
+    if (xRelations.is())
+    {
+        try
+        {
+            auto relationships = xRelations->getRelationshipsByType(type);
+            return relationships.getLength() > 0;
+        }
+        catch (const Exception&)
+        {
+            return false;
+        }
+    }
+
+    return false;
+}
+// MACRO: M-1090 Fix custom XML relations }
+
 static void
 writeElement( const FSHelperPtr& pDoc, sal_Int32 nXmlElement, std::u16string_view sValue )
 {

libreoffice-core/oox/source/token/relationship.inc

@@ -45,4 +45,6 @@
 {Relationship::AUDIO, u"http://schemas.openxmlformats.org/officeDocument/2006/relationships/audio"},
 {Relationship::VMLDRAWING, u"http://schemas.openxmlformats.org/officeDocument/2006/relationships/vmlDrawing"},
 {Relationship::WORDVBADATA, u"http://schemas.microsoft.com/office/2006/relationships/wordVbaData"},
-{Relationship::WORKSHEET, u"http://schemas.openxmlformats.org/officeDocument/2006/relationships/worksheet"}
+{Relationship::WORKSHEET, u"http://schemas.openxmlformats.org/officeDocument/2006/relationships/worksheet"},
+{Relationship::STYLESWITHEFFECTS, u"http://schemas.microsoft.com/office/2007/relationships/stylesWithEffects"},
+{Relationship::WEBSETTINGS, u"http://schemas.openxmlformats.org/officeDocument/2006/relationships/webSettings"}

libreoffice-core/sw/source/filter/ww8/docxexport.cxx

@@ -675,6 +675,16 @@ void DocxExport::InitStyles()
 {
     m_pStyles.reset(new MSWordStyles( *this, /*bListStyles =*/ true ));
 
+    // MACRO: M-1090 Fix docx export {
+    const bool hasWebSettings
+        = m_rFilter.hasRelWithType(m_pDocumentFS->getOutputStream(), u"http://schemas.openxmlformats.org/officeDocument/2006/relationships/webSettings"_ustr);
+
+    const bool hasStylesWithEffects
+        = m_rFilter.hasRelWithType(m_pDocumentFS->getOutputStream(), u"http://schemas.microsoft.com/office/2007/relationships/stylesWithEffects"_ustr);
+
+    m_rFilter.clearRelations(m_pDocumentFS->getOutputStream());
+
+    // MACRO: M-1090 }
     // setup word/styles.xml and the relations + content type
     m_rFilter.addRelation( m_pDocumentFS->getOutputStream(),
             oox::getRelationship(Relationship::STYLES),
@@ -694,6 +704,20 @@ void DocxExport::InitStyles()
     m_pAttrOutput->SetSerializer( m_pDocumentFS );
 
     pStylesFS->endDocument();
+
+    // MACRO: M-1090 Fix docx export {
+    if (hasStylesWithEffects)
+    {
+        m_rFilter.addRelation(m_pDocumentFS->getOutputStream(),
+                              oox::getRelationship(Relationship::STYLESWITHEFFECTS),
+                              u"stylesWithEffects.xml");
+    }
+    if (hasWebSettings)
+    {
+        m_rFilter.addRelation(m_pDocumentFS->getOutputStream(),
+                              oox::getRelationship(Relationship::WEBSETTINGS), u"webSettings.xml");
+    }
+    // MACRO: M-1090 }
 }
 
 void DocxExport::WriteFootnotesEndnotes()
@@ -1692,6 +1716,10 @@ void DocxExport::WriteCustomXml()
 
     for (sal_Int32 j = 0; j < customXmlDomlist.getLength(); j++)
     {
+    // MACRO: M-1090 Fix docx export {
+        m_rFilter.clearRelations(GetFilter().openFragmentStream(
+            "customXml/item" + OUString::number(j + 1) + ".xml", "application/xml"));
+    // MACRO: M-1090 }
         uno::Reference<xml::dom::XDocument> customXmlDom = customXmlDomlist[j];
         uno::Reference<xml::dom::XDocument> customXmlDomProps = customXmlDomPropslist[j];
         if (customXmlDom.is())

qa-env/src/utils.ts

@@ -17,7 +17,9 @@ export function downloadFile(name: string, buffer: ArrayBuffer, type: string) {
 export async function unzipDocxFile(blob: Blob): Promise<Array<{path: string, content: ArrayBuffer}>> {
   const zip = await JsZip.loadAsync(blob);
 
-  const files = Promise.all(Object.keys(zip.files).map(async (key) => {
+  const files = Promise.all(Object.keys(zip.files)
+  .filter((key) => !zip.files[key].dir)
+  .map(async (key) => {
     const file = zip.files[key];
     return {
       path: key,