[Libreoffice-commits] core.git: sw/qa

Xisco Fauli (via logerrit) logerrit at kemper.freedesktop.org
Wed Jun 9 11:41:25 UTC 2021


 sw/qa/extras/layout/layout.cxx  | 1371 ++++++++++++++++++++++++++++++++++++++++
 sw/qa/extras/layout/layout2.cxx | 1340 ---------------------------------------
 2 files changed, 1371 insertions(+), 1340 deletions(-)

New commits:
commit 1c01bdd6c1fabf301218560d7d1d26dea6915827
Author:     Xisco Fauli <xiscofauli at libreoffice.org>
AuthorDate: Wed Jun 9 12:06:28 2021 +0200
Commit:     Xisco Fauli <xiscofauli at libreoffice.org>
CommitDate: Wed Jun 9 13:38:33 2021 +0200

    sw_layoutwriter: split tests evenly
    
    Before sw/qa/extras/layout/layout.cxx had 23 tests and
    sw/qa/extras/layout/layout2.cxx 124. Now they have
    81 and 66 respectively
    Change-Id: Ib28824b4cbe6467c1e66ed29c99a3467dd9943f4
    
    Change-Id: Ic561b2a2e5d6d33e24a4d0a73508fb3cb7284ea9
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116889
    Tested-by: Jenkins
    Reviewed-by: Xisco Fauli <xiscofauli at libreoffice.org>

diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx
index 1e8878da6887..4c69dc6dcf05 100644
--- a/sw/qa/extras/layout/layout.cxx
+++ b/sw/qa/extras/layout/layout.cxx
@@ -9,18 +9,49 @@
 
 #include <swmodeltestbase.hxx>
 #include <com/sun/star/linguistic2/LinguServiceManager.hpp>
+#include <comphelper/propertysequence.hxx>
+#include <com/sun/star/linguistic2/XHyphenator.hpp>
+#include <com/sun/star/text/WrapTextMode.hpp>
 #include <comphelper/scopeguard.hxx>
+#include <unotools/syslocaleoptions.hxx>
+#include <i18nlangtag/languagetag.hxx>
+#include <vcl/event.hxx>
+#include <vcl/scheduler.hxx>
+#include <editeng/lrspitem.hxx>
+#include <editeng/fontitem.hxx>
+#include <editeng/fhgtitem.hxx>
+#include <editeng/postitem.hxx>
+#include <editeng/unolingu.hxx>
+#include <editeng/outlobj.hxx>
+#include <editeng/editobj.hxx>
+#include <comphelper/sequence.hxx>
 
 #include <fmtanchr.hxx>
 #include <fmtfsize.hxx>
 #include <fmtcntnt.hxx>
 #include <wrtsh.hxx>
+#include <edtwin.hxx>
+#include <view.hxx>
+#include <txtfrm.hxx>
+#include <pagefrm.hxx>
+#include <bodyfrm.hxx>
+#include <sortedobjs.hxx>
+#include <anchoredobject.hxx>
+#include <ndtxt.hxx>
+#include <frmatr.hxx>
+#include <IDocumentSettingAccess.hxx>
+#include <config_features.h>
 #include <unotxdoc.hxx>
 #include <rootfrm.hxx>
 #include <docsh.hxx>
 #include <IDocumentLayoutAccess.hxx>
+#include <IDocumentDrawModelAccess.hxx>
 #include <textboxhelper.hxx>
 #include <unoframe.hxx>
+#include <drawdoc.hxx>
+#include <svx/svdpage.hxx>
+#include <svx/svdotext.hxx>
+#include <dcontact.hxx>
 
 constexpr OUStringLiteral DATA_DIRECTORY = u"/sw/qa/extras/layout/data/";
 
@@ -2279,6 +2310,1346 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testRedlineTables)
     assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Text[1]", "Portion", "foar");
 }
 
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf109137)
+{
+    createDoc("tdf109137.docx");
+    uno::Reference<frame::XStorable> xStorable(mxComponent, uno::UNO_QUERY);
+    utl::TempFile aTempFile;
+    aTempFile.EnableKillingFile();
+    uno::Sequence<beans::PropertyValue> aDescriptor(comphelper::InitPropertySequence({
+        { "FilterName", uno::Any(OUString("writer8")) },
+    }));
+    xStorable->storeToURL(aTempFile.GetURL(), aDescriptor);
+    loadURL(aTempFile.GetURL(), "tdf109137.odt");
+    xmlDocUniquePtr pXmlDoc = parseLayoutDump();
+    // This was 0, the blue rectangle moved from the 1st to the 2nd page.
+    assertXPath(pXmlDoc, "/root/page[1]/body/txt/anchored/fly/notxt",
+                /*nNumberOfNodes=*/1);
+}
+
+//just care it doesn't crash/assert
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testForcepoint72) { createDoc("forcepoint72-1.rtf"); }
+
+//just care it doesn't crash/assert
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testForcepoint75) { createDoc("forcepoint75-1.rtf"); }
+
+//just care it doesn't crash/assert
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testForcepointFootnoteFrame)
+{
+    createDoc("forcepoint-swfootnoteframe-1.rtf");
+}
+
+//FIXME: disabled after failing again with fixed layout
+//CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testForcepoint76) { createDoc("forcepoint76-1.rtf"); }
+
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf118058)
+{
+    SwDoc* pDoc = createDoc("tdf118058.fodt");
+    // This resulted in a layout loop.
+    pDoc->getIDocumentLayoutAccess().GetCurrentViewShell()->CalcLayout();
+}
+
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf128611)
+{
+    createDoc("tdf128611.fodt");
+    xmlDocUniquePtr pXmlDoc = parseLayoutDump();
+    CPPUNIT_ASSERT(pXmlDoc);
+    // Without the accompanying fix in place, this test would have failed with:
+    // - Expected: 1
+    // - Actual  : 14
+    // i.e. there were multiple portions in the first paragraph of the A1 cell, which means that the
+    // rotated text was broken into multiple lines without a good reason.
+    assertXPath(pXmlDoc, "//tab/row/cell[1]/txt/Text", "Portion", "Abcd efghijkl");
+}
+
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf125893)
+{
+    createDoc("tdf125893.docx");
+    xmlDocUniquePtr pXmlDoc = parseLayoutDump();
+    // This was 400. The paragraph must have zero top border.
+    assertXPath(pXmlDoc, "/root/page/body/txt[4]/infos/prtBounds", "top", "0");
+}
+
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf134463)
+{
+    createDoc("tdf134463.docx");
+    xmlDocUniquePtr pXmlDoc = parseLayoutDump();
+    // This was 621. The previous paragraph must have zero bottom border.
+    assertXPath(pXmlDoc, "/root/page/body/txt[3]/infos/prtBounds", "top", "21");
+}
+
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf117188)
+{
+    createDoc("tdf117188.docx");
+    uno::Reference<frame::XStorable> xStorable(mxComponent, uno::UNO_QUERY);
+    utl::TempFile aTempFile;
+    aTempFile.EnableKillingFile();
+    uno::Sequence<beans::PropertyValue> aDescriptor(comphelper::InitPropertySequence({
+        { "FilterName", uno::Any(OUString("writer8")) },
+    }));
+    xStorable->storeToURL(aTempFile.GetURL(), aDescriptor);
+    loadURL(aTempFile.GetURL(), "tdf117188.odt");
+    xmlDocUniquePtr pXmlDoc = parseLayoutDump();
+    OUString sWidth = getXPath(pXmlDoc, "/root/page/body/txt/anchored/fly/infos/bounds", "width");
+    OUString sHeight = getXPath(pXmlDoc, "/root/page/body/txt/anchored/fly/infos/bounds", "height");
+    // The text box must have zero border distances
+    assertXPath(pXmlDoc, "/root/page/body/txt/anchored/fly/infos/prtBounds", "left", "0");
+    assertXPath(pXmlDoc, "/root/page/body/txt/anchored/fly/infos/prtBounds", "top", "0");
+    assertXPath(pXmlDoc, "/root/page/body/txt/anchored/fly/infos/prtBounds", "width", sWidth);
+    assertXPath(pXmlDoc, "/root/page/body/txt/anchored/fly/infos/prtBounds", "height", sHeight);
+}
+
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf117187)
+{
+    createDoc("tdf117187.odt");
+    xmlDocUniquePtr pXmlDoc = parseLayoutDump();
+
+    // there should be no fly portions
+    assertXPath(pXmlDoc, "/root/page/body/txt/Special[@nType='PortionType::Fly']", 0);
+}
+
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf119875)
+{
+    createDoc("tdf119875.odt");
+    xmlDocUniquePtr pXmlDoc = parseLayoutDump();
+    sal_Int32 nFirstTop
+        = getXPath(pXmlDoc, "/root/page[2]/body/section[1]/infos/bounds", "top").toInt32();
+    sal_Int32 nSecondTop
+        = getXPath(pXmlDoc, "/root/page[2]/body/section[2]/infos/bounds", "top").toInt32();
+    // The first section had the same top value as the second one, so they
+    // overlapped.
+    CPPUNIT_ASSERT_LESS(nSecondTop, nFirstTop);
+}
+
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf120287)
+{
+    createDoc("tdf120287.fodt");
+    xmlDocUniquePtr pXmlDoc = parseLayoutDump();
+    // This was 2, TabOverMargin Word-specific compat flag did not imply
+    // default-in-Word printer-independent layout, resulting in an additional
+    // line break.
+    assertXPath(pXmlDoc, "/root/page/body/txt[1]/LineBreak", 1);
+}
+
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf106234)
+{
+    createDoc("tdf106234.fodt");
+    // Ensure that all text portions are calculated before testing.
+    SwXTextDocument* pTextDoc = dynamic_cast<SwXTextDocument*>(mxComponent.get());
+    CPPUNIT_ASSERT(pTextDoc);
+    SwViewShell* pViewShell
+        = pTextDoc->GetDocShell()->GetDoc()->getIDocumentLayoutAccess().GetCurrentViewShell();
+    CPPUNIT_ASSERT(pViewShell);
+    pViewShell->Reformat();
+
+    xmlDocUniquePtr pXmlDoc = parseLayoutDump();
+    // In justified paragraphs, there is justification between left tabulators and manual line breaks
+    assertXPath(pXmlDoc, "/root/page/body/txt[1]/Special", "nType", "PortionType::Margin");
+    assertXPathNoAttribute(pXmlDoc, "/root/page/body/txt[1]/Special", "nWidth");
+    // but not after centered, right and decimal tabulators
+    assertXPath(pXmlDoc, "/root/page/body/txt[2]/Special", "nType", "PortionType::Margin");
+    // This was a justified line, without nWidth
+    assertXPath(pXmlDoc, "/root/page/body/txt[2]/Special", "nWidth", "7881");
+}
+
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf120287b)
+{
+    createDoc("tdf120287b.fodt");
+    xmlDocUniquePtr pXmlDoc = parseLayoutDump();
+    // This was 1418, TabOverMargin did the right split of the paragraph to two
+    // lines, but then calculated a too large tab portion size on the first
+    // line.
+    assertXPath(pXmlDoc, "/root/page/body/txt[1]/Text[@nType='PortionType::TabRight']", "nWidth",
+                "17");
+}
+
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf120287c)
+{
+    createDoc("tdf120287c.fodt");
+    xmlDocUniquePtr pXmlDoc = parseLayoutDump();
+    // This was 2, the second line was not broken into a 2nd and a 3rd one,
+    // rendering text outside the paragraph frame.
+    assertXPath(pXmlDoc, "/root/page/body/txt[1]/LineBreak", 3);
+}
+
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf122878)
+{
+    createDoc("tdf122878.docx");
+    xmlDocUniquePtr pXmlDoc = parseLayoutDump();
+    // FIXME: the XPath should be adjusted when the proper floating table would be imported
+    const sal_Int32 nTblTop
+        = getXPath(pXmlDoc, "/root/page[1]/footer/txt/anchored/fly/tab/infos/bounds", "top")
+              .toInt32();
+    const sal_Int32 nFirstPageParaCount
+        = getXPathContent(pXmlDoc, "count(/root/page[1]/body/txt)").toInt32();
+    CPPUNIT_ASSERT_EQUAL(sal_Int32(30), nFirstPageParaCount);
+    for (sal_Int32 i = 1; i <= nFirstPageParaCount; ++i)
+    {
+        const OString xPath = "/root/page[1]/body/txt[" + OString::number(i) + "]/infos/bounds";
+        const sal_Int32 nTxtBottom = getXPath(pXmlDoc, xPath.getStr(), "top").toInt32()
+                                     + getXPath(pXmlDoc, xPath.getStr(), "height").toInt32();
+        // No body paragraphs should overlap the table in the footer
+        CPPUNIT_ASSERT_MESSAGE(OString("testing paragraph #" + OString::number(i)).getStr(),
+                               nTxtBottom <= nTblTop);
+    }
+}
+
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf115094)
+{
+    createDoc("tdf115094.docx");
+    xmlDocUniquePtr pXmlDoc = parseLayoutDump();
+
+    sal_Int32 nTopOfD1
+        = getXPath(pXmlDoc, "/root/page/body/txt/anchored/fly/tab/row[1]/cell[4]/infos/bounds",
+                   "top")
+              .toInt32();
+    sal_Int32 nTopOfD1Anchored = getXPath(pXmlDoc,
+                                          "/root/page/body/txt/anchored/fly/tab/row[1]/cell[4]/"
+                                          "txt[2]/anchored/fly/infos/bounds",
+                                          "top")
+                                     .toInt32();
+    CPPUNIT_ASSERT_LESS(nTopOfD1Anchored, nTopOfD1);
+    sal_Int32 nTopOfB2
+        = getXPath(pXmlDoc, "/root/page/body/txt/anchored/fly/tab/row[2]/cell[2]/infos/bounds",
+                   "top")
+              .toInt32();
+    sal_Int32 nTopOfB2Anchored = getXPath(pXmlDoc,
+                                          "/root/page/body/txt/anchored/fly/tab/row[2]/cell[2]/"
+                                          "txt[1]/anchored/fly/infos/bounds",
+                                          "top")
+                                     .toInt32();
+    CPPUNIT_ASSERT_LESS(nTopOfB2Anchored, nTopOfB2);
+}
+
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf112290)
+{
+    SwDoc* pDoc = createDoc("tdf112290.docx");
+    CPPUNIT_ASSERT(pDoc);
+    auto pXml = parseLayoutDump();
+    assertXPath(pXml, "/root/page/body/txt/LineBreak[2]", "Line", "Xxxx Xxxx");
+}
+
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf122607)
+{
+    createDoc("tdf122607.odt");
+    xmlDocUniquePtr pXmlDoc = parseLayoutDump();
+    assertXPath(pXmlDoc,
+                "/root/page[1]/anchored/fly/txt[1]/anchored/fly/tab/row[2]/cell/txt[7]/anchored/"
+                "fly/txt/Text[1]",
+                "nHeight", "253");
+    assertXPath(pXmlDoc,
+                "/root/page[1]/anchored/fly/txt[1]/anchored/fly/tab/row[2]/cell/txt[7]/anchored/"
+                "fly/txt/Text[1]",
+                "nWidth", "428");
+    assertXPath(pXmlDoc,
+                "/root/page[1]/anchored/fly/txt[1]/anchored/fly/tab/row[2]/cell/txt[7]/anchored/"
+                "fly/txt/Text[1]",
+                "Portion", "Fax:");
+}
+
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf122607_regression)
+{
+    discardDumpedLayout();
+    if (mxComponent.is())
+        mxComponent->dispose();
+
+    OUString const pName("tdf122607_leerzeile.odt");
+
+    OUString const url(m_directories.getURLFromSrc(DATA_DIRECTORY) + pName);
+
+    // note: must set Hidden property, so that SfxFrameViewWindow_Impl::Resize()
+    // does *not* forward initial VCL Window Resize and thereby triggers a
+    // layout which does not happen on soffice --convert-to pdf.
+    std::vector<beans::PropertyValue> aFilterOptions = {
+        { beans::PropertyValue("Hidden", -1, uno::Any(true), beans::PropertyState_DIRECT_VALUE) },
+    };
+
+    std::cout << pName << ":\n";
+
+    // inline the loading because currently properties can't be passed...
+    mxComponent = loadFromDesktop(url, "com.sun.star.text.TextDocument",
+                                  comphelper::containerToSequence(aFilterOptions));
+    uno::Sequence<beans::PropertyValue> props(comphelper::InitPropertySequence({
+        { "FilterName", uno::Any(OUString("writer_pdf_Export")) },
+    }));
+    utl::TempFile aTempFile;
+    uno::Reference<frame::XStorable> xStorable(mxComponent, uno::UNO_QUERY);
+    xStorable->storeToURL(aTempFile.GetURL(), props);
+
+    xmlDocUniquePtr pXmlDoc = parseLayoutDump();
+    // somehow these 2 rows overlapped in the PDF unless CalcLayout() runs
+    assertXPath(pXmlDoc, "/root/page[1]/anchored/fly/tab[1]/row[1]/infos/bounds", "mbFixSize",
+                "false");
+    assertXPath(pXmlDoc, "/root/page[1]/anchored/fly/tab[1]/row[1]/infos/bounds", "top", "2977");
+    assertXPath(pXmlDoc, "/root/page[1]/anchored/fly/tab[1]/row[1]/infos/bounds", "height", "241");
+    assertXPath(pXmlDoc, "/root/page[1]/anchored/fly/tab[1]/row[2]/infos/bounds", "mbFixSize",
+                "true");
+    // this was 3034, causing the overlap
+    assertXPath(pXmlDoc, "/root/page[1]/anchored/fly/tab[1]/row[2]/infos/bounds", "top", "3218");
+    assertXPath(pXmlDoc, "/root/page[1]/anchored/fly/tab[1]/row[2]/infos/bounds", "height", "164");
+
+    aTempFile.EnableKillingFile();
+}
+
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testBtlrCell)
+{
+    SwDoc* pDoc = createDoc("btlr-cell.odt");
+    SwDocShell* pShell = pDoc->GetDocShell();
+
+    // Dump the rendering of the first page as an XML file.
+    std::shared_ptr<GDIMetaFile> xMetaFile = pShell->GetPreviewMetaFile();
+    MetafileXmlDump dumper;
+    xmlDocUniquePtr pXmlDoc = dumpAndParse(dumper, *xMetaFile);
+    CPPUNIT_ASSERT(pXmlDoc);
+
+    // Without the accompanying fix in place, this test would have failed, as
+    // the orientation was 0 (layout did not take btlr direction request from
+    // doc model).
+    assertXPath(pXmlDoc, "//font[1]", "orientation", "900");
+
+#if !defined(MACOSX) && !defined(_WIN32) // macOS fails with x == 2662 for some reason.
+    // Without the accompanying fix in place, this test would have failed with 'Expected: 1915;
+    // Actual  : 1756', i.e. the AAA1 text was too close to the left cell border due to an ascent vs
+    // descent mismatch when calculating the baseline offset of the text portion.
+    assertXPath(pXmlDoc, "//textarray[1]", "x", "1915");
+    assertXPath(pXmlDoc, "//textarray[1]", "y", "2707");
+
+    // Without the accompanying fix in place, this test would have failed with 'Expected: 1979;
+    // Actual  : 2129', i.e. the gray background of the "AAA2." text was too close to the right edge
+    // of the text portion. Now it's exactly behind the text portion.
+    assertXPath(pXmlDoc, "//rect[@top='2159']", "left", "1979");
+
+    // Without the accompanying fix in place, this test would have failed with 'Expected: 269;
+    // Actual  : 0', i.e. the AAA2 frame was not visible due to 0 width.
+    pXmlDoc = parseLayoutDump();
+    assertXPath(pXmlDoc, "/root/page/body/tab/row/cell[1]/txt[2]/infos/bounds", "width", "269");
+
+    // Test the position of the cursor after doc load.
+    // We expect that it's inside the first text frame in the first cell.
+    // More precisely, this is a bottom to top vertical frame, so we expect it's at the start, which
+    // means it's at the lower half of the text frame rectangle (vertically).
+    SwWrtShell* pWrtShell = pShell->GetWrtShell();
+    CPPUNIT_ASSERT(pWrtShell);
+
+    const SwRect& rCharRect = pWrtShell->GetCharRect();
+    SwTwips nFirstParaTop
+        = getXPath(pXmlDoc, "/root/page/body/tab/row/cell[1]/txt[1]/infos/bounds", "top").toInt32();
+    SwTwips nFirstParaHeight
+        = getXPath(pXmlDoc, "/root/page/body/tab/row/cell[1]/txt[1]/infos/bounds", "height")
+              .toInt32();
+    SwTwips nFirstParaMiddle = nFirstParaTop + nFirstParaHeight / 2;
+    SwTwips nFirstParaBottom = nFirstParaTop + nFirstParaHeight;
+    // Without the accompanying fix in place, this test would have failed: the lower half (vertical)
+    // range was 2273 -> 2835, the good vertical position is 2730, the bad one was 1830.
+    CPPUNIT_ASSERT_GREATER(nFirstParaMiddle, rCharRect.Top());
+    CPPUNIT_ASSERT_LESS(nFirstParaBottom, rCharRect.Top());
+
+    // Save initial cursor position.
+    SwPosition aCellStart = *pWrtShell->GetCursor()->Start();
+
+    // Test that pressing "up" at the start of the cell goes to the next character position.
+    sal_uLong nNodeIndex = pWrtShell->GetCursor()->Start()->nNode.GetIndex();
+    sal_Int32 nIndex = pWrtShell->GetCursor()->Start()->nContent.GetIndex();
+    KeyEvent aKeyEvent(0, KEY_UP);
+    SwEditWin& rEditWin = pShell->GetView()->GetEditWin();
+    rEditWin.KeyInput(aKeyEvent);
+    Scheduler::ProcessEventsToIdle();
+    // Without the accompanying fix in place, this test would have failed: "up" was interpreted as
+    // logical "left", which does nothing if you're at the start of the text anyway.
+    CPPUNIT_ASSERT_EQUAL(nIndex + 1, pWrtShell->GetCursor()->Start()->nContent.GetIndex());
+
+    // Test that pressing "right" goes to the next paragraph (logical "down").
+    sal_Int32 nContentIndex = pWrtShell->GetCursor()->Start()->nContent.GetIndex();
+    aKeyEvent = KeyEvent(0, KEY_RIGHT);
+    rEditWin.KeyInput(aKeyEvent);
+    Scheduler::ProcessEventsToIdle();
+    // Without the accompanying fix in place, this test would have failed: the cursor went to the
+    // paragraph after the table.
+    CPPUNIT_ASSERT_EQUAL(nNodeIndex + 1, pWrtShell->GetCursor()->Start()->nNode.GetIndex());
+
+    // Test that we have the correct character index after traveling to the next paragraph.
+    // Without the accompanying fix in place, this test would have failed: char position was 5, i.e.
+    // the cursor jumped to the end of the paragraph for no reason.
+    CPPUNIT_ASSERT_EQUAL(nContentIndex, pWrtShell->GetCursor()->Start()->nContent.GetIndex());
+
+    // Test that clicking "below" the second paragraph positions the cursor at the start of the
+    // second paragraph.
+    SwRootFrame* pLayout = pDoc->getIDocumentLayoutAccess().GetCurrentLayout();
+    SwPosition aPosition(aCellStart);
+    SwTwips nSecondParaLeft
+        = getXPath(pXmlDoc, "/root/page/body/tab/row/cell[1]/txt[2]/infos/bounds", "left")
+              .toInt32();
+    SwTwips nSecondParaWidth
+        = getXPath(pXmlDoc, "/root/page/body/tab/row/cell[1]/txt[2]/infos/bounds", "width")
+              .toInt32();
+    SwTwips nSecondParaTop
+        = getXPath(pXmlDoc, "/root/page/body/tab/row/cell[1]/txt[2]/infos/bounds", "top").toInt32();
+    SwTwips nSecondParaHeight
+        = getXPath(pXmlDoc, "/root/page/body/tab/row/cell[1]/txt[2]/infos/bounds", "height")
+              .toInt32();
+    Point aPoint;
+    aPoint.setX(nSecondParaLeft + nSecondParaWidth / 2);
+    aPoint.setY(nSecondParaTop + nSecondParaHeight - 100);
+    SwCursorMoveState aState(CursorMoveState::NONE);
+    pLayout->GetModelPositionForViewPoint(&aPosition, aPoint, &aState);
+    CPPUNIT_ASSERT_EQUAL(aCellStart.nNode.GetIndex() + 1, aPosition.nNode.GetIndex());
+    // Without the accompanying fix in place, this test would have failed: character position was 5,
+    // i.e. cursor was at the end of the paragraph.
+    CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(0), aPosition.nContent.GetIndex());
+
+    // Test that the selection rectangles are inside the cell frame if we select all the cell
+    // content.
+    SwTwips nCellLeft
+        = getXPath(pXmlDoc, "/root/page/body/tab/row/cell[1]/infos/bounds", "left").toInt32();
+    SwTwips nCellWidth
+        = getXPath(pXmlDoc, "/root/page/body/tab/row/cell[1]/infos/bounds", "width").toInt32();
+    SwTwips nCellTop
+        = getXPath(pXmlDoc, "/root/page/body/tab/row/cell[1]/infos/bounds", "top").toInt32();
+    SwTwips nCellHeight
+        = getXPath(pXmlDoc, "/root/page/body/tab/row/cell[1]/infos/bounds", "height").toInt32();
+    SwRect aCellRect(Point(nCellLeft, nCellTop), Size(nCellWidth, nCellHeight));
+    pWrtShell->SelAll();
+    SwShellCursor* pShellCursor = pWrtShell->getShellCursor(/*bBlock=*/false);
+    CPPUNIT_ASSERT(!pShellCursor->empty());
+    // Without the accompanying fix in place, this test would have failed with:
+    // selection rectangle 269x2573@(1970,2172) is not inside cell rectangle 3207x1134@(1593,1701)
+    // i.e. the selection went past the bottom border of the cell frame.
+    for (const auto& rRect : *pShellCursor)
+    {
+        std::stringstream ss;
+        ss << "selection rectangle " << rRect << " is not inside cell rectangle " << aCellRect;
+        CPPUNIT_ASSERT_MESSAGE(ss.str(), aCellRect.IsInside(rRect));
+    }
+
+    // Make sure that the correct rectangle gets repainted on scroll.
+    SwFrame* pPageFrame = pLayout->GetLower();
+    CPPUNIT_ASSERT(pPageFrame->IsPageFrame());
+
+    SwFrame* pBodyFrame = pPageFrame->GetLower();
+    CPPUNIT_ASSERT(pBodyFrame->IsBodyFrame());
+
+    SwFrame* pTabFrame = pBodyFrame->GetLower();
+    CPPUNIT_ASSERT(pTabFrame->IsTabFrame());
+
+    SwFrame* pRowFrame = pTabFrame->GetLower();
+    CPPUNIT_ASSERT(pRowFrame->IsRowFrame());
+
+    SwFrame* pCellFrame = pRowFrame->GetLower();
+    CPPUNIT_ASSERT(pCellFrame->IsCellFrame());
+
+    SwFrame* pFrame = pCellFrame->GetLower();
+    CPPUNIT_ASSERT(pFrame->IsTextFrame());
+
+    SwTextFrame* pTextFrame = static_cast<SwTextFrame*>(pFrame);
+    pTextFrame->SwapWidthAndHeight();
+    // Mimic what normally SwTextFrame::PaintSwFrame() does:
+    SwRect aRect(4207, 2273, 269, 572);
+    pTextFrame->SwitchVerticalToHorizontal(aRect);
+    // Without the accompanying fix in place, this test would have failed with:
+    // Expected: 572x269@(1691,4217)
+    // Actual  : 572x269@(2263,4217)
+    // i.e. the paint rectangle position was incorrect, text was not painted on scrolling up.
+    CPPUNIT_ASSERT_EQUAL(SwRect(1691, 4217, 572, 269), aRect);
+#endif
+}
+
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf123898)
+{
+    createDoc("tdf123898.odt");
+
+    // Make sure spellchecker has done its job already
+    Scheduler::ProcessEventsToIdle();
+
+    xmlDocUniquePtr pXmlDoc = parseLayoutDump();
+    // Make sure that the arrow on the left is not there (there are 43 children if it's there)
+    assertXPathChildren(pXmlDoc, "/root/page/body/txt/anchored/fly/txt", 42);
+}
+
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf123651)
+{
+    createDoc("tdf123651.docx");
+    xmlDocUniquePtr pXmlDoc = parseLayoutDump();
+    // Without the accompanying fix in place, this test would have failed with 'Expected: 7639;
+    // Actual: 12926'. The shape was below the second "Lorem ipsum" text, not above it.
+    const sal_Int32 nTopValue
+        = getXPath(pXmlDoc, "//anchored/SwAnchoredDrawObject/bounds", "top").toInt32();
+    CPPUNIT_ASSERT_DOUBLES_EQUAL(7639, nTopValue, 10);
+}
+
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf116501)
+{
+    //just care it doesn't freeze
+    createDoc("tdf116501.odt");
+}
+
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testAbi11870)
+{
+    //just care it doesn't assert
+    createDoc("abi11870-2.odt");
+}
+
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf118719)
+{
+    // Insert a page break.
+    SwDoc* pDoc = createDoc();
+    SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
+
+    // Enable hide whitespace mode.
+    SwViewOption aViewOptions(*pWrtShell->GetViewOptions());
+    aViewOptions.SetHideWhitespaceMode(true);
+    pWrtShell->ApplyViewOptions(aViewOptions);
+
+    pWrtShell->Insert("first");
+    pWrtShell->InsertPageBreak();
+    pWrtShell->Insert("second");
+
+    // Without the accompanying fix in place, this test would have failed, as the height of the
+    // first page was 15840 twips, instead of the much smaller 276.
+    sal_Int32 nOther = parseDump("/root/page[1]/infos/bounds", "height").toInt32();
+    sal_Int32 nLast = parseDump("/root/page[2]/infos/bounds", "height").toInt32();
+    CPPUNIT_ASSERT_GREATER(nOther, nLast);
+}
+
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTabOverMargin)
+{
+    createDoc("tab-over-margin.odt");
+    xmlDocUniquePtr pXmlDoc = parseLayoutDump();
+
+    // 2nd paragraph has a tab over the right margin, and with the TabOverMargin compat option,
+    // there is enough space to have all content in a single line.
+    // Without the accompanying fix in place, this test would have failed, there were 2 lines.
+    assertXPath(pXmlDoc, "/root/page/body/txt[2]/LineBreak", 1);
+}
+
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testImageComment)
+{
+    // Load a document that has "aaa" in it, then a commented image (4th char is the as-char image,
+    // 5th char is the comment anchor).
+    SwDoc* pDoc = createDoc("image-comment.odt");
+    SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
+
+    // Look up a layout position which is on the right of the image.
+    SwRootFrame* pRoot = pWrtShell->GetLayout();
+    CPPUNIT_ASSERT(pRoot->GetLower()->IsPageFrame());
+    SwPageFrame* pPage = static_cast<SwPageFrame*>(pRoot->GetLower());
+    CPPUNIT_ASSERT(pPage->GetLower()->IsBodyFrame());
+    SwBodyFrame* pBody = static_cast<SwBodyFrame*>(pPage->GetLower());
+    CPPUNIT_ASSERT(pBody->GetLower()->IsTextFrame());
+    SwTextFrame* pTextFrame = static_cast<SwTextFrame*>(pBody->GetLower());
+    CPPUNIT_ASSERT(pTextFrame->GetDrawObjs());
+    SwSortedObjs& rDrawObjs = *pTextFrame->GetDrawObjs();
+    CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(1), rDrawObjs.size());
+    SwAnchoredObject* pDrawObj = rDrawObjs[0];
+    const SwRect& rDrawObjRect = pDrawObj->GetObjRect();
+    Point aPoint = rDrawObjRect.Center();
+    aPoint.setX(aPoint.getX() + rDrawObjRect.Width() / 2);
+
+    // Ask for the doc model pos of this layout point.
+    SwPosition aPosition(*pTextFrame->GetTextNodeForFirstText());
+    pTextFrame->GetModelPositionForViewPoint(&aPosition, aPoint);
+
+    // Without the accompanying fix in place, this test would have failed with:
+    // - Expected: 5
+    // - Actual  : 4
+    // i.e. the cursor got positioned between the image and its comment, so typing extended the
+    // comment, instead of adding content after the commented image.
+    CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(5), aPosition.nContent.GetIndex());
+}
+
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testScriptField)
+{
+    // Test clicking script field inside table ( tdf#141079 )
+    SwDoc* pDoc = createDoc("tdf141079.odt");
+    SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
+
+    // Look up layout position which is the first cell in the table
+    SwRootFrame* pRoot = pWrtShell->GetLayout();
+    CPPUNIT_ASSERT(pRoot->GetLower()->IsPageFrame());
+    SwPageFrame* pPage = static_cast<SwPageFrame*>(pRoot->GetLower());
+    CPPUNIT_ASSERT(pPage->GetLower()->IsBodyFrame());
+    SwBodyFrame* pBody = static_cast<SwBodyFrame*>(pPage->GetLower());
+    CPPUNIT_ASSERT(pBody->GetLower()->IsTextFrame());
+    SwTextFrame* pTextFrame = static_cast<SwTextFrame*>(pBody->GetLower());
+    CPPUNIT_ASSERT(pTextFrame->GetNext()->IsTabFrame());
+    SwFrame* pTable = pTextFrame->GetNext();
+    SwFrame* pRow1 = pTable->GetLower();
+    CPPUNIT_ASSERT(pRow1->GetLower()->IsCellFrame());
+    SwFrame* pCell1 = pRow1->GetLower();
+    CPPUNIT_ASSERT(pCell1->GetLower()->IsTextFrame());
+    SwTextFrame* pCellTextFrame = static_cast<SwTextFrame*>(pCell1->GetLower());
+    const SwRect& rCellRect = pCell1->getFrameArea();
+    Point aPoint = rCellRect.Center();
+    aPoint.setX(aPoint.getX() - rCellRect.Width() / 2);
+
+    // Ask for the doc model pos of this layout point.
+    SwPosition aPosition(*pCellTextFrame->GetTextNodeForFirstText());
+    pCellTextFrame->GetModelPositionForViewPoint(&aPosition, aPoint);
+
+    // Position was 1 without the fix from tdf#141079
+    CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(0), aPosition.nContent.GetIndex());
+}
+
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testCommentCursorPosition)
+{
+    // Load a document that has "aaa" in it, followed by three comments.
+    SwDoc* pDoc = createDoc("endOfLineComments.odt");
+    SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
+
+    SwRootFrame* pRoot = pWrtShell->GetLayout();
+    CPPUNIT_ASSERT(pRoot->GetLower()->IsPageFrame());
+    SwPageFrame* pPage = static_cast<SwPageFrame*>(pRoot->GetLower());
+    CPPUNIT_ASSERT(pPage->GetLower()->IsBodyFrame());
+    SwBodyFrame* pBody = static_cast<SwBodyFrame*>(pPage->GetLower());
+    CPPUNIT_ASSERT(pBody->GetLower()->IsTextFrame());
+    SwTextFrame* pTextFrame = static_cast<SwTextFrame*>(pBody->GetLower());
+
+    // Set a point in the whitespace past the end of the first line.
+    Point aPoint = pWrtShell->getShellCursor(false)->GetSttPos();
+    aPoint.setX(aPoint.getX() + 10000);
+
+    // Ask for the doc model pos of this layout point.
+    SwPosition aPosition(*pTextFrame->GetTextNodeForFirstText());
+    pTextFrame->GetModelPositionForViewPoint(&aPosition, aPoint);
+
+    // Without the accompanying fix in place, this test would have failed with:
+    // - Expected: 6
+    // - Actual  : 3 or 4
+    // i.e. the cursor got positioned before the comments,
+    // so typing extended the first comment instead of adding content after the comments.
+    CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(6), aPosition.nContent.GetIndex());
+    // The second line is also important, but can't be auto-tested
+    // since the failing situation depends on GetViewWidth which is zero in the headless tests.
+    // bb<comment>|   - the cursor should move behind the |, not before it.
+}
+
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testCombiningCharacterCursorPosition)
+{
+    // Load a document that has "a" in it, followed by a combining acute in a separate rext span
+    SwDoc* pDoc = createDoc("tdf138592-a-acute.fodt");
+    SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
+
+    SwRootFrame* pRoot = pWrtShell->GetLayout();
+    CPPUNIT_ASSERT(pRoot->GetLower()->IsPageFrame());
+    SwPageFrame* pPage = static_cast<SwPageFrame*>(pRoot->GetLower());
+    CPPUNIT_ASSERT(pPage->GetLower()->IsBodyFrame());
+    SwBodyFrame* pBody = static_cast<SwBodyFrame*>(pPage->GetLower());
+    CPPUNIT_ASSERT(pBody->GetLower()->IsTextFrame());
+    SwTextFrame* pTextFrame = static_cast<SwTextFrame*>(pBody->GetLower());
+
+    // Set a point in the whitespace past the end of the first line.
+    Point aPoint = pWrtShell->getShellCursor(false)->GetSttPos();
+    aPoint.AdjustX(10000);
+
+    // Ask for the doc model pos of this layout point.
+    SwPosition aPosition(*pTextFrame->GetTextNodeForFirstText());
+    pTextFrame->GetModelPositionForViewPoint(&aPosition, aPoint);
+
+    // Without the accompanying fix in place, this test would have failed with:
+    // - Expected: 2
+    // - Actual  : 1
+    // i.e. the cursor got positioned before the acute, so typing shifted the acute (applying it
+    // to newly typed characters) instead of adding content after it.
+    CPPUNIT_ASSERT_EQUAL(sal_Int32(2), aPosition.nContent.GetIndex());
+}
+
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf64222)
+{
+    createDoc("tdf64222.docx");
+    xmlDocUniquePtr pXmlDoc = parseLayoutDump();
+    assertXPath(pXmlDoc, "/root/page/body/txt[2]/Special", "nHeight", "560");
+}
+
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf113014)
+{
+    SwDoc* pDoc = createDoc("tdf113014.fodt");
+    SwDocShell* pShell = pDoc->GetDocShell();
+
+    // Dump the rendering of the first page as an XML file.
+    std::shared_ptr<GDIMetaFile> xMetaFile = pShell->GetPreviewMetaFile();
+    MetafileXmlDump dumper;
+    xmlDocUniquePtr pXmlDoc = dumpAndParse(dumper, *xMetaFile);
+    CPPUNIT_ASSERT(pXmlDoc);
+
+    // This failed, if numbering of cell A1 is missing
+    // (A1: left indent: 3 cm, first line indent: -3 cm
+    // A2: left indent: 0 cm, first line indent: 0 cm)
+    assertXPathContent(pXmlDoc, "/metafile/push[1]/push[1]/push[1]/textarray[1]/text", "1.");
+    assertXPathContent(pXmlDoc, "/metafile/push[1]/push[1]/push[1]/textarray[3]/text", "2.");
+    assertXPathContent(pXmlDoc, "/metafile/push[1]/push[1]/push[1]/textarray[5]/text", "3.");
+}
+
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf130218)
+{
+    SwDoc* pDoc = createDoc("tdf130218.fodt");
+    SwDocShell* pShell = pDoc->GetDocShell();
+
+    // Dump the rendering of the first page as an XML file.
+    std::shared_ptr<GDIMetaFile> xMetaFile = pShell->GetPreviewMetaFile();
+    MetafileXmlDump dumper;
+
+    xmlDocUniquePtr pXmlDoc = dumpAndParse(dumper, *xMetaFile);
+    CPPUNIT_ASSERT(pXmlDoc);
+
+    // This failed, if hanging first line was hidden
+    assertXPathContent(pXmlDoc, "/metafile/push[1]/push[1]/push[1]/textarray[1]/text", "Text");
+}
+
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf127235)
+{
+    SwDoc* pDoc = createDoc("tdf127235.odt");
+    // This resulted in a layout loop.
+    pDoc->getIDocumentLayoutAccess().GetCurrentViewShell()->CalcLayout();
+}
+
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf138039)
+{
+    createDoc("tdf138039.odt");
+
+    xmlDocUniquePtr pXmlDoc = parseLayoutDump();
+
+    // there are 3 pages
+    assertXPath(pXmlDoc, "/root/page", 3);
+    // table on first page
+    assertXPath(pXmlDoc, "/root/page[1]/body/tab", 1);
+    assertXPath(pXmlDoc, "/root/page[1]/body/txt", 0);
+    // paragraph with large fly on second page
+    assertXPath(pXmlDoc, "/root/page[2]/body/tab", 0);
+    assertXPath(pXmlDoc, "/root/page[2]/body/txt", 1);
+    assertXPath(pXmlDoc, "/root/page[2]/body/txt[1]/anchored/fly", 1);
+    assertXPath(pXmlDoc, "/root/page[2]/body/txt[1]/anchored/fly[1]/infos/bounds", "top", "17915");
+    assertXPath(pXmlDoc, "/root/page[2]/body/txt[1]/anchored/fly[1]/infos/bounds", "height",
+                "15819");
+    // paragraph on third page
+    assertXPath(pXmlDoc, "/root/page[3]/body/tab", 0);
+    assertXPath(pXmlDoc, "/root/page[3]/body/txt", 1);
+    assertXPath(pXmlDoc, "/root/page[3]/body/txt[1]/anchored", 0);
+}
+
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf134298)
+{
+    createDoc("tdf134298.ott");
+
+    xmlDocUniquePtr pXmlDoc = parseLayoutDump();
+
+    // there are 2 pages
+    assertXPath(pXmlDoc, "/root/page", 2);
+    // table and first para on first page
+    assertXPath(pXmlDoc, "/root/page[1]/body/tab", 1);
+    assertXPath(pXmlDoc, "/root/page[1]/body/txt", 1);
+    assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/anchored", 0);
+    // paragraph with large fly on second page
+    assertXPath(pXmlDoc, "/root/page[2]/body/tab", 0);
+    assertXPath(pXmlDoc, "/root/page[2]/body/txt", 1);
+    assertXPath(pXmlDoc, "/root/page[2]/body/txt[1]/anchored/fly", 1);
+    assertXPath(pXmlDoc, "/root/page[2]/body/txt[1]/anchored/fly[1]/infos/bounds", "top", "17897");
+    assertXPath(pXmlDoc, "/root/page[2]/body/txt[1]/anchored/fly[1]/infos/bounds", "height",
+                "15819");
+}
+
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testShapeAllowOverlap)
+{
+// Need to find out why this fails on macOS and why this is unstable on Windows.
+#if !defined(MACOSX) && !defined(_WIN32)
+    // Create an empty document with two, intentionally overlapping shapes.
+    // Set their AllowOverlap property to false.
+    loadURL("private:factory/swriter", nullptr);
+    uno::Reference<lang::XMultiServiceFactory> xDocument(mxComponent, uno::UNO_QUERY);
+    awt::Point aPoint(1000, 1000);
+    awt::Size aSize(2000, 2000);
+    uno::Reference<drawing::XShape> xShape(
+        xDocument->createInstance("com.sun.star.drawing.RectangleShape"), uno::UNO_QUERY);
+    xShape->setPosition(aPoint);
+    xShape->setSize(aSize);
+    uno::Reference<drawing::XDrawPageSupplier> xDrawPageSupplier(xDocument, uno::UNO_QUERY);
+    uno::Reference<beans::XPropertySet> xShapeProperties(xShape, uno::UNO_QUERY);
+    xShapeProperties->setPropertyValue("AllowOverlap", uno::makeAny(false));
+    xShapeProperties->setPropertyValue("AnchorType",
+                                       uno::makeAny(text::TextContentAnchorType_AT_CHARACTER));
+    xDrawPageSupplier->getDrawPage()->add(xShape);
+
+    aPoint = awt::Point(2000, 2000);
+    xShape.set(xDocument->createInstance("com.sun.star.drawing.RectangleShape"), uno::UNO_QUERY);
+    xShape->setPosition(aPoint);
+    xShape->setSize(aSize);
+    xShapeProperties.set(xShape, uno::UNO_QUERY);
+    xShapeProperties->setPropertyValue("AllowOverlap", uno::makeAny(false));
+    xShapeProperties->setPropertyValue("AnchorType",
+                                       uno::makeAny(text::TextContentAnchorType_AT_CHARACTER));
+    xDrawPageSupplier->getDrawPage()->add(xShape);
+
+    // Now verify that the rectangle of the anchored objects don't overlap.
+    SwXTextDocument* pTextDoc = dynamic_cast<SwXTextDocument*>(mxComponent.get());
+    CPPUNIT_ASSERT(pTextDoc);
+    SwDoc* pDoc = pTextDoc->GetDocShell()->GetDoc();
+    SwRootFrame* pLayout = pDoc->getIDocumentLayoutAccess().GetCurrentLayout();
+    SwFrame* pPageFrame = pLayout->GetLower();
+    SwFrame* pBodyFrame = pPageFrame->GetLower();
+    SwFrame* pTextFrame = pBodyFrame->GetLower();
+    CPPUNIT_ASSERT(pTextFrame->GetDrawObjs());
+    SwSortedObjs& rObjs = *pTextFrame->GetDrawObjs();
+    CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(2), rObjs.size());
+    SwAnchoredObject* pFirst = rObjs[0];
+    SwAnchoredObject* pSecond = rObjs[1];
+    // Without the accompanying fix in place, this test would have failed: the layout dump was
+    // <bounds left="1984" top="1984" width="1137" height="1137"/>
+    // <bounds left="2551" top="2551" width="1137" height="1137"/>
+    // so there was a clear vertical overlap. (Allow for 1px tolerance.)
+    OString aMessage = "Unexpected overlap: first shape's bottom is "
+                       + OString::number(pFirst->GetObjRect().Bottom()) + ", second shape's top is "
+                       + OString::number(pSecond->GetObjRect().Top());
+    CPPUNIT_ASSERT_MESSAGE(aMessage.getStr(),
+                           std::abs(pFirst->GetObjRect().Bottom() - pSecond->GetObjRect().Top())
+                               < 15);
+#endif
+}
+
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testShapeAllowOverlapWrap)
+{
+    // Create an empty document with two, intentionally overlapping shapes.
+    // Set their AllowOverlap property to false and their wrap to through.
+    loadURL("private:factory/swriter", nullptr);
+    uno::Reference<lang::XMultiServiceFactory> xDocument(mxComponent, uno::UNO_QUERY);
+    awt::Point aPoint(1000, 1000);
+    awt::Size aSize(2000, 2000);
+    uno::Reference<drawing::XShape> xShape(
+        xDocument->createInstance("com.sun.star.drawing.RectangleShape"), uno::UNO_QUERY);
+    xShape->setPosition(aPoint);
+    xShape->setSize(aSize);
+    uno::Reference<drawing::XDrawPageSupplier> xDrawPageSupplier(xDocument, uno::UNO_QUERY);
+    uno::Reference<beans::XPropertySet> xShapeProperties(xShape, uno::UNO_QUERY);
+    xShapeProperties->setPropertyValue("AllowOverlap", uno::makeAny(false));
+    xShapeProperties->setPropertyValue("AnchorType",
+                                       uno::makeAny(text::TextContentAnchorType_AT_CHARACTER));
+    xShapeProperties->setPropertyValue("Surround", uno::makeAny(text::WrapTextMode_THROUGH));
+    xDrawPageSupplier->getDrawPage()->add(xShape);
+
+    aPoint = awt::Point(2000, 2000);
+    xShape.set(xDocument->createInstance("com.sun.star.drawing.RectangleShape"), uno::UNO_QUERY);
+    xShape->setPosition(aPoint);
+    xShape->setSize(aSize);
+    xShapeProperties.set(xShape, uno::UNO_QUERY);
+    xShapeProperties->setPropertyValue("AllowOverlap", uno::makeAny(false));
+    xShapeProperties->setPropertyValue("AnchorType",
+                                       uno::makeAny(text::TextContentAnchorType_AT_CHARACTER));
+    xShapeProperties->setPropertyValue("Surround", uno::makeAny(text::WrapTextMode_THROUGH));
+    xDrawPageSupplier->getDrawPage()->add(xShape);
+
+    // Now verify that the rectangle of the anchored objects do overlap.
+    SwXTextDocument* pTextDoc = dynamic_cast<SwXTextDocument*>(mxComponent.get());
+    CPPUNIT_ASSERT(pTextDoc);
+    SwDoc* pDoc = pTextDoc->GetDocShell()->GetDoc();
+    SwRootFrame* pLayout = pDoc->getIDocumentLayoutAccess().GetCurrentLayout();
+    SwFrame* pPageFrame = pLayout->GetLower();
+    SwFrame* pBodyFrame = pPageFrame->GetLower();
+    SwFrame* pTextFrame = pBodyFrame->GetLower();
+    CPPUNIT_ASSERT(pTextFrame->GetDrawObjs());
+    SwSortedObjs& rObjs = *pTextFrame->GetDrawObjs();
+    CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(2), rObjs.size());
+    SwAnchoredObject* pFirst = rObjs[0];
+    SwAnchoredObject* pSecond = rObjs[1];
+    // Without the accompanying fix in place, this test would have failed: AllowOverlap=no had
+    // priority over Surround=through (which is bad for Word compat).
+    CPPUNIT_ASSERT(pSecond->GetObjRect().IsOver(pFirst->GetObjRect()));
+}
+
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf124600)
+{
+    createDoc("tdf124600.docx");
+    xmlDocUniquePtr pXmlDoc = parseLayoutDump();
+
+    // Without the accompanying fix in place, this test would have failed with:
+    // - Expected: 1
+    // - Actual  : 2
+    // i.e. the last line in the body text had 2 lines, while it should have 1, as Word does (as the
+    // fly frame does not intersect with the print area of the paragraph.)
+    assertXPath(pXmlDoc, "/root/page/body/txt[2]/LineBreak", 1);
+}
+
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf124601)
+{
+    // This is a testcase for the ContinuousEndnotes compat flag.
+    // The document has 2 pages, the endnote anchor is on the first page.
+    // The endnote should be on the 2nd page together with the last page content.
+    createDoc("tdf124601.doc");
+    xmlDocUniquePtr pXmlDoc = parseLayoutDump();
+
+    // Without the accompanying fix in place, this test would have failed with:
+    // - Expected: 2
+    // - Actual  : 3
+    // i.e. there was a separate endnote page, even when the ContinuousEndnotes compat option was
+    // on.
+    assertXPath(pXmlDoc, "/root/page", 2);
+    assertXPath(pXmlDoc, "/root/page[2]/ftncont", 1);
+}
+
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf124601b)
+{
+    // Table has an image, which is anchored in the first row, but its vertical position is large
+    // enough to be rendered in the second row.
+    // The shape has layoutInCell=1, so should match what Word does here.
+    // Also the horizontal position should be in the last column, even if the anchor is in the
+    // last-but-one column.
+    createDoc("tdf124601b.doc");
+    xmlDocUniquePtr pXmlDoc = parseLayoutDump();
+
+    sal_Int32 nFlyTop = getXPath(pXmlDoc, "//anchored/fly/infos/bounds", "top").toInt32();
+    sal_Int32 nFlyLeft = getXPath(pXmlDoc, "//anchored/fly/infos/bounds", "left").toInt32();
+    sal_Int32 nFlyRight
+        = nFlyLeft + getXPath(pXmlDoc, "//anchored/fly/infos/bounds", "width").toInt32();
+    sal_Int32 nSecondRowTop = getXPath(pXmlDoc, "//tab/row[2]/infos/bounds", "top").toInt32();
+    sal_Int32 nLastCellLeft
+        = getXPath(pXmlDoc, "//tab/row[1]/cell[5]/infos/bounds", "left").toInt32();
+    sal_Int32 nLastCellRight
+        = nLastCellLeft + getXPath(pXmlDoc, "//tab/row[1]/cell[5]/infos/bounds", "width").toInt32();
+    // Without the accompanying fix in place, this test would have failed with:
+    // - Expected greater than: 3736
+    // - Actual  : 2852
+    // i.e. the image was still inside the first row.
+    CPPUNIT_ASSERT_GREATER(nSecondRowTop, nFlyTop);
+
+    // Without the accompanying fix in place, this test would have failed with:
+    // - Expected greater than: 9640
+    // - Actual  : 9639
+    // i.e. the right edge of the image was not within the bounds of the last column, the right edge
+    // was in the last-but-one column.
+    CPPUNIT_ASSERT_GREATER(nLastCellLeft, nFlyRight);
+    CPPUNIT_ASSERT_LESS(nLastCellRight, nFlyRight);
+}
+
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf124770)
+{
+    // Enable content over margin.
+    SwDoc* pDoc = createDoc();
+    pDoc->getIDocumentSettingAccess().set(DocumentSettingId::TAB_OVER_MARGIN, true);
+
+    // Set page width.
+    SwPageDesc& rPageDesc = pDoc->GetPageDesc(0);
+    SwFrameFormat& rPageFormat = rPageDesc.GetMaster();
+    const SwAttrSet& rPageSet = rPageFormat.GetAttrSet();
+    SwFormatFrameSize aPageSize = rPageSet.GetFrameSize();
+    aPageSize.SetWidth(3703);
+    rPageFormat.SetFormatAttr(aPageSize);
+
+    // Set left and right margin.
+    SvxLRSpaceItem aLRSpace = rPageSet.GetLRSpace();
+    aLRSpace.SetLeft(1418);
+    aLRSpace.SetRight(1418);
+    rPageFormat.SetFormatAttr(aLRSpace);
+    pDoc->ChgPageDesc(0, rPageDesc);
+
+    // Set font to italic 20pt Liberation Serif.
+    SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
+    SfxItemSet aTextSet(pWrtShell->GetView().GetPool(),
+                        svl::Items<RES_CHRATR_BEGIN, RES_CHRATR_END - 1>{});
+    SvxFontItem aFont(RES_CHRATR_FONT);
+    aFont.SetFamilyName("Liberation Serif");
+    aTextSet.Put(aFont);
+    SvxFontHeightItem aHeight(400, 100, RES_CHRATR_FONTSIZE);
+    aTextSet.Put(aHeight);
+    SvxPostureItem aItalic(ITALIC_NORMAL, RES_CHRATR_POSTURE);
+    aTextSet.Put(aItalic);
+    pWrtShell->SetAttrSet(aTextSet);
+
+    // Insert the text.
+    pWrtShell->Insert2("HHH");
+
+    xmlDocUniquePtr pXmlDoc = parseLayoutDump();
+    // Without the accompanying fix in place, this test would have failed with:
+    // - Expected: 1
+    // - Actual  : 2
+    // i.e. the italic string was broken into 2 lines, while Word kept it in a single line.
+    assertXPath(pXmlDoc, "/root/page/body/txt[1]/LineBreak", 1);
+}
+
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTextWrappingInHeader)
+{
+    SwDoc* pDoc = createDoc("tdf104254.docx");
+
+    std::shared_ptr<GDIMetaFile> xMetaFile = pDoc->GetDocShell()->GetPreviewMetaFile();
+    MetafileXmlDump dumper;
+    xmlDocUniquePtr pXmlDoc = dumpAndParse(dumper, *xMetaFile);
+    CPPUNIT_ASSERT(pXmlDoc);
+    assertXPath(pXmlDoc, "/metafile/push[1]/push[1]/push[1]/textarray", 2);
+
+    // Make sure the header image does not block any of the header text.
+    // Without the accompanying fix in place, this test would have failed with:
+    // - Expected: > 3000
+    // - Actual  : 2009
+    OUString sTextArrayX = getXPath(pXmlDoc, "/metafile/push[1]/push[1]/push[1]/textarray[1]", "x");
+    CPPUNIT_ASSERT(sTextArrayX.toUInt32() > 3000);
+}
+
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testContinuousEndnotesInsertPageAtStart)
+{
+    // Create a new document with CONTINUOUS_ENDNOTES enabled.
+    SwDoc* pDoc = createDoc();
+    pDoc->getIDocumentSettingAccess().set(DocumentSettingId::CONTINUOUS_ENDNOTES, true);
+
+    // Insert a second page, and an endnote on the 2nd page (both the anchor and the endnote is on
+    // the 2nd page).
+    SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
+    pWrtShell->InsertPageBreak();
+    pWrtShell->InsertFootnote("endnote", /*bEndNote=*/true, /*bEdit=*/false);
+
+    // Add a new page at the start of the document.
+    pWrtShell->SttEndDoc(/*bStart=*/true);
+    pWrtShell->InsertPageBreak();
+
+    // Make sure that the endnote is moved from the 2nd page to the 3rd one.
+    xmlDocUniquePtr pXmlDoc = parseLayoutDump();
+    assertXPath(pXmlDoc, "/root/page", 3);
+    // Without the accompanying fix in place, this test would have failed with:
+    // - Expected: 1
+    // - Actual  : 0
+    // i.e. the footnote container remained on page 2.
+    assertXPath(pXmlDoc, "/root/page[3]/ftncont", 1);
+}
+
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testContinuousEndnotesDeletePageAtStart)
+{
+    // Create a new document with CONTINUOUS_ENDNOTES enabled.
+    SwDoc* pDoc = createDoc();
+    pDoc->getIDocumentSettingAccess().set(DocumentSettingId::CONTINUOUS_ENDNOTES, true);
+
+    // Insert a second page, and an endnote on the 2nd page (both the anchor and the endnote is on
+    // the 2nd page).
+    SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
+    pWrtShell->InsertPageBreak();
+    pWrtShell->InsertFootnote("endnote", /*bEndNote=*/true, /*bEdit=*/false);
+
+    // Remove the empty page at the start of the document.
+    pWrtShell->SttEndDoc(/*bStart=*/true);
+    pWrtShell->DelRight();
+
+    // Make sure that the endnote is moved from the 2nd page to the 1st one.
+    xmlDocUniquePtr pXmlDoc = parseLayoutDump();
+    // Without the accompanying fix in place, this test would have failed with:
+    // - Expected: 1
+    // - Actual  : 2
+    // i.e. the endnote remained on an (otherwise) empty 2nd page.
+    assertXPath(pXmlDoc, "/root/page", 1);
+    assertXPath(pXmlDoc, "/root/page[1]/ftncont", 1);
+}
+
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf128399)
+{
+    SwDoc* pDoc = createDoc("tdf128399.docx");
+    SwRootFrame* pLayout = pDoc->getIDocumentLayoutAccess().GetCurrentLayout();
+    SwFrame* pPage = pLayout->GetLower();
+    SwFrame* pBody = pPage->GetLower();
+    SwFrame* pTable = pBody->GetLower();
+    SwFrame* pRow1 = pTable->GetLower();
+    SwFrame* pRow2 = pRow1->GetNext();
+    const SwRect& rRow2Rect = pRow2->getFrameArea();
+    Point aPoint = rRow2Rect.Center();
+
+    SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
+    SwPosition aPosition = *pWrtShell->GetCursor()->Start();
+    SwPosition aFirstRow(aPosition);
+    SwCursorMoveState aState(CursorMoveState::NONE);
+    pLayout->GetModelPositionForViewPoint(&aPosition, aPoint, &aState);
+    // Second row is +3: end node, start node and the first text node in the 2nd row.
+    sal_uLong nExpected = aFirstRow.nNode.GetIndex() + 3;
+
+    // Without the accompanying fix in place, this test would have failed with:
+    // - Expected: 14
+    // - Actual  : 11
+    // i.e. clicking on the center of the 2nd row placed the cursor in the 1st row.
+    CPPUNIT_ASSERT_EQUAL(nExpected, aPosition.nNode.GetIndex());
+}
+
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf105481)
+{
+    createDoc("tdf105481.odt");
+    xmlDocUniquePtr pXmlDoc = parseLayoutDump();
+    CPPUNIT_ASSERT(pXmlDoc);
+
+    // Without the accompanying fix in place, this test would have failed
+    // because the vertical position of the as-char shape object and the
+    // as-char math object will be wrong (below/beyond the text frame's bottom).
+
+    SwTwips nTxtTop = getXPath(pXmlDoc,
+                               "/root/page/anchored/fly/txt[2]"
+                               "/infos/bounds",
+                               "top")
+                          .toInt32();
+    SwTwips nTxtBottom = nTxtTop
+                         + getXPath(pXmlDoc,
+                                    "/root/page/anchored/fly/txt[2]"
+                                    "/infos/bounds",
+                                    "height")
+                               .toInt32();
+
+    SwTwips nFormula1Top = getXPath(pXmlDoc,
+                                    "/root/page/anchored/fly/txt[2]"
+                                    "/anchored/fly[1]/infos/bounds",
+                                    "top")
+                               .toInt32();
+    SwTwips nFormula1Bottom = nFormula1Top
+                              + getXPath(pXmlDoc,
+                                         "/root/page/anchored/fly/txt[2]"
+                                         "/anchored/fly[1]/infos/bounds",
+                                         "height")
+                                    .toInt32();
+
+    SwTwips nFormula2Top = getXPath(pXmlDoc,
+                                    "/root/page/anchored/fly/txt[2]"
+                                    "/anchored/fly[2]/infos/bounds",
+                                    "top")
+                               .toInt32();
+    SwTwips nFormula2Bottom = nFormula2Top
+                              + getXPath(pXmlDoc,
+                                         "/root/page/anchored/fly/txt[2]"
+                                         "/anchored/fly[2]/infos/bounds",
+                                         "height")
+                                    .toInt32();
+
+    // Ensure that the two formula positions are at least between top and bottom of the text frame.
+    // The below two are satisfied even without the fix.
+    CPPUNIT_ASSERT_GREATEREQUAL(nTxtTop, nFormula1Top);
+    CPPUNIT_ASSERT_GREATEREQUAL(nTxtTop, nFormula2Top);
+
+    // Without the accompanying fix in place, this test would have failed with:
+    // - Expected less than or equal to : 14423
+    // - Actual  : 14828
+    // that is, the formula is below the text-frame's y bound.
+    CPPUNIT_ASSERT_LESSEQUAL(nTxtBottom, nFormula1Bottom);
+    // Similarly for formula # 2 :
+    // - Expected less than or equal to : 14423
+    // - Actual  : 15035
+    // that is, the formula is below the text-frame's y bound.
+    CPPUNIT_ASSERT_LESSEQUAL(nTxtBottom, nFormula2Bottom);
+}
+
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf117982)
+{
+    SwDoc* pDocument = createDoc("tdf117982.docx");
+    SwDocShell* pShell = pDocument->GetDocShell();
+    std::shared_ptr<GDIMetaFile> xMetaFile = pShell->GetPreviewMetaFile();
+    MetafileXmlDump dumper;
+    xmlDocUniquePtr pXmlDoc = dumpAndParse(dumper, *xMetaFile);
+    assertXPathContent(pXmlDoc, "/metafile/push[1]/push[1]/push[1]/textarray[1]/text", "FOO AAA");
+    //The first cell must be "FOO AAA". If not, this means the first cell content not visible in
+    //the source document.
+}
+
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf128959)
+{
+    // no orphan/widow control in table cells
+    SwDoc* pDocument = createDoc("tdf128959.docx");
+    CPPUNIT_ASSERT(pDocument);
+    discardDumpedLayout();
+    xmlDocUniquePtr pXmlDoc = parseLayoutDump();
+
+    // first two lines of the paragraph in the split table cell on the first page
+    // (these lines were completely lost)
+    assertXPath(
+        pXmlDoc, "/root/page[1]/body/tab[1]/row[1]/cell[1]/txt[1]/LineBreak[1]", "Line",
+        "a)Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Maecenas porttitor congue ");
+    assertXPath(
+        pXmlDoc, "/root/page[1]/body/tab[1]/row[1]/cell[1]/txt[1]/LineBreak[2]", "Line",
+        "massa. Fusce posuere, magna sed pulvinar ultricies, purus lectus malesuada libero, sit ");
+    // last line of the paragraph in the split table cell on the second page
+    assertXPath(pXmlDoc, "/root/page[2]/body/tab[1]/row[1]/cell[1]/txt[1]/LineBreak[1]", "Line",
+                "amet commodo magna eros quis urna.");
+}
+
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf121658)
+{
+    uno::Reference<linguistic2::XHyphenator> xHyphenator = LinguMgr::GetHyphenator();
+    if (!xHyphenator->hasLocale(lang::Locale("en", "US", OUString())))
+        return;
+
+    createDoc("tdf121658.odt");
+    xmlDocUniquePtr pXmlDoc = parseLayoutDump();
+
+    // Only 2 hyphenated words should appear in the document (in the lowercase words).
+    // Uppercase words should not be hyphenated.
+    assertXPath(pXmlDoc, "//Special[@nType='PortionType::Hyphen']", 2);
+}
+
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testWriterImageNoCapture)
+{
+    createDoc("writer-image-no-capture.docx");
+    xmlDocUniquePtr pXmlDoc = parseLayoutDump();
+    CPPUNIT_ASSERT(pXmlDoc);
+    sal_Int32 nPageLeft = getXPath(pXmlDoc, "//page/infos/bounds", "left").toInt32();
+    sal_Int32 nImageLeft = getXPath(pXmlDoc, "//anchored/fly/infos/bounds", "left").toInt32();
+    // Without the accompanying fix in place, this test would have failed with:
+    // - Expected less than: 284
+    // - Actual  : 284
+    // i.e. the image position was modified to be inside the page frame ("captured"), even if Word
+    // does not do that.
+    CPPUNIT_ASSERT_LESS(nPageLeft, nImageLeft);
+}
+
+static SwRect lcl_getVisibleFlyObjRect(SwWrtShell* pWrtShell)
+{
+    SwRootFrame* pRoot = pWrtShell->GetLayout();
+    SwPageFrame* pPage = static_cast<SwPageFrame*>(pRoot->GetLower());
+    pPage = static_cast<SwPageFrame*>(pPage->GetNext());
+    pPage = static_cast<SwPageFrame*>(pPage->GetNext());
+    SwSortedObjs* pDrawObjs = pPage->GetDrawObjs();
+    CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(1), pDrawObjs->size());
+    SwAnchoredObject* pDrawObj = (*pDrawObjs)[0];
+    CPPUNIT_ASSERT_EQUAL(OUString("Rahmen8"), pDrawObj->GetFrameFormat().GetName());
+    pPage = static_cast<SwPageFrame*>(pPage->GetNext());
+    pDrawObjs = pPage->GetDrawObjs();
+    CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(1), pDrawObjs->size());
+    pDrawObj = (*pDrawObjs)[0];
+    CPPUNIT_ASSERT_EQUAL(OUString("Rahmen123"), pDrawObj->GetFrameFormat().GetName());
+    SwRect aFlyRect = pDrawObj->GetObjRect();
+    CPPUNIT_ASSERT(pPage->getFrameArea().IsInside(aFlyRect));
+    return aFlyRect;
+}
+
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testStableAtPageAnchoredFlyPosition)
+{
+    // this doc has two page-anchored frames: one tiny on page 3 and one large on page 4.
+    // it also has a style:master-page named "StandardEntwurf", which contains some fields.
+    // if you add a break to page 2, or append some text to page 4 (or just toggle display field names),
+    // the page anchored frame on page 4 vanishes, as it is incorrectly moved out of the page bounds.
+    SwDoc* pDoc = createDoc("stable-at-page-anchored-fly-position.odt");
+    SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
+
+    // look up the layout position of the page-bound frame on page four
+    SwRect aOrigRect = lcl_getVisibleFlyObjRect(pWrtShell);
+
+    // append some text to the document to trigger bug / relayout
+    pWrtShell->SttEndDoc(false);
+    pWrtShell->Insert("foo");
+
+    // get the current position of the frame on page four
+    SwRect aRelayoutRect = lcl_getVisibleFlyObjRect(pWrtShell);
+
+    // the anchored frame should not have moved
+    CPPUNIT_ASSERT_EQUAL(aOrigRect, aRelayoutRect);
+}
+
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf134548)
+{
+    createDoc("tdf134548.odt");
+    xmlDocUniquePtr pXmlDoc = parseLayoutDump();
+
+    // Second paragraph has two non zero width tabs in beginning of line
+    {
+        OUString sNodeType = parseDump("/root/page/body/txt[2]/Text[1]", "nType");
+        CPPUNIT_ASSERT_EQUAL(OUString("PortionType::TabLeft"), sNodeType);
+        sal_Int32 nWidth = parseDump("/root/page/body/txt[2]/Text[1]", "nWidth").toInt32();
+        CPPUNIT_ASSERT_GREATER(sal_Int32(0), nWidth);
+    }
+    {
+        OUString sNodeType = parseDump("/root/page/body/txt[2]/Text[2]", "nType");
+        CPPUNIT_ASSERT_EQUAL(OUString("PortionType::TabLeft"), sNodeType);
+        sal_Int32 nWidth = parseDump("/root/page/body/txt[2]/Text[2]", "nWidth").toInt32();
+        CPPUNIT_ASSERT_GREATER(sal_Int32(0), nWidth);
+    }
+}
+
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf124423)
+{
+    createDoc("tdf124423.docx");
+    xmlDocUniquePtr pXmlDoc = parseLayoutDump();
+    sal_Int32 nFly1Width
+        = getXPath(pXmlDoc, "(//anchored/fly)[1]/infos/prtBounds", "width").toInt32();
+    sal_Int32 nFly2Width
+        = getXPath(pXmlDoc, "(//anchored/fly)[2]/infos/prtBounds", "width").toInt32();
+    sal_Int32 nPageWidth = getXPath(pXmlDoc, "//page/infos/prtBounds", "width").toInt32();
+    CPPUNIT_ASSERT_EQUAL(nPageWidth, nFly2Width);
+    CPPUNIT_ASSERT_LESS(nPageWidth / 2, nFly1Width);
+
+    createDoc("tdf124423.odt");
+    pXmlDoc = parseLayoutDump();
+    nFly1Width = getXPath(pXmlDoc, "(//anchored/fly)[1]/infos/prtBounds", "width").toInt32();
+    nFly2Width = getXPath(pXmlDoc, "(//anchored/fly)[2]/infos/prtBounds", "width").toInt32();
+    nPageWidth = getXPath(pXmlDoc, "//page/infos/prtBounds", "width").toInt32();
+    CPPUNIT_ASSERT_LESS(nPageWidth / 2, nFly2Width);
+    CPPUNIT_ASSERT_LESS(nPageWidth / 2, nFly1Width);
+}
+
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf137185)
+{
+    // First load the sample bugdoc
+    load(DATA_DIRECTORY, "tdf137185.odt");
+    SwXTextDocument* pTextDoc = dynamic_cast<SwXTextDocument*>(mxComponent.get());
+    CPPUNIT_ASSERT(pTextDoc);
+    // Get the doc shell
+    SwDoc* pDoc(pTextDoc->GetDocShell()->GetDoc());
+
+    // Get the DrawObject from page
+    auto pModel = pDoc->getIDocumentDrawModelAccess().GetDrawModel();
+    CPPUNIT_ASSERT(pModel);
+    auto pPage = pModel->GetPage(0);
+    CPPUNIT_ASSERT(pPage);
+    auto pObj = pPage->GetObj(0);
+    CPPUNIT_ASSERT(pObj);
+
+    // Get the format of the draw object
+    auto pShape = FindFrameFormat(pObj);
+    CPPUNIT_ASSERT(pShape);
+
+    // Check the text of the shape
+    uno::Reference<text::XText> xTxt(getShape(1), uno::UNO_QUERY);
+    CPPUNIT_ASSERT_EQUAL(OUString("Align me!"), xTxt->getText()->getString());
+
+    // Add a textbox to the shape
+    SwTextBoxHelper::create(pShape, true);
+
+    // Check if the text moved from the shape to the frame
+    auto pFormat = SwTextBoxHelper::getOtherTextBoxFormat(getShape(1));
+    auto xTextFrame = SwXTextFrame::CreateXTextFrame(*pFormat->GetDoc(), pFormat);
+
+    CPPUNIT_ASSERT_EQUAL(OUString("Align me!"), xTextFrame->getText()->getString());
+    SdrTextObj* pTextObj = dynamic_cast<SdrTextObj*>(pObj);
+    CPPUNIT_ASSERT(pTextObj);
+    auto aOutStr = pTextObj->GetOutlinerParaObject()->GetTextObject();
+
+    CPPUNIT_ASSERT(aOutStr.GetText(0).isEmpty());
+    // Before the patch it failed, because the text appeared 2 times on each other.
+}
+
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf138782)
+{
+    CPPUNIT_ASSERT(createDoc("tdf138782.docx"));
+    auto pXml = parseLayoutDump();
+    CPPUNIT_ASSERT(pXml);
+
+    // Without the fix it failed because the 3rd shape was outside the page:
+    // - Expected less than: 13327
+    // - Actual  : 14469
+
+    CPPUNIT_ASSERT_LESS(
+        getXPath(pXml, "/root/page/infos/bounds", "right").toInt32(),
+        getXPath(pXml, "/root/page/body/txt[8]/anchored/SwAnchoredDrawObject/bounds", "right")
+            .toInt32());
+}
+
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf135035)
+{
+    createDoc("tdf135035.docx");
+    xmlDocUniquePtr pXmlDoc = parseLayoutDump();
+    sal_Int32 nFly1Width
+        = getXPath(pXmlDoc, "(//anchored/fly)[1]/infos/prtBounds", "width").toInt32();
+    sal_Int32 nFly2Width
+        = getXPath(pXmlDoc, "(//anchored/fly)[2]/infos/prtBounds", "width").toInt32();
+    sal_Int32 nFly3Width
+        = getXPath(pXmlDoc, "(//anchored/fly)[3]/infos/prtBounds", "width").toInt32();
+    sal_Int32 nParentWidth = getXPath(pXmlDoc, "(//txt)[1]/infos/prtBounds", "width").toInt32();
+    CPPUNIT_ASSERT_EQUAL(nParentWidth, nFly2Width);
+    CPPUNIT_ASSERT_EQUAL(nParentWidth, nFly3Width);
+    CPPUNIT_ASSERT_LESS(nParentWidth / 2, nFly1Width);
+
+    createDoc("tdf135035.odt");
+    pXmlDoc = parseLayoutDump();
+    nFly1Width = getXPath(pXmlDoc, "(//anchored/fly)[1]/infos/prtBounds", "width").toInt32();
+    nFly2Width = getXPath(pXmlDoc, "(//anchored/fly)[2]/infos/prtBounds", "width").toInt32();
+    nFly3Width = getXPath(pXmlDoc, "(//anchored/fly)[3]/infos/prtBounds", "width").toInt32();
+    nParentWidth = getXPath(pXmlDoc, "(//txt)[1]/infos/prtBounds", "width").toInt32();
+    CPPUNIT_ASSERT_LESS(nParentWidth / 2, nFly2Width);
+    CPPUNIT_ASSERT_LESS(nParentWidth / 2, nFly1Width);
+    CPPUNIT_ASSERT_GREATER(nParentWidth, nFly3Width);
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/qa/extras/layout/layout2.cxx b/sw/qa/extras/layout/layout2.cxx
index 7e962c9b5976..27488737e536 100644
--- a/sw/qa/extras/layout/layout2.cxx
+++ b/sw/qa/extras/layout/layout2.cxx
@@ -1521,1346 +1521,6 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter2, testUserFieldTypeLanguage)
                 "1,234.56");
 }
 
