From c779883414c588d80c31540bbc794080b8e2c1f3 Mon Sep 17 00:00:00 2001 From: Serge Krot Date: Fri, 16 Mar 2018 10:42:50 +0100 Subject: tdf#113182: DOCX filter: new values of wrap property in text box Added support of "none" and "through" values of the w:wrap poroperty in the text box. Change-Id: I83f0c9e8162e93bf457f228d49d3b426050d4dc6 Reviewed-on: https://gerrit.libreoffice.org/51396 Tested-by: Jenkins Reviewed-by: Thorsten Behrens (cherry picked from commit be02ce71f2ee694fa2609a7a630853c24acfbfff) Reviewed-on: https://gerrit.libreoffice.org/51431 Reviewed-by: Serge Krot (CIB) (cherry picked from commit 133821d1526800a93bb395a91f87dc77d29f0b8d) --- sw/qa/extras/ooxmlimport/data/tdf113182.docx | Bin 0 -> 12561 bytes sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 8 ++++++++ 2 files changed, 8 insertions(+) create mode 100755 sw/qa/extras/ooxmlimport/data/tdf113182.docx (limited to 'sw') diff --git a/sw/qa/extras/ooxmlimport/data/tdf113182.docx b/sw/qa/extras/ooxmlimport/data/tdf113182.docx new file mode 100755 index 000000000000..9f35ec3d4ebc Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/tdf113182.docx differ diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx index d879dab4495a..e3cdc19701ab 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx @@ -1574,6 +1574,14 @@ DECLARE_OOXMLIMPORT_TEST(testTdf112443, "tdf112443.docx") } +// DOCX: Textbox wrap differs in MSO and LO +// Both should layout text regardless of existing text box +// and as result only one page should be generated. +DECLARE_OOXMLIMPORT_TEST(testTdf113182, "tdf113182.docx") +{ + CPPUNIT_ASSERT_EQUAL(getPages(), 1); +} + DECLARE_OOXMLIMPORT_TEST(testTdf113946, "tdf113946.docx") { OUString aTop = parseDump("/root/page/body/txt/anchored/SwAnchoredDrawObject/bounds", "top"); -- cgit