sw/qa/extras/layout/layout2.cxx |  342 ++++++++++++++++++++++++++--------------
 1 file changed, 228 insertions(+), 114 deletions(-)

New commits:
commit aad1bc31afd6a4186684a7801caab2ea21fd333a
Author:     Miklos Vajna <[email protected]>
AuthorDate: Thu Jun 30 20:42:03 2022 +0200
Commit:     Miklos Vajna <[email protected]>
CommitDate: Fri Jul 1 08:43:27 2022 +0200

    CppunitTest_sw_layoutwriter: use more SwParaPortion::dumpAsXml()
    
    See commit feeed3e762cf077fbd9cf48f82e949365108ccc1
    (CppunitTest_sw_layoutwriter: avoid some a11y-based layout testing,
    2022-04-07) for motivation.
    
    Change-Id: I8b4c7b88232532cbcffc0424b1ca40a809098eef
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136683
    Tested-by: Jenkins
    Reviewed-by: Miklos Vajna <[email protected]>

diff --git a/sw/qa/extras/layout/layout2.cxx b/sw/qa/extras/layout/layout2.cxx
index 08160784a4d0..c9c0a80ca9eb 100644
--- a/sw/qa/extras/layout/layout2.cxx
+++ b/sw/qa/extras/layout/layout2.cxx
@@ -44,54 +44,92 @@ void SwLayoutWriter2::CheckRedlineCharAttributesHidden()
     discardDumpedLayout();
     xmlDocUniquePtr pXmlDoc = parseLayoutDump();
     assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/merged", 
