diff options
| author | Justin Luth <justin.luth@collabora.com> | 2020-03-31 14:49:13 +0300 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2020-04-03 10:06:18 +0200 |
| commit | f497d1dc27b4fee3db1e2228647a00971922eb5f (patch) | |
| tree | 7b141274305372600e8e154ecc5926e79af97ed0 /sw/qa/extras/layout/layout.cxx | |
| parent | 0f29d36aa9e6ac7d0914a6e1749c16ecec216904 (diff) | |
tdf#131707 sw layout try2: ConsiderTextWrap on positioning
rework 7.0 commit 1052acae9a599c54e518c8fc17d6a994d8778757
jmux and I were working on related bugs at the same time.
My patch happened to get committed before his. Since mine
regressed, use jmux's version instead.
This should fix tdf#119748 and tdf#123257
Change-Id: I705d9f6c4ac81216c31009948cf1c9150017bbf3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91420
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'sw/qa/extras/layout/layout.cxx')
| -rw-r--r-- | sw/qa/extras/layout/layout.cxx | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx index 2a24e68ccd35..70cf21c1ef8a 100644 --- a/sw/qa/extras/layout/layout.cxx +++ b/sw/qa/extras/layout/layout.cxx @@ -2279,6 +2279,16 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf114163) // This failed, if the legend first label is not "Data3". The legend position is right. } +CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf131707) +{ + createDoc("tdf131707_flyWrap.doc"); + xmlDocPtr pXmlDoc = parseLayoutDump(); + + assertXPath(pXmlDoc, "//body/tab/row[3]/cell[2]/txt/infos/bounds", "top", "2185"); + // the image should be inside of the cell boundary - so the same top or higher + assertXPath(pXmlDoc, "//body/tab/row[3]/cell[2]/txt/anchored/fly/infos/bounds", "top", "2185"); +} + CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf125335) { SwDoc* pDoc = createDoc("tdf125335.odt"); |