diff options
| author | Justin Luth <jluth@mail.com> | 2024-09-05 17:12:12 +0200 |
|---|---|---|
| committer | Justin Luth <jluth@mail.com> | 2024-09-05 19:34:09 +0200 |
| commit | 47bb0e2b7d0690f06150c7e110e6992f3d62bd10 (patch) | |
| tree | 7956754153f41a6254955dbf18ee2b1838ce28db /sw/qa/extras/ooxmlexport | |
| parent | ac1600f9d13f6aa66b635ed5c48bc8d26ec83f6f (diff) | |
Revert "tdf#162612 mso import NOT-layoutInCell: effectively are wrap-through"
This reverts my 25.2 commit c8e272734a8fa26d93b057d1c9def8dc6c401143.
Reason for revert: I found an example where wrapping does apply.
In addition, wrap-through images are not restricted to the paper area, but in this case the shape should still be restricted.
Needs more testing..., so just completely revert for now.
Change-Id: I559942fee98f5693c90f7e16f65fefb7ecb9ab48
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/172899
Reviewed-by: Justin Luth <jluth@mail.com>
Tested-by: Jenkins
Diffstat (limited to 'sw/qa/extras/ooxmlexport')
| -rw-r--r-- | sw/qa/extras/ooxmlexport/data/tdf162612_notLayoutInCell_notWrapThrough_contourOpaque.docx | bin | 35416 -> 0 bytes | |||
| -rw-r--r-- | sw/qa/extras/ooxmlexport/ooxmlexport21.cxx | 21 |
2 files changed, 0 insertions, 21 deletions
diff --git a/sw/qa/extras/ooxmlexport/data/tdf162612_notLayoutInCell_notWrapThrough_contourOpaque.docx b/sw/qa/extras/ooxmlexport/data/tdf162612_notLayoutInCell_notWrapThrough_contourOpaque.docx Binary files differdeleted file mode 100644 index dae6163b2af3..000000000000 --- a/sw/qa/extras/ooxmlexport/data/tdf162612_notLayoutInCell_notWrapThrough_contourOpaque.docx +++ /dev/null diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport21.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport21.cxx index a18c55327875..a7ceb3f03ab1 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport21.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport21.cxx @@ -14,7 +14,6 @@ #include <com/sun/star/beans/XPropertyState.hpp> #include <com/sun/star/drawing/FillStyle.hpp> #include <com/sun/star/text/RelOrientation.hpp> -#include <com/sun/star/text/WrapTextMode.hpp> #include <com/sun/star/text/XDocumentIndex.hpp> #include <com/sun/star/text/XTextTable.hpp> #include <com/sun/star/text/XTextField.hpp> @@ -724,26 +723,6 @@ DECLARE_OOXMLEXPORT_TEST(testTdf162551, "tdf162551_notLayoutInCell_charLeft_from CPPUNIT_ASSERT(getProperty<bool>(getShape(1), u"IsFollowingTextFlow"_ustr)); } -DECLARE_OOXMLEXPORT_TEST(testTdf162612, - "tdf162612_notLayoutInCell_notWrapThrough_contourOpaque.docx") -{ - // given cell B2 with a centered, tight-wrapped image that is NOT layoutInCell - // (but Microsoft doesn't wrap any text around it) - xmlDocUniquePtr pDump = parseLayoutDump(); - CPPUNIT_ASSERT_EQUAL(OUString("-anchor point-"), - getXPathContent(pDump, "//tab/row[2]/cell[2]/txt"_ostr)); - sal_Int32 nParaHeight - = getXPath(pDump, "//tab/row[2]/cell[2]/txt/infos/bounds"_ostr, "height"_ostr).toInt32(); - // text should not wrap as two lines(552) beside the shape. It is one line(276) behind the shape - CPPUNIT_ASSERT_EQUAL(sal_Int32(276), nParaHeight); - - // the image is over top of the text - CPPUNIT_ASSERT(getProperty<bool>(getShape(1), u"Opaque"_ustr)); - // image should be wrapThrough, not PARALLEL (despite being wp:wrapTight wrapText="bothSides") - CPPUNIT_ASSERT_EQUAL(text::WrapTextMode_THROUGH, - getProperty<text::WrapTextMode>(getShape(1), u"Surround"_ustr)); -} - CPPUNIT_TEST_FIXTURE(Test, testTdf159207_footerFramePrBorder) { loadFromFile(u"tdf159207_footerFramePrBorder.docx"); // re-imports as editeng Frame/Shape |