"paraPropsNodeIndex", "9");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Text[1]", "nType", 
"PortionType::Para");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Text[1]", "Portion", 
"foobaz");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[1]/SwParaPortion/SwLineLayout/SwParaPortion[1]",
+                "type", "PortionType::Para");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[1]/SwParaPortion/SwLineLayout/SwParaPortion[1]",
+                "portion", "foobaz");
     assertXPath(pXmlDoc, "/root/page[1]/body/txt[2]/merged", 
"paraPropsNodeIndex", "10");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[2]/Text[1]", "nType", 
"PortionType::Para");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[2]/Text[1]", "Portion", 
"foobaz");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[2]/SwParaPortion/SwLineLayout/SwParaPortion[1]",
+                "type", "PortionType::Para");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[2]/SwParaPortion/SwLineLayout/SwParaPortion[1]",
+                "portion", "foobaz");
     assertXPath(pXmlDoc, "/root/page[1]/body/txt[3]/merged", 
"paraPropsNodeIndex", "11");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[3]/Text[1]", "nType", 
"PortionType::Text");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[3]/Text[1]", "Portion", 
"foo");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[3]/Text[2]", "nType", 
"PortionType::Text");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[3]/Text[2]", "Portion", 
"baz");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[3]/SwParaPortion/SwLineLayout/SwLinePortion[1]",
+                "type", "PortionType::Text");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[3]/SwParaPortion/SwLineLayout/SwLinePortion[1]",
+                "portion", "foo");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[3]/SwParaPortion/SwLineLayout/SwLinePortion[2]",
+                "type", "PortionType::Text");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[3]/SwParaPortion/SwLineLayout/SwLinePortion[2]",
+                "portion", "baz");
     assertXPath(pXmlDoc, "/root/page[1]/body/txt[4]/merged", 
"paraPropsNodeIndex", "12");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[4]/Text[1]", "nType", 
"PortionType::Text");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[4]/Text[1]", "Portion", 
"foo");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[4]/Text[2]", "nType", 
"PortionType::Text");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[4]/Text[2]", "Portion", 
"baz");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[4]/SwParaPortion/SwLineLayout/SwLinePortion[1]",
+                "type", "PortionType::Text");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[4]/SwParaPortion/SwLineLayout/SwLinePortion[1]",
+                "portion", "foo");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[4]/SwParaPortion/SwLineLayout/SwLinePortion[2]",
+                "type", "PortionType::Text");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[4]/SwParaPortion/SwLineLayout/SwLinePortion[2]",
+                "portion", "baz");
     assertXPath(pXmlDoc, "/root/page[1]/body/txt[5]/merged", 
"paraPropsNodeIndex", "13");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[5]/Text[1]", "nType", 
"PortionType::Text");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[5]/Text[1]", "Portion", 
"foo");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[5]/Text[2]", "nType", 
"PortionType::Text");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[5]/Text[2]", "Portion", 
"baz");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[5]/SwParaPortion/SwLineLayout/SwLinePortion[1]",
+                "type", "PortionType::Text");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[5]/SwParaPortion/SwLineLayout/SwLinePortion[1]",
+                "portion", "foo");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[5]/SwParaPortion/SwLineLayout/SwLinePortion[2]",
+                "type", "PortionType::Text");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[5]/SwParaPortion/SwLineLayout/SwLinePortion[2]",
+                "portion", "baz");
     assertXPath(pXmlDoc, "/root/page[1]/body/txt[6]/merged", 
"paraPropsNodeIndex", "14");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[6]/Text[1]", "nType", 
"PortionType::Text");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[6]/Text[1]", "Portion", 
"foo");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[6]/Text[2]", "nType", 
"PortionType::Text");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[6]/Text[2]", "Portion", 
"baz");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[6]/SwParaPortion/SwLineLayout/SwLinePortion[1]",
+                "type", "PortionType::Text");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[6]/SwParaPortion/SwLineLayout/SwLinePortion[1]",
+                "portion", "foo");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[6]/SwParaPortion/SwLineLayout/SwLinePortion[2]",
+                "type", "PortionType::Text");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[6]/SwParaPortion/SwLineLayout/SwLinePortion[2]",
+                "portion", "baz");
     assertXPath(pXmlDoc, "/root/page[1]/body/txt[7]/merged", 
"paraPropsNodeIndex", "15");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[7]/Text[1]", "nType", 
"PortionType::Text");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[7]/Text[1]", "Portion", 
"foo");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[7]/Text[2]", "nType", 
"PortionType::Text");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[7]/Text[2]", "Portion", 
"baz");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[7]/SwParaPortion/SwLineLayout/SwLinePortion[1]",
+                "type", "PortionType::Text");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[7]/SwParaPortion/SwLineLayout/SwLinePortion[1]",
+                "portion", "foo");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[7]/SwParaPortion/SwLineLayout/SwLinePortion[2]",
+                "type", "PortionType::Text");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[7]/SwParaPortion/SwLineLayout/SwLinePortion[2]",
+                "portion", "baz");
     assertXPath(pXmlDoc, "/root/page[1]/body/txt[8]/merged", 
"paraPropsNodeIndex", "16");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[8]/Text[1]", "nType", 
"PortionType::Text");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[8]/Text[1]", "Portion", 
"foo");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[8]/Text[2]", "nType", 
"PortionType::Text");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[8]/Text[2]", "Portion", 
"baz");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[8]/SwParaPortion/SwLineLayout/SwLinePortion[1]",
+                "type", "PortionType::Text");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[8]/SwParaPortion/SwLineLayout/SwLinePortion[1]",
+                "portion", "foo");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[8]/SwParaPortion/SwLineLayout/SwLinePortion[2]",
+                "type", "PortionType::Text");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[8]/SwParaPortion/SwLineLayout/SwLinePortion[2]",
+                "portion", "baz");
     assertXPath(pXmlDoc, "/root/page[1]/body/txt[9]/merged", 
"paraPropsNodeIndex", "17");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[9]/Text[1]", "nType", 
"PortionType::Para");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[9]/Text[1]", "Portion", 
"foobaz");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[9]/SwParaPortion/SwLineLayout/SwParaPortion[1]",
+                "type", "PortionType::Para");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[9]/SwParaPortion/SwLineLayout/SwParaPortion[1]",
+                "portion", "foobaz");
     assertXPath(pXmlDoc, "/root/page[1]/body/txt[10]/merged", 
"paraPropsNodeIndex", "18");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[10]/Text[1]", "nType", 
"PortionType::Text");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[10]/Text[1]", "Portion", 
"fo");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[10]/Text[2]", "nType", 
"PortionType::Text");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[10]/Text[2]", "Portion", 
"ob");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[10]/Text[3]", "nType", 
"PortionType::Text");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[10]/Text[3]", "Portion", 
"az");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[10]/SwParaPortion/SwLineLayout/SwLinePortion[1]",
+                "type", "PortionType::Text");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[10]/SwParaPortion/SwLineLayout/SwLinePortion[1]",
+                "portion", "fo");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[10]/SwParaPortion/SwLineLayout/SwLinePortion[2]",
+                "type", "PortionType::Text");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[10]/SwParaPortion/SwLineLayout/SwLinePortion[2]",
+                "portion", "ob");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[10]/SwParaPortion/SwLineLayout/SwLinePortion[3]",
+                "type", "PortionType::Text");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[10]/SwParaPortion/SwLineLayout/SwLinePortion[3]",
+                "portion", "az");
     assertXPath(pXmlDoc, "/root/page[1]/body/txt[11]/merged", 
"paraPropsNodeIndex", "19");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[11]/Text[1]", "nType", 
"PortionType::Para");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[11]/Text[1]", "Portion", 
"foobaz");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[11]/SwParaPortion/SwLineLayout/SwParaPortion[1]",
+                "type", "PortionType::Para");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[11]/SwParaPortion/SwLineLayout/SwParaPortion[1]",
+                "portion", "foobaz");
 }
 
 CPPUNIT_TEST_FIXTURE(SwLayoutWriter2, testTdf100680_as_char_wrap)