-CPPUNIT_TEST_FIXTURE(SwLayoutWriter2, testTdf109137)
-{
-    createDoc("tdf109137.docx");
-    uno::Reference<frame::XStorable> xStorable(mxComponent, uno::UNO_QUERY);
-    utl::TempFile aTempFile;
-    aTempFile.EnableKillingFile();
-    uno::Sequence<beans::PropertyValue> aDescriptor(comphelper::InitPropertySequence({
-        { "FilterName", uno::Any(OUString("writer8")) },
-    }));
-    xStorable->storeToURL(aTempFile.GetURL(), aDescriptor);
-    loadURL(aTempFile.GetURL(), "tdf109137.odt");
-    xmlDocUniquePtr pXmlDoc = parseLayoutDump();
-    // This was 0, the blue rectangle moved from the 1st to the 2nd page.
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt/anchored/fly/notxt",
-                /*nNumberOfNodes=*/1);
-}
-
-//just care it doesn't crash/assert
-CPPUNIT_TEST_FIXTURE(SwLayoutWriter2, testForcepoint72) { createDoc("forcepoint72-1.rtf"); }
-
-//just care it doesn't crash/assert
-CPPUNIT_TEST_FIXTURE(SwLayoutWriter2, testForcepoint75) { createDoc("forcepoint75-1.rtf"); }
-
-//just care it doesn't crash/assert
-CPPUNIT_TEST_FIXTURE(SwLayoutWriter2, testForcepointFootnoteFrame)
-{
-    createDoc("forcepoint-swfootnoteframe-1.rtf");
-}
-
-//FIXME: disabled after failing again with fixed layout
-//CPPUNIT_TEST_FIXTURE(SwLayoutWriter2, testForcepoint76) { createDoc("forcepoint76-1.rtf"); }
-
-CPPUNIT_TEST_FIXTURE(SwLayoutWriter2, testTdf118058)
-{
-    SwDoc* pDoc = createDoc("tdf118058.fodt");
-    // This resulted in a layout loop.
-    pDoc->getIDocumentLayoutAccess().GetCurrentViewShell()->CalcLayout();
-}
-
-CPPUNIT_TEST_FIXTURE(SwLayoutWriter2, testTdf128611)
-{
-    createDoc("tdf128611.fodt");
-    xmlDocUniquePtr pXmlDoc = parseLayoutDump();
-    CPPUNIT_ASSERT(pXmlDoc);
-    // Without the accompanying fix in place, this test would have failed with:
-    // - Expected: 1
-    // - Actual  : 14
-    // i.e. there were multiple portions in the first paragraph of the A1 cell, which means that the
-    // rotated text was broken into multiple lines without a good reason.
-    assertXPath(pXmlDoc, "//tab/row/cell[1]/txt/Text", "Portion", "Abcd efghijkl");
-}
-
-CPPUNIT_TEST_FIXTURE(SwLayoutWriter2, testTdf125893)
-{
-    createDoc("tdf125893.docx");
-    xmlDocUniquePtr pXmlDoc = parseLayoutDump();
-    // This was 400. The paragraph must have zero top border.
-    assertXPath(pXmlDoc, "/root/page/body/txt[4]/infos/prtBounds", "top", "0");
-}
-
-CPPUNIT_TEST_FIXTURE(SwLayoutWriter2, testTdf134463)
-{
-    createDoc("tdf134463.docx");
-    xmlDocUniquePtr pXmlDoc = parseLayoutDump();
-    // This was 621. The previous paragraph must have zero bottom border.
-    assertXPath(pXmlDoc, "/root/page/body/txt[3]/infos/prtBounds", "top", "21");
-}
-
-CPPUNIT_TEST_FIXTURE(SwLayoutWriter2, testTdf117188)
-{
-    createDoc("tdf117188.docx");
-    uno::Reference<frame::XStorable> xStorable(mxComponent, uno::UNO_QUERY);
-    utl::TempFile aTempFile;
-    aTempFile.EnableKillingFile();
-    uno::Sequence<beans::PropertyValue> aDescriptor(comphelper::InitPropertySequence({
-        { "FilterName", uno::Any(OUString("writer8")) },
-    }));
-    xStorable->storeToURL(aTempFile.GetURL(), aDescriptor);
-    loadURL(aTempFile.GetURL(), "tdf117188.odt");
-    xmlDocUniquePtr pXmlDoc = parseLayoutDump();
-    OUString sWidth = getXPath(pXmlDoc, "/root/page/body/txt/anchored/fly/infos/bounds", "width");
-    OUString sHeight = getXPath(pXmlDoc, "/root/page/body/txt/anchored/fly/infos/bounds", "height");
-    // The text box must have zero border distances
-    assertXPath(pXmlDoc, "/root/page/body/txt/anchored/fly/infos/prtBounds", "left", "0");
-    assertXPath(pXmlDoc, "/root/page/body/txt/anchored/fly/infos/prtBounds", "top", "0");
-    assertXPath(pXmlDoc, "/root/page/body/txt/anchored/fly/infos/prtBounds", "width", sWidth);
-    assertXPath(pXmlDoc, "/root/page/body/txt/anchored/fly/infos/prtBounds", "height", sHeight);
-}
-
-CPPUNIT_TEST_FIXTURE(SwLayoutWriter2, testTdf117187)
-{
-    createDoc("tdf117187.odt");
-    xmlDocUniquePtr pXmlDoc = parseLayoutDump();
-
-    // there should be no fly portions
-    assertXPath(pXmlDoc, "/root/page/body/txt/Special[@nType='PortionType::Fly']", 0);
-}
-
-CPPUNIT_TEST_FIXTURE(SwLayoutWriter2, testTdf119875)
-{
-    createDoc("tdf119875.odt");
-    xmlDocUniquePtr pXmlDoc = parseLayoutDump();
-    sal_Int32 nFirstTop
-        = getXPath(pXmlDoc, "/root/page[2]/body/section[1]/infos/bounds", "top").toInt32();
-    sal_Int32 nSecondTop
-        = getXPath(pXmlDoc, "/root/page[2]/body/section[2]/infos/bounds", "top").toInt32();
-    // The first section had the same top value as the second one, so they
-    // overlapped.
-    CPPUNIT_ASSERT_LESS(nSecondTop, nFirstTop);
-}
-
-CPPUNIT_TEST_FIXTURE(SwLayoutWriter2, testTdf120287)
-{
-    createDoc("tdf120287.fodt");
-    xmlDocUniquePtr pXmlDoc = parseLayoutDump();
-    // This was 2, TabOverMargin Word-specific compat flag did not imply
-    // default-in-Word printer-independent layout, resulting in an additional
-    // line break.
-    assertXPath(pXmlDoc, "/root/page/body/txt[1]/LineBreak", 1);
-}
-
-CPPUNIT_TEST_FIXTURE(SwLayoutWriter2, testTdf106234)
-{
-    createDoc("tdf106234.fodt");
-    // Ensure that all text portions are calculated before testing.
-    SwXTextDocument* pTextDoc = dynamic_cast<SwXTextDocument*>(mxComponent.get());
-    CPPUNIT_ASSERT(pTextDoc);
-    SwViewShell* pViewShell
-        = pTextDoc->GetDocShell()->GetDoc()->getIDocumentLayoutAccess().GetCurrentViewShell();
-    CPPUNIT_ASSERT(pViewShell);
-    pViewShell->Reformat();
-
-    xmlDocUniquePtr pXmlDoc = parseLayoutDump();
-    // In justified paragraphs, there is justification between left tabulators and manual line breaks
-    assertXPath(pXmlDoc, "/root/page/body/txt[1]/Special", "nType", "PortionType::Margin");
-    assertXPathNoAttribute(pXmlDoc, "/root/page/body/txt[1]/Special", "nWidth");
-    // but not after centered, right and decimal tabulators
-    assertXPath(pXmlDoc, "/root/page/body/txt[2]/Special", "nType", "PortionType::Margin");
-    // This was a justified line, without nWidth
-    assertXPath(pXmlDoc, "/root/page/body/txt[2]/Special", "nWidth", "7881");
-}
-
-CPPUNIT_TEST_FIXTURE(SwLayoutWriter2, testTdf120287b)
-{
-    createDoc("tdf120287b.fodt");
-    xmlDocUniquePtr pXmlDoc = parseLayoutDump();
-    // This was 1418, TabOverMargin did the right split of the paragraph to two
-    // lines, but then calculated a too large tab portion size on the first
-    // line.
-    assertXPath(pXmlDoc, "/root/page/body/txt[1]/Text[@nType='PortionType::TabRight']", "nWidth",
-                "17");
-}
-
-CPPUNIT_TEST_FIXTURE(SwLayoutWriter2, testTdf120287c)
-{
-    createDoc("tdf120287c.fodt");
-    xmlDocUniquePtr pXmlDoc = parseLayoutDump();
-    // This was 2, the second line was not broken into a 2nd and a 3rd one,
-    // rendering text outside the paragraph frame.
-    assertXPath(pXmlDoc, "/root/page/body/txt[1]/LineBreak", 3);
-}
-
-CPPUNIT_TEST_FIXTURE(SwLayoutWriter2, testTdf122878)
-{
-    createDoc("tdf122878.docx");
-    xmlDocUniquePtr pXmlDoc = parseLayoutDump();
-    // FIXME: the XPath should be adjusted when the proper floating table would be imported
-    const sal_Int32 nTblTop
-        = getXPath(pXmlDoc, "/root/page[1]/footer/txt/anchored/fly/tab/infos/bounds", "top")
-              .toInt32();
-    const sal_Int32 nFirstPageParaCount
-        = getXPathContent(pXmlDoc, "count(/root/page[1]/body/txt)").toInt32();
-    CPPUNIT_ASSERT_EQUAL(sal_Int32(30), nFirstPageParaCount);
-    for (sal_Int32 i = 1; i <= nFirstPageParaCount; ++i)
-    {
-        const OString xPath = "/root/page[1]/body/txt[" + OString::number(i) + "]/infos/bounds";
-        const sal_Int32 nTxtBottom = getXPath(pXmlDoc, xPath.getStr(), "top").toInt32()
-                                     + getXPath(pXmlDoc, xPath.getStr(), "height").toInt32();
-        // No body paragraphs should overlap the table in the footer
-        CPPUNIT_ASSERT_MESSAGE(OString("testing paragraph #" + OString::number(i)).getStr(),
-                               nTxtBottom <= nTblTop);
-    }
-}
-
-CPPUNIT_TEST_FIXTURE(SwLayoutWriter2, testTdf115094)
-{
-    createDoc("tdf115094.docx");
-    xmlDocUniquePtr pXmlDoc = parseLayoutDump();
-
-    sal_Int32 nTopOfD1
-        = getXPath(pXmlDoc, "/root/page/body/txt/anchored/fly/tab/row[1]/cell[4]/infos/bounds",
-                   "top")
-              .toInt32();
-    sal_Int32 nTopOfD1Anchored = getXPath(pXmlDoc,
-                                          "/root/page/body/txt/anchored/fly/tab/row[1]/cell[4]/"
-                                          "txt[2]/anchored/fly/infos/bounds",
-                                          "top")
-                                     .toInt32();
-    CPPUNIT_ASSERT_LESS(nTopOfD1Anchored, nTopOfD1);
-    sal_Int32 nTopOfB2
-        = getXPath(pXmlDoc, "/root/page/body/txt/anchored/fly/tab/row[2]/cell[2]/infos/bounds",
-                   "top")
-              .toInt32();
-    sal_Int32 nTopOfB2Anchored = getXPath(pXmlDoc,
-                                          "/root/page/body/txt/anchored/fly/tab/row[2]/cell[2]/"
-                                          "txt[1]/anchored/fly/infos/bounds",
-                                          "top")
-                                     .toInt32();
-    CPPUNIT_ASSERT_LESS(nTopOfB2Anchored, nTopOfB2);
-}
-
-CPPUNIT_TEST_FIXTURE(SwLayoutWriter2, testTdf112290)
-{
-    SwDoc* pDoc = createDoc("tdf112290.docx");
-    CPPUNIT_ASSERT(pDoc);
-    auto pXml = parseLayoutDump();
-    assertXPath(pXml, "/root/page/body/txt/LineBreak[2]", "Line", "Xxxx Xxxx");
-}
-
-CPPUNIT_TEST_FIXTURE(SwLayoutWriter2, testTdf122607)
-{
-    createDoc("tdf122607.odt");
-    xmlDocUniquePtr pXmlDoc = parseLayoutDump();
-    assertXPath(pXmlDoc,
-                "/root/page[1]/anchored/fly/txt[1]/anchored/fly/tab/row[2]/cell/txt[7]/anchored/"
-                "fly/txt/Text[1]",
-                "nHeight", "253");
-    assertXPath(pXmlDoc,
-                "/root/page[1]/anchored/fly/txt[1]/anchored/fly/tab/row[2]/cell/txt[7]/anchored/"
-                "fly/txt/Text[1]",
-                "nWidth", "428");
-    assertXPath(pXmlDoc,
-                "/root/page[1]/anchored/fly/txt[1]/anchored/fly/tab/row[2]/cell/txt[7]/anchored/"
-                "fly/txt/Text[1]",
-                "Portion", "Fax:");
-}
-
-CPPUNIT_TEST_FIXTURE(SwLayoutWriter2, testTdf122607_regression)
-{
-    discardDumpedLayout();
-    if (mxComponent.is())
-        mxComponent->dispose();
-
-    OUString const pName("tdf122607_leerzeile.odt");
-
-    OUString const url(m_directories.getURLFromSrc(DATA_DIRECTORY) + pName);
-
-    // note: must set Hidden property, so that SfxFrameViewWindow_Impl::Resize()
-    // does *not* forward initial VCL Window Resize and thereby triggers a
-    // layout which does not happen on soffice --convert-to pdf.
-    std::vector<beans::PropertyValue> aFilterOptions = {
-        { beans::PropertyValue("Hidden", -1, uno::Any(true), beans::PropertyState_DIRECT_VALUE) },
-    };
-
-    std::cout << pName << ":\n";
-
-    // inline the loading because currently properties can't be passed...
-    mxComponent = loadFromDesktop(url, "com.sun.star.text.TextDocument",
-                                  comphelper::containerToSequence(aFilterOptions));
-    uno::Sequence<beans::PropertyValue> props(comphelper::InitPropertySequence({
-        { "FilterName", uno::Any(OUString("writer_pdf_Export")) },
-    }));
-    utl::TempFile aTempFile;
-    uno::Reference<frame::XStorable> xStorable(mxComponent, uno::UNO_QUERY);
-    xStorable->storeToURL(aTempFile.GetURL(), props);
-
-    xmlDocUniquePtr pXmlDoc = parseLayoutDump();
-    // somehow these 2 rows overlapped in the PDF unless CalcLayout() runs
-    assertXPath(pXmlDoc, "/root/page[1]/anchored/fly/tab[1]/row[1]/infos/bounds", "mbFixSize",
-                "false");
-    assertXPath(pXmlDoc, "/root/page[1]/anchored/fly/tab[1]/row[1]/infos/bounds", "top", "2977");
-    assertXPath(pXmlDoc, "/root/page[1]/anchored/fly/tab[1]/row[1]/infos/bounds", "height", "241");
-    assertXPath(pXmlDoc, "/root/page[1]/anchored/fly/tab[1]/row[2]/infos/bounds", "mbFixSize",
-                "true");
-    // this was 3034, causing the overlap
-    assertXPath(pXmlDoc, "/root/page[1]/anchored/fly/tab[1]/row[2]/infos/bounds", "top", "3218");
-    assertXPath(pXmlDoc, "/root/page[1]/anchored/fly/tab[1]/row[2]/infos/bounds", "height", "164");
-
-    aTempFile.EnableKillingFile();
-}
-
-CPPUNIT_TEST_FIXTURE(SwLayoutWriter2, testBtlrCell)
-{
-    SwDoc* pDoc = createDoc("btlr-cell.odt");
-    SwDocShell* pShell = pDoc->GetDocShell();
-
-    // Dump the rendering of the first page as an XML file.
-    std::shared_ptr<GDIMetaFile> xMetaFile = pShell->GetPreviewMetaFile();
-    MetafileXmlDump dumper;
-    xmlDocUniquePtr pXmlDoc = dumpAndParse(dumper, *xMetaFile);
-    CPPUNIT_ASSERT(pXmlDoc);
-
-    // Without the accompanying fix in place, this test would have failed, as
-    // the orientation was 0 (layout did not take btlr direction request from
-    // doc model).
-    assertXPath(pXmlDoc, "//font[1]", "orientation", "900");
-
-#if !defined(MACOSX) && !defined(_WIN32) // macOS fails with x == 2662 for some reason.
-    // Without the accompanying fix in place, this test would have failed with 'Expected: 1915;
-    // Actual  : 1756', i.e. the AAA1 text was too close to the left cell border due to an ascent vs
-    // descent mismatch when calculating the baseline offset of the text portion.
-    assertXPath(pXmlDoc, "//textarray[1]", "x", "1915");
-    assertXPath(pXmlDoc, "//textarray[1]", "y", "2707");
-
-    // Without the accompanying fix in place, this test would have failed with 'Expected: 1979;
-    // Actual  : 2129', i.e. the gray background of the "AAA2." text was too close to the right edge
-    // of the text portion. Now it's exactly behind the text portion.
-    assertXPath(pXmlDoc, "//rect[@top='2159']", "left", "1979");
-
-    // Without the accompanying fix in place, this test would have failed with 'Expected: 269;
-    // Actual  : 0', i.e. the AAA2 frame was not visible due to 0 width.
-    pXmlDoc = parseLayoutDump();
-    assertXPath(pXmlDoc, "/root/page/body/tab/row/cell[1]/txt[2]/infos/bounds", "width", "269");
-
-    // Test the position of the cursor after doc load.
-    // We expect that it's inside the first text frame in the first cell.
-    // More precisely, this is a bottom to top vertical frame, so we expect it's at the start, which
-    // means it's at the lower half of the text frame rectangle (vertically).
-    SwWrtShell* pWrtShell = pShell->GetWrtShell();
-    CPPUNIT_ASSERT(pWrtShell);
-
-    const SwRect& rCharRect = pWrtShell->GetCharRect();
-    SwTwips nFirstParaTop
-        = getXPath(pXmlDoc, "/root/page/body/tab/row/cell[1]/txt[1]/infos/bounds", "top").toInt32();
-    SwTwips nFirstParaHeight
-        = getXPath(pXmlDoc, "/root/page/body/tab/row/cell[1]/txt[1]/infos/bounds", "height")
-              .toInt32();
-    SwTwips nFirstParaMiddle = nFirstParaTop + nFirstParaHeight / 2;
-    SwTwips nFirstParaBottom = nFirstParaTop + nFirstParaHeight;
-    // Without the accompanying fix in place, this test would have failed: the lower half (vertical)
-    // range was 2273 -> 2835, the good vertical position is 2730, the bad one was 1830.
-    CPPUNIT_ASSERT_GREATER(nFirstParaMiddle, rCharRect.Top());
-    CPPUNIT_ASSERT_LESS(nFirstParaBottom, rCharRect.Top());
-
-    // Save initial cursor position.
-    SwPosition aCellStart = *pWrtShell->GetCursor()->Start();
-
-    // Test that pressing "up" at the start of the cell goes to the next character position.
-    sal_uLong nNodeIndex = pWrtShell->GetCursor()->Start()->nNode.GetIndex();
-    sal_Int32 nIndex = pWrtShell->GetCursor()->Start()->nContent.GetIndex();
-    KeyEvent aKeyEvent(0, KEY_UP);
-    SwEditWin& rEditWin = pShell->GetView()->GetEditWin();
-    rEditWin.KeyInput(aKeyEvent);
-    Scheduler::ProcessEventsToIdle();
-    // Without the accompanying fix in place, this test would have failed: "up" was interpreted as
-    // logical "left", which does nothing if you're at the start of the text anyway.
-    CPPUNIT_ASSERT_EQUAL(nIndex + 1, pWrtShell->GetCursor()->Start()->nContent.GetIndex());
-
-    // Test that pressing "right" goes to the next paragraph (logical "down").
-    sal_Int32 nContentIndex = pWrtShell->GetCursor()->Start()->nContent.GetIndex();
-    aKeyEvent = KeyEvent(0, KEY_RIGHT);
-    rEditWin.KeyInput(aKeyEvent);
-    Scheduler::ProcessEventsToIdle();
-    // Without the accompanying fix in place, this test would have failed: the cursor went to the
-    // paragraph after the table.
-    CPPUNIT_ASSERT_EQUAL(nNodeIndex + 1, pWrtShell->GetCursor()->Start()->nNode.GetIndex());
-
-    // Test that we have the correct character index after traveling to the next paragraph.
-    // Without the accompanying fix in place, this test would have failed: char position was 5, i.e.
-    // the cursor jumped to the end of the paragraph for no reason.
-    CPPUNIT_ASSERT_EQUAL(nContentIndex, pWrtShell->GetCursor()->Start()->nContent.GetIndex());
-
-    // Test that clicking "below" the second paragraph positions the cursor at the start of the
-    // second paragraph.
-    SwRootFrame* pLayout = pDoc->getIDocumentLayoutAccess().GetCurrentLayout();
-    SwPosition aPosition(aCellStart);
-    SwTwips nSecondParaLeft
-        = getXPath(pXmlDoc, "/root/page/body/tab/row/cell[1]/txt[2]/infos/bounds", "left")
-              .toInt32();
-    SwTwips nSecondParaWidth
-        = getXPath(pXmlDoc, "/root/page/body/tab/row/cell[1]/txt[2]/infos/bounds", "width")
-              .toInt32();
-    SwTwips nSecondParaTop
-        = getXPath(pXmlDoc, "/root/page/body/tab/row/cell[1]/txt[2]/infos/bounds", "top").toInt32();
-    SwTwips nSecondParaHeight
-        = getXPath(pXmlDoc, "/root/page/body/tab/row/cell[1]/txt[2]/infos/bounds", "height")
-              .toInt32();
-    Point aPoint;
-    aPoint.setX(nSecondParaLeft + nSecondParaWidth / 2);
-    aPoint.setY(nSecondParaTop + nSecondParaHeight - 100);
-    SwCursorMoveState aState(CursorMoveState::NONE);
-    pLayout->GetModelPositionForViewPoint(&aPosition, aPoint, &aState);
-    CPPUNIT_ASSERT_EQUAL(aCellStart.nNode.GetIndex() + 1, aPosition.nNode.GetIndex());
-    // Without the accompanying fix in place, this test would have failed: character position was 5,
-    // i.e. cursor was at the end of the paragraph.
-    CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(0), aPosition.nContent.GetIndex());
-
-    // Test that the selection rectangles are inside the cell frame if we select all the cell
-    // content.
-    SwTwips nCellLeft
-        = getXPath(pXmlDoc, "/root/page/body/tab/row/cell[1]/infos/bounds", "left").toInt32();
-    SwTwips nCellWidth
-        = getXPath(pXmlDoc, "/root/page/body/tab/row/cell[1]/infos/bounds", "width").toInt32();
-    SwTwips nCellTop
-        = getXPath(pXmlDoc, "/root/page/body/tab/row/cell[1]/infos/bounds", "top").toInt32();
-    SwTwips nCellHeight
-        = getXPath(pXmlDoc, "/root/page/body/tab/row/cell[1]/infos/bounds", "height").toInt32();
-    SwRect aCellRect(Point(nCellLeft, nCellTop), Size(nCellWidth, nCellHeight));
-    pWrtShell->SelAll();
-    SwShellCursor* pShellCursor = pWrtShell->getShellCursor(/*bBlock=*/false);
-    CPPUNIT_ASSERT(!pShellCursor->empty());
-    // Without the accompanying fix in place, this test would have failed with:
-    // selection rectangle 269x2573@(1970,2172) is not inside cell rectangle 3207x1134@(1593,1701)
-    // i.e. the selection went past the bottom border of the cell frame.
-    for (const auto& rRect : *pShellCursor)
-    {
-        std::stringstream ss;
-        ss << "selection rectangle " << rRect << " is not inside cell rectangle " << aCellRect;
-        CPPUNIT_ASSERT_MESSAGE(ss.str(), aCellRect.IsInside(rRect));
-    }
-
-    // Make sure that the correct rectangle gets repainted on scroll.
-    SwFrame* pPageFrame = pLayout->GetLower();
-    CPPUNIT_ASSERT(pPageFrame->IsPageFrame());
-
-    SwFrame* pBodyFrame = pPageFrame->GetLower();
-    CPPUNIT_ASSERT(pBodyFrame->IsBodyFrame());
-
-    SwFrame* pTabFrame = pBodyFrame->GetLower();
-    CPPUNIT_ASSERT(pTabFrame->IsTabFrame());
-
-    SwFrame* pRowFrame = pTabFrame->GetLower();
-    CPPUNIT_ASSERT(pRowFrame->IsRowFrame());
-
-    SwFrame* pCellFrame = pRowFrame->GetLower();
-    CPPUNIT_ASSERT(pCellFrame->IsCellFrame());
-
-    SwFrame* pFrame = pCellFrame->GetLower();
-    CPPUNIT_ASSERT(pFrame->IsTextFrame());
-
-    SwTextFrame* pTextFrame = static_cast<SwTextFrame*>(pFrame);
-    pTextFrame->SwapWidthAndHeight();
-    // Mimic what normally SwTextFrame::PaintSwFrame() does:
-    SwRect aRect(4207, 2273, 269, 572);
-    pTextFrame->SwitchVerticalToHorizontal(aRect);
-    // Without the accompanying fix in place, this test would have failed with:
-    // Expected: 572x269@(1691,4217)
-    // Actual  : 572x269@(2263,4217)
-    // i.e. the paint rectangle position was incorrect, text was not painted on scrolling up.
-    CPPUNIT_ASSERT_EQUAL(SwRect(1691, 4217, 572, 269), aRect);
-#endif
-}
-
-CPPUNIT_TEST_FIXTURE(SwLayoutWriter2, testTdf123898)
-{
-    createDoc("tdf123898.odt");
-
-    // Make sure spellchecker has done its job already
-    Scheduler::ProcessEventsToIdle();
-
-    xmlDocUniquePtr pXmlDoc = parseLayoutDump();
-    // Make sure that the arrow on the left is not there (there are 43 children if it's there)
-    assertXPathChildren(pXmlDoc, "/root/page/body/txt/anchored/fly/txt", 42);
-}
-
-CPPUNIT_TEST_FIXTURE(SwLayoutWriter2, testTdf123651)
-{
-    createDoc("tdf123651.docx");
-    xmlDocUniquePtr pXmlDoc = parseLayoutDump();
-    // Without the accompanying fix in place, this test would have failed with 'Expected: 7639;
-    // Actual: 12926'. The shape was below the second "Lorem ipsum" text, not above it.
-    const sal_Int32 nTopValue
-        = getXPath(pXmlDoc, "//anchored/SwAnchoredDrawObject/bounds", "top").toInt32();
-    CPPUNIT_ASSERT_DOUBLES_EQUAL(7639, nTopValue, 10);
-}
-
-CPPUNIT_TEST_FIXTURE(SwLayoutWriter2, testTdf116501)
-{
-    //just care it doesn't freeze
-    createDoc("tdf116501.odt");
-}
-
-CPPUNIT_TEST_FIXTURE(SwLayoutWriter2, testAbi11870)
-{
-    //just care it doesn't assert
-    createDoc("abi11870-2.odt");
-}
-
-CPPUNIT_TEST_FIXTURE(SwLayoutWriter2, testTdf118719)
-{
-    // Insert a page break.
-    SwDoc* pDoc = createDoc();
-    SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
-
-    // Enable hide whitespace mode.
-    SwViewOption aViewOptions(*pWrtShell->GetViewOptions());
-    aViewOptions.SetHideWhitespaceMode(true);
-    pWrtShell->ApplyViewOptions(aViewOptions);
-
-    pWrtShell->Insert("first");
-    pWrtShell->InsertPageBreak();
-    pWrtShell->Insert("second");
-
-    // Without the accompanying fix in place, this test would have failed, as the height of the
-    // first page was 15840 twips, instead of the much smaller 276.
-    sal_Int32 nOther = parseDump("/root/page[1]/infos/bounds", "height").toInt32();
-    sal_Int32 nLast = parseDump("/root/page[2]/infos/bounds", "height").toInt32();
-    CPPUNIT_ASSERT_GREATER(nOther, nLast);
-}
-
-CPPUNIT_TEST_FIXTURE(SwLayoutWriter2, testTabOverMargin)
-{
-    createDoc("tab-over-margin.odt");
-    xmlDocUniquePtr pXmlDoc = parseLayoutDump();
-
-    // 2nd paragraph has a tab over the right margin, and with the TabOverMargin compat option,
-    // there is enough space to have all content in a single line.
-    // Without the accompanying fix in place, this test would have failed, there were 2 lines.
-    assertXPath(pXmlDoc, "/root/page/body/txt[2]/LineBreak", 1);
-}
-
-CPPUNIT_TEST_FIXTURE(SwLayoutWriter2, testImageComment)
-{
-    // Load a document that has "aaa" in it, then a commented image (4th char is the as-char image,
-    // 5th char is the comment anchor).
-    SwDoc* pDoc = createDoc("image-comment.odt");
-    SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
-
-    // Look up a layout position which is on the right of the image.
-    SwRootFrame* pRoot = pWrtShell->GetLayout();
-    CPPUNIT_ASSERT(pRoot->GetLower()->IsPageFrame());
-    SwPageFrame* pPage = static_cast<SwPageFrame*>(pRoot->GetLower());
-    CPPUNIT_ASSERT(pPage->GetLower()->IsBodyFrame());
-    SwBodyFrame* pBody = static_cast<SwBodyFrame*>(pPage->GetLower());
-    CPPUNIT_ASSERT(pBody->GetLower()->IsTextFrame());
-    SwTextFrame* pTextFrame = static_cast<SwTextFrame*>(pBody->GetLower());
-    CPPUNIT_ASSERT(pTextFrame->GetDrawObjs());
-    SwSortedObjs& rDrawObjs = *pTextFrame->GetDrawObjs();
-    CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(1), rDrawObjs.size());
-    SwAnchoredObject* pDrawObj = rDrawObjs[0];
-    const SwRect& rDrawObjRect = pDrawObj->GetObjRect();
-    Point aPoint = rDrawObjRect.Center();
-    aPoint.setX(aPoint.getX() + rDrawObjRect.Width() / 2);
-
-    // Ask for the doc model pos of this layout point.
-    SwPosition aPosition(*pTextFrame->GetTextNodeForFirstText());
-    pTextFrame->GetModelPositionForViewPoint(&aPosition, aPoint);
-
-    // Without the accompanying fix in place, this test would have failed with:
-    // - Expected: 5
-    // - Actual  : 4
-    // i.e. the cursor got positioned between the image and its comment, so typing extended the
-    // comment, instead of adding content after the commented image.
-    CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(5), aPosition.nContent.GetIndex());
-}
-
-CPPUNIT_TEST_FIXTURE(SwLayoutWriter2, testScriptField)
-{
-    // Test clicking script field inside table ( tdf#141079 )
-    SwDoc* pDoc = createDoc("tdf141079.odt");
-    SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
-
-    // Look up layout position which is the first cell in the table
-    SwRootFrame* pRoot = pWrtShell->GetLayout();
-    CPPUNIT_ASSERT(pRoot->GetLower()->IsPageFrame());
-    SwPageFrame* pPage = static_cast<SwPageFrame*>(pRoot->GetLower());
-    CPPUNIT_ASSERT(pPage->GetLower()->IsBodyFrame());
-    SwBodyFrame* pBody = static_cast<SwBodyFrame*>(pPage->GetLower());
-    CPPUNIT_ASSERT(pBody->GetLower()->IsTextFrame());
-    SwTextFrame* pTextFrame = static_cast<SwTextFrame*>(pBody->GetLower());
-    CPPUNIT_ASSERT(pTextFrame->GetNext()->IsTabFrame());
-    SwFrame* pTable = pTextFrame->GetNext();
-    SwFrame* pRow1 = pTable->GetLower();
-    CPPUNIT_ASSERT(pRow1->GetLower()->IsCellFrame());
-    SwFrame* pCell1 = pRow1->GetLower();
-    CPPUNIT_ASSERT(pCell1->GetLower()->IsTextFrame());
-    SwTextFrame* pCellTextFrame = static_cast<SwTextFrame*>(pCell1->GetLower());
-    const SwRect& rCellRect = pCell1->getFrameArea();
-    Point aPoint = rCellRect.Center();
-    aPoint.setX(aPoint.getX() - rCellRect.Width() / 2);
-
-    // Ask for the doc model pos of this layout point.
-    SwPosition aPosition(*pCellTextFrame->GetTextNodeForFirstText());
-    pCellTextFrame->GetModelPositionForViewPoint(&aPosition, aPoint);
-
-    // Position was 1 without the fix from tdf#141079
-    CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(0), aPosition.nContent.GetIndex());
-}
-
-CPPUNIT_TEST_FIXTURE(SwLayoutWriter2, testCommentCursorPosition)
-{
-    // Load a document that has "aaa" in it, followed by three comments.
-    SwDoc* pDoc = createDoc("endOfLineComments.odt");
-    SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
-
-    SwRootFrame* pRoot = pWrtShell->GetLayout();
-    CPPUNIT_ASSERT(pRoot->GetLower()->IsPageFrame());
-    SwPageFrame* pPage = static_cast<SwPageFrame*>(pRoot->GetLower());
-    CPPUNIT_ASSERT(pPage->GetLower()->IsBodyFrame());
-    SwBodyFrame* pBody = static_cast<SwBodyFrame*>(pPage->GetLower());
-    CPPUNIT_ASSERT(pBody->GetLower()->IsTextFrame());
-    SwTextFrame* pTextFrame = static_cast<SwTextFrame*>(pBody->GetLower());
-
-    // Set a point in the whitespace past the end of the first line.
-    Point aPoint = pWrtShell->getShellCursor(false)->GetSttPos();
-    aPoint.setX(aPoint.getX() + 10000);
-
-    // Ask for the doc model pos of this layout point.
-    SwPosition aPosition(*pTextFrame->GetTextNodeForFirstText());
-    pTextFrame->GetModelPositionForViewPoint(&aPosition, aPoint);
-
-    // Without the accompanying fix in place, this test would have failed with:
-    // - Expected: 6
-    // - Actual  : 3 or 4
-    // i.e. the cursor got positioned before the comments,
-    // so typing extended the first comment instead of adding content after the comments.
-    CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(6), aPosition.nContent.GetIndex());
-    // The second line is also important, but can't be auto-tested
-    // since the failing situation depends on GetViewWidth which is zero in the headless tests.
-    // bb<comment>|   - the cursor should move behind the |, not before it.
-}
-
-CPPUNIT_TEST_FIXTURE(SwLayoutWriter2, testCombiningCharacterCursorPosition)
-{
-    // Load a document that has "a" in it, followed by a combining acute in a separate rext span
-    SwDoc* pDoc = createDoc("tdf138592-a-acute.fodt");
-    SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
-
-    SwRootFrame* pRoot = pWrtShell->GetLayout();
-    CPPUNIT_ASSERT(pRoot->GetLower()->IsPageFrame());
-    SwPageFrame* pPage = static_cast<SwPageFrame*>(pRoot->GetLower());
-    CPPUNIT_ASSERT(pPage->GetLower()->IsBodyFrame());
-    SwBodyFrame* pBody = static_cast<SwBodyFrame*>(pPage->GetLower());
-    CPPUNIT_ASSERT(pBody->GetLower()->IsTextFrame());
-    SwTextFrame* pTextFrame = static_cast<SwTextFrame*>(pBody->GetLower());
-
-    // Set a point in the whitespace past the end of the first line.
-    Point aPoint = pWrtShell->getShellCursor(false)->GetSttPos();
-    aPoint.AdjustX(10000);
-
-    // Ask for the doc model pos of this layout point.
-    SwPosition aPosition(*pTextFrame->GetTextNodeForFirstText());
-    pTextFrame->GetModelPositionForViewPoint(&aPosition, aPoint);
-
-    // Without the accompanying fix in place, this test would have failed with:
-    // - Expected: 2
-    // - Actual  : 1
-    // i.e. the cursor got positioned before the acute, so typing shifted the acute (applying it
-    // to newly typed characters) instead of adding content after it.
-    CPPUNIT_ASSERT_EQUAL(sal_Int32(2), aPosition.nContent.GetIndex());
-}
-
-CPPUNIT_TEST_FIXTURE(SwLayoutWriter2, testTdf64222)
-{
-    createDoc("tdf64222.docx");
-    xmlDocUniquePtr pXmlDoc = parseLayoutDump();
-    assertXPath(pXmlDoc, "/root/page/body/txt[2]/Special", "nHeight", "560");
-}
-
-CPPUNIT_TEST_FIXTURE(SwLayoutWriter2, testTdf113014)
-{
-    SwDoc* pDoc = createDoc("tdf113014.fodt");
-    SwDocShell* pShell = pDoc->GetDocShell();
-
-    // Dump the rendering of the first page as an XML file.
-    std::shared_ptr<GDIMetaFile> xMetaFile = pShell->GetPreviewMetaFile();
-    MetafileXmlDump dumper;
-    xmlDocUniquePtr pXmlDoc = dumpAndParse(dumper, *xMetaFile);
-    CPPUNIT_ASSERT(pXmlDoc);
-
-    // This failed, if numbering of cell A1 is missing
-    // (A1: left indent: 3 cm, first line indent: -3 cm
-    // A2: left indent: 0 cm, first line indent: 0 cm)
-    assertXPathContent(pXmlDoc, "/metafile/push[1]/push[1]/push[1]/textarray[1]/text", "1.");
-    assertXPathContent(pXmlDoc, "/metafile/push[1]/push[1]/push[1]/textarray[3]/text", "2.");
-    assertXPathContent(pXmlDoc, "/metafile/push[1]/push[1]/push[1]/textarray[5]/text", "3.");
-}
-
-CPPUNIT_TEST_FIXTURE(SwLayoutWriter2, testTdf130218)
-{
-    SwDoc* pDoc = createDoc("tdf130218.fodt");
-    SwDocShell* pShell = pDoc->GetDocShell();
-
-    // Dump the rendering of the first page as an XML file.
-    std::shared_ptr<GDIMetaFile> xMetaFile = pShell->GetPreviewMetaFile();
-    MetafileXmlDump dumper;
-
-    xmlDocUniquePtr pXmlDoc = dumpAndParse(dumper, *xMetaFile);
-    CPPUNIT_ASSERT(pXmlDoc);
-
-    // This failed, if hanging first line was hidden
-    assertXPathContent(pXmlDoc, "/metafile/push[1]/push[1]/push[1]/textarray[1]/text", "Text");
-}
-
-CPPUNIT_TEST_FIXTURE(SwLayoutWriter2, testTdf127235)
-{
-    SwDoc* pDoc = createDoc("tdf127235.odt");
-    // This resulted in a layout loop.
-    pDoc->getIDocumentLayoutAccess().GetCurrentViewShell()->CalcLayout();
-}
-
-CPPUNIT_TEST_FIXTURE(SwLayoutWriter2, testTdf138039)
-{
-    createDoc("tdf138039.odt");
-
-    xmlDocUniquePtr pXmlDoc = parseLayoutDump();
-
-    // there are 3 pages
-    assertXPath(pXmlDoc, "/root/page", 3);
-    // table on first page
-    assertXPath(pXmlDoc, "/root/page[1]/body/tab", 1);
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt", 0);
-    // paragraph with large fly on second page
-    assertXPath(pXmlDoc, "/root/page[2]/body/tab", 0);
-    assertXPath(pXmlDoc, "/root/page[2]/body/txt", 1);
-    assertXPath(pXmlDoc, "/root/page[2]/body/txt[1]/anchored/fly", 1);
-    assertXPath(pXmlDoc, "/root/page[2]/body/txt[1]/anchored/fly[1]/infos/bounds", "top", "17915");
-    assertXPath(pXmlDoc, "/root/page[2]/body/txt[1]/anchored/fly[1]/infos/bounds", "height",
-                "15819");
-    // paragraph on third page
-    assertXPath(pXmlDoc, "/root/page[3]/body/tab", 0);
-    assertXPath(pXmlDoc, "/root/page[3]/body/txt", 1);
-    assertXPath(pXmlDoc, "/root/page[3]/body/txt[1]/anchored", 0);
-}
-
-CPPUNIT_TEST_FIXTURE(SwLayoutWriter2, testTdf134298)
-{
-    createDoc("tdf134298.ott");
-
-    xmlDocUniquePtr pXmlDoc = parseLayoutDump();
-
-    // there are 2 pages
-    assertXPath(pXmlDoc, "/root/page", 2);
-    // table and first para on first page
-    assertXPath(pXmlDoc, "/root/page[1]/body/tab", 1);
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt", 1);
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/anchored", 0);
-    // paragraph with large fly on second page
-    assertXPath(pXmlDoc, "/root/page[2]/body/tab", 0);
-    assertXPath(pXmlDoc, "/root/page[2]/body/txt", 1);
-    assertXPath(pXmlDoc, "/root/page[2]/body/txt[1]/anchored/fly", 1);
-    assertXPath(pXmlDoc, "/root/page[2]/body/txt[1]/anchored/fly[1]/infos/bounds", "top", "17897");
-    assertXPath(pXmlDoc, "/root/page[2]/body/txt[1]/anchored/fly[1]/infos/bounds", "height",
-                "15819");
-}
-
-CPPUNIT_TEST_FIXTURE(SwLayoutWriter2, testShapeAllowOverlap)
-{
-// Need to find out why this fails on macOS and why this is unstable on Windows.
-#if !defined(MACOSX) && !defined(_WIN32)
-    // Create an empty document with two, intentionally overlapping shapes.
-    // Set their AllowOverlap property to false.
-    loadURL("private:factory/swriter", nullptr);
-    uno::Reference<lang::XMultiServiceFactory> xDocument(mxComponent, uno::UNO_QUERY);
-    awt::Point aPoint(1000, 1000);
-    awt::Size aSize(2000, 2000);
-    uno::Reference<drawing::XShape> xShape(
-        xDocument->createInstance("com.sun.star.drawing.RectangleShape"), uno::UNO_QUERY);

... etc. - the rest is truncated


More information about the Libreoffice-commits mailing list