sw/qa/extras/layout/layout.cxx | 318 +++++++++++++++++++++++++++++------------
1 file changed, 229 insertions(+), 89 deletions(-)
New commits:
commit f9b6bd6336b35de060f6f5bdd91517caf5e9a56e
Author: Miklos Vajna <vmik...@collabora.com>
AuthorDate: Thu Apr 28 20:25:49 2022 +0200
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Fri Apr 29 08:12:00 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: I1bd84e232c8010fcbcf228295b80ef9306d30136
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133580
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx
index 6df37719bf53..c543a89076e5 100644
--- a/sw/qa/extras/layout/layout.cxx
+++ b/sw/qa/extras/layout/layout.cxx
@@ -348,14 +348,22 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter,
testRedlineFlysInBody)
discardDumpedLayout();
xmlDocUniquePtr pXmlDoc = parseLayoutDump();
assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/merged",
"paraPropsNodeIndex", "14");
- assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Text[1]", "nType",
"PortionType::Para");
- assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Text[1]", "Portion",
"foaz");
+ 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", "foaz");
assertXPath(pXmlDoc,
"/root/page[1]/body/txt[1]/anchored/fly[1]/txt[1]/merged",
"paraPropsNodeIndex", "6");
- assertXPath(pXmlDoc,
"/root/page[1]/body/txt[1]/anchored/fly[1]/txt[1]/Text[1]", "nType",
- "PortionType::Para");
- assertXPath(pXmlDoc,
"/root/page[1]/body/txt[1]/anchored/fly[1]/txt[1]/Text[1]", "Portion",
- "ahi");
+ assertXPath(pXmlDoc,
+
"/root/page[1]/body/txt[1]/anchored/fly[1]/txt[1]/SwParaPortion/SwLineLayout/"
+ "SwParaPortion[1]",
+ "type", "PortionType::Para");
+ assertXPath(pXmlDoc,
+
"/root/page[1]/body/txt[1]/anchored/fly[1]/txt[1]/SwParaPortion/SwLineLayout/"
+ "SwParaPortion[1]",
+ "portion", "ahi");
dispatchCommand(mxComponent, ".uno:ShowTrackedChanges", {});
CPPUNIT_ASSERT(!pLayout->IsHideRedlines());
@@ -369,36 +377,76 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter,
testRedlineFlysInBody)
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",
"fo");
- assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Text[2]", "nType",
"PortionType::Text");
- assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Text[2]", "Portion",
"o");
- assertXPath(pXmlDoc,
"/root/page[1]/body/txt[1]/anchored/fly[1]/txt[1]/Text[1]", "nType",
+ assertXPath(pXmlDoc,
+
"/root/page[1]/body/txt[1]/SwParaPortion/SwLineLayout/SwLinePortion[1]", "type",
"PortionType::Text");
- assertXPath(pXmlDoc,
"/root/page[1]/body/txt[1]/anchored/fly[1]/txt[1]/Text[1]", "Portion",
- "a");
- assertXPath(pXmlDoc,
"/root/page[1]/body/txt[1]/anchored/fly[1]/txt[1]/Text[2]", "nType",
+ assertXPath(pXmlDoc,
+
"/root/page[1]/body/txt[1]/SwParaPortion/SwLineLayout/SwLinePortion[1]",
+ "portion", "fo");
+ assertXPath(pXmlDoc,
+
"/root/page[1]/body/txt[1]/SwParaPortion/SwLineLayout/SwLinePortion[2]", "type",
"PortionType::Text");
- assertXPath(pXmlDoc,
"/root/page[1]/body/txt[1]/anchored/fly[1]/txt[1]/Text[2]", "Portion",
- "bc");
- assertXPath(pXmlDoc,
"/root/page[1]/body/txt[1]/anchored/fly[1]/txt[2]/Text[1]", "nType",
+ assertXPath(pXmlDoc,
+
"/root/page[1]/body/txt[1]/SwParaPortion/SwLineLayout/SwLinePortion[2]",
+ "portion", "o");
+ assertXPath(pXmlDoc,
+
"/root/page[1]/body/txt[1]/anchored/fly[1]/txt[1]/SwParaPortion/SwLineLayout/"
+ "SwLinePortion[1]",
+ "type", "PortionType::Text");
+ assertXPath(pXmlDoc,
+
"/root/page[1]/body/txt[1]/anchored/fly[1]/txt[1]/SwParaPortion/SwLineLayout/"
+ "SwLinePortion[1]",
+ "portion", "a");
+ assertXPath(pXmlDoc,
+
"/root/page[1]/body/txt[1]/anchored/fly[1]/txt[1]/SwParaPortion/SwLineLayout/"
+ "SwLinePortion[2]",
+ "type", "PortionType::Text");
+ assertXPath(pXmlDoc,
+
"/root/page[1]/body/txt[1]/anchored/fly[1]/txt[1]/SwParaPortion/SwLineLayout/"
+ "SwLinePortion[2]",
+ "portion", "bc");
+ assertXPath(pXmlDoc,
+
"/root/page[1]/body/txt[1]/anchored/fly[1]/txt[2]/SwParaPortion/SwLineLayout/"
+ "SwParaPortion[1]",
+ "type", "PortionType::Para");
+ assertXPath(pXmlDoc,
+
"/root/page[1]/body/txt[1]/anchored/fly[1]/txt[2]/SwParaPortion/SwLineLayout/"
+ "SwParaPortion[1]",
+ "portion", "def");
+ assertXPath(pXmlDoc,
+
"/root/page[1]/body/txt[1]/anchored/fly[1]/txt[3]/SwParaPortion/SwLineLayout/"
+ "SwLinePortion[1]",
+ "type", "PortionType::Text");
+ assertXPath(pXmlDoc,
+
"/root/page[1]/body/txt[1]/anchored/fly[1]/txt[3]/SwParaPortion/SwLineLayout/"
+ "SwLinePortion[1]",
+ "portion", "g");
+ assertXPath(pXmlDoc,
+
"/root/page[1]/body/txt[1]/anchored/fly[1]/txt[3]/SwParaPortion/SwLineLayout/"
+ "SwLinePortion[2]",
+ "type", "PortionType::Text");
+ assertXPath(pXmlDoc,
+
"/root/page[1]/body/txt[1]/anchored/fly[1]/txt[3]/SwParaPortion/SwLineLayout/"
+ "SwLinePortion[2]",
+ "portion", "hi");
+ assertXPath(pXmlDoc,
+
"/root/page[1]/body/txt[2]/SwParaPortion/SwLineLayout/SwParaPortion[1]", "type",
"PortionType::Para");
- assertXPath(pXmlDoc,
"/root/page[1]/body/txt[1]/anchored/fly[1]/txt[2]/Text[1]", "Portion",
- "def");
- assertXPath(pXmlDoc,
"/root/page[1]/body/txt[1]/anchored/fly[1]/txt[3]/Text[1]", "nType",
+ assertXPath(pXmlDoc,
+
"/root/page[1]/body/txt[2]/SwParaPortion/SwLineLayout/SwParaPortion[1]",
+ "portion", "bar");
+ assertXPath(pXmlDoc,
+
"/root/page[1]/body/txt[3]/SwParaPortion/SwLineLayout/SwLinePortion[1]", "type",
"PortionType::Text");
- assertXPath(pXmlDoc,
"/root/page[1]/body/txt[1]/anchored/fly[1]/txt[3]/Text[1]", "Portion",
- "g");
- assertXPath(pXmlDoc,
"/root/page[1]/body/txt[1]/anchored/fly[1]/txt[3]/Text[2]", "nType",
+ assertXPath(pXmlDoc,
+
"/root/page[1]/body/txt[3]/SwParaPortion/SwLineLayout/SwLinePortion[1]",
+ "portion", "b");
+ assertXPath(pXmlDoc,
+
"/root/page[1]/body/txt[3]/SwParaPortion/SwLineLayout/SwLinePortion[2]", "type",
"PortionType::Text");
- assertXPath(pXmlDoc,
"/root/page[1]/body/txt[1]/anchored/fly[1]/txt[3]/Text[2]", "Portion",
- "hi");
- assertXPath(pXmlDoc, "/root/page[1]/body/txt[2]/Text[1]", "nType",
"PortionType::Para");
- assertXPath(pXmlDoc, "/root/page[1]/body/txt[2]/Text[1]", "Portion",
"bar");
- assertXPath(pXmlDoc, "/root/page[1]/body/txt[3]/Text[1]", "nType",
"PortionType::Text");
- assertXPath(pXmlDoc, "/root/page[1]/body/txt[3]/Text[1]", "Portion",
"b");
- assertXPath(pXmlDoc, "/root/page[1]/body/txt[3]/Text[2]", "nType",
"PortionType::Text");
- assertXPath(pXmlDoc, "/root/page[1]/body/txt[3]/Text[2]", "Portion",
"az");
+ assertXPath(pXmlDoc,
+
"/root/page[1]/body/txt[3]/SwParaPortion/SwLineLayout/SwLinePortion[2]",
+ "portion", "az");
}
// anchor to 2nd (deleted) paragraph
@@ -424,8 +472,12 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testRedlineFlysInBody)
discardDumpedLayout();
xmlDocUniquePtr pXmlDoc = parseLayoutDump();
assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/merged",
"paraPropsNodeIndex", "14");
- assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Text[1]", "nType",
"PortionType::Para");
- assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Text[1]", "Portion",
"foaz");
+ 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", "foaz");
{ // hide: no anchored object shown
xmlXPathObjectPtr pXmlObj = getXPathNode(pXmlDoc, "//anchored");
@@ -446,36 +498,76 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter,
testRedlineFlysInBody)
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",
"fo");
- assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Text[2]", "nType",
"PortionType::Text");
- assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Text[2]", "Portion",
"o");
- assertXPath(pXmlDoc, "/root/page[1]/body/txt[2]/Text[1]", "nType",
"PortionType::Para");
- assertXPath(pXmlDoc, "/root/page[1]/body/txt[2]/Text[1]", "Portion",
"bar");
- assertXPath(pXmlDoc,
"/root/page[1]/body/txt[2]/anchored/fly[1]/txt[1]/Text[1]", "nType",
+ assertXPath(pXmlDoc,
+
"/root/page[1]/body/txt[1]/SwParaPortion/SwLineLayout/SwLinePortion[1]", "type",
"PortionType::Text");
- assertXPath(pXmlDoc,
"/root/page[1]/body/txt[2]/anchored/fly[1]/txt[1]/Text[1]", "Portion",
- "a");
- assertXPath(pXmlDoc,
"/root/page[1]/body/txt[2]/anchored/fly[1]/txt[1]/Text[2]", "nType",
+ assertXPath(pXmlDoc,
+
"/root/page[1]/body/txt[1]/SwParaPortion/SwLineLayout/SwLinePortion[1]",
+ "portion", "fo");
+ assertXPath(pXmlDoc,
+
"/root/page[1]/body/txt[1]/SwParaPortion/SwLineLayout/SwLinePortion[2]", "type",
"PortionType::Text");
- assertXPath(pXmlDoc,
"/root/page[1]/body/txt[2]/anchored/fly[1]/txt[1]/Text[2]", "Portion",
- "bc");
- assertXPath(pXmlDoc,
"/root/page[1]/body/txt[2]/anchored/fly[1]/txt[2]/Text[1]", "nType",
+ assertXPath(pXmlDoc,
+
"/root/page[1]/body/txt[1]/SwParaPortion/SwLineLayout/SwLinePortion[2]",
+ "portion", "o");
+ assertXPath(pXmlDoc,
+
"/root/page[1]/body/txt[2]/SwParaPortion/SwLineLayout/SwParaPortion[1]", "type",
"PortionType::Para");
- assertXPath(pXmlDoc,
"/root/page[1]/body/txt[2]/anchored/fly[1]/txt[2]/Text[1]", "Portion",
- "def");
- assertXPath(pXmlDoc,
"/root/page[1]/body/txt[2]/anchored/fly[1]/txt[3]/Text[1]", "nType",
+ assertXPath(pXmlDoc,
+
"/root/page[1]/body/txt[2]/SwParaPortion/SwLineLayout/SwParaPortion[1]",
+ "portion", "bar");
+ assertXPath(pXmlDoc,
+
"/root/page[1]/body/txt[2]/anchored/fly[1]/txt[1]/SwParaPortion/SwLineLayout/"
+ "SwLinePortion[1]",
+ "type", "PortionType::Text");
+ assertXPath(pXmlDoc,
+
"/root/page[1]/body/txt[2]/anchored/fly[1]/txt[1]/SwParaPortion/SwLineLayout/"
+ "SwLinePortion[1]",
+ "portion", "a");
+ assertXPath(pXmlDoc,
+
"/root/page[1]/body/txt[2]/anchored/fly[1]/txt[1]/SwParaPortion/SwLineLayout/"
+ "SwLinePortion[2]",
+ "type", "PortionType::Text");
+ assertXPath(pXmlDoc,
+
"/root/page[1]/body/txt[2]/anchored/fly[1]/txt[1]/SwParaPortion/SwLineLayout/"
+ "SwLinePortion[2]",
+ "portion", "bc");
+ assertXPath(pXmlDoc,
+
"/root/page[1]/body/txt[2]/anchored/fly[1]/txt[2]/SwParaPortion/SwLineLayout/"
+ "SwParaPortion[1]",
+ "type", "PortionType::Para");
+ assertXPath(pXmlDoc,
+
"/root/page[1]/body/txt[2]/anchored/fly[1]/txt[2]/SwParaPortion/SwLineLayout/"
+ "SwParaPortion[1]",
+ "portion", "def");
+ assertXPath(pXmlDoc,
+
"/root/page[1]/body/txt[2]/anchored/fly[1]/txt[3]/SwParaPortion/SwLineLayout/"
+ "SwLinePortion[1]",
+ "type", "PortionType::Text");
+ assertXPath(pXmlDoc,
+
"/root/page[1]/body/txt[2]/anchored/fly[1]/txt[3]/SwParaPortion/SwLineLayout/"
+ "SwLinePortion[1]",
+ "portion", "g");
+ assertXPath(pXmlDoc,
+
"/root/page[1]/body/txt[2]/anchored/fly[1]/txt[3]/SwParaPortion/SwLineLayout/"
+ "SwLinePortion[2]",
+ "type", "PortionType::Text");
+ assertXPath(pXmlDoc,
+
"/root/page[1]/body/txt[2]/anchored/fly[1]/txt[3]/SwParaPortion/SwLineLayout/"
+ "SwLinePortion[2]",
+ "portion", "hi");
+ assertXPath(pXmlDoc,
+
"/root/page[1]/body/txt[3]/SwParaPortion/SwLineLayout/SwLinePortion[1]", "type",
"PortionType::Text");
- assertXPath(pXmlDoc,
"/root/page[1]/body/txt[2]/anchored/fly[1]/txt[3]/Text[1]", "Portion",
- "g");
- assertXPath(pXmlDoc,
"/root/page[1]/body/txt[2]/anchored/fly[1]/txt[3]/Text[2]", "nType",
+ assertXPath(pXmlDoc,
+
"/root/page[1]/body/txt[3]/SwParaPortion/SwLineLayout/SwLinePortion[1]",
+ "portion", "b");
+ assertXPath(pXmlDoc,
+
"/root/page[1]/body/txt[3]/SwParaPortion/SwLineLayout/SwLinePortion[2]", "type",
"PortionType::Text");
- assertXPath(pXmlDoc,
"/root/page[1]/body/txt[2]/anchored/fly[1]/txt[3]/Text[2]", "Portion",
- "hi");
- assertXPath(pXmlDoc, "/root/page[1]/body/txt[3]/Text[1]", "nType",
"PortionType::Text");
- assertXPath(pXmlDoc, "/root/page[1]/body/txt[3]/Text[1]", "Portion",
"b");
- assertXPath(pXmlDoc, "/root/page[1]/body/txt[3]/Text[2]", "nType",
"PortionType::Text");
- assertXPath(pXmlDoc, "/root/page[1]/body/txt[3]/Text[2]", "Portion",
"az");
+ assertXPath(pXmlDoc,
+
"/root/page[1]/body/txt[3]/SwParaPortion/SwLineLayout/SwLinePortion[2]",
+ "portion", "az");
}
// anchor to 3rd paragraph
@@ -500,14 +592,22 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter,
testRedlineFlysInBody)
discardDumpedLayout();
xmlDocUniquePtr pXmlDoc = parseLayoutDump();
assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/merged",
"paraPropsNodeIndex", "14");
- assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Text[1]", "nType",
"PortionType::Para");
- assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Text[1]", "Portion",
"foaz");
+ 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", "foaz");
assertXPath(pXmlDoc,
"/root/page[1]/body/txt[1]/anchored/fly[1]/txt[1]/merged",
"paraPropsNodeIndex", "6");
- assertXPath(pXmlDoc,
"/root/page[1]/body/txt[1]/anchored/fly[1]/txt[1]/Text[1]", "nType",
- "PortionType::Para");
- assertXPath(pXmlDoc,
"/root/page[1]/body/txt[1]/anchored/fly[1]/txt[1]/Text[1]", "Portion",
- "ahi");
+ assertXPath(pXmlDoc,
+
"/root/page[1]/body/txt[1]/anchored/fly[1]/txt[1]/SwParaPortion/SwLineLayout/"
+ "SwParaPortion[1]",
+ "type", "PortionType::Para");
+ assertXPath(pXmlDoc,
+
"/root/page[1]/body/txt[1]/anchored/fly[1]/txt[1]/SwParaPortion/SwLineLayout/"
+ "SwParaPortion[1]",
+ "portion", "ahi");
dispatchCommand(mxComponent, ".uno:ShowTrackedChanges", {});
CPPUNIT_ASSERT(!pLayout->IsHideRedlines());
@@ -521,36 +621,76 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter,
testRedlineFlysInBody)
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",
"fo");
- assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Text[2]", "nType",
"PortionType::Text");
- assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Text[2]", "Portion",
"o");
- assertXPath(pXmlDoc, "/root/page[1]/body/txt[2]/Text[1]", "nType",
"PortionType::Para");
- assertXPath(pXmlDoc, "/root/page[1]/body/txt[2]/Text[1]", "Portion",
"bar");
- assertXPath(pXmlDoc, "/root/page[1]/body/txt[3]/Text[1]", "nType",
"PortionType::Text");
- assertXPath(pXmlDoc, "/root/page[1]/body/txt[3]/Text[1]", "Portion",
"b");
- assertXPath(pXmlDoc, "/root/page[1]/body/txt[3]/Text[2]", "nType",
"PortionType::Text");
- assertXPath(pXmlDoc, "/root/page[1]/body/txt[3]/Text[2]", "Portion",
"az");
- assertXPath(pXmlDoc,
"/root/page[1]/body/txt[3]/anchored/fly[1]/txt[1]/Text[1]", "nType",
+ assertXPath(pXmlDoc,
+
"/root/page[1]/body/txt[1]/SwParaPortion/SwLineLayout/SwLinePortion[1]", "type",
"PortionType::Text");
- assertXPath(pXmlDoc,
"/root/page[1]/body/txt[3]/anchored/fly[1]/txt[1]/Text[1]", "Portion",
- "a");
- assertXPath(pXmlDoc,
"/root/page[1]/body/txt[3]/anchored/fly[1]/txt[1]/Text[2]", "nType",
+ assertXPath(pXmlDoc,
+
"/root/page[1]/body/txt[1]/SwParaPortion/SwLineLayout/SwLinePortion[1]",
+ "portion", "fo");
+ assertXPath(pXmlDoc,
+
"/root/page[1]/body/txt[1]/SwParaPortion/SwLineLayout/SwLinePortion[2]", "type",
"PortionType::Text");
- assertXPath(pXmlDoc,
"/root/page[1]/body/txt[3]/anchored/fly[1]/txt[1]/Text[2]", "Portion",
- "bc");
- assertXPath(pXmlDoc,
"/root/page[1]/body/txt[3]/anchored/fly[1]/txt[2]/Text[1]", "nType",
+ assertXPath(pXmlDoc,
+
"/root/page[1]/body/txt[1]/SwParaPortion/SwLineLayout/SwLinePortion[2]",
+ "portion", "o");
+ assertXPath(pXmlDoc,
+
"/root/page[1]/body/txt[2]/SwParaPortion/SwLineLayout/SwParaPortion[1]", "type",
"PortionType::Para");
- assertXPath(pXmlDoc,
"/root/page[1]/body/txt[3]/anchored/fly[1]/txt[2]/Text[1]", "Portion",
- "def");
- assertXPath(pXmlDoc,
"/root/page[1]/body/txt[3]/anchored/fly[1]/txt[3]/Text[1]", "nType",
+ assertXPath(pXmlDoc,
+
"/root/page[1]/body/txt[2]/SwParaPortion/SwLineLayout/SwParaPortion[1]",
+ "portion", "bar");
+ assertXPath(pXmlDoc,
+
"/root/page[1]/body/txt[3]/SwParaPortion/SwLineLayout/SwLinePortion[1]", "type",
"PortionType::Text");
- assertXPath(pXmlDoc,
"/root/page[1]/body/txt[3]/anchored/fly[1]/txt[3]/Text[1]", "Portion",
- "g");
- assertXPath(pXmlDoc,
"/root/page[1]/body/txt[3]/anchored/fly[1]/txt[3]/Text[2]", "nType",
+ assertXPath(pXmlDoc,
+
"/root/page[1]/body/txt[3]/SwParaPortion/SwLineLayout/SwLinePortion[1]",
+ "portion", "b");
+ assertXPath(pXmlDoc,
+
"/root/page[1]/body/txt[3]/SwParaPortion/SwLineLayout/SwLinePortion[2]", "type",
"PortionType::Text");
- assertXPath(pXmlDoc,
"/root/page[1]/body/txt[3]/anchored/fly[1]/txt[3]/Text[2]", "Portion",
- "hi");
+ assertXPath(pXmlDoc,
+
"/root/page[1]/body/txt[3]/SwParaPortion/SwLineLayout/SwLinePortion[2]",
+ "portion", "az");
+ assertXPath(pXmlDoc,
+
"/root/page[1]/body/txt[3]/anchored/fly[1]/txt[1]/SwParaPortion/SwLineLayout/"
+ "SwLinePortion[1]",
+ "type", "PortionType::Text");
+ assertXPath(pXmlDoc,
+
"/root/page[1]/body/txt[3]/anchored/fly[1]/txt[1]/SwParaPortion/SwLineLayout/"
+ "SwLinePortion[1]",
+ "portion", "a");
+ assertXPath(pXmlDoc,
+
"/root/page[1]/body/txt[3]/anchored/fly[1]/txt[1]/SwParaPortion/SwLineLayout/"
+ "SwLinePortion[2]",
+ "type", "PortionType::Text");
+ assertXPath(pXmlDoc,
+
"/root/page[1]/body/txt[3]/anchored/fly[1]/txt[1]/SwParaPortion/SwLineLayout/"
+ "SwLinePortion[2]",
+ "portion", "bc");
+ assertXPath(pXmlDoc,
+
"/root/page[1]/body/txt[3]/anchored/fly[1]/txt[2]/SwParaPortion/SwLineLayout/"
+ "SwParaPortion[1]",
+ "type", "PortionType::Para");
+ assertXPath(pXmlDoc,
+
"/root/page[1]/body/txt[3]/anchored/fly[1]/txt[2]/SwParaPortion/SwLineLayout/"
+ "SwParaPortion[1]",
+ "portion", "def");
+ assertXPath(pXmlDoc,
+
"/root/page[1]/body/txt[3]/anchored/fly[1]/txt[3]/SwParaPortion/SwLineLayout/"
+ "SwLinePortion[1]",
+ "type", "PortionType::Text");
+ assertXPath(pXmlDoc,
+
"/root/page[1]/body/txt[3]/anchored/fly[1]/txt[3]/SwParaPortion/SwLineLayout/"
+ "SwLinePortion[1]",
+ "portion", "g");
+ assertXPath(pXmlDoc,
+
"/root/page[1]/body/txt[3]/anchored/fly[1]/txt[3]/SwParaPortion/SwLineLayout/"
+ "SwLinePortion[2]",
+ "type", "PortionType::Text");
+ assertXPath(pXmlDoc,
+
"/root/page[1]/body/txt[3]/anchored/fly[1]/txt[3]/SwParaPortion/SwLineLayout/"
+ "SwLinePortion[2]",
+ "portion", "hi");
}
}