@@ -126,82 +164,158 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter2, 
testRedlineCharAttributes)
     xmlNodeSetPtr pXmlNodes = pXmlObj->nodesetval;
     CPPUNIT_ASSERT_EQUAL(0, xmlXPathNodeSetGetLength(pXmlNodes));
     xmlXPathFreeObject(pXmlObj);
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Text[1]", "nType", 
"PortionType::Text");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Text[1]", "Portion", 
"foo");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Text[2]", "nType", 
"PortionType::Text");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Text[2]", "Portion", 
"bar");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Text[3]", "nType", 
"PortionType::Text");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Text[3]", "Portion", 
"baz");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[2]/Text[1]", "nType", 
"PortionType::Text");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[2]/Text[1]", "Portion", 
"foo");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[2]/Text[2]", "nType", 
"PortionType::Text");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[2]/Text[2]", "Portion", 
"bar");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[2]/Text[3]", "nType", 
"PortionType::Text");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[2]/Text[3]", "Portion", 
"baz");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[3]/Text[1]", "nType", 
"PortionType::Text");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[3]/Text[1]", "Portion", 
"foo");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[3]/Text[2]", "nType", 
"PortionType::Text");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[3]/Text[2]", "Portion", 
"bar");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[3]/Text[3]", "nType", 
"PortionType::Text");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[3]/Text[3]", "Portion", 
"baz");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[4]/Text[1]", "nType", 
"PortionType::Text");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[4]/Text[1]", "Portion", 
"foo");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[4]/Text[2]", "nType", 
"PortionType::Text");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[4]/Text[2]", "Portion", 
"bar");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[4]/Text[3]", "nType", 
"PortionType::Text");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[4]/Text[3]", "Portion", 
"baz");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[5]/Text[1]", "nType", 
"PortionType::Text");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[5]/Text[1]", "Portion", 
"foo");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[5]/Text[2]", "nType", 
"PortionType::Text");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[5]/Text[2]", "Portion", 
"bar");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[5]/Text[3]", "nType", 
"PortionType::Text");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[5]/Text[3]", "Portion", 
"baz");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[6]/Text[1]", "nType", 
"PortionType::Text");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[6]/Text[1]", "Portion", 
"foo");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[6]/Text[2]", "nType", 
"PortionType::Text");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[6]/Text[2]", "Portion", 
"bar");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[6]/Text[3]", "nType", 
"PortionType::Text");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[6]/Text[3]", "Portion", 
"baz");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[7]/Text[1]", "nType", 
"PortionType::Text");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[7]/Text[1]", "Portion", 
"foo");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[7]/Text[2]", "nType", 
"PortionType::Text");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[7]/Text[2]", "Portion", 
"bar");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[7]/Text[3]", "nType", 
"PortionType::Text");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[7]/Text[3]", "Portion", 
"baz");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[8]/Text[1]", "nType", 
"PortionType::Text");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[8]/Text[1]", "Portion", 
"foo");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[8]/Text[2]", "nType", 
"PortionType::Text");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[8]/Text[2]", "Portion", "ba");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[8]/Text[3]", "nType", 
"PortionType::Text");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[8]/Text[3]", "Portion", "r");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[8]/Text[4]", "nType", 
"PortionType::Text");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[8]/Text[4]", "Portion", 
"baz");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[9]/Text[1]", "nType", 
"PortionType::Text");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[9]/Text[1]", "Portion", 
"foo");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[9]/Text[2]", "nType", 
"PortionType::Text");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[9]/Text[2]", "Portion", 
"bar");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[9]/Text[3]", "nType", 
"PortionType::Text");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[9]/Text[3]", "Portion", 
"baz");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[10]/Text[1]", "nType", 
"PortionType::Text");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[10]/Text[1]", "Portion", 
"fo");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[10]/Text[2]", "nType", 
"PortionType::Text");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[10]/Text[2]", "Portion", "o");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[10]/Text[3]", "nType", 
"PortionType::Text");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[10]/Text[3]", "Portion", 
"bar");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[10]/Text[4]", "nType", 
"PortionType::Text");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[10]/Text[4]", "Portion", "b");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[10]/Text[5]", "nType", 
"PortionType::Text");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[10]/Text[5]", "Portion", 
"az");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[11]/Text[1]", "nType", 
"PortionType::Text");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[11]/Text[1]", "Portion", 
"foo");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[11]/Text[2]", "nType", 
"PortionType::Text");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[11]/Text[2]", "Portion", "b");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[11]/Text[3]", "nType", 
"PortionType::Text");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[11]/Text[3]", "Portion", "a");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[11]/Text[4]", "nType", 
"PortionType::Text");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[11]/Text[4]", "Portion", "r");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[11]/Text[5]", "nType", 
"PortionType::Text");
-    assertXPath(pXmlDoc, "/root/page[1]/body/txt[11]/Text[5]", "Portion", 
"baz");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[1]/SwParaPortion/SwLineLayout/SwLinePortion[1]",
+                "type", "PortionType::Text");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[1]/SwParaPortion/SwLineLayout/SwLinePortion[1]",
+                "portion", "foo");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[1]/SwParaPortion/SwLineLayout/SwLinePortion[2]",
+                "type", "PortionType::Text");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[1]/SwParaPortion/SwLineLayout/SwLinePortion[2]",
+                "portion", "bar");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[1]/SwParaPortion/SwLineLayout/SwLinePortion[3]",
+                "type", "PortionType::Text");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[1]/SwParaPortion/SwLineLayout/SwLinePortion[3]",
+                "portion", "baz");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[2]/SwParaPortion/SwLineLayout/SwLinePortion[1]",
+                "type", "PortionType::Text");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[2]/SwParaPortion/SwLineLayout/SwLinePortion[1]",
+                "portion", "foo");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[2]/SwParaPortion/SwLineLayout/SwLinePortion[2]",
+                "type", "PortionType::Text");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[2]/SwParaPortion/SwLineLayout/SwLinePortion[2]",
+                "portion", "bar");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[2]/SwParaPortion/SwLineLayout/SwLinePortion[3]",
+                "type", "PortionType::Text");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[2]/SwParaPortion/SwLineLayout/SwLinePortion[3]",
+                "portion", "baz");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[3]/SwParaPortion/SwLineLayout/SwLinePortion[1]",
+                "type", "PortionType::Text");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[3]/SwParaPortion/SwLineLayout/SwLinePortion[1]",
+                "portion", "foo");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[3]/SwParaPortion/SwLineLayout/SwLinePortion[2]",
+                "type", "PortionType::Text");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[3]/SwParaPortion/SwLineLayout/SwLinePortion[2]",
+                "portion", "bar");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[3]/SwParaPortion/SwLineLayout/SwLinePortion[3]",
+                "type", "PortionType::Text");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[3]/SwParaPortion/SwLineLayout/SwLinePortion[3]",
+                "portion", "baz");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[4]/SwParaPortion/SwLineLayout/SwLinePortion[1]",
+                "type", "PortionType::Text");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[4]/SwParaPortion/SwLineLayout/SwLinePortion[1]",
+                "portion", "foo");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[4]/SwParaPortion/SwLineLayout/SwLinePortion[2]",
+                "type", "PortionType::Text");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[4]/SwParaPortion/SwLineLayout/SwLinePortion[2]",
+                "portion", "bar");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[4]/SwParaPortion/SwLineLayout/SwLinePortion[3]",
+                "type", "PortionType::Text");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[4]/SwParaPortion/SwLineLayout/SwLinePortion[3]",
+                "portion", "baz");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[5]/SwParaPortion/SwLineLayout/SwLinePortion[1]",
+                "type", "PortionType::Text");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[5]/SwParaPortion/SwLineLayout/SwLinePortion[1]",
+                "portion", "foo");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[5]/SwParaPortion/SwLineLayout/SwLinePortion[2]",
+                "type", "PortionType::Text");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[5]/SwParaPortion/SwLineLayout/SwLinePortion[2]",
+                "portion", "bar");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[5]/SwParaPortion/SwLineLayout/SwLinePortion[3]",
+                "type", "PortionType::Text");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[5]/SwParaPortion/SwLineLayout/SwLinePortion[3]",
+                "portion", "baz");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[6]/SwParaPortion/SwLineLayout/SwLinePortion[1]",
+                "type", "PortionType::Text");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[6]/SwParaPortion/SwLineLayout/SwLinePortion[1]",
+                "portion", "foo");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[6]/SwParaPortion/SwLineLayout/SwLinePortion[2]",
+                "type", "PortionType::Text");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[6]/SwParaPortion/SwLineLayout/SwLinePortion[2]",
+                "portion", "bar");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[6]/SwParaPortion/SwLineLayout/SwLinePortion[3]",
+                "type", "PortionType::Text");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[6]/SwParaPortion/SwLineLayout/SwLinePortion[3]",
+                "portion", "baz");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[7]/SwParaPortion/SwLineLayout/SwLinePortion[1]",
+                "type", "PortionType::Text");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[7]/SwParaPortion/SwLineLayout/SwLinePortion[1]",
+                "portion", "foo");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[7]/SwParaPortion/SwLineLayout/SwLinePortion[2]",
+                "type", "PortionType::Text");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[7]/SwParaPortion/SwLineLayout/SwLinePortion[2]",
+                "portion", "bar");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[7]/SwParaPortion/SwLineLayout/SwLinePortion[3]",
+                "type", "PortionType::Text");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[7]/SwParaPortion/SwLineLayout/SwLinePortion[3]",
+                "portion", "baz");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[8]/SwParaPortion/SwLineLayout/SwLinePortion[1]",
+                "type", "PortionType::Text");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[8]/SwParaPortion/SwLineLayout/SwLinePortion[1]",
+                "portion", "foo");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[8]/SwParaPortion/SwLineLayout/SwLinePortion[2]",
+                "type", "PortionType::Text");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[8]/SwParaPortion/SwLineLayout/SwLinePortion[2]",
+                "portion", "ba");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[8]/SwParaPortion/SwLineLayout/SwLinePortion[3]",
+                "type", "PortionType::Text");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[8]/SwParaPortion/SwLineLayout/SwLinePortion[3]",
+                "portion", "r");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[8]/SwParaPortion/SwLineLayout/SwLinePortion[4]",
+                "type", "PortionType::Text");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[8]/SwParaPortion/SwLineLayout/SwLinePortion[4]",
+                "portion", "baz");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[9]/SwParaPortion/SwLineLayout/SwLinePortion[1]",
+                "type", "PortionType::Text");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[9]/SwParaPortion/SwLineLayout/SwLinePortion[1]",
+                "portion", "foo");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[9]/SwParaPortion/SwLineLayout/SwLinePortion[2]",
+                "type", "PortionType::Text");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[9]/SwParaPortion/SwLineLayout/SwLinePortion[2]",
+                "portion", "bar");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[9]/SwParaPortion/SwLineLayout/SwLinePortion[3]",
+                "type", "PortionType::Text");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[9]/SwParaPortion/SwLineLayout/SwLinePortion[3]",
+                "portion", "baz");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[10]/SwParaPortion/SwLineLayout/SwLinePortion[1]",
+                "type", "PortionType::Text");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[10]/SwParaPortion/SwLineLayout/SwLinePortion[1]",
+                "portion", "fo");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[10]/SwParaPortion/SwLineLayout/SwLinePortion[2]",
+                "type", "PortionType::Text");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[10]/SwParaPortion/SwLineLayout/SwLinePortion[2]",
+                "portion", "o");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[10]/SwParaPortion/SwLineLayout/SwLinePortion[3]",
+                "type", "PortionType::Text");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[10]/SwParaPortion/SwLineLayout/SwLinePortion[3]",
+                "portion", "bar");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[10]/SwParaPortion/SwLineLayout/SwLinePortion[4]",
+                "type", "PortionType::Text");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[10]/SwParaPortion/SwLineLayout/SwLinePortion[4]",
+                "portion", "b");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[10]/SwParaPortion/SwLineLayout/SwLinePortion[5]",
+                "type", "PortionType::Text");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[10]/SwParaPortion/SwLineLayout/SwLinePortion[5]",
+                "portion", "az");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[11]/SwParaPortion/SwLineLayout/SwLinePortion[1]",
+                "type", "PortionType::Text");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[11]/SwParaPortion/SwLineLayout/SwLinePortion[1]",
+                "portion", "foo");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[11]/SwParaPortion/SwLineLayout/SwLinePortion[2]",
+                "type", "PortionType::Text");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[11]/SwParaPortion/SwLineLayout/SwLinePortion[2]",
+                "portion", "b");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[11]/SwParaPortion/SwLineLayout/SwLinePortion[3]",
+                "type", "PortionType::Text");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[11]/SwParaPortion/SwLineLayout/SwLinePortion[3]",
+                "portion", "a");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[11]/SwParaPortion/SwLineLayout/SwLinePortion[4]",
+                "type", "PortionType::Text");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[11]/SwParaPortion/SwLineLayout/SwLinePortion[4]",
+                "portion", "r");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[11]/SwParaPortion/SwLineLayout/SwLinePortion[5]",
+                "type", "PortionType::Text");
+    assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[11]/SwParaPortion/SwLineLayout/SwLinePortion[5]",
+                "portion", "baz");
 
     // verify after hide
     dispatchCommand(mxComponent, ".uno:ShowTrackedChanges", {});

Reply via email to