sw/qa/extras/layout/layout.cxx | 731 ++++++++++++------------
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 2
sw/qa/extras/rtfimport/rtfimport.cxx | 3
sw/qa/extras/uiwriter/uiwriter.cxx | 66 +-
sw/qa/extras/ww8export/ww8export.cxx | 6
sw/qa/extras/ww8export/ww8export2.cxx | 2
sw/source/core/access/accportions.cxx | 60 -
sw/source/core/access/accportions.hxx | 6
sw/source/core/inc/SwPortionHandler.hxx | 5
sw/source/core/inc/txttypes.hxx | 128 ++--
sw/source/core/text/EnhancedPDFExportHelper.cxx | 33 -
sw/source/core/text/inftxt.cxx | 32 -
sw/source/core/text/inftxt.hxx | 2
sw/source/core/text/itrform2.cxx | 8
sw/source/core/text/porexp.cxx | 4
sw/source/core/text/porexp.hxx | 4
sw/source/core/text/porfld.cxx | 20
sw/source/core/text/porfld.hxx | 2
sw/source/core/text/porfly.cxx | 2
sw/source/core/text/porfly.hxx | 2
sw/source/core/text/porftn.hxx | 2
sw/source/core/text/porglue.cxx | 8
sw/source/core/text/porhyph.hxx | 4
sw/source/core/text/porlay.cxx | 8
sw/source/core/text/porlin.cxx | 2
sw/source/core/text/porlin.hxx | 80 +-
sw/source/core/text/pormulti.cxx | 2
sw/source/core/text/pormulti.hxx | 2
sw/source/core/text/porref.cxx | 6
sw/source/core/text/porref.hxx | 2
sw/source/core/text/porrst.cxx | 16
sw/source/core/text/porrst.hxx | 6
sw/source/core/text/portab.hxx | 8
sw/source/core/text/portox.cxx | 6
sw/source/core/text/portox.hxx | 2
sw/source/core/text/portxt.cxx | 8
sw/source/core/text/portxt.hxx | 2
sw/source/core/text/txtdrop.cxx | 2
sw/source/core/text/txtftn.cxx | 10
sw/source/core/text/txthyph.cxx | 16
sw/source/core/text/txttab.cxx | 26
sw/source/core/text/xmldump.cxx | 128 ++--
42 files changed, 761 insertions(+), 703 deletions(-)
New commits:
commit 60b0526ea4929ce273de499f552a4d478a973d10
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Thu Jan 17 14:46:05 2019 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Fri Jan 18 07:48:57 2019 +0100
convert POR constants to scoped enum
Change-Id: Ia146f1f932cf4437e2e7e20722b0957a458979fd
Reviewed-on: https://gerrit.libreoffice.org/66514
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx
index b4b27ccaf337..7ed24771c661 100644
--- a/sw/qa/extras/layout/layout.cxx
+++ b/sw/qa/extras/layout/layout.cxx
@@ -141,21 +141,25 @@ void SwLayoutWriter::CheckRedlineFootnotesHidden()
discardDumpedLayout();
xmlDocPtr pXmlDoc = parseLayoutDump();
assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/merged",
"paraPropsNodeIndex", "24");
- assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Special[1]", "nType",
"POR_FTN");
+ assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Special[1]", "nType",
"PortionType::Footnote");
assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Special[1]", "rText", "1");
- assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Text[1]", "nType",
"POR_TXT");
+ assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Text[1]", "nType",
"PortionType::Text");
assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Text[1]", "Portion",
"foaz");
- assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Special[2]", "nType",
"POR_FTN");
+ assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Special[2]", "nType",
"PortionType::Footnote");
assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Special[2]", "rText", "2");
assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[1]/txt[1]/merged",
"paraPropsNodeIndex", "13");
- assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[1]/txt[1]/Special[1]",
"nType", "POR_FTNNUM");
+ assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[1]/txt[1]/Special[1]",
"nType",
+ "PortionType::FootnoteNum");
assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[1]/txt[1]/Special[1]",
"rText", "1");
- assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[1]/txt[1]/Text[1]",
"nType", "POR_TXT");
+ assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[1]/txt[1]/Text[1]",
"nType",
+ "PortionType::Text");
assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[1]/txt[1]/Text[1]",
"Portion", "ac");
assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[2]/txt[1]/merged",
"paraPropsNodeIndex", "16");
- assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[2]/txt[1]/Special[1]",
"nType", "POR_FTNNUM");
+ assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[2]/txt[1]/Special[1]",
"nType",
+ "PortionType::FootnoteNum");
assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[2]/txt[1]/Special[1]",
"rText", "2");
- assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[2]/txt[1]/Text[1]",
"nType", "POR_TXT");
+ assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[2]/txt[1]/Text[1]",
"nType",
+ "PortionType::Text");
assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[2]/txt[1]/Text[1]",
"Portion", "mo");
}
@@ -193,57 +197,71 @@ void SwLayoutWriter::testRedlineFootnotes()
xmlNodeSetPtr pXmlNodes = pXmlObj->nodesetval;
CPPUNIT_ASSERT_EQUAL(0, xmlXPathNodeSetGetLength(pXmlNodes));
xmlXPathFreeObject(pXmlObj);
- assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Special[1]", "nType",
"POR_FTN");
+ assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Special[1]", "nType",
"PortionType::Footnote");
assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Special[1]", "rText", "1");
- assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Text[1]", "nType",
"POR_TXT");
+ 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",
"POR_TXT");
+ 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]/Special[2]", "nType",
"POR_FTN");
+ assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Special[2]", "nType",
"PortionType::Footnote");
assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Special[2]", "rText", "2");
- assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[1]/txt[1]/Special[1]",
"nType", "POR_FTNNUM");
+ assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[1]/txt[1]/Special[1]",
"nType",
+ "PortionType::FootnoteNum");
assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[1]/txt[1]/Special[1]",
"rText", "1");
- assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[1]/txt[1]/Text[1]",
"nType", "POR_TXT");
+ assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[1]/txt[1]/Text[1]",
"nType",
+ "PortionType::Text");
assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[1]/txt[1]/Text[1]",
"Portion", "a");
- assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[1]/txt[1]/Text[2]",
"nType", "POR_TXT");
+ assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[1]/txt[1]/Text[2]",
"nType",
+ "PortionType::Text");
assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[1]/txt[1]/Text[2]",
"Portion", "b");
- assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[1]/txt[1]/Text[3]",
"nType", "POR_TXT");
+ assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[1]/txt[1]/Text[3]",
"nType",
+ "PortionType::Text");
assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[1]/txt[1]/Text[3]",
"Portion", "c");
- assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[2]/txt[1]/Special[1]",
"nType", "POR_FTNNUM");
+ assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[2]/txt[1]/Special[1]",
"nType",
+ "PortionType::FootnoteNum");
assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[2]/txt[1]/Special[1]",
"rText", "2");
- assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[2]/txt[1]/Text[1]",
"nType", "POR_TXT");
+ assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[2]/txt[1]/Text[1]",
"nType",
+ "PortionType::Text");
assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[2]/txt[1]/Text[1]",
"Portion", "def");
- assertXPath(pXmlDoc, "/root/page[1]/body/txt[2]/Text[1]", "nType",
"POR_TXT");
+ assertXPath(pXmlDoc, "/root/page[1]/body/txt[2]/Text[1]", "nType",
"PortionType::Text");
assertXPath(pXmlDoc, "/root/page[1]/body/txt[2]/Text[1]", "Portion", "b");
- assertXPath(pXmlDoc, "/root/page[1]/body/txt[2]/Special[1]", "nType",
"POR_FTN");
+ assertXPath(pXmlDoc, "/root/page[1]/body/txt[2]/Special[1]", "nType",
"PortionType::Footnote");
assertXPath(pXmlDoc, "/root/page[1]/body/txt[2]/Special[1]", "rText", "3");
- assertXPath(pXmlDoc, "/root/page[1]/body/txt[2]/Text[2]", "nType",
"POR_TXT");
+ assertXPath(pXmlDoc, "/root/page[1]/body/txt[2]/Text[2]", "nType",
"PortionType::Text");
assertXPath(pXmlDoc, "/root/page[1]/body/txt[2]/Text[2]", "Portion", "ar");
- assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[3]/txt[1]/Special[1]",
"nType", "POR_FTNNUM");
+ assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[3]/txt[1]/Special[1]",
"nType",
+ "PortionType::FootnoteNum");
assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[3]/txt[1]/Special[1]",
"rText", "3");
- assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[3]/txt[1]/Text[1]",
"nType", "POR_TXT");
+ assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[3]/txt[1]/Text[1]",
"nType",
+ "PortionType::Text");
assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[3]/txt[1]/Text[1]",
"Portion", "ghi");
- assertXPath(pXmlDoc, "/root/page[1]/body/txt[3]/Special[1]", "nType",
"POR_FTN");
+ assertXPath(pXmlDoc, "/root/page[1]/body/txt[3]/Special[1]", "nType",
"PortionType::Footnote");
assertXPath(pXmlDoc, "/root/page[1]/body/txt[3]/Special[1]", "rText", "4");
- assertXPath(pXmlDoc, "/root/page[1]/body/txt[3]/Text[1]", "nType",
"POR_TXT");
+ 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",
"POR_TXT");
+ 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]/Special[2]", "nType",
"POR_FTN");
+ assertXPath(pXmlDoc, "/root/page[1]/body/txt[3]/Special[2]", "nType",
"PortionType::Footnote");
assertXPath(pXmlDoc, "/root/page[1]/body/txt[3]/Special[2]", "rText", "5");
- assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[4]/txt[1]/Special[1]",
"nType", "POR_FTNNUM");
+ assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[4]/txt[1]/Special[1]",
"nType",
+ "PortionType::FootnoteNum");
assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[4]/txt[1]/Special[1]",
"rText", "4");
- assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[4]/txt[1]/Text[1]",
"nType", "POR_TXT");
+ assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[4]/txt[1]/Text[1]",
"nType",
+ "PortionType::Text");
assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[4]/txt[1]/Text[1]",
"Portion", "jkl");
- assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[5]/txt[1]/Special[1]",
"nType", "POR_FTNNUM");
+ assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[5]/txt[1]/Special[1]",
"nType",
+ "PortionType::FootnoteNum");
assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[5]/txt[1]/Special[1]",
"rText", "5");
- assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[5]/txt[1]/Text[1]",
"nType", "POR_TXT");
+ assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[5]/txt[1]/Text[1]",
"nType",
+ "PortionType::Text");
assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[5]/txt[1]/Text[1]",
"Portion", "m");
- assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[5]/txt[1]/Text[2]",
"nType", "POR_TXT");
+ assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[5]/txt[1]/Text[2]",
"nType",
+ "PortionType::Text");
assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[5]/txt[1]/Text[2]",
"Portion", "n");
- assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[5]/txt[1]/Text[3]",
"nType", "POR_TXT");
+ assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[5]/txt[1]/Text[3]",
"nType",
+ "PortionType::Text");
assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[5]/txt[1]/Text[3]",
"Portion", "o");
// verify after hide
@@ -325,12 +343,12 @@ void SwLayoutWriter::testRedlineFlysInBody()
discardDumpedLayout();
xmlDocPtr pXmlDoc = parseLayoutDump();
assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/merged",
"paraPropsNodeIndex", "14");
- assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Text[1]", "nType",
"POR_PARA");
+ 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]/anchored/fly[1]/txt[1]/merged",
"paraPropsNodeIndex", "6");
assertXPath(pXmlDoc,
"/root/page[1]/body/txt[1]/anchored/fly[1]/txt[1]/Text[1]", "nType",
- "POR_PARA");
+ "PortionType::Para");
assertXPath(pXmlDoc,
"/root/page[1]/body/txt[1]/anchored/fly[1]/txt[1]/Text[1]", "Portion",
"ahi");
@@ -346,35 +364,35 @@ void SwLayoutWriter::testRedlineFlysInBody()
xmlXPathFreeObject(pXmlObj);
}
- assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Text[1]", "nType",
"POR_TXT");
+ 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",
"POR_TXT");
+ 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",
- "POR_TXT");
+ "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",
- "POR_TXT");
+ "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",
- "POR_PARA");
+ "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",
- "POR_TXT");
+ "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",
- "POR_TXT");
+ "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",
"POR_PARA");
+ 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",
"POR_TXT");
+ 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",
"POR_TXT");
+ 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");
}
@@ -401,7 +419,7 @@ void SwLayoutWriter::testRedlineFlysInBody()
discardDumpedLayout();
xmlDocPtr pXmlDoc = parseLayoutDump();
assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/merged",
"paraPropsNodeIndex", "14");
- assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Text[1]", "nType",
"POR_PARA");
+ 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");
{ // hide: no anchored object shown
@@ -423,35 +441,35 @@ void SwLayoutWriter::testRedlineFlysInBody()
xmlXPathFreeObject(pXmlObj);
}
- assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Text[1]", "nType",
"POR_TXT");
+ 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",
"POR_TXT");
+ 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",
"POR_PARA");
+ 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",
- "POR_TXT");
+ "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",
- "POR_TXT");
+ "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",
- "POR_PARA");
+ "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",
- "POR_TXT");
+ "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",
- "POR_TXT");
+ "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",
"POR_TXT");
+ 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",
"POR_TXT");
+ 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");
}
@@ -477,12 +495,12 @@ void SwLayoutWriter::testRedlineFlysInBody()
discardDumpedLayout();
xmlDocPtr pXmlDoc = parseLayoutDump();
assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/merged",
"paraPropsNodeIndex", "14");
- assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Text[1]", "nType",
"POR_PARA");
+ 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]/anchored/fly[1]/txt[1]/merged",
"paraPropsNodeIndex", "6");
assertXPath(pXmlDoc,
"/root/page[1]/body/txt[1]/anchored/fly[1]/txt[1]/Text[1]", "nType",
- "POR_PARA");
+ "PortionType::Para");
assertXPath(pXmlDoc,
"/root/page[1]/body/txt[1]/anchored/fly[1]/txt[1]/Text[1]", "Portion",
"ahi");
@@ -498,34 +516,34 @@ void SwLayoutWriter::testRedlineFlysInBody()
xmlXPathFreeObject(pXmlObj);
}
- assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Text[1]", "nType",
"POR_TXT");
+ 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",
"POR_TXT");
+ 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",
"POR_PARA");
+ 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",
"POR_TXT");
+ 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",
"POR_TXT");
+ 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",
- "POR_TXT");
+ "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",
- "POR_TXT");
+ "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",
- "POR_PARA");
+ "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",
- "POR_TXT");
+ "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",
- "POR_TXT");
+ "PortionType::Text");
assertXPath(pXmlDoc,
"/root/page[1]/body/txt[3]/anchored/fly[1]/txt[3]/Text[2]", "Portion",
"hi");
}
@@ -606,15 +624,15 @@ void SwLayoutWriter::testRedlineFlysInHeader()
CPPUNIT_ASSERT(pLayout->IsHideRedlines());
discardDumpedLayout();
xmlDocPtr pXmlDoc = parseLayoutDump();
- assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Text[1]", "nType",
"POR_PARA");
+ assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Text[1]", "nType",
"PortionType::Para");
assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Text[1]", "nLength",
"0");
assertXPath(pXmlDoc, "/root/page[1]/header/txt[1]/merged",
"paraPropsNodeIndex", "6");
- assertXPath(pXmlDoc, "/root/page[1]/header/txt[1]/Text[1]", "nType",
"POR_PARA");
+ assertXPath(pXmlDoc, "/root/page[1]/header/txt[1]/Text[1]", "nType",
"PortionType::Para");
assertXPath(pXmlDoc, "/root/page[1]/header/txt[1]/Text[1]", "Portion",
"foaz");
assertXPath(pXmlDoc,
"/root/page[1]/header/txt[1]/anchored/fly[1]/txt[1]/merged",
"paraPropsNodeIndex", "11");
assertXPath(pXmlDoc,
"/root/page[1]/header/txt[1]/anchored/fly[1]/txt[1]/Text[1]", "nType",
- "POR_PARA");
+ "PortionType::Para");
assertXPath(pXmlDoc,
"/root/page[1]/header/txt[1]/anchored/fly[1]/txt[1]/Text[1]",
"Portion", "ahi");
@@ -630,37 +648,37 @@ void SwLayoutWriter::testRedlineFlysInHeader()
xmlXPathFreeObject(pXmlObj);
}
- assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Text[1]", "nType",
"POR_PARA");
+ assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Text[1]", "nType",
"PortionType::Para");
assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Text[1]", "nLength",
"0");
- assertXPath(pXmlDoc, "/root/page[1]/header/txt[1]/Text[1]", "nType",
"POR_TXT");
+ assertXPath(pXmlDoc, "/root/page[1]/header/txt[1]/Text[1]", "nType",
"PortionType::Text");
assertXPath(pXmlDoc, "/root/page[1]/header/txt[1]/Text[1]", "Portion",
"fo");
- assertXPath(pXmlDoc, "/root/page[1]/header/txt[1]/Text[2]", "nType",
"POR_TXT");
+ assertXPath(pXmlDoc, "/root/page[1]/header/txt[1]/Text[2]", "nType",
"PortionType::Text");
assertXPath(pXmlDoc, "/root/page[1]/header/txt[1]/Text[2]", "Portion",
"o");
assertXPath(pXmlDoc,
"/root/page[1]/header/txt[1]/anchored/fly[1]/txt[1]/Text[1]", "nType",
- "POR_TXT");
+ "PortionType::Text");
assertXPath(pXmlDoc,
"/root/page[1]/header/txt[1]/anchored/fly[1]/txt[1]/Text[1]",
"Portion", "a");
assertXPath(pXmlDoc,
"/root/page[1]/header/txt[1]/anchored/fly[1]/txt[1]/Text[2]", "nType",
- "POR_TXT");
+ "PortionType::Text");
assertXPath(pXmlDoc,
"/root/page[1]/header/txt[1]/anchored/fly[1]/txt[1]/Text[2]",
"Portion", "bc");
assertXPath(pXmlDoc,
"/root/page[1]/header/txt[1]/anchored/fly[1]/txt[2]/Text[1]", "nType",
- "POR_PARA");
+ "PortionType::Para");
assertXPath(pXmlDoc,
"/root/page[1]/header/txt[1]/anchored/fly[1]/txt[2]/Text[1]",
"Portion", "def");
assertXPath(pXmlDoc,
"/root/page[1]/header/txt[1]/anchored/fly[1]/txt[3]/Text[1]", "nType",
- "POR_TXT");
+ "PortionType::Text");
assertXPath(pXmlDoc,
"/root/page[1]/header/txt[1]/anchored/fly[1]/txt[3]/Text[1]",
"Portion", "g");
assertXPath(pXmlDoc,
"/root/page[1]/header/txt[1]/anchored/fly[1]/txt[3]/Text[2]", "nType",
- "POR_TXT");
+ "PortionType::Text");
assertXPath(pXmlDoc,
"/root/page[1]/header/txt[1]/anchored/fly[1]/txt[3]/Text[2]",
"Portion", "hi");
- assertXPath(pXmlDoc, "/root/page[1]/header/txt[2]/Text[1]", "nType",
"POR_PARA");
+ assertXPath(pXmlDoc, "/root/page[1]/header/txt[2]/Text[1]", "nType",
"PortionType::Para");
assertXPath(pXmlDoc, "/root/page[1]/header/txt[2]/Text[1]", "Portion",
"bar");
- assertXPath(pXmlDoc, "/root/page[1]/header/txt[3]/Text[1]", "nType",
"POR_TXT");
+ assertXPath(pXmlDoc, "/root/page[1]/header/txt[3]/Text[1]", "nType",
"PortionType::Text");
assertXPath(pXmlDoc, "/root/page[1]/header/txt[3]/Text[1]", "Portion",
"b");
- assertXPath(pXmlDoc, "/root/page[1]/header/txt[3]/Text[2]", "nType",
"POR_TXT");
+ assertXPath(pXmlDoc, "/root/page[1]/header/txt[3]/Text[2]", "nType",
"PortionType::Text");
assertXPath(pXmlDoc, "/root/page[1]/header/txt[3]/Text[2]", "Portion",
"az");
}
@@ -687,10 +705,10 @@ void SwLayoutWriter::testRedlineFlysInHeader()
discardDumpedLayout();
xmlDocPtr pXmlDoc = parseLayoutDump();
// now the frame has no Text portion? not sure why it's a 0-length one
first and now none?
- // assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Text[1]",
"nType", "POR_PARA");
+ // assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Text[1]",
"nType", "PortionType::Para");
// assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Text[1]",
"nLength", "0");
assertXPath(pXmlDoc, "/root/page[1]/header/txt[1]/merged",
"paraPropsNodeIndex", "6");
- assertXPath(pXmlDoc, "/root/page[1]/header/txt[1]/Text[1]", "nType",
"POR_PARA");
+ assertXPath(pXmlDoc, "/root/page[1]/header/txt[1]/Text[1]", "nType",
"PortionType::Para");
assertXPath(pXmlDoc, "/root/page[1]/header/txt[1]/Text[1]", "Portion",
"foaz");
{ // hide: no anchored object shown
@@ -712,37 +730,37 @@ void SwLayoutWriter::testRedlineFlysInHeader()
xmlXPathFreeObject(pXmlObj);
}
- assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Text[1]", "nType",
"POR_PARA");
+ assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Text[1]", "nType",
"PortionType::Para");
assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Text[1]", "nLength",
"0");
- assertXPath(pXmlDoc, "/root/page[1]/header/txt[1]/Text[1]", "nType",
"POR_TXT");
+ assertXPath(pXmlDoc, "/root/page[1]/header/txt[1]/Text[1]", "nType",
"PortionType::Text");
assertXPath(pXmlDoc, "/root/page[1]/header/txt[1]/Text[1]", "Portion",
"fo");
- assertXPath(pXmlDoc, "/root/page[1]/header/txt[1]/Text[2]", "nType",
"POR_TXT");
+ assertXPath(pXmlDoc, "/root/page[1]/header/txt[1]/Text[2]", "nType",
"PortionType::Text");
assertXPath(pXmlDoc, "/root/page[1]/header/txt[1]/Text[2]", "Portion",
"o");
- assertXPath(pXmlDoc, "/root/page[1]/header/txt[2]/Text[1]", "nType",
"POR_PARA");
+ assertXPath(pXmlDoc, "/root/page[1]/header/txt[2]/Text[1]", "nType",
"PortionType::Para");
assertXPath(pXmlDoc, "/root/page[1]/header/txt[2]/Text[1]", "Portion",
"bar");
assertXPath(pXmlDoc,
"/root/page[1]/header/txt[2]/anchored/fly[1]/txt[1]/Text[1]", "nType",
- "POR_TXT");
+ "PortionType::Text");
assertXPath(pXmlDoc,
"/root/page[1]/header/txt[2]/anchored/fly[1]/txt[1]/Text[1]",
"Portion", "a");
assertXPath(pXmlDoc,
"/root/page[1]/header/txt[2]/anchored/fly[1]/txt[1]/Text[2]", "nType",
- "POR_TXT");
+ "PortionType::Text");
assertXPath(pXmlDoc,
"/root/page[1]/header/txt[2]/anchored/fly[1]/txt[1]/Text[2]",
"Portion", "bc");
assertXPath(pXmlDoc,
"/root/page[1]/header/txt[2]/anchored/fly[1]/txt[2]/Text[1]", "nType",
- "POR_PARA");
+ "PortionType::Para");
assertXPath(pXmlDoc,
"/root/page[1]/header/txt[2]/anchored/fly[1]/txt[2]/Text[1]",
"Portion", "def");
assertXPath(pXmlDoc,
"/root/page[1]/header/txt[2]/anchored/fly[1]/txt[3]/Text[1]", "nType",
- "POR_TXT");
+ "PortionType::Text");
assertXPath(pXmlDoc,
"/root/page[1]/header/txt[2]/anchored/fly[1]/txt[3]/Text[1]",
"Portion", "g");
assertXPath(pXmlDoc,
"/root/page[1]/header/txt[2]/anchored/fly[1]/txt[3]/Text[2]", "nType",
- "POR_TXT");
+ "PortionType::Text");
assertXPath(pXmlDoc,
"/root/page[1]/header/txt[2]/anchored/fly[1]/txt[3]/Text[2]",
"Portion", "hi");
- assertXPath(pXmlDoc, "/root/page[1]/header/txt[3]/Text[1]", "nType",
"POR_TXT");
+ assertXPath(pXmlDoc, "/root/page[1]/header/txt[3]/Text[1]", "nType",
"PortionType::Text");
assertXPath(pXmlDoc, "/root/page[1]/header/txt[3]/Text[1]", "Portion",
"b");
- assertXPath(pXmlDoc, "/root/page[1]/header/txt[3]/Text[2]", "nType",
"POR_TXT");
+ assertXPath(pXmlDoc, "/root/page[1]/header/txt[3]/Text[2]", "nType",
"PortionType::Text");
assertXPath(pXmlDoc, "/root/page[1]/header/txt[3]/Text[2]", "Portion",
"az");
}
@@ -767,15 +785,15 @@ void SwLayoutWriter::testRedlineFlysInHeader()
CPPUNIT_ASSERT(pLayout->IsHideRedlines());
discardDumpedLayout();
xmlDocPtr pXmlDoc = parseLayoutDump();
- assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Text[1]", "nType",
"POR_PARA");
+ assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Text[1]", "nType",
"PortionType::Para");
assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Text[1]", "nLength",
"0");
assertXPath(pXmlDoc, "/root/page[1]/header/txt[1]/merged",
"paraPropsNodeIndex", "6");
- assertXPath(pXmlDoc, "/root/page[1]/header/txt[1]/Text[1]", "nType",
"POR_PARA");
+ assertXPath(pXmlDoc, "/root/page[1]/header/txt[1]/Text[1]", "nType",
"PortionType::Para");
assertXPath(pXmlDoc, "/root/page[1]/header/txt[1]/Text[1]", "Portion",
"foaz");
assertXPath(pXmlDoc,
"/root/page[1]/header/txt[1]/anchored/fly[1]/txt[1]/merged",
"paraPropsNodeIndex", "11");
assertXPath(pXmlDoc,
"/root/page[1]/header/txt[1]/anchored/fly[1]/txt[1]/Text[1]", "nType",
- "POR_PARA");
+ "PortionType::Para");
assertXPath(pXmlDoc,
"/root/page[1]/header/txt[1]/anchored/fly[1]/txt[1]/Text[1]",
"Portion", "ahi");
@@ -791,36 +809,36 @@ void SwLayoutWriter::testRedlineFlysInHeader()
xmlXPathFreeObject(pXmlObj);
}
- assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Text[1]", "nType",
"POR_PARA");
+ assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Text[1]", "nType",
"PortionType::Para");
assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Text[1]", "nLength",
"0");
- assertXPath(pXmlDoc, "/root/page[1]/header/txt[1]/Text[1]", "nType",
"POR_TXT");
+ assertXPath(pXmlDoc, "/root/page[1]/header/txt[1]/Text[1]", "nType",
"PortionType::Text");
assertXPath(pXmlDoc, "/root/page[1]/header/txt[1]/Text[1]", "Portion",
"fo");
- assertXPath(pXmlDoc, "/root/page[1]/header/txt[1]/Text[2]", "nType",
"POR_TXT");
+ assertXPath(pXmlDoc, "/root/page[1]/header/txt[1]/Text[2]", "nType",
"PortionType::Text");
assertXPath(pXmlDoc, "/root/page[1]/header/txt[1]/Text[2]", "Portion",
"o");
- assertXPath(pXmlDoc, "/root/page[1]/header/txt[2]/Text[1]", "nType",
"POR_PARA");
+ assertXPath(pXmlDoc, "/root/page[1]/header/txt[2]/Text[1]", "nType",
"PortionType::Para");
assertXPath(pXmlDoc, "/root/page[1]/header/txt[2]/Text[1]", "Portion",
"bar");
- assertXPath(pXmlDoc, "/root/page[1]/header/txt[3]/Text[1]", "nType",
"POR_TXT");
+ assertXPath(pXmlDoc, "/root/page[1]/header/txt[3]/Text[1]", "nType",
"PortionType::Text");
assertXPath(pXmlDoc, "/root/page[1]/header/txt[3]/Text[1]", "Portion",
"b");
- assertXPath(pXmlDoc, "/root/page[1]/header/txt[3]/Text[2]", "nType",
"POR_TXT");
+ assertXPath(pXmlDoc, "/root/page[1]/header/txt[3]/Text[2]", "nType",
"PortionType::Text");
assertXPath(pXmlDoc, "/root/page[1]/header/txt[3]/Text[2]", "Portion",
"az");
assertXPath(pXmlDoc,
"/root/page[1]/header/txt[3]/anchored/fly[1]/txt[1]/Text[1]", "nType",
- "POR_TXT");
+ "PortionType::Text");
assertXPath(pXmlDoc,
"/root/page[1]/header/txt[3]/anchored/fly[1]/txt[1]/Text[1]",
"Portion", "a");
assertXPath(pXmlDoc,
"/root/page[1]/header/txt[3]/anchored/fly[1]/txt[1]/Text[2]", "nType",
- "POR_TXT");
+ "PortionType::Text");
assertXPath(pXmlDoc,
"/root/page[1]/header/txt[3]/anchored/fly[1]/txt[1]/Text[2]",
"Portion", "bc");
assertXPath(pXmlDoc,
"/root/page[1]/header/txt[3]/anchored/fly[1]/txt[2]/Text[1]", "nType",
- "POR_PARA");
+ "PortionType::Para");
assertXPath(pXmlDoc,
"/root/page[1]/header/txt[3]/anchored/fly[1]/txt[2]/Text[1]",
"Portion", "def");
assertXPath(pXmlDoc,
"/root/page[1]/header/txt[3]/anchored/fly[1]/txt[3]/Text[1]", "nType",
- "POR_TXT");
+ "PortionType::Text");
assertXPath(pXmlDoc,
"/root/page[1]/header/txt[3]/anchored/fly[1]/txt[3]/Text[1]",
"Portion", "g");
assertXPath(pXmlDoc,
"/root/page[1]/header/txt[3]/anchored/fly[1]/txt[3]/Text[2]", "nType",
- "POR_TXT");
+ "PortionType::Text");
assertXPath(pXmlDoc,
"/root/page[1]/header/txt[3]/anchored/fly[1]/txt[3]/Text[2]",
"Portion", "hi");
}
@@ -922,18 +940,19 @@ void SwLayoutWriter::testRedlineFlysInFootnote()
discardDumpedLayout();
xmlDocPtr pXmlDoc = parseLayoutDump();
assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/merged",
"paraPropsNodeIndex", "25");
- assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Special[1]", "nType",
"POR_FTN");
+ assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Special[1]", "nType",
+ "PortionType::Footnote");
assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Special[1]", "rText",
"1");
assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[1]/txt[1]/merged",
"paraPropsNodeIndex",
"7");
assertXPath(pXmlDoc,
"/root/page[1]/ftncont/ftn[1]/txt[1]/anchored/fly[1]/txt[1]/merged",
"paraPropsNodeIndex", "17");
assertXPath(pXmlDoc,
"/root/page[1]/ftncont/ftn[1]/txt[1]/anchored/fly[1]/txt[1]/Text[1]",
- "nType", "POR_PARA");
+ "nType", "PortionType::Para");
assertXPath(pXmlDoc,
"/root/page[1]/ftncont/ftn[1]/txt[1]/anchored/fly[1]/txt[1]/Text[1]",
"Portion", "ahi");
assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[1]/txt[1]/Special[1]",
"nType",
- "POR_FTNNUM");
+ "PortionType::FootnoteNum");
assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[1]/txt[1]/Special[1]",
"rText", "1");
lcl_dispatchCommand(mxComponent, ".uno:ShowTrackedChanges", {});
@@ -948,49 +967,56 @@ void SwLayoutWriter::testRedlineFlysInFootnote()
xmlXPathFreeObject(pXmlObj);
}
- assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Special[1]", "nType",
"POR_FTN");
+ assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Special[1]", "nType",
+ "PortionType::Footnote");
assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Special[1]", "rText",
"1");
- assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Special[2]", "nType",
"POR_FTN");
+ assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Special[2]", "nType",
+ "PortionType::Footnote");
assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Special[2]", "rText",
"2");
assertXPath(pXmlDoc,
"/root/page[1]/ftncont/ftn[1]/txt[1]/anchored/fly[1]/txt[1]/Text[1]",
- "nType", "POR_PARA");
+ "nType", "PortionType::Para");
assertXPath(pXmlDoc,
"/root/page[1]/ftncont/ftn[1]/txt[1]/anchored/fly[1]/txt[1]/Text[1]",
"Portion", "quux");
assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[1]/txt[1]/Special[1]",
"nType",
- "POR_FTNNUM");
+ "PortionType::FootnoteNum");
assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[1]/txt[1]/Special[1]",
"rText", "1");
assertXPath(pXmlDoc,
"/root/page[1]/ftncont/ftn[2]/txt[1]/anchored/fly[1]/txt[1]/Text[1]",
- "nType", "POR_TXT");
+ "nType", "PortionType::Text");
assertXPath(pXmlDoc,
"/root/page[1]/ftncont/ftn[2]/txt[1]/anchored/fly[1]/txt[1]/Text[1]",
"Portion", "a");
assertXPath(pXmlDoc,
"/root/page[1]/ftncont/ftn[2]/txt[1]/anchored/fly[1]/txt[1]/Text[2]",
- "nType", "POR_TXT");
+ "nType", "PortionType::Text");
assertXPath(pXmlDoc,
"/root/page[1]/ftncont/ftn[2]/txt[1]/anchored/fly[1]/txt[1]/Text[2]",
"Portion", "bc");
assertXPath(pXmlDoc,
"/root/page[1]/ftncont/ftn[2]/txt[1]/anchored/fly[1]/txt[2]/Text[1]",
- "nType", "POR_PARA");
+ "nType", "PortionType::Para");
assertXPath(pXmlDoc,
"/root/page[1]/ftncont/ftn[2]/txt[1]/anchored/fly[1]/txt[2]/Text[1]",
"Portion", "def");
assertXPath(pXmlDoc,
"/root/page[1]/ftncont/ftn[2]/txt[1]/anchored/fly[1]/txt[3]/Text[1]",
- "nType", "POR_TXT");
+ "nType", "PortionType::Text");
assertXPath(pXmlDoc,
"/root/page[1]/ftncont/ftn[2]/txt[1]/anchored/fly[1]/txt[3]/Text[1]",
"Portion", "g");
assertXPath(pXmlDoc,
"/root/page[1]/ftncont/ftn[2]/txt[1]/anchored/fly[1]/txt[3]/Text[2]",
- "nType", "POR_TXT");
+ "nType", "PortionType::Text");
assertXPath(pXmlDoc,
"/root/page[1]/ftncont/ftn[2]/txt[1]/anchored/fly[1]/txt[3]/Text[2]",
"Portion", "hi");
assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[2]/txt[1]/Special[1]",
"nType",
- "POR_FTNNUM");
+ "PortionType::FootnoteNum");
assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[2]/txt[1]/Special[1]",
"rText", "2");
- assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[2]/txt[1]/Text[1]",
"nType", "POR_TXT");
+ assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[2]/txt[1]/Text[1]",
"nType",
+ "PortionType::Text");
assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[2]/txt[1]/Text[1]",
"Portion", "fo");
- assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[2]/txt[1]/Text[2]",
"nType", "POR_TXT");
+ assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[2]/txt[1]/Text[2]",
"nType",
+ "PortionType::Text");
assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[2]/txt[1]/Text[2]",
"Portion", "o");
- assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[2]/txt[2]/Text[1]",
"nType", "POR_PARA");
+ assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[2]/txt[2]/Text[1]",
"nType",
+ "PortionType::Para");
assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[2]/txt[2]/Text[1]",
"Portion", "bar");
- assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[2]/txt[3]/Text[1]",
"nType", "POR_TXT");
+ assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[2]/txt[3]/Text[1]",
"nType",
+ "PortionType::Text");
assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[2]/txt[3]/Text[1]",
"Portion", "b");
- assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[2]/txt[3]/Text[2]",
"nType", "POR_TXT");
+ assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[2]/txt[3]/Text[2]",
"nType",
+ "PortionType::Text");
assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[2]/txt[3]/Text[2]",
"Portion", "az");
}
@@ -1020,12 +1046,13 @@ void SwLayoutWriter::testRedlineFlysInFootnote()
xmlDocPtr pXmlDoc = parseLayoutDump();
assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/merged",
"paraPropsNodeIndex", "25");
- assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Special[1]", "nType",
"POR_FTN");
+ assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Special[1]", "nType",
+ "PortionType::Footnote");
assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Special[1]", "rText",
"1");
assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[1]/txt[1]/merged",
"paraPropsNodeIndex",
"7");
assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[1]/txt[1]/Special[1]",
"nType",
- "POR_FTNNUM");
+ "PortionType::FootnoteNum");
assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[1]/txt[1]/Special[1]",
"rText", "1");
{ // hide: no anchored object shown
@@ -1047,49 +1074,56 @@ void SwLayoutWriter::testRedlineFlysInFootnote()
xmlXPathFreeObject(pXmlObj);
}
- assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Special[1]", "nType",
"POR_FTN");
+ assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Special[1]", "nType",
+ "PortionType::Footnote");
assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Special[1]", "rText",
"1");
- assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Special[2]", "nType",
"POR_FTN");
+ assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Special[2]", "nType",
+ "PortionType::Footnote");
assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Special[2]", "rText",
"2");
assertXPath(pXmlDoc,
"/root/page[1]/ftncont/ftn[1]/txt[1]/anchored/fly[1]/txt[1]/Text[1]",
- "nType", "POR_PARA");
+ "nType", "PortionType::Para");
assertXPath(pXmlDoc,
"/root/page[1]/ftncont/ftn[1]/txt[1]/anchored/fly[1]/txt[1]/Text[1]",
"Portion", "quux");
assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[1]/txt[1]/Special[1]",
"nType",
- "POR_FTNNUM");
+ "PortionType::FootnoteNum");
assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[1]/txt[1]/Special[1]",
"rText", "1");
assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[2]/txt[1]/Special[1]",
"nType",
- "POR_FTNNUM");
+ "PortionType::FootnoteNum");
assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[2]/txt[1]/Special[1]",
"rText", "2");
- assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[2]/txt[1]/Text[1]",
"nType", "POR_TXT");
+ assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[2]/txt[1]/Text[1]",
"nType",
+ "PortionType::Text");
assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[2]/txt[1]/Text[1]",
"Portion", "fo");
- assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[2]/txt[1]/Text[2]",
"nType", "POR_TXT");
+ assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[2]/txt[1]/Text[2]",
"nType",
+ "PortionType::Text");
assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[2]/txt[1]/Text[2]",
"Portion", "o");
assertXPath(pXmlDoc,
"/root/page[1]/ftncont/ftn[2]/txt[2]/anchored/fly[1]/txt[1]/Text[1]",
- "nType", "POR_TXT");
+ "nType", "PortionType::Text");
assertXPath(pXmlDoc,
"/root/page[1]/ftncont/ftn[2]/txt[2]/anchored/fly[1]/txt[1]/Text[1]",
"Portion", "a");
assertXPath(pXmlDoc,
"/root/page[1]/ftncont/ftn[2]/txt[2]/anchored/fly[1]/txt[1]/Text[2]",
- "nType", "POR_TXT");
+ "nType", "PortionType::Text");
assertXPath(pXmlDoc,
"/root/page[1]/ftncont/ftn[2]/txt[2]/anchored/fly[1]/txt[1]/Text[2]",
"Portion", "bc");
assertXPath(pXmlDoc,
"/root/page[1]/ftncont/ftn[2]/txt[2]/anchored/fly[1]/txt[2]/Text[1]",
- "nType", "POR_PARA");
+ "nType", "PortionType::Para");
assertXPath(pXmlDoc,
"/root/page[1]/ftncont/ftn[2]/txt[2]/anchored/fly[1]/txt[2]/Text[1]",
"Portion", "def");
assertXPath(pXmlDoc,
"/root/page[1]/ftncont/ftn[2]/txt[2]/anchored/fly[1]/txt[3]/Text[1]",
- "nType", "POR_TXT");
+ "nType", "PortionType::Text");
assertXPath(pXmlDoc,
"/root/page[1]/ftncont/ftn[2]/txt[2]/anchored/fly[1]/txt[3]/Text[1]",
"Portion", "g");
assertXPath(pXmlDoc,
"/root/page[1]/ftncont/ftn[2]/txt[2]/anchored/fly[1]/txt[3]/Text[2]",
- "nType", "POR_TXT");
+ "nType", "PortionType::Text");
assertXPath(pXmlDoc,
"/root/page[1]/ftncont/ftn[2]/txt[2]/anchored/fly[1]/txt[3]/Text[2]",
"Portion", "hi");
- assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[2]/txt[2]/Text[1]",
"nType", "POR_PARA");
+ assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[2]/txt[2]/Text[1]",
"nType",
+ "PortionType::Para");
assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[2]/txt[2]/Text[1]",
"Portion", "bar");
- assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[2]/txt[3]/Text[1]",
"nType", "POR_TXT");
+ assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[2]/txt[3]/Text[1]",
"nType",
+ "PortionType::Text");
assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[2]/txt[3]/Text[1]",
"Portion", "b");
- assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[2]/txt[3]/Text[2]",
"nType", "POR_TXT");
+ assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[2]/txt[3]/Text[2]",
"nType",
+ "PortionType::Text");
assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[2]/txt[3]/Text[2]",
"Portion", "az");
}
@@ -1119,18 +1153,19 @@ void SwLayoutWriter::testRedlineFlysInFootnote()
discardDumpedLayout();
xmlDocPtr pXmlDoc = parseLayoutDump();
assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/merged",
"paraPropsNodeIndex", "25");
- assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Special[1]", "nType",
"POR_FTN");
+ assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Special[1]", "nType",
+ "PortionType::Footnote");
assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Special[1]", "rText",
"1");
assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[1]/txt[1]/merged",
"paraPropsNodeIndex",
"7");
assertXPath(pXmlDoc,
"/root/page[1]/ftncont/ftn[1]/txt[1]/anchored/fly[1]/txt[1]/merged",
"paraPropsNodeIndex", "17");
assertXPath(pXmlDoc,
"/root/page[1]/ftncont/ftn[1]/txt[1]/anchored/fly[1]/txt[1]/Text[1]",
- "nType", "POR_PARA");
+ "nType", "PortionType::Para");
assertXPath(pXmlDoc,
"/root/page[1]/ftncont/ftn[1]/txt[1]/anchored/fly[1]/txt[1]/Text[1]",
"Portion", "ahi");
assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[1]/txt[1]/Special[1]",
"nType",
- "POR_FTNNUM");
+ "PortionType::FootnoteNum");
assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[1]/txt[1]/Special[1]",
"rText", "1");
lcl_dispatchCommand(mxComponent, ".uno:ShowTrackedChanges", {});
@@ -1145,49 +1180,56 @@ void SwLayoutWriter::testRedlineFlysInFootnote()
xmlXPathFreeObject(pXmlObj);
}
- assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Special[1]", "nType",
"POR_FTN");
+ assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Special[1]", "nType",
+ "PortionType::Footnote");
assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Special[1]", "rText",
"1");
- assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Special[2]", "nType",
"POR_FTN");
+ assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Special[2]", "nType",
+ "PortionType::Footnote");
assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Special[2]", "rText",
"2");
assertXPath(pXmlDoc,
"/root/page[1]/ftncont/ftn[1]/txt[1]/anchored/fly[1]/txt[1]/Text[1]",
- "nType", "POR_PARA");
+ "nType", "PortionType::Para");
assertXPath(pXmlDoc,
"/root/page[1]/ftncont/ftn[1]/txt[1]/anchored/fly[1]/txt[1]/Text[1]",
"Portion", "quux");
assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[1]/txt[1]/Special[1]",
"nType",
- "POR_FTNNUM");
+ "PortionType::FootnoteNum");
assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[1]/txt[1]/Special[1]",
"rText", "1");
assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[2]/txt[1]/Special[1]",
"nType",
- "POR_FTNNUM");
+ "PortionType::FootnoteNum");
assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[2]/txt[1]/Special[1]",
"rText", "2");
- assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[2]/txt[1]/Text[1]",
"nType", "POR_TXT");
+ assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[2]/txt[1]/Text[1]",
"nType",
+ "PortionType::Text");
assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[2]/txt[1]/Text[1]",
"Portion", "fo");
- assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[2]/txt[1]/Text[2]",
"nType", "POR_TXT");
+ assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[2]/txt[1]/Text[2]",
"nType",
+ "PortionType::Text");
assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[2]/txt[1]/Text[2]",
"Portion", "o");
- assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[2]/txt[2]/Text[1]",
"nType", "POR_PARA");
+ assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[2]/txt[2]/Text[1]",
"nType",
+ "PortionType::Para");
assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[2]/txt[2]/Text[1]",
"Portion", "bar");
assertXPath(pXmlDoc,
"/root/page[1]/ftncont/ftn[2]/txt[3]/anchored/fly[1]/txt[1]/Text[1]",
- "nType", "POR_TXT");
+ "nType", "PortionType::Text");
assertXPath(pXmlDoc,
"/root/page[1]/ftncont/ftn[2]/txt[3]/anchored/fly[1]/txt[1]/Text[1]",
"Portion", "a");
assertXPath(pXmlDoc,
"/root/page[1]/ftncont/ftn[2]/txt[3]/anchored/fly[1]/txt[1]/Text[2]",
- "nType", "POR_TXT");
+ "nType", "PortionType::Text");
assertXPath(pXmlDoc,
"/root/page[1]/ftncont/ftn[2]/txt[3]/anchored/fly[1]/txt[1]/Text[2]",
"Portion", "bc");
assertXPath(pXmlDoc,
"/root/page[1]/ftncont/ftn[2]/txt[3]/anchored/fly[1]/txt[2]/Text[1]",
- "nType", "POR_PARA");
+ "nType", "PortionType::Para");
assertXPath(pXmlDoc,
"/root/page[1]/ftncont/ftn[2]/txt[3]/anchored/fly[1]/txt[2]/Text[1]",
"Portion", "def");
assertXPath(pXmlDoc,
"/root/page[1]/ftncont/ftn[2]/txt[3]/anchored/fly[1]/txt[3]/Text[1]",
- "nType", "POR_TXT");
+ "nType", "PortionType::Text");
assertXPath(pXmlDoc,
"/root/page[1]/ftncont/ftn[2]/txt[3]/anchored/fly[1]/txt[3]/Text[1]",
"Portion", "g");
assertXPath(pXmlDoc,
"/root/page[1]/ftncont/ftn[2]/txt[3]/anchored/fly[1]/txt[3]/Text[2]",
- "nType", "POR_TXT");
+ "nType", "PortionType::Text");
assertXPath(pXmlDoc,
"/root/page[1]/ftncont/ftn[2]/txt[3]/anchored/fly[1]/txt[3]/Text[2]",
"Portion", "hi");
- assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[2]/txt[3]/Text[1]",
"nType", "POR_TXT");
+ assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[2]/txt[3]/Text[1]",
"nType",
+ "PortionType::Text");
assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[2]/txt[3]/Text[1]",
"Portion", "b");
- assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[2]/txt[3]/Text[2]",
"nType", "POR_TXT");
+ assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[2]/txt[3]/Text[2]",
"nType",
+ "PortionType::Text");
assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn[2]/txt[3]/Text[2]",
"Portion", "az");
}
}
@@ -1298,18 +1340,18 @@ void SwLayoutWriter::testRedlineFlysInFlys()
assertXPath(
pXmlDoc,
"/root/page[1]/body/txt[1]/anchored/fly[1]/txt[1]/anchored[1]/fly[1]/txt[1]/Text[1]",
- "nType", "POR_PARA");
+ "nType", "PortionType::Para");
assertXPath(
pXmlDoc,
"/root/page[1]/body/txt[1]/anchored/fly[1]/txt[1]/anchored[1]/fly[1]/txt[1]/Text[1]",
"Portion", "jqr");
assertXPath(pXmlDoc,
"/root/page[1]/body/txt[1]/anchored/fly[1]/txt[1]/Special[1]", "nType",
- "POR_FLY"); // remove???
+ "PortionType::Fly"); // remove???
assertXPath(pXmlDoc,
"/root/page[1]/body/txt[1]/anchored/fly[1]/txt[1]/Text[1]", "nType",
- "POR_LAY");
+ "PortionType::Lay");
assertXPath(pXmlDoc,
"/root/page[1]/body/txt[1]/anchored/fly[1]/txt[1]/Text[1]", "Portion",
"abhi");
- assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Text[1]", "nType",
"POR_PARA");
+ 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");
lcl_dispatchCommand(mxComponent, ".uno:ShowTrackedChanges", {});
@@ -1327,7 +1369,7 @@ void SwLayoutWriter::testRedlineFlysInFlys()
assertXPath(
pXmlDoc,
"/root/page[1]/body/txt[1]/anchored/fly[1]/txt[1]/anchored[1]/fly[1]/txt[1]/Text[1]",
- "nType", "POR_TXT");
+ "nType", "PortionType::Text");
assertXPath(
pXmlDoc,
"/root/page[1]/body/txt[1]/anchored/fly[1]/txt[1]/anchored[1]/fly[1]/txt[1]/Text[1]",
@@ -1335,7 +1377,7 @@ void SwLayoutWriter::testRedlineFlysInFlys()
assertXPath(
pXmlDoc,
"/root/page[1]/body/txt[1]/anchored/fly[1]/txt[1]/anchored[1]/fly[1]/txt[1]/Text[2]",
- "nType", "POR_TXT");
+ "nType", "PortionType::Text");
assertXPath(
pXmlDoc,
"/root/page[1]/body/txt[1]/anchored/fly[1]/txt[1]/anchored[1]/fly[1]/txt[1]/Text[2]",
@@ -1343,7 +1385,7 @@ void SwLayoutWriter::testRedlineFlysInFlys()
assertXPath(
pXmlDoc,
"/root/page[1]/body/txt[1]/anchored/fly[1]/txt[1]/anchored[1]/fly[1]/txt[2]/Text[1]",
- "nType", "POR_PARA");
+ "nType", "PortionType::Para");
assertXPath(
pXmlDoc,
"/root/page[1]/body/txt[1]/anchored/fly[1]/txt[1]/anchored[1]/fly[1]/txt[2]/Text[1]",
@@ -1351,7 +1393,7 @@ void SwLayoutWriter::testRedlineFlysInFlys()
assertXPath(
pXmlDoc,
"/root/page[1]/body/txt[1]/anchored/fly[1]/txt[1]/anchored[1]/fly[1]/txt[3]/Text[1]",
- "nType", "POR_TXT");
+ "nType", "PortionType::Text");
assertXPath(
pXmlDoc,
"/root/page[1]/body/txt[1]/anchored/fly[1]/txt[1]/anchored[1]/fly[1]/txt[3]/Text[1]",
@@ -1359,42 +1401,42 @@ void SwLayoutWriter::testRedlineFlysInFlys()
assertXPath(
pXmlDoc,
"/root/page[1]/body/txt[1]/anchored/fly[1]/txt[1]/anchored[1]/fly[1]/txt[3]/Text[2]",
- "nType", "POR_TXT");
+ "nType", "PortionType::Text");
assertXPath(
pXmlDoc,
"/root/page[1]/body/txt[1]/anchored/fly[1]/txt[1]/anchored[1]/fly[1]/txt[3]/Text[2]",
"Portion", "qr");
assertXPath(pXmlDoc,
"/root/page[1]/body/txt[1]/anchored/fly[1]/txt[1]/Special[1]", "nType",
- "POR_FLY"); // remove???
+ "PortionType::Fly"); // remove???
assertXPath(pXmlDoc,
"/root/page[1]/body/txt[1]/anchored/fly[1]/txt[1]/Text[1]", "nType",
- "POR_TXT");
+ "PortionType::Text");
assertXPath(pXmlDoc,
"/root/page[1]/body/txt[1]/anchored/fly[1]/txt[1]/Text[1]", "Portion",
"ab");
assertXPath(pXmlDoc,
"/root/page[1]/body/txt[1]/anchored/fly[1]/txt[1]/Text[2]", "nType",
- "POR_TXT");
+ "PortionType::Text");
assertXPath(pXmlDoc,
"/root/page[1]/body/txt[1]/anchored/fly[1]/txt[1]/Text[2]", "Portion",
"c");
assertXPath(pXmlDoc,
"/root/page[1]/body/txt[1]/anchored/fly[1]/txt[2]/Text[1]", "nType",
- "POR_PARA");
+ "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",
- "POR_TXT");
+ "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",
- "POR_TXT");
+ "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[1]/Text[1]", "nType",
"POR_TXT");
+ 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",
"POR_TXT");
+ 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",
"POR_PARA");
+ 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",
"POR_TXT");
+ 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",
"POR_TXT");
+ 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");
}
@@ -1431,7 +1473,7 @@ void SwLayoutWriter::testRedlineFlysInFlys()
discardDumpedLayout();
xmlDocPtr pXmlDoc = parseLayoutDump();
assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/merged",
"paraPropsNodeIndex", "19");
- assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Text[1]", "nType",
"POR_PARA");
+ 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");
{ // hide: no anchored object shown
@@ -1453,22 +1495,22 @@ void SwLayoutWriter::testRedlineFlysInFlys()
xmlXPathFreeObject(pXmlObj);
}
- assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Text[1]", "nType",
"POR_TXT");
+ 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",
"POR_TXT");
+ 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]/anchored/fly[1]/txt[1]/Text[1]", "nType",
- "POR_TXT");
+ "PortionType::Text");
assertXPath(pXmlDoc,
"/root/page[1]/body/txt[2]/anchored/fly[1]/txt[1]/Text[1]", "Portion",
"j");
assertXPath(pXmlDoc,
"/root/page[1]/body/txt[2]/anchored/fly[1]/txt[1]/Text[2]", "nType",
- "POR_TXT");
+ "PortionType::Text");
assertXPath(pXmlDoc,
"/root/page[1]/body/txt[2]/anchored/fly[1]/txt[1]/Text[2]", "Portion",
"kl");
assertXPath(
pXmlDoc,
"/root/page[1]/body/txt[2]/anchored/fly[1]/txt[2]/anchored[1]/fly[1]/txt[1]/Text[1]",
- "nType", "POR_TXT");
+ "nType", "PortionType::Text");
assertXPath(
pXmlDoc,
"/root/page[1]/body/txt[2]/anchored/fly[1]/txt[2]/anchored[1]/fly[1]/txt[1]/Text[1]",
@@ -1476,7 +1518,7 @@ void SwLayoutWriter::testRedlineFlysInFlys()
assertXPath(
pXmlDoc,
"/root/page[1]/body/txt[2]/anchored/fly[1]/txt[2]/anchored[1]/fly[1]/txt[1]/Text[2]",
- "nType", "POR_TXT");
+ "nType", "PortionType::Text");
assertXPath(
pXmlDoc,
"/root/page[1]/body/txt[2]/anchored/fly[1]/txt[2]/anchored[1]/fly[1]/txt[1]/Text[2]",
@@ -1484,7 +1526,7 @@ void SwLayoutWriter::testRedlineFlysInFlys()
assertXPath(
pXmlDoc,
"/root/page[1]/body/txt[2]/anchored/fly[1]/txt[2]/anchored[1]/fly[1]/txt[2]/Text[1]",
- "nType", "POR_PARA");
+ "nType", "PortionType::Para");
assertXPath(
pXmlDoc,
"/root/page[1]/body/txt[2]/anchored/fly[1]/txt[2]/anchored[1]/fly[1]/txt[2]/Text[1]",
@@ -1492,7 +1534,7 @@ void SwLayoutWriter::testRedlineFlysInFlys()
assertXPath(
pXmlDoc,
"/root/page[1]/body/txt[2]/anchored/fly[1]/txt[2]/anchored[1]/fly[1]/txt[3]/Text[1]",
- "nType", "POR_TXT");
+ "nType", "PortionType::Text");
assertXPath(
pXmlDoc,
"/root/page[1]/body/txt[2]/anchored/fly[1]/txt[2]/anchored[1]/fly[1]/txt[3]/Text[1]",
@@ -1500,30 +1542,30 @@ void SwLayoutWriter::testRedlineFlysInFlys()
assertXPath(
pXmlDoc,
"/root/page[1]/body/txt[2]/anchored/fly[1]/txt[2]/anchored[1]/fly[1]/txt[3]/Text[2]",
- "nType", "POR_TXT");
+ "nType", "PortionType::Text");
assertXPath(
pXmlDoc,
"/root/page[1]/body/txt[2]/anchored/fly[1]/txt[2]/anchored[1]/fly[1]/txt[3]/Text[2]",
"Portion", "hi");
assertXPath(pXmlDoc,
"/root/page[1]/body/txt[2]/anchored/fly[1]/txt[2]/Special[1]", "nType",
- "POR_FLY"); // remove???
+ "PortionType::Fly"); // remove???
assertXPath(pXmlDoc,
"/root/page[1]/body/txt[2]/anchored/fly[1]/txt[2]/Text[1]", "nType",
- "POR_LAY");
+ "PortionType::Lay");
assertXPath(pXmlDoc,
"/root/page[1]/body/txt[2]/anchored/fly[1]/txt[2]/Text[1]", "Portion",
"mno");
assertXPath(pXmlDoc,
"/root/page[1]/body/txt[2]/anchored/fly[1]/txt[3]/Text[1]", "nType",
- "POR_TXT");
+ "PortionType::Text");
assertXPath(pXmlDoc,
"/root/page[1]/body/txt[2]/anchored/fly[1]/txt[3]/Text[1]", "Portion",
"p");
assertXPath(pXmlDoc,
"/root/page[1]/body/txt[2]/anchored/fly[1]/txt[3]/Text[2]", "nType",
- "POR_TXT");
+ "PortionType::Text");
assertXPath(pXmlDoc,
"/root/page[1]/body/txt[2]/anchored/fly[1]/txt[3]/Text[2]", "Portion",
"qr");
- assertXPath(pXmlDoc, "/root/page[1]/body/txt[2]/Text[1]", "nType",
"POR_PARA");
+ 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",
"POR_TXT");
+ 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",
"POR_TXT");
+ 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");
}
@@ -1567,18 +1609,18 @@ void SwLayoutWriter::testRedlineFlysInFlys()
assertXPath(
pXmlDoc,
"/root/page[1]/body/txt[1]/anchored/fly[1]/txt[1]/anchored[1]/fly[1]/txt[1]/Text[1]",
- "nType", "POR_PARA");
+ "nType", "PortionType::Para");
assertXPath(
pXmlDoc,
"/root/page[1]/body/txt[1]/anchored/fly[1]/txt[1]/anchored[1]/fly[1]/txt[1]/Text[1]",
"Portion", "jqr");
assertXPath(pXmlDoc,
"/root/page[1]/body/txt[1]/anchored/fly[1]/txt[1]/Special[1]", "nType",
- "POR_FLY"); // remove???
+ "PortionType::Fly"); // remove???
assertXPath(pXmlDoc,
"/root/page[1]/body/txt[1]/anchored/fly[1]/txt[1]/Text[1]", "nType",
- "POR_LAY");
+ "PortionType::Lay");
assertXPath(pXmlDoc,
"/root/page[1]/body/txt[1]/anchored/fly[1]/txt[1]/Text[1]", "Portion",
"abhi");
- assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Text[1]", "nType",
"POR_PARA");
+ 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");
lcl_dispatchCommand(mxComponent, ".uno:ShowTrackedChanges", {});
@@ -1593,28 +1635,28 @@ void SwLayoutWriter::testRedlineFlysInFlys()
xmlXPathFreeObject(pXmlObj);
}
- assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Text[1]", "nType",
"POR_TXT");
+ 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",
"POR_TXT");
+ 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",
"POR_PARA");
+ 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]/anchored/fly[1]/txt[1]/Text[1]", "nType",
- "POR_TXT");
+ "PortionType::Text");
assertXPath(pXmlDoc,
"/root/page[1]/body/txt[3]/anchored/fly[1]/txt[1]/Text[1]", "Portion",
"ab");
assertXPath(pXmlDoc,
"/root/page[1]/body/txt[3]/anchored/fly[1]/txt[1]/Text[2]", "nType",
- "POR_TXT");
+ "PortionType::Text");
assertXPath(pXmlDoc,
"/root/page[1]/body/txt[3]/anchored/fly[1]/txt[1]/Text[2]", "Portion",
"c");
assertXPath(pXmlDoc,
"/root/page[1]/body/txt[3]/anchored/fly[1]/txt[2]/Text[1]", "nType",
- "POR_PARA");
+ "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]/anchored[1]/fly[1]/txt[1]/Text[1]",
- "nType", "POR_TXT");
+ "nType", "PortionType::Text");
assertXPath(
pXmlDoc,
"/root/page[1]/body/txt[3]/anchored/fly[1]/txt[3]/anchored[1]/fly[1]/txt[1]/Text[1]",
@@ -1622,7 +1664,7 @@ void SwLayoutWriter::testRedlineFlysInFlys()
assertXPath(
pXmlDoc,
"/root/page[1]/body/txt[3]/anchored/fly[1]/txt[3]/anchored[1]/fly[1]/txt[1]/Text[2]",
- "nType", "POR_TXT");
+ "nType", "PortionType::Text");
assertXPath(
pXmlDoc,
"/root/page[1]/body/txt[3]/anchored/fly[1]/txt[3]/anchored[1]/fly[1]/txt[1]/Text[2]",
@@ -1630,7 +1672,7 @@ void SwLayoutWriter::testRedlineFlysInFlys()
assertXPath(
pXmlDoc,
"/root/page[1]/body/txt[3]/anchored/fly[1]/txt[3]/anchored[1]/fly[1]/txt[2]/Text[1]",
- "nType", "POR_PARA");
+ "nType", "PortionType::Para");
assertXPath(
pXmlDoc,
"/root/page[1]/body/txt[3]/anchored/fly[1]/txt[3]/anchored[1]/fly[1]/txt[2]/Text[1]",
@@ -1638,7 +1680,7 @@ void SwLayoutWriter::testRedlineFlysInFlys()
assertXPath(
pXmlDoc,
"/root/page[1]/body/txt[3]/anchored/fly[1]/txt[3]/anchored[1]/fly[1]/txt[3]/Text[1]",
- "nType", "POR_TXT");
+ "nType", "PortionType::Text");
assertXPath(
pXmlDoc,
"/root/page[1]/body/txt[3]/anchored/fly[1]/txt[3]/anchored[1]/fly[1]/txt[3]/Text[1]",
@@ -1646,24 +1688,24 @@ void SwLayoutWriter::testRedlineFlysInFlys()
assertXPath(
pXmlDoc,
"/root/page[1]/body/txt[3]/anchored/fly[1]/txt[3]/anchored[1]/fly[1]/txt[3]/Text[2]",
- "nType", "POR_TXT");
+ "nType", "PortionType::Text");
assertXPath(
pXmlDoc,
"/root/page[1]/body/txt[3]/anchored/fly[1]/txt[3]/anchored[1]/fly[1]/txt[3]/Text[2]",
"Portion", "qr");
assertXPath(pXmlDoc,
"/root/page[1]/body/txt[3]/anchored/fly[1]/txt[3]/Text[1]", "nType",
- "POR_TXT");
+ "PortionType::Text");
assertXPath(pXmlDoc,
"/root/page[1]/body/txt[3]/anchored/fly[1]/txt[3]/Special[1]", "nType",
- "POR_FLY"); // remove???
+ "PortionType::Fly"); // remove???
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",
- "POR_TXT");
+ "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]/Text[1]", "nType",
"POR_TXT");
+ 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",
"POR_TXT");
+ 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");
}
}
@@ -1757,17 +1799,17 @@ void SwLayoutWriter::testRedlineFlysAtFlys()
"paraPropsNodeIndex", "11");
assertXPath(pXmlDoc,
"/root/page[1]/body/txt[1]/anchored/fly[1]/anchored[1]/fly[1]/txt[1]/Text[1]",
- "nType", "POR_PARA");
+ "nType", "PortionType::Para");
assertXPath(pXmlDoc,
"/root/page[1]/body/txt[1]/anchored/fly[1]/anchored[1]/fly[1]/txt[1]/Text[1]",
"Portion", "jqr");
assertXPath(pXmlDoc,
"/root/page[1]/body/txt[1]/anchored/fly[1]/txt[1]/Special[1]", "nType",
- "POR_FLY"); // remove???
+ "PortionType::Fly"); // remove???
assertXPath(pXmlDoc,
"/root/page[1]/body/txt[1]/anchored/fly[1]/txt[1]/Text[1]", "nType",
- "POR_LAY");
+ "PortionType::Lay");
assertXPath(pXmlDoc,
"/root/page[1]/body/txt[1]/anchored/fly[1]/txt[1]/Text[1]", "Portion",
"abhi");
- assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Text[1]", "nType",
"POR_PARA");
+ 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");
lcl_dispatchCommand(mxComponent, ".uno:ShowTrackedChanges", {});
@@ -1784,65 +1826,65 @@ void SwLayoutWriter::testRedlineFlysAtFlys()
assertXPath(pXmlDoc,
"/root/page[1]/body/txt[1]/anchored/fly[1]/anchored[1]/fly[1]/txt[1]/Text[1]",
- "nType", "POR_TXT");
+ "nType", "PortionType::Text");
assertXPath(pXmlDoc,
"/root/page[1]/body/txt[1]/anchored/fly[1]/anchored[1]/fly[1]/txt[1]/Text[1]",
"Portion", "j");
assertXPath(pXmlDoc,
"/root/page[1]/body/txt[1]/anchored/fly[1]/anchored[1]/fly[1]/txt[1]/Text[2]",
- "nType", "POR_TXT");
+ "nType", "PortionType::Text");
assertXPath(pXmlDoc,
"/root/page[1]/body/txt[1]/anchored/fly[1]/anchored[1]/fly[1]/txt[1]/Text[2]",
"Portion", "kl");
assertXPath(pXmlDoc,
"/root/page[1]/body/txt[1]/anchored/fly[1]/anchored[1]/fly[1]/txt[2]/Text[1]",
- "nType", "POR_PARA");
+ "nType", "PortionType::Para");
assertXPath(pXmlDoc,
"/root/page[1]/body/txt[1]/anchored/fly[1]/anchored[1]/fly[1]/txt[2]/Text[1]",
"Portion", "mno");
assertXPath(pXmlDoc,
"/root/page[1]/body/txt[1]/anchored/fly[1]/anchored[1]/fly[1]/txt[3]/Text[1]",
- "nType", "POR_TXT");
+ "nType", "PortionType::Text");
assertXPath(pXmlDoc,
"/root/page[1]/body/txt[1]/anchored/fly[1]/anchored[1]/fly[1]/txt[3]/Text[1]",
"Portion", "p");
assertXPath(pXmlDoc,
"/root/page[1]/body/txt[1]/anchored/fly[1]/anchored[1]/fly[1]/txt[3]/Text[2]",
- "nType", "POR_TXT");
+ "nType", "PortionType::Text");
assertXPath(pXmlDoc,
"/root/page[1]/body/txt[1]/anchored/fly[1]/anchored[1]/fly[1]/txt[3]/Text[2]",
"Portion", "qr");
assertXPath(pXmlDoc,
"/root/page[1]/body/txt[1]/anchored/fly[1]/txt[1]/Special[1]", "nType",
- "POR_FLY"); // remove???
+ "PortionType::Fly"); // remove???
assertXPath(pXmlDoc,
"/root/page[1]/body/txt[1]/anchored/fly[1]/txt[1]/Text[1]", "nType",
- "POR_TXT");
+ "PortionType::Text");
assertXPath(pXmlDoc,
"/root/page[1]/body/txt[1]/anchored/fly[1]/txt[1]/Text[1]", "Portion",
"ab");
assertXPath(pXmlDoc,
"/root/page[1]/body/txt[1]/anchored/fly[1]/txt[1]/Text[2]", "nType",
- "POR_TXT");
+ "PortionType::Text");
assertXPath(pXmlDoc,
"/root/page[1]/body/txt[1]/anchored/fly[1]/txt[1]/Text[2]", "Portion",
"c");
assertXPath(pXmlDoc,
"/root/page[1]/body/txt[1]/anchored/fly[1]/txt[2]/Text[1]", "nType",
- "POR_PARA");
+ "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",
- "POR_TXT");
+ "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",
- "POR_TXT");
+ "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[1]/Text[1]", "nType",
"POR_TXT");
+ 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",
"POR_TXT");
+ 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",
"POR_PARA");
+ 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",
"POR_TXT");
+ 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",
"POR_TXT");
+ 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");
// anchor to 2nd (deleted) paragraph
@@ -1857,7 +1899,7 @@ void SwLayoutWriter::testRedlineFlysAtFlys()
discardDumpedLayout();
pXmlDoc = parseLayoutDump();
assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/merged",
"paraPropsNodeIndex", "19");
- assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Text[1]", "nType",
"POR_PARA");
+ 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");
{ // hide: no anchored object shown
@@ -1879,67 +1921,67 @@ void SwLayoutWriter::testRedlineFlysAtFlys()
xmlXPathFreeObject(pXmlObj);
}
- assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Text[1]", "nType",
"POR_TXT");
+ 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",
"POR_TXT");
+ 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]/anchored/fly[1]/anchored[1]/fly[1]/txt[1]/Text[1]",
- "nType", "POR_TXT");
+ "nType", "PortionType::Text");
assertXPath(pXmlDoc,
"/root/page[1]/body/txt[2]/anchored/fly[1]/anchored[1]/fly[1]/txt[1]/Text[1]",
"Portion", "j");
assertXPath(pXmlDoc,
"/root/page[1]/body/txt[2]/anchored/fly[1]/anchored[1]/fly[1]/txt[1]/Text[2]",
- "nType", "POR_TXT");
+ "nType", "PortionType::Text");
assertXPath(pXmlDoc,
"/root/page[1]/body/txt[2]/anchored/fly[1]/anchored[1]/fly[1]/txt[1]/Text[2]",
"Portion", "kl");
assertXPath(pXmlDoc,
"/root/page[1]/body/txt[2]/anchored/fly[1]/anchored[1]/fly[1]/txt[2]/Text[1]",
- "nType", "POR_PARA");
+ "nType", "PortionType::Para");
assertXPath(pXmlDoc,
"/root/page[1]/body/txt[2]/anchored/fly[1]/anchored[1]/fly[1]/txt[2]/Text[1]",
"Portion", "mno");
assertXPath(pXmlDoc,
"/root/page[1]/body/txt[2]/anchored/fly[1]/anchored[1]/fly[1]/txt[3]/Text[1]",
- "nType", "POR_TXT");
+ "nType", "PortionType::Text");
assertXPath(pXmlDoc,
"/root/page[1]/body/txt[2]/anchored/fly[1]/anchored[1]/fly[1]/txt[3]/Text[1]",
"Portion", "p");
assertXPath(pXmlDoc,
"/root/page[1]/body/txt[2]/anchored/fly[1]/anchored[1]/fly[1]/txt[3]/Text[2]",
- "nType", "POR_TXT");
+ "nType", "PortionType::Text");
assertXPath(pXmlDoc,
"/root/page[1]/body/txt[2]/anchored/fly[1]/anchored[1]/fly[1]/txt[3]/Text[2]",
"Portion", "qr");
assertXPath(pXmlDoc,
"/root/page[1]/body/txt[2]/anchored/fly[1]/txt[1]/Text[1]", "nType",
- "POR_TXT");
+ "PortionType::Text");
assertXPath(pXmlDoc,
"/root/page[1]/body/txt[2]/anchored/fly[1]/txt[1]/Special[1]", "nType",
- "POR_FLY"); // remove???
+ "PortionType::Fly"); // remove???
assertXPath(pXmlDoc,
"/root/page[1]/body/txt[2]/anchored/fly[1]/txt[1]/Text[1]", "Portion",
"ab");
assertXPath(pXmlDoc,
"/root/page[1]/body/txt[2]/anchored/fly[1]/txt[1]/Text[2]", "nType",
- "POR_TXT");
+ "PortionType::Text");
assertXPath(pXmlDoc,
"/root/page[1]/body/txt[2]/anchored/fly[1]/txt[1]/Text[2]", "Portion",
"c");
assertXPath(pXmlDoc,
"/root/page[1]/body/txt[2]/anchored/fly[1]/txt[2]/Text[1]", "nType",
- "POR_PARA");
+ "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",
- "POR_TXT");
+ "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",
- "POR_TXT");
+ "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[2]/Text[1]", "nType",
"POR_PARA");
+ 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",
"POR_TXT");
+ 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",
"POR_TXT");
+ 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");
}
@@ -1948,10 +1990,11 @@ void SwLayoutWriter::CheckRedlineSectionsHidden()
discardDumpedLayout();
xmlDocPtr pXmlDoc = parseLayoutDump();
assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/merged",
"paraPropsNodeIndex", "12");
- assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Text[1]", "nType",
"POR_PARA");
+ assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Text[1]", "nType",
"PortionType::Para");
assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Text[1]", "Portion",
"folah");
assertXPath(pXmlDoc, "/root/page[1]/body/section[1]/txt[1]/merged",
"paraPropsNodeIndex", "20");
- assertXPath(pXmlDoc, "/root/page[1]/body/section[1]/txt[1]/Text[1]",
"nType", "POR_PARA");
+ assertXPath(pXmlDoc, "/root/page[1]/body/section[1]/txt[1]/Text[1]",
"nType",
+ "PortionType::Para");
assertXPath(pXmlDoc, "/root/page[1]/body/section[1]/txt[1]/Text[1]",
"Portion", "folah");
}
@@ -1991,32 +2034,39 @@ void SwLayoutWriter::testRedlineSections()
xmlNodeSetPtr pXmlNodes = pXmlObj->nodesetval;
CPPUNIT_ASSERT_EQUAL(0, xmlXPathNodeSetGetLength(pXmlNodes));
xmlXPathFreeObject(pXmlObj);
- assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Text[1]", "nType",
"POR_TXT");
+ 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",
"POR_TXT");
+ 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/section[1]/txt[1]/anchored/fly[1]/txt[1]/Text[1]",
- "nType", "POR_PARA");
+ "nType", "PortionType::Para");
assertXPath(pXmlDoc,
"/root/page[1]/body/section[1]/txt[1]/anchored/fly[1]/txt[1]/Text[1]",
"Portion", "FRAME");
- assertXPath(pXmlDoc, "/root/page[1]/body/section[1]/txt[1]/Text[1]",
"nType", "POR_PARA");
+ assertXPath(pXmlDoc, "/root/page[1]/body/section[1]/txt[1]/Text[1]",
"nType",
+ "PortionType::Para");
assertXPath(pXmlDoc, "/root/page[1]/body/section[1]/txt[1]/Text[1]",
"Portion", "bar");
- assertXPath(pXmlDoc, "/root/page[1]/body/section[1]/txt[2]/Text[1]",
"nType", "POR_PARA");
+ assertXPath(pXmlDoc, "/root/page[1]/body/section[1]/txt[2]/Text[1]",
"nType",
+ "PortionType::Para");
assertXPath(pXmlDoc, "/root/page[1]/body/section[1]/txt[2]/Text[1]",
"Portion", "baz");
- assertXPath(pXmlDoc, "/root/page[1]/body/txt[2]/Text[1]", "nType",
"POR_TXT");
+ assertXPath(pXmlDoc, "/root/page[1]/body/txt[2]/Text[1]", "nType",
"PortionType::Text");
assertXPath(pXmlDoc, "/root/page[1]/body/txt[2]/Text[1]", "Portion", "b");
- assertXPath(pXmlDoc, "/root/page[1]/body/txt[2]/Text[2]", "nType",
"POR_TXT");
+ assertXPath(pXmlDoc, "/root/page[1]/body/txt[2]/Text[2]", "nType",
"PortionType::Text");
assertXPath(pXmlDoc, "/root/page[1]/body/txt[2]/Text[2]", "Portion",
"lah");
- assertXPath(pXmlDoc, "/root/page[1]/body/section[2]/txt[1]/Text[1]",
"nType", "POR_TXT");
+ assertXPath(pXmlDoc, "/root/page[1]/body/section[2]/txt[1]/Text[1]",
"nType",
+ "PortionType::Text");
assertXPath(pXmlDoc, "/root/page[1]/body/section[2]/txt[1]/Text[1]",
"Portion", "fo");
- assertXPath(pXmlDoc, "/root/page[1]/body/section[2]/txt[1]/Text[2]",
"nType", "POR_TXT");
+ assertXPath(pXmlDoc, "/root/page[1]/body/section[2]/txt[1]/Text[2]",
"nType",
+ "PortionType::Text");
assertXPath(pXmlDoc, "/root/page[1]/body/section[2]/txt[1]/Text[2]",
"Portion", "o");
- assertXPath(pXmlDoc, "/root/page[1]/body/section[2]/txt[2]/Text[1]",
"nType", "POR_PARA");
+ assertXPath(pXmlDoc, "/root/page[1]/body/section[2]/txt[2]/Text[1]",
"nType",
+ "PortionType::Para");
assertXPath(pXmlDoc, "/root/page[1]/body/section[2]/txt[2]/Text[1]",
"Portion", "bar");
- assertXPath(pXmlDoc, "/root/page[1]/body/section[2]/txt[3]/Text[1]",
"nType", "POR_TXT");
+ assertXPath(pXmlDoc, "/root/page[1]/body/section[2]/txt[3]/Text[1]",
"nType",
+ "PortionType::Text");
assertXPath(pXmlDoc, "/root/page[1]/body/section[2]/txt[3]/Text[1]",
"Portion", "b");
- assertXPath(pXmlDoc, "/root/page[1]/body/section[2]/txt[3]/Text[2]",
"nType", "POR_TXT");
+ assertXPath(pXmlDoc, "/root/page[1]/body/section[2]/txt[3]/Text[2]",
"nType",
+ "PortionType::Text");
assertXPath(pXmlDoc, "/root/page[1]/body/section[2]/txt[3]/Text[2]",
"Portion", "lah");
// verify after hide
@@ -2053,7 +2103,7 @@ void SwLayoutWriter::testRedlineTables()
discardDumpedLayout();
xmlDocPtr pXmlDoc = parseLayoutDump();
assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/merged",
"paraPropsNodeIndex", "12");
- assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Text[1]", "nType",
"POR_PARA");
+ assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Text[1]", "nType",
"PortionType::Para");
assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Text[1]", "Portion",
"foar");
lcl_dispatchCommand(mxComponent, ".uno:ShowTrackedChanges", {});
@@ -2068,28 +2118,28 @@ void SwLayoutWriter::testRedlineTables()
xmlNodeSetPtr pXmlNodes = pXmlObj->nodesetval;
CPPUNIT_ASSERT_EQUAL(0, xmlXPathNodeSetGetLength(pXmlNodes));
xmlXPathFreeObject(pXmlObj);
- assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Text[1]", "nType",
"POR_TXT");
+ 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",
"POR_TXT");
+ 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/tab[1]/row[1]/cell[1]/txt[1]/anchored/fly[1]/txt[1]/Text[1]",
- "nType", "POR_PARA");
+ "nType", "PortionType::Para");
assertXPath(pXmlDoc,
"/root/page[1]/body/tab[1]/row[1]/cell[1]/txt[1]/anchored/fly[1]/txt[1]/Text[1]",
"Portion", "FRAME");
assertXPath(pXmlDoc,
"/root/page[1]/body/tab[1]/row[1]/cell[1]/txt[1]/Text[1]", "nType",
- "POR_PARA");
+ "PortionType::Para");
assertXPath(pXmlDoc,
"/root/page[1]/body/tab[1]/row[1]/cell[1]/txt[1]/Text[1]", "Portion",
"aaa");
assertXPath(pXmlDoc,
"/root/page[1]/body/tab[1]/row[2]/cell[2]/txt[1]/Text[1]", "nType",
- "POR_PARA");
+ "PortionType::Para");
assertXPath(pXmlDoc,
"/root/page[1]/body/tab[1]/row[2]/cell[2]/txt[1]/Text[1]", "Portion",
"ddd");
- assertXPath(pXmlDoc, "/root/page[1]/body/txt[2]/Text[1]", "nType",
"POR_TXT");
+ assertXPath(pXmlDoc, "/root/page[1]/body/txt[2]/Text[1]", "nType",
"PortionType::Text");
assertXPath(pXmlDoc, "/root/page[1]/body/txt[2]/Text[1]", "Portion", "b");
- assertXPath(pXmlDoc, "/root/page[1]/body/txt[2]/Text[2]", "nType",
"POR_TXT");
+ assertXPath(pXmlDoc, "/root/page[1]/body/txt[2]/Text[2]", "nType",
"PortionType::Text");
assertXPath(pXmlDoc, "/root/page[1]/body/txt[2]/Text[2]", "Portion", "ar");
// verify after hide
@@ -2100,7 +2150,7 @@ void SwLayoutWriter::testRedlineTables()
discardDumpedLayout();
pXmlDoc = parseLayoutDump();
assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/merged",
"paraPropsNodeIndex", "12");
- assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Text[1]", "nType",
"POR_PARA");
+ assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Text[1]", "nType",
"PortionType::Para");
assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Text[1]", "Portion",
"foar");
}
@@ -2110,53 +2160,53 @@ void SwLayoutWriter::CheckRedlineCharAttributesHidden()
discardDumpedLayout();
xmlDocPtr pXmlDoc = parseLayoutDump();
assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/merged",
"paraPropsNodeIndex", "9");
- assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Text[1]", "nType",
"POR_PARA");
+ 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[2]/merged",
"paraPropsNodeIndex", "10");
- assertXPath(pXmlDoc, "/root/page[1]/body/txt[2]/Text[1]", "nType",
"POR_PARA");
+ 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[3]/merged",
"paraPropsNodeIndex", "11");
- assertXPath(pXmlDoc, "/root/page[1]/body/txt[3]/Text[1]", "nType",
"POR_TXT");
+ 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",
"POR_TXT");
+ 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[4]/merged",
"paraPropsNodeIndex", "12");
- assertXPath(pXmlDoc, "/root/page[1]/body/txt[4]/Text[1]", "nType",
"POR_TXT");
+ 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",
"POR_TXT");
+ 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[5]/merged",
"paraPropsNodeIndex", "13");
- assertXPath(pXmlDoc, "/root/page[1]/body/txt[5]/Text[1]", "nType",
"POR_TXT");
+ 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",
"POR_TXT");
+ 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[6]/merged",
"paraPropsNodeIndex", "14");
- assertXPath(pXmlDoc, "/root/page[1]/body/txt[6]/Text[1]", "nType",
"POR_TXT");
+ 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",
"POR_TXT");
+ 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[7]/merged",
"paraPropsNodeIndex", "15");
- assertXPath(pXmlDoc, "/root/page[1]/body/txt[7]/Text[1]", "nType",
"POR_TXT");
+ 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",
"POR_TXT");
+ 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[8]/merged",
"paraPropsNodeIndex", "16");
- assertXPath(pXmlDoc, "/root/page[1]/body/txt[8]/Text[1]", "nType",
"POR_TXT");
+ 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",
"POR_TXT");
+ 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[9]/merged",
"paraPropsNodeIndex", "17");
- assertXPath(pXmlDoc, "/root/page[1]/body/txt[9]/Text[1]", "nType",
"POR_PARA");
+ 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[10]/merged",
"paraPropsNodeIndex", "18");
- assertXPath(pXmlDoc, "/root/page[1]/body/txt[10]/Text[1]", "nType",
"POR_TXT");
+ 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",
"POR_TXT");
+ 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",
"POR_TXT");
+ 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[11]/merged",
"paraPropsNodeIndex", "19");
- assertXPath(pXmlDoc, "/root/page[1]/body/txt[11]/Text[1]", "nType",
"POR_PARA");
+ 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");
}
@@ -2196,81 +2246,81 @@ void SwLayoutWriter::testRedlineCharAttributes()
xmlNodeSetPtr pXmlNodes = pXmlObj->nodesetval;
CPPUNIT_ASSERT_EQUAL(0, xmlXPathNodeSetGetLength(pXmlNodes));
xmlXPathFreeObject(pXmlObj);
- assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Text[1]", "nType",
"POR_TXT");
+ 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",
"POR_TXT");
+ 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",
"POR_TXT");
... etc. - the rest is truncated
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
