diff options
Diffstat (limited to 'sw')
-rwxr-xr-x | sw/qa/extras/layout/data/tdf106390.odt | bin | 0 -> 13081 bytes | |||
-rw-r--r-- | sw/qa/extras/layout/layout.cxx | 20 | ||||
-rw-r--r-- | sw/source/core/layout/paintfrm.cxx | 14 |
3 files changed, 30 insertions, 4 deletions
diff --git a/sw/qa/extras/layout/data/tdf106390.odt b/sw/qa/extras/layout/data/tdf106390.odt Binary files differnew file mode 100755 index 000000000000..b2adf5332e34 --- /dev/null +++ b/sw/qa/extras/layout/data/tdf106390.odt diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx index 4d05162a7d74..a7eb24e89208 100644 --- a/sw/qa/extras/layout/layout.cxx +++ b/sw/qa/extras/layout/layout.cxx @@ -19,6 +19,7 @@ public: void testTdf116830(); void testTdf116925(); void testTdf117028(); + void testTdf106390(); void testTdf116848(); void testTdf117245(); @@ -26,6 +27,7 @@ public: CPPUNIT_TEST(testTdf116830); CPPUNIT_TEST(testTdf116925); CPPUNIT_TEST(testTdf117028); + CPPUNIT_TEST(testTdf106390); CPPUNIT_TEST(testTdf116848); CPPUNIT_TEST(testTdf117245); CPPUNIT_TEST_SUITE_END(); @@ -112,6 +114,24 @@ void SwLayoutWriter::testTdf117028() assertXPathContent(pXmlDoc, "//textarray/text", "Hello"); } +void SwLayoutWriter::testTdf106390() +{ + SwDoc* pDoc = createDoc("tdf106390.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; + xmlDocPtr pXmlDoc = dumper.dumpAndParse(*xMetaFile); + CPPUNIT_ASSERT(pXmlDoc); + sal_Int32 nBottom = getXPath(pXmlDoc, "//sectrectclipregion", "bottom").toInt32(); + + // No end point of line segments shall go below the bottom of the clipping area. + const OString sXPath = "//polyline/point[@y>" + OString::number(nBottom) + "]"; + + assertXPath(pXmlDoc, sXPath, 0); +} + void SwLayoutWriter::testTdf116848() { SwDoc* pDoc = createDoc("tdf116848.odt"); diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index 1d1cf069385c..cd76c222b040 100644 --- a/sw/source/core/layout/paintfrm.cxx +++ b/sw/source/core/layout/paintfrm.cxx @@ -2729,10 +2729,16 @@ void SwTabFramePainter::Insert( const SwFrame& rFrame, const SvxBoxItem& rBoxIte { // build 4 line entries for the 4 borders: SwRect aBorderRect = rFrame.getFrameArea(); - if ( rFrame.IsTabFrame() ) - { - aBorderRect = rFrame.getFramePrintArea(); - aBorderRect.Pos() += rFrame.getFrameArea().Pos(); + // Frame area of a table might be larger than the containing frame + // so we have to intersect the border rect with upper frames til + // the first frame that is not part of a table. + const SwLayoutFrame *pUpper = rFrame.GetUpper(); + while(pUpper) + { + aBorderRect.Intersection(pUpper->getFrameArea()); + if (!pUpper->IsInTab()) + break; + pUpper = pUpper->GetUpper(); } bool const bBottomAsTop(lcl_IsFirstRowInFollowTableWithoutRepeatedHeadlines( |