sw/qa/extras/ooxmlexport/ooxmlexport16.cxx | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
New commits:
commit 9a6293bec8d1902b1f2ff2028c95c6b5bb950a35
Author: Miklos Vajna <vmik...@collabora.com>
AuthorDate: Thu Aug 25 20:52:33 2022 +0200
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Fri Aug 26 08:24:42 2022 +0200
CppunitTest_sw_ooxmlexport16: use more SwParaPortion::dumpAsXml()
See commit feeed3e762cf077fbd9cf48f82e949365108ccc1
(CppunitTest_sw_layoutwriter: avoid some a11y-based layout testing,
2022-04-07) for motivation.
Change-Id: Ie85ede4f098ab659d85eb3e317c13d5701a16dcc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138843
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx
index f1c912bad79c..60f4e801ba0a 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx
@@ -597,34 +597,34 @@ CPPUNIT_TEST_FIXTURE(Test,
testTdf142404_tabOverSpacingC15)
// The original 3-page ODT saved as DOCX would fit on one page in MS Word
2010, but 3 in Word 2013.
CPPUNIT_ASSERT_EQUAL_MESSAGE("too big for two pages", 3, getPages());
// The tab goes over the paragraph margin
- CPPUNIT_ASSERT_EQUAL(OUString("A left tab positioned at"),
parseDump("//page[1]/body/txt[2]/Text[1]", "Portion"));
- sal_Int32 nTextLen = parseDump("//page[1]/body/txt[2]/Text[1]",
"nWidth").toInt32();
- CPPUNIT_ASSERT_EQUAL(OUString("*"),
parseDump("//page[1]/body/txt[2]/Text[2]", "Portion"));
- sal_Int32 nTabLen = parseDump("//page[1]/body/txt[2]/Text[2]",
"nWidth").toInt32();
+ CPPUNIT_ASSERT_EQUAL(OUString("A left tab positioned at"),
parseDump("//page[1]/body/txt[2]/SwParaPortion/SwLineLayout[1]/SwLinePortion[1]",
"portion"));
+ sal_Int32 nTextLen =
parseDump("//page[1]/body/txt[2]/SwParaPortion/SwLineLayout[1]/SwLinePortion[1]",
"width").toInt32();
+ CPPUNIT_ASSERT_EQUAL(OUString("*"),
parseDump("//page[1]/body/txt[2]/SwParaPortion/SwLineLayout[1]/SwFixPortion[1]",
"portion"));
+ sal_Int32 nTabLen =
parseDump("//page[1]/body/txt[2]/SwParaPortion/SwLineLayout[1]/SwFixPortion[1]",
"width").toInt32();
CPPUNIT_ASSERT_MESSAGE("Large left tab", nTextLen < nTabLen);
// Not 1 line high (Word 2010 DOCX), or 3 lines high (LO DOCX) or 5 lines
high (ODT), but 4 lines high
sal_Int32 nHeight = parseDump("//page[1]/body/txt[2]/infos/bounds",
"height").toInt32();
CPPUNIT_ASSERT_MESSAGE("4 lines high", 1100 < nHeight);
CPPUNIT_ASSERT_MESSAGE("4 lines high", nHeight < 1300);
- CPPUNIT_ASSERT_EQUAL(OUString("TabOverflow does what?"),
parseDump("//page[1]/body/txt[7]/Text[1]", "Portion"));
+ CPPUNIT_ASSERT_EQUAL(OUString("TabOverflow does what?"),
parseDump("//page[1]/body/txt[7]/SwParaPortion/SwLineLayout[1]/SwLinePortion[1]",
"portion"));
// Not 1 line high (Word 2010 DOCX), or 4 lines high (prev LO DOCX) or 8
lines high (ODT).
// but two lines high. (3 in Word 2016 because it pulls down "what?" to
the second line - weird)
nHeight = parseDump("//page[1]/body/txt[7]/infos/bounds",
"height").toInt32();
CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE("2 lines high (but 3 in Word)",
242*2.5, nHeight, 242);
- CPPUNIT_ASSERT_EQUAL(OUString("A centered tab positioned at"),
parseDump("//page[1]/body/txt[3]/Text[1]", "Portion"));
- sal_Int32 nLineWidth = parseDump("//page[1]/body/txt[3]/Text[2]",
"nWidth").toInt32();
+ CPPUNIT_ASSERT_EQUAL(OUString("A centered tab positioned at"),
parseDump("//page[1]/body/txt[3]/SwParaPortion/SwLineLayout[1]/SwLinePortion[1]",
"portion"));
+ sal_Int32 nLineWidth =
parseDump("//page[1]/body/txt[3]/SwParaPortion/SwLineLayout[1]/SwFixPortion[1]",
"width").toInt32();
CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE("Big tab: full paragraph area used",
737, nLineWidth, 100);
// Pages 2/3 are TabOverMargin - in this particular case tabs should not
go over margin.
- CPPUNIT_ASSERT_EQUAL(OUString("A right tab positioned at"),
parseDump("//page[2]/body/txt[6]/Text[1]", "Portion"));
+ CPPUNIT_ASSERT_EQUAL(OUString("A right tab positioned at"),
parseDump("//page[2]/body/txt[6]/SwParaPortion/SwLineLayout[1]/SwLinePortion[1]",
"portion"));
sal_Int32 nParaWidth = parseDump("//page[2]/body/txt[6]/infos/prtBounds",
"width").toInt32();
// the clearest non-first-line visual example is this second tab in the
right-tab paragraph.
- nLineWidth = parseDump("//page[2]/body/txt[6]/LineBreak[4]",
"nWidth").toInt32();
+ nLineWidth =
parseDump("//page[2]/body/txt[6]/SwParaPortion/SwLineLayout[4]",
"width").toInt32();
CPPUNIT_ASSERT_EQUAL_MESSAGE("Full paragraph area used", nLineWidth,
nParaWidth);
- CPPUNIT_ASSERT_EQUAL(OUString("TabOverflow does what?"),
parseDump("//page[3]/body/txt[2]/Text[1]", "Portion"));
+ CPPUNIT_ASSERT_EQUAL(OUString("TabOverflow does what?"),
parseDump("//page[3]/body/txt[2]/SwParaPortion/SwLineLayout[1]/SwLinePortion[2]",
"portion"));
// Not 1 line high (Word 2010 DOCX and ODT), or 4 lines high (prev LO
DOCX),
// but 8 lines high.
nHeight = parseDump("//page[3]/body/txt[2]/infos/bounds",
"height").toInt32();
