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

[Xisco Fauli (via logerrit)]

 sw/qa/extras/ooxmlimport/data/tdf97038.docx |binary
 sw/qa/extras/ooxmlimport/ooxmlimport2.cxx   |    7 +++++++
 2 files changed, 7 insertions(+)

New commits:
commit 237347dc530800bd83cc01bb8b675c01b351b5c8
Author:     Xisco Fauli <xiscofauli at libreoffice.org>
AuthorDate: Mon Oct 21 16:34:39 2019 +0200
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Tue Oct 22 09:16:58 2019 +0200

    tdf#97038: Add unittest
    
    Fixed by e042a83843ed2573dbce9338058b3dc545dd6898
    
    d630f69d90f15bc652a62648b05ea515de78d16a fixes the .doc part
    
    Change-Id: Id8bb1fd1a8eb10dcdacc66601b1b5f9f9252bdee
    Reviewed-on: https://gerrit.libreoffice.org/81248
    Tested-by: Jenkins
    Reviewed-by: Xisco Faulí <xiscofauli at libreoffice.org>
    (cherry picked from commit 3aaa2ec8c60330e3fdf21507a235aade4eb63d43)
    Reviewed-on: https://gerrit.libreoffice.org/81286
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>

diff --git a/sw/qa/extras/ooxmlimport/data/tdf97038.docx b/sw/qa/extras/ooxmlimport/data/tdf97038.docx
new file mode 100644
index 000000000000..8295d5199968
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/tdf97038.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx
index 3dd937ecbd2d..2a250a898cf2 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx
@@ -71,6 +71,13 @@ DECLARE_OOXMLIMPORT_TEST(testTdf108849, "tdf108849.docx")
                                  getPages());
 }
 
+DECLARE_OOXMLIMPORT_TEST(testTdf97038, "tdf97038.docx")
+{
+    // Without the accompanying fix in place, this test would have failed, as the importer lost the
+    // fLayoutInCell shape property for wrap-though shapes.
+    CPPUNIT_ASSERT(getProperty<bool>(getShapeByName("Kep2"), "IsFollowingTextFlow"));
+}
+
 DECLARE_OOXMLIMPORT_TEST(testTdf109524, "tdf109524.docx")
 {
     uno::Reference<text::XTextTablesSupplier> xTablesSupplier(mxComponent, uno::UNO_QUERY);