[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sw/inc sw/qa

[Caolán McNamara (via logerrit)]

 sw/inc/shellio.hxx                        |    1 +
 sw/qa/extras/uiwriter/data2/ofz18563.docx |binary
 sw/qa/extras/uiwriter/uiwriter2.cxx       |    9 +++++++++
 3 files changed, 10 insertions(+)

New commits:
commit 34d5b03d8f323e6af33e2358b898a5843596f4ea
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Dec 5 12:03:56 2019 +0000
Commit:     Michael Stahl <michael.stahl at cib.de>
CommitDate: Mon Dec 9 16:15:30 2019 +0100

    ofz#18563 test case for assert/crash
    
    Change-Id: Idb98b7fae03bc31fc050519a7b0720208adeb843
    Reviewed-on: https://gerrit.libreoffice.org/84556
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.stahl at cib.de>
    (cherry picked from commit c29b89acc59f5913068f60d670e72918121e4e84)
    Reviewed-on: https://gerrit.libreoffice.org/84728

diff --git a/sw/inc/shellio.hxx b/sw/inc/shellio.hxx
index b4004898ad77..82da722ac10d 100644
--- a/sw/inc/shellio.hxx
+++ b/sw/inc/shellio.hxx
@@ -190,6 +190,7 @@ namespace o3tl {
 };
 
 extern "C" SAL_DLLPUBLIC_EXPORT bool TestImportDOC(SvStream &rStream, const OUString &rFltName);
+extern "C" SAL_DLLPUBLIC_EXPORT bool TestImportDOCX(SvStream &rStream);
 extern "C" SAL_DLLPUBLIC_EXPORT bool TestImportRTF(SvStream &rStream);
 extern "C" SAL_DLLPUBLIC_EXPORT bool TestImportHTML(SvStream &rStream);
 SAL_DLLPUBLIC_EXPORT void FlushFontCache();
diff --git a/sw/qa/extras/uiwriter/data2/ofz18563.docx b/sw/qa/extras/uiwriter/data2/ofz18563.docx
new file mode 100644
index 000000000000..6733db44abb7
Binary files /dev/null and b/sw/qa/extras/uiwriter/data2/ofz18563.docx differ
diff --git a/sw/qa/extras/uiwriter/uiwriter2.cxx b/sw/qa/extras/uiwriter/uiwriter2.cxx
index 4a317d194ad5..79601dfddcd5 100644
--- a/sw/qa/extras/uiwriter/uiwriter2.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter2.cxx
@@ -48,6 +48,7 @@
 #include <PostItMgr.hxx>
 #include <postithelper.hxx>
 #include <fmtcntnt.hxx>
+#include <shellio.hxx>
 
 namespace
 {
@@ -2412,4 +2413,12 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf128603)
     CPPUNIT_ASSERT_EQUAL(pIndex4->GetIndex(), pIndex5->GetIndex());
 }
 
+// only care that it doesn't assert/crash
+CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testOfz18563)
+{
+    OUString sURL(m_directories.getURLFromSrc("/sw/qa/extras/uiwriter/data2/ofz18563.docx"));
+    SvFileStream aFileStream(sURL, StreamMode::READ);
+    TestImportDOCX(aFileStream);
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */