diff options
| -rw-r--r-- | sw/qa/extras/layout/data/btlr-cell.odt | bin | 9179 -> 9223 bytes | |||
| -rw-r--r-- | sw/qa/extras/layout/layout.cxx | 5 | ||||
| -rw-r--r-- | sw/source/core/text/inftxt.cxx | 2 |
3 files changed, 6 insertions, 1 deletions
diff --git a/sw/qa/extras/layout/data/btlr-cell.odt b/sw/qa/extras/layout/data/btlr-cell.odt Binary files differindex 17a9c19eef25..a4439218b057 100644 --- a/sw/qa/extras/layout/data/btlr-cell.odt +++ b/sw/qa/extras/layout/data/btlr-cell.odt diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx index daca397a4d05..ea0eaac86c61 100644 --- a/sw/qa/extras/layout/layout.cxx +++ b/sw/qa/extras/layout/layout.cxx @@ -2817,6 +2817,11 @@ void SwLayoutWriter::testBtlrCell() 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(); diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx index b18e7273672c..4fe1bf96e9bb 100644 --- a/sw/source/core/text/inftxt.cxx +++ b/sw/source/core/text/inftxt.cxx @@ -749,7 +749,7 @@ void SwTextPaintInfo::CalcRect( const SwLinePortion& rPor, else { aPoint.setX( X() ); - if ( GetTextFrame()->IsVertLR() ) + if (GetTextFrame()->IsVertLR() && !GetTextFrame()->IsVertLRBT()) aPoint.setY( Y() - rPor.Height() + rPor.GetAscent() ); else aPoint.setY( Y() - rPor.GetAscent() ); |