core.git: Branch 'libreoffice-24-8' - sw/source

[Caolán McNamara (via logerrit)]

 sw/source/filter/ww8/docxexport.cxx |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 7c682d402d4761fb5fb4b6abefa7c7c29a88596e
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Mon Dec 16 12:22:07 2024 +0000
Commit:     Michael Stahl <michael.st...@allotropia.de>
CommitDate: Tue Dec 17 11:17:05 2024 +0100

    crashtesting: unable to import doc export of forum-de2-10510.ott
    
    "No namespace defined for pic at sax/source/fastparser/fastparser.cxx:718"
    
    Change-Id: I417ee6608b63f27b92236ab96cc705d4261b8350
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178581
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
    Tested-by: Jenkins
    (cherry picked from commit d0ecc9bbffb15bd9b312e706238a131f9a19fa0f)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178598
    (cherry picked from commit 26f99cba2cd696fce75f77a16d6285d14673a258)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178616
    Reviewed-by: Michael Stahl <michael.st...@allotropia.de>

diff --git a/sw/source/filter/ww8/docxexport.cxx 
b/sw/source/filter/ww8/docxexport.cxx
index 911b2cddc50f..f3082c7d2221 100644
--- a/sw/source/filter/ww8/docxexport.cxx
+++ b/sw/source/filter/ww8/docxexport.cxx
@@ -2032,6 +2032,7 @@ rtl::Reference<FastAttributeList> 
DocxExport::MainXmlNamespaces()
     pAttr->add( FSNS( XML_xmlns, XML_w ), 
OUStringToOString(m_rFilter.getNamespaceURL(OOX_NS(doc)), 
RTL_TEXTENCODING_UTF8) );
     pAttr->add( FSNS( XML_xmlns, XML_w10 ), 
OUStringToOString(m_rFilter.getNamespaceURL(OOX_NS(vmlWord)), 
RTL_TEXTENCODING_UTF8) );
     pAttr->add( FSNS( XML_xmlns, XML_wp ), 
OUStringToOString(m_rFilter.getNamespaceURL(OOX_NS(dmlWordDr)), 
RTL_TEXTENCODING_UTF8) );
+    pAttr->add( FSNS( XML_xmlns, XML_pic ), 
OUStringToOString(m_rFilter.getNamespaceURL(OOX_NS(dmlPicture)), 
RTL_TEXTENCODING_UTF8) );
     pAttr->add( FSNS( XML_xmlns, XML_wps ), 
OUStringToOString(m_rFilter.getNamespaceURL(OOX_NS(wps)), 
RTL_TEXTENCODING_UTF8) );
     pAttr->add( FSNS( XML_xmlns, XML_wpg ), 
OUStringToOString(m_rFilter.getNamespaceURL(OOX_NS(wpg)), 
RTL_TEXTENCODING_UTF8) );
     pAttr->add( FSNS( XML_xmlns, XML_mc ), 
OUStringToOString(m_rFilter.getNamespaceURL(OOX_NS(mce)), 
RTL_TEXTENCODING_UTF8) );