path: root/sw/qa/extras
diff options
authorJustin Luth <>2020-08-13 19:05:35 +0300
committerMiklos Vajna <>2020-08-31 16:00:46 +0200
commit57320af60d97f2918b5d1e73575b23682e0a0637 (patch)
treea1e19e40aee1c02e1821789a20eb6b3f696521c4 /sw/qa/extras
parent6b08eaa0c483efe5071c5a710a894e1204a0a3f4 (diff)
tdf#104596 sw layout: wrap in header only if bLayoutInCell
This patch depends on tdf#77794's 7.1 commit 7cc353df4f0993228984fcda3efb2c9181dddafb. For more details about the issue in general, see the verbose comments in this bug's previous 7.1 commit e4635544b816d1ca27bd1ebba60f51444b0a898e. This patch is related to CompatibilityMode < 15. Unfortunately, the previous patch didn't work with older Word 2010 versions of the file, which _shouldn't_ wrap non-LayoutInCell table-anchored flies. Unfortunately, now that different behaviour is necessary for different Word compat levels, it no longer allows a nice way for Writer to handle this natively. So since it would be very unlikely for a user to create a document like this (since the necessary "keep inside text boundaries" is off by default in Writer, but is forced on by definition in Word 2013+), I'm removing the compatibility flag I added in 7.1, and its related unit test. [To do this natively would probably require enabling the IsFollowingTextFlow property by default in SW. That sounds very dangerous since this property is not restricted to IsInTable layout situations. This property has been around since at least LO 3.5.] Change-Id: I70da016cb68f515924ed6c17085bf73a9e1c5492 Reviewed-on: Tested-by: Jenkins Reviewed-by: Justin Luth <> Reviewed-by: Miklos Vajna <>
Diffstat (limited to 'sw/qa/extras')
-rw-r--r--sw/qa/extras/odfexport/data/tdf104596_breakingExample.odtbin64455 -> 0 bytes
-rw-r--r--sw/qa/extras/ooxmlexport/data/tdf135595_HFtableWrap_c12.docxbin0 -> 74051 bytes
4 files changed, 9 insertions, 6 deletions
diff --git a/sw/qa/extras/odfexport/data/tdf104596_breakingExample.odt b/sw/qa/extras/odfexport/data/tdf104596_breakingExample.odt
deleted file mode 100644
index 19d0e85c42b7..000000000000
--- a/sw/qa/extras/odfexport/data/tdf104596_breakingExample.odt
+++ /dev/null
Binary files differ
diff --git a/sw/qa/extras/odfexport/odfexport.cxx b/sw/qa/extras/odfexport/odfexport.cxx
index 715d9ad68d35..cb131ece62de 100644
--- a/sw/qa/extras/odfexport/odfexport.cxx
+++ b/sw/qa/extras/odfexport/odfexport.cxx
@@ -466,12 +466,6 @@ DECLARE_ODFEXPORT_TEST(testredlineTextFrame, "redlineTextFrame.odt")
CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess->getCount());
-DECLARE_ODFEXPORT_TEST(testTdf104596_breakingExample, "tdf104596_breakingExample.odt")
- //wrapping should be ignored on in-table flies for pre-LO7.1 documents. ALLOW_WRAP_WHEN_ANCHORED_IN_TABLE
- CPPUNIT_ASSERT_EQUAL_MESSAGE( "Fits on one page", 1, getPages() );
CPPUNIT_ASSERT_EQUAL(12, getShapes());
diff --git a/sw/qa/extras/ooxmlexport/data/tdf135595_HFtableWrap_c12.docx b/sw/qa/extras/ooxmlexport/data/tdf135595_HFtableWrap_c12.docx
new file mode 100644
index 000000000000..00c1353d984d
--- /dev/null
+++ b/sw/qa/extras/ooxmlexport/data/tdf135595_HFtableWrap_c12.docx
Binary files differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
index 01f0726f5296..e68dde7499e7 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
@@ -111,6 +111,15 @@ DECLARE_OOXMLEXPORT_TEST(testTdf135595_HFtableWrap, "tdf135595_HFtableWrap.odt")
CPPUNIT_ASSERT_MESSAGE("Image must be contained inside the table cell", nRowHeight > 2000);
+DECLARE_OOXMLEXPORT_TEST(testTdf135595_HFtableWrap_c12, "tdf135595_HFtableWrap_c12.docx")
+ xmlDocUniquePtr pXmlDoc = parseLayoutDump();
+ // tdf#104596: ignore wrap exception apparently does not apply if it is not "layout in table cell".
+ // Should be only one page. Row height should be two lines at 722, not wrapped to three lines at 998.
+ sal_Int32 nRowHeight = getXPath(pXmlDoc, "//header/tab/row/infos/bounds", "height").toInt32();
+ CPPUNIT_ASSERT_MESSAGE("Text must not wrap around header image", nRowHeight < 800);
DECLARE_OOXMLIMPORT_TEST(testTdf123622, "tdf123622.docx")
uno::Reference<beans::XPropertySet> XPropsRight(getShape(1),uno::UNO_QUERY);