[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - sw/qa sw/source

[Justin Luth (via logerrit)]

 sw/qa/extras/ooxmlexport/data/tdf135906.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport17.cxx   |    5 +++++
 sw/source/filter/ww8/docxsdrexport.cxx       |    1 +
 3 files changed, 6 insertions(+)

New commits:
commit 5853e4d137c3cb535571cba0233b05a48761ac52
Author:     Justin Luth <justin_l...@sil.org>
AuthorDate: Thu Nov 18 11:28:42 2021 +0200
Commit:     Miklos Vajna <vmik...@collabora.com>
CommitDate: Fri Nov 19 17:08:05 2021 +0100

    tdf#135906 docxexport: set serializer before writing
    
    This fixes a 6.3 regresssion from
    commit aafaf1f55fa413ad49d4556cf7c0a713dd206ae4.
    
    Change-Id: Ia2d3d26fe2cfa2b213326021f6b97f8d40c6e98c
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125441
    Tested-by: Jenkins
    Reviewed-by: Justin Luth <jl...@mail.com>
    Reviewed-by: Miklos Vajna <vmik...@collabora.com>
    Signed-off-by: Xisco Fauli <xiscofa...@libreoffice.org>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125537

diff --git a/sw/qa/extras/ooxmlexport/data/tdf135906.docx 
b/sw/qa/extras/ooxmlexport/data/tdf135906.docx
new file mode 100644
index 000000000000..701fccff5ed4
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf135906.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport17.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport17.cxx
index f1726052ca02..c1c723fccb25 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport17.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport17.cxx
@@ -43,6 +43,11 @@ DECLARE_OOXMLEXPORT_TEST(testTdf135164_cancelledNumbering, 
"tdf135164_cancelledN
     CPPUNIT_ASSERT_EQUAL(OUString("i"), getProperty<OUString>(xPara, 
"ListLabelString"));
 }
 
+DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf135906, "tdf135906.docx")
+{
+    // just test round-tripping. The document was exported as corrupt and 
didn't re-load.
+}
+
 DECLARE_OOXMLEXPORT_TEST(testTdf123642_BookmarkAtDocEnd, "tdf123642.docx")
 {
     // get bookmark interface
diff --git a/sw/source/filter/ww8/docxsdrexport.cxx 
b/sw/source/filter/ww8/docxsdrexport.cxx
index 539eb63c20b1..fe284534ae64 100644
--- a/sw/source/filter/ww8/docxsdrexport.cxx
+++ b/sw/source/filter/ww8/docxsdrexport.cxx
@@ -1245,6 +1245,7 @@ void DocxSdrExport::writeDiagram(const SdrObject* 
sdrObject, const SwFrameFormat
     Size aSize(sdrObject->GetSnapRect().GetWidth(), 
sdrObject->GetSnapRect().GetHeight());
     startDMLAnchorInline(&rFrameFormat, aSize);
 
+    m_pImpl->getDrawingML()->SetFS(m_pImpl->getSerializer());
     m_pImpl->getDrawingML()->WriteDiagram(xShape, nDiagramId);
 
     endDMLAnchorInline(&rFrameFormat);