OFFICE-2102: ODF export: write <text:s> after non-mark elements too

... and fix the wrong export for <text:meta-field>, which erroneously
did not use the same bIsPrevCharSpace flag as everything else (which was
obviously a bug, as there should be one flag per paragraph).

Interop testing demonstrates that at least Word and Calligra Words
differ in their interpretation of spaces following <draw:frame> and
other shape elements, and <text:note>: if there is a U+0020 space
before the element, LO will not collapse a U+0020 space behind the
element but Word and Calligra Words do collapse it.

The distinction between "mark elements" and "non-mark elements" in the
whitespace collapsing implementation in OOo since the beginning was
never explicitly spelled out in ODF, although listing the
<text:bookmark> etc. elements in ODF 1.1, 5.1.1 was a strong hint.

Fortunately all 3 applications agree that a <text:s> following a
<draw:frame> is consumed as a space, and it is valid to write a <text:s>
in this situation, so just do that to improve interoperability.

Change-Id: I42260c0528db9fe7e87e8dbae5105aeadb83780d

2 files changed, 323 insertions, 0 deletions

diff --git a/sw/qa/extras/odfexport/data/whitespace.odt b/sw/qa/extras/odfexport/data/whitespace.odt
new file mode 100644
index 000000000000..fe2b3dd574b7
--- /dev/null
+++ b/sw/qa/extras/odfexport/data/whitespace.odt
diff --git a/sw/qa/extras/odfexport/odfexport.cxx b/sw/qa/extras/odfexport/odfexport.cxx
index 41d7abbbfd03..0ed193c280d6 100644
--- a/sw/qa/extras/odfexport/odfexport.cxx
+++ b/sw/qa/extras/odfexport/odfexport.cxx
@@ -862,6 +862,329 @@ DECLARE_ODFEXPORT_TEST(testTextboxRoundedCorners, "textbox-rounded-corners.odt")
         assertXPath(pXmlDoc, "//draw:custom-shape/loext:table", "name", "Table1");
 }
 
+// test that import whitespace collapsing is compatible with old docs
+DECLARE_ODFEXPORT_TEST(testWhitespace, "whitespace.odt")
+{
+    uno::Reference<container::XEnumerationAccess> xPara;
+    uno::Reference<container::XEnumeration> xPortions;
+    uno::Reference<text::XTextRange> xPortion;
+    xPara.set(getParagraphOrTable(1), uno::UNO_QUERY);
+    xPortions.set(xPara->createEnumeration());
+    xPortion.set(xPortions->nextElement(), uno::UNO_QUERY);
+    CPPUNIT_ASSERT_EQUAL(OUString("Text"), getProperty<OUString>(xPortion, "TextPortionType"));
+    CPPUNIT_ASSERT_EQUAL(OUString("X "), xPortion->getString());
+    xPortion.set(xPortions->nextElement(), uno::UNO_QUERY);
+    CPPUNIT_ASSERT_EQUAL(OUString("Text"), getProperty<OUString>(xPortion, "TextPortionType"));
+    CPPUNIT_ASSERT_EQUAL(OUString(" "), xPortion->getString());
+    xPortion.set(xPortions->nextElement(), uno::UNO_QUERY);
+    CPPUNIT_ASSERT_EQUAL(OUString("Text"), getProperty<OUString>(xPortion, "TextPortionType"));
+    CPPUNIT_ASSERT_EQUAL(OUString(" X"), xPortion->getString());
+    CPPUNIT_ASSERT(!xPortions->hasMoreElements());
+
+    xPara.set(getParagraphOrTable(2), uno::UNO_QUERY);
+    xPortions.set(xPara->createEnumeration());
+    xPortion.set(xPortions->nextElement(), uno::UNO_QUERY);
+    CPPUNIT_ASSERT_EQUAL(OUString("Text"), getProperty<OUString>(xPortion, "TextPortionType"));
+    CPPUNIT_ASSERT_EQUAL(OUString("X "), xPortion->getString());
+    xPortion.set(xPortions->nextElement(), uno::UNO_QUERY);
+    CPPUNIT_ASSERT_EQUAL(OUString("Text"), getProperty<OUString>(xPortion, "TextPortionType"));
+    CPPUNIT_ASSERT_EQUAL(OUString(" "), xPortion->getString());
+    CPPUNIT_ASSERT_EQUAL(OUString("http://example.com/"), getProperty<OUString>(xPortion, "HyperLinkURL"));
+    xPortion.set(xPortions->nextElement(), uno::UNO_QUERY);
+    CPPUNIT_ASSERT_EQUAL(OUString("Text"), getProperty<OUString>(xPortion, "TextPortionType"));
+    CPPUNIT_ASSERT_EQUAL(OUString(" X"), xPortion->getString());
+    CPPUNIT_ASSERT(!xPortions->hasMoreElements());
+
+    xPara.set(getParagraphOrTable(3), uno::UNO_QUERY);
+    xPortions.set(xPara->createEnumeration());
+    xPortion.set(xPortions->nextElement(), uno::UNO_QUERY);
+    CPPUNIT_ASSERT_EQUAL(OUString("Text"), getProperty<OUString>(xPortion, "TextPortionType"));
+    CPPUNIT_ASSERT_EQUAL(OUString("X "), xPortion->getString());
+    xPortion.set(xPortions->nextElement(), uno::UNO_QUERY);
+    CPPUNIT_ASSERT_EQUAL(OUString("Ruby"), getProperty<OUString>(xPortion, "TextPortionType"));
+    CPPUNIT_ASSERT_EQUAL(OUString(""), xPortion->getString());
+    CPPUNIT_ASSERT_EQUAL(OUString("foo"), getProperty<OUString>(xPortion, "RubyText"));
+    xPortion.set(xPortions->nextElement(), uno::UNO_QUERY);
+    CPPUNIT_ASSERT_EQUAL(OUString("Text"), getProperty<OUString>(xPortion, "TextPortionType"));
+    CPPUNIT_ASSERT_EQUAL(OUString(" "), xPortion->getString());
+    xPortion.set(xPortions->nextElement(), uno::UNO_QUERY);
+    CPPUNIT_ASSERT_EQUAL(OUString("Ruby"), getProperty<OUString>(xPortion, "TextPortionType"));
+    CPPUNIT_ASSERT_EQUAL(OUString(""), xPortion->getString());
+    xPortion.set(xPortions->nextElement(), uno::UNO_QUERY);
+    CPPUNIT_ASSERT_EQUAL(OUString("Text"), getProperty<OUString>(xPortion, "TextPortionType"));
+    CPPUNIT_ASSERT_EQUAL(OUString(" X"), xPortion->getString());
+    CPPUNIT_ASSERT(!xPortions->hasMoreElements());
+
+    xPara.set(getParagraphOrTable(4), uno::UNO_QUERY);
+    xPortions.set(xPara->createEnumeration());
+    xPortion.set(xPortions->nextElement(), uno::UNO_QUERY);
+    CPPUNIT_ASSERT_EQUAL(OUString("Text"), getProperty<OUString>(xPortion, "TextPortionType"));
+    CPPUNIT_ASSERT_EQUAL(OUString("X "), xPortion->getString());
+    xPortion.set(xPortions->nextElement(), uno::UNO_QUERY);
+    CPPUNIT_ASSERT_EQUAL(OUString("InContentMetadata"), getProperty<OUString>(xPortion, "TextPortionType"));
+    {
+        // what a stupid idea to require recursively enumerating this
+        uno::Reference<container::XEnumerationAccess> xMeta(
+            getProperty<uno::Reference<text::XTextContent>>(xPortion, "InContentMetadata"), uno::UNO_QUERY);
+        uno::Reference<container::XEnumeration> xMetaPortions(
+            xMeta->createEnumeration(), uno::UNO_QUERY);
+        uno::Reference<text::XTextRange> xMP(xMetaPortions->nextElement(), uno::UNO_QUERY);
+        CPPUNIT_ASSERT_EQUAL(OUString("Text"), getProperty<OUString>(xMP, "TextPortionType"));
+        CPPUNIT_ASSERT_EQUAL(OUString(" "), xMP->getString());
+        CPPUNIT_ASSERT(!xMetaPortions->hasMoreElements());
+    }
+    xPortion.set(xPortions->nextElement(), uno::UNO_QUERY);
+    CPPUNIT_ASSERT_EQUAL(OUString("Text"), getProperty<OUString>(xPortion, "TextPortionType"));
+    CPPUNIT_ASSERT_EQUAL(OUString(" X"), xPortion->getString());
+    CPPUNIT_ASSERT(!xPortions->hasMoreElements());
+
+    xPara.set(getParagraphOrTable(5), uno::UNO_QUERY);
+    xPortions.set(xPara->createEnumeration());
+    xPortion.set(xPortions->nextElement(), uno::UNO_QUERY);
+    CPPUNIT_ASSERT_EQUAL(OUString("Text"), getProperty<OUString>(xPortion, "TextPortionType"));
+    CPPUNIT_ASSERT_EQUAL(OUString("X "), xPortion->getString());
+    xPortion.set(xPortions->nextElement(), uno::UNO_QUERY);
+    CPPUNIT_ASSERT_EQUAL(OUString("TextField"), getProperty<OUString>(xPortion, "TextPortionType"));
+    {
+        // what a stupid idea to require recursively enumerating this
+        uno::Reference<container::XEnumerationAccess> xMeta(
+            getProperty<uno::Reference<text::XTextContent>>(xPortion, "TextField"), uno::UNO_QUERY);
+        uno::Reference<container::XEnumeration> xMetaPortions(
+            xMeta->createEnumeration(), uno::UNO_QUERY);
+        uno::Reference<text::XTextRange> xMP(xMetaPortions->nextElement(), uno::UNO_QUERY);
+        CPPUNIT_ASSERT_EQUAL(OUString("Text"), getProperty<OUString>(xMP, "TextPortionType"));
+        CPPUNIT_ASSERT_EQUAL(OUString(" "), xMP->getString());
+        CPPUNIT_ASSERT(!xMetaPortions->hasMoreElements());
+    }
+    xPortion.set(xPortions->nextElement(), uno::UNO_QUERY);
+    CPPUNIT_ASSERT_EQUAL(OUString("Text"), getProperty<OUString>(xPortion, "TextPortionType"));
+    CPPUNIT_ASSERT_EQUAL(OUString(" X"), xPortion->getString());
+    CPPUNIT_ASSERT(!xPortions->hasMoreElements());
+
+    xPara.set(getParagraphOrTable(7), uno::UNO_QUERY);
+    xPortions.set(xPara->createEnumeration());
+    xPortion.set(xPortions->nextElement(), uno::UNO_QUERY);
+    CPPUNIT_ASSERT_EQUAL(OUString("Text"), getProperty<OUString>(xPortion, "TextPortionType"));
+    CPPUNIT_ASSERT_EQUAL(OUString("X "), xPortion->getString());
+    xPortion.set(xPortions->nextElement(), uno::UNO_QUERY);
+    CPPUNIT_ASSERT_EQUAL(OUString("Frame"), getProperty<OUString>(xPortion, "TextPortionType"));
+    xPortion.set(xPortions->nextElement(), uno::UNO_QUERY);
+    CPPUNIT_ASSERT_EQUAL(OUString("Text"), getProperty<OUString>(xPortion, "TextPortionType"));
+    CPPUNIT_ASSERT_EQUAL(OUString(" X"), xPortion->getString());
+    CPPUNIT_ASSERT(!xPortions->hasMoreElements());
+
+    xPara.set(getParagraphOrTable(8), uno::UNO_QUERY);
+    xPortions.set(xPara->createEnumeration());
+    xPortion.set(xPortions->nextElement(), uno::UNO_QUERY);
+    CPPUNIT_ASSERT_EQUAL(OUString("Text"), getProperty<OUString>(xPortion, "TextPortionType"));
+    CPPUNIT_ASSERT_EQUAL(OUString("X "), xPortion->getString());
+    xPortion.set(xPortions->nextElement(), uno::UNO_QUERY);
+    CPPUNIT_ASSERT_EQUAL(OUString("Frame"), getProperty<OUString>(xPortion, "TextPortionType"));
+    xPortion.set(xPortions->nextElement(), uno::UNO_QUERY);
+    CPPUNIT_ASSERT_EQUAL(OUString("Text"), getProperty<OUString>(xPortion, "TextPortionType"));
+    CPPUNIT_ASSERT_EQUAL(OUString(" X"), xPortion->getString());
+    CPPUNIT_ASSERT(!xPortions->hasMoreElements());
+
+    xPara.set(getParagraphOrTable(9), uno::UNO_QUERY);
+    xPortions.set(xPara->createEnumeration());
+    xPortion.set(xPortions->nextElement(), uno::UNO_QUERY);
+    CPPUNIT_ASSERT_EQUAL(OUString("Text"), getProperty<OUString>(xPortion, "TextPortionType"));
+    CPPUNIT_ASSERT_EQUAL(OUString("X "), xPortion->getString());
+    xPortion.set(xPortions->nextElement(), uno::UNO_QUERY);
+    CPPUNIT_ASSERT_EQUAL(OUString("Frame"), getProperty<OUString>(xPortion, "TextPortionType"));
+    xPortion.set(xPortions->nextElement(), uno::UNO_QUERY);
+    CPPUNIT_ASSERT_EQUAL(OUString("Text"), getProperty<OUString>(xPortion, "TextPortionType"));
+    CPPUNIT_ASSERT_EQUAL(OUString(" X"), xPortion->getString());
+    CPPUNIT_ASSERT(!xPortions->hasMoreElements());
+
+    xPara.set(getParagraphOrTable(10), uno::UNO_QUERY);
+    uno::Reference<container::XContentEnumerationAccess> xCEA(xPara, uno::UNO_QUERY);
+    uno::Reference<container::XEnumeration> xFrames(
+            xCEA->createContentEnumeration("com.sun.star.text.TextContent"));
+    xFrames->nextElement(); // one at-paragraph frame
+    CPPUNIT_ASSERT(!xFrames->hasMoreElements());
+    xPortions.set(xPara->createEnumeration());
+    xPortion.set(xPortions->nextElement(), uno::UNO_QUERY);
+    CPPUNIT_ASSERT_EQUAL(OUString("Text"), getProperty<OUString>(xPortion, "TextPortionType"));
+    CPPUNIT_ASSERT_EQUAL(OUString(" X"), xPortion->getString());
+    CPPUNIT_ASSERT(!xPortions->hasMoreElements());
+
+    xPara.set(getParagraphOrTable(11), uno::UNO_QUERY);
+    xPortions.set(xPara->createEnumeration());
+    xPortion.set(xPortions->nextElement(), uno::UNO_QUERY);
+    CPPUNIT_ASSERT_EQUAL(OUString("Text"), getProperty<OUString>(xPortion, "TextPortionType"));
+    CPPUNIT_ASSERT_EQUAL(OUString("X "), xPortion->getString());
+    xPortion.set(xPortions->nextElement(), uno::UNO_QUERY);
+    CPPUNIT_ASSERT_EQUAL(OUString("Footnote"), getProperty<OUString>(xPortion, "TextPortionType"));
+    xPortion.set(xPortions->nextElement(), uno::UNO_QUERY);
+    CPPUNIT_ASSERT_EQUAL(OUString("Text"), getProperty<OUString>(xPortion, "TextPortionType"));
+    CPPUNIT_ASSERT_EQUAL(OUString(" X"), xPortion->getString());
+    CPPUNIT_ASSERT(!xPortions->hasMoreElements());
+
+    xPara.set(getParagraphOrTable(12), uno::UNO_QUERY);
+    xPortions.set(xPara->createEnumeration());
+    xPortion.set(xPortions->nextElement(), uno::UNO_QUERY);
+    CPPUNIT_ASSERT_EQUAL(OUString("Text"), getProperty<OUString>(xPortion, "TextPortionType"));
+    CPPUNIT_ASSERT_EQUAL(OUString("X "), xPortion->getString());
+    xPortion.set(xPortions->nextElement(), uno::UNO_QUERY);
+    CPPUNIT_ASSERT_EQUAL(OUString("TextField"), getProperty<OUString>(xPortion, "TextPortionType"));
+    xPortion.set(xPortions->nextElement(), uno::UNO_QUERY);
+    CPPUNIT_ASSERT_EQUAL(OUString("Text"), getProperty<OUString>(xPortion, "TextPortionType"));
+    CPPUNIT_ASSERT_EQUAL(OUString(" X"), xPortion->getString());
+    CPPUNIT_ASSERT(!xPortions->hasMoreElements());
+
+    xPara.set(getParagraphOrTable(13), uno::UNO_QUERY);
+    xPortions.set(xPara->createEnumeration());
+    xPortion.set(xPortions->nextElement(), uno::UNO_QUERY);
+    CPPUNIT_ASSERT_EQUAL(OUString("Text"), getProperty<OUString>(xPortion, "TextPortionType"));
+    CPPUNIT_ASSERT_EQUAL(OUString("X "), xPortion->getString());
+    xPortion.set(xPortions->nextElement(), uno::UNO_QUERY);
+    CPPUNIT_ASSERT_EQUAL(OUString("Annotation"), getProperty<OUString>(xPortion, "TextPortionType"));
+    xPortion.set(xPortions->nextElement(), uno::UNO_QUERY);
+    CPPUNIT_ASSERT_EQUAL(OUString("Text"), getProperty<OUString>(xPortion, "TextPortionType"));
+    CPPUNIT_ASSERT_EQUAL(OUString(" "), xPortion->getString());
+    xPortion.set(xPortions->nextElement(), uno::UNO_QUERY);
+    CPPUNIT_ASSERT_EQUAL(OUString("AnnotationEnd"), getProperty<OUString>(xPortion, "TextPortionType"));
+    xPortion.set(xPortions->nextElement(), uno::UNO_QUERY);
+    CPPUNIT_ASSERT_EQUAL(OUString("Text"), getProperty<OUString>(xPortion, "TextPortionType"));
+    CPPUNIT_ASSERT_EQUAL(OUString(" X"), xPortion->getString());
+    CPPUNIT_ASSERT(!xPortions->hasMoreElements());
+
+    xPara.set(getParagraphOrTable(15), uno::UNO_QUERY);
+    xPortions.set(xPara->createEnumeration());
+    xPortion.set(xPortions->nextElement(), uno::UNO_QUERY);
+    CPPUNIT_ASSERT_EQUAL(OUString("Text"), getProperty<OUString>(xPortion, "TextPortionType"));
+    CPPUNIT_ASSERT_EQUAL(OUString("X "), xPortion->getString());
+    xPortion.set(xPortions->nextElement(), uno::UNO_QUERY);
+    CPPUNIT_ASSERT_EQUAL(OUString("Bookmark"), getProperty<OUString>(xPortion, "TextPortionType"));
+    CPPUNIT_ASSERT(getProperty<bool>(xPortion, "IsCollapsed"));
+    xPortion.set(xPortions->nextElement(), uno::UNO_QUERY);
+    CPPUNIT_ASSERT_EQUAL(OUString("Text"), getProperty<OUString>(xPortion, "TextPortionType"));
+    CPPUNIT_ASSERT_EQUAL(OUString(" X"), xPortion->getString());
+    CPPUNIT_ASSERT(!xPortions->hasMoreElements());
+
+    xPara.set(getParagraphOrTable(16), uno::UNO_QUERY);
+    xPortions.set(xPara->createEnumeration());
+    xPortion.set(xPortions->nextElement(), uno::UNO_QUERY);
+    CPPUNIT_ASSERT_EQUAL(OUString("Text"), getProperty<OUString>(xPortion, "TextPortionType"));
+    CPPUNIT_ASSERT_EQUAL(OUString("X "), xPortion->getString());
+    xPortion.set(xPortions->nextElement(), uno::UNO_QUERY);
+    CPPUNIT_ASSERT_EQUAL(OUString("Bookmark"), getProperty<OUString>(xPortion, "TextPortionType"));
+    CPPUNIT_ASSERT(!getProperty<bool>(xPortion, "IsCollapsed"));
+    xPortion.set(xPortions->nextElement(), uno::UNO_QUERY);
+    CPPUNIT_ASSERT_EQUAL(OUString("Text"), getProperty<OUString>(xPortion, "TextPortionType"));
+    CPPUNIT_ASSERT_EQUAL(OUString(" "), xPortion->getString());
+    xPortion.set(xPortions->nextElement(), uno::UNO_QUERY);
+    CPPUNIT_ASSERT_EQUAL(OUString("Bookmark"), getProperty<OUString>(xPortion, "TextPortionType"));
+    CPPUNIT_ASSERT(!getProperty<bool>(xPortion, "IsCollapsed"));
+    xPortion.set(xPortions->nextElement(), uno::UNO_QUERY);
+    CPPUNIT_ASSERT_EQUAL(OUString("Text"), getProperty<OUString>(xPortion, "TextPortionType"));
+    CPPUNIT_ASSERT_EQUAL(OUString(" X"), xPortion->getString());
+    CPPUNIT_ASSERT(!xPortions->hasMoreElements());
+
+    xPara.set(getParagraphOrTable(17), uno::UNO_QUERY);
+    xPortions.set(xPara->createEnumeration());
+    xPortion.set(xPortions->nextElement(), uno::UNO_QUERY);
+    CPPUNIT_ASSERT_EQUAL(OUString("Text"), getProperty<OUString>(xPortion, "TextPortionType"));
+    CPPUNIT_ASSERT_EQUAL(OUString("X "), xPortion->getString());
+    xPortion.set(xPortions->nextElement(), uno::UNO_QUERY);
+    CPPUNIT_ASSERT_EQUAL(OUString("Redline"), getProperty<OUString>(xPortion, "TextPortionType"));
+    CPPUNIT_ASSERT(!getProperty<bool>(xPortion, "IsCollapsed"));
+    xPortion.set(xPortions->nextElement(), uno::UNO_QUERY);
+    CPPUNIT_ASSERT_EQUAL(OUString("Text"), getProperty<OUString>(xPortion, "TextPortionType"));
+    CPPUNIT_ASSERT_EQUAL(OUString(" "), xPortion->getString());
+    xPortion.set(xPortions->nextElement(), uno::UNO_QUERY);
+    CPPUNIT_ASSERT_EQUAL(OUString("Redline"), getProperty<OUString>(xPortion, "TextPortionType"));
+    CPPUNIT_ASSERT(!getProperty<bool>(xPortion, "IsCollapsed"));
+    xPortion.set(xPortions->nextElement(), uno::UNO_QUERY);
+    CPPUNIT_ASSERT_EQUAL(OUString("Text"), getProperty<OUString>(xPortion, "TextPortionType"));
+    CPPUNIT_ASSERT_EQUAL(OUString(" X"), xPortion->getString());
+    CPPUNIT_ASSERT(!xPortions->hasMoreElements());
+
+    xPara.set(getParagraphOrTable(18), uno::UNO_QUERY);
+    xPortions.set(xPara->createEnumeration());
+    xPortion.set(xPortions->nextElement(), uno::UNO_QUERY);
+    CPPUNIT_ASSERT_EQUAL(OUString("Text"), getProperty<OUString>(xPortion, "TextPortionType"));
+    CPPUNIT_ASSERT_EQUAL(OUString("X "), xPortion->getString());
+    xPortion.set(xPortions->nextElement(), uno::UNO_QUERY);
+    CPPUNIT_ASSERT_EQUAL(OUString("Redline"), getProperty<OUString>(xPortion, "TextPortionType"));
+    CPPUNIT_ASSERT(!getProperty<bool>(xPortion, "IsCollapsed"));
+    xPortion.set(xPortions->nextElement(), uno::UNO_QUERY);
+    CPPUNIT_ASSERT_EQUAL(OUString("Text"), getProperty<OUString>(xPortion, "TextPortionType"));
+    CPPUNIT_ASSERT_EQUAL(OUString(" "), xPortion->getString());
+    xPortion.set(xPortions->nextElement(), uno::UNO_QUERY);
+    CPPUNIT_ASSERT_EQUAL(OUString("Redline"), getProperty<OUString>(xPortion, "TextPortionType"));
+    CPPUNIT_ASSERT(!getProperty<bool>(xPortion, "IsCollapsed"));
+    xPortion.set(xPortions->nextElement(), uno::UNO_QUERY);
+    CPPUNIT_ASSERT_EQUAL(OUString("Text"), getProperty<OUString>(xPortion, "TextPortionType"));
+    CPPUNIT_ASSERT_EQUAL(OUString(" X"), xPortion->getString());
+    CPPUNIT_ASSERT(!xPortions->hasMoreElements());
+
+    xPara.set(getParagraphOrTable(19), uno::UNO_QUERY);
+    xPortions.set(xPara->createEnumeration());
+    xPortion.set(xPortions->nextElement(), uno::UNO_QUERY);
+    CPPUNIT_ASSERT_EQUAL(OUString("Text"), getProperty<OUString>(xPortion, "TextPortionType"));
+    CPPUNIT_ASSERT_EQUAL(OUString("X "), xPortion->getString());
+    xPortion.set(xPortions->nextElement(), uno::UNO_QUERY);
+    CPPUNIT_ASSERT_EQUAL(OUString("ReferenceMark"), getProperty<OUString>(xPortion, "TextPortionType"));
+    CPPUNIT_ASSERT(getProperty<bool>(xPortion, "IsCollapsed"));
+    xPortion.set(xPortions->nextElement(), uno::UNO_QUERY);
+    CPPUNIT_ASSERT_EQUAL(OUString("Text"), getProperty<OUString>(xPortion, "TextPortionType"));
+    CPPUNIT_ASSERT_EQUAL(OUString(" X"), xPortion->getString());
+    CPPUNIT_ASSERT(!xPortions->hasMoreElements());
+
+    xPara.set(getParagraphOrTable(20), uno::UNO_QUERY);
+    xPortions.set(xPara->createEnumeration());
+    xPortion.set(xPortions->nextElement(), uno::UNO_QUERY);
+    CPPUNIT_ASSERT_EQUAL(OUString("Text"), getProperty<OUString>(xPortion, "TextPortionType"));
+    CPPUNIT_ASSERT_EQUAL(OUString("X "), xPortion->getString());
+    xPortion.set(xPortions->nextElement(), uno::UNO_QUERY);
+    CPPUNIT_ASSERT_EQUAL(OUString("ReferenceMark"), getProperty<OUString>(xPortion, "TextPortionType"));
+    CPPUNIT_ASSERT(!getProperty<bool>(xPortion, "IsCollapsed"));
+    xPortion.set(xPortions->nextElement(), uno::UNO_QUERY);
+    CPPUNIT_ASSERT_EQUAL(OUString("Text"), getProperty<OUString>(xPortion, "TextPortionType"));
+    CPPUNIT_ASSERT_EQUAL(OUString(" "), xPortion->getString());
+    xPortion.set(xPortions->nextElement(), uno::UNO_QUERY);
+    CPPUNIT_ASSERT_EQUAL(OUString("ReferenceMark"), getProperty<OUString>(xPortion, "TextPortionType"));
+    CPPUNIT_ASSERT(!getProperty<bool>(xPortion, "IsCollapsed"));
+    xPortion.set(xPortions->nextElement(), uno::UNO_QUERY);
+    CPPUNIT_ASSERT_EQUAL(OUString("Text"), getProperty<OUString>(xPortion, "TextPortionType"));
+    CPPUNIT_ASSERT_EQUAL(OUString(" X"), xPortion->getString());
+    CPPUNIT_ASSERT(!xPortions->hasMoreElements());
+
+    xPara.set(getParagraphOrTable(21), uno::UNO_QUERY);
+    xPortions.set(xPara->createEnumeration());
+    xPortion.set(xPortions->nextElement(), uno::UNO_QUERY);
+    CPPUNIT_ASSERT_EQUAL(OUString("Text"), getProperty<OUString>(xPortion, "TextPortionType"));
+    CPPUNIT_ASSERT_EQUAL(OUString("X "), xPortion->getString());
+    xPortion.set(xPortions->nextElement(), uno::UNO_QUERY);
+    CPPUNIT_ASSERT_EQUAL(OUString("DocumentIndexMark"), getProperty<OUString>(xPortion, "TextPortionType"));
+    CPPUNIT_ASSERT(getProperty<bool>(xPortion, "IsCollapsed"));
+    xPortion.set(xPortions->nextElement(), uno::UNO_QUERY);
+    CPPUNIT_ASSERT_EQUAL(OUString("Text"), getProperty<OUString>(xPortion, "TextPortionType"));
+    CPPUNIT_ASSERT_EQUAL(OUString(" X"), xPortion->getString());
+    CPPUNIT_ASSERT(!xPortions->hasMoreElements());
+
+    xPara.set(getParagraphOrTable(22), uno::UNO_QUERY);
+    xPortions.set(xPara->createEnumeration());
+    xPortion.set(xPortions->nextElement(), uno::UNO_QUERY);
+    CPPUNIT_ASSERT_EQUAL(OUString("Text"), getProperty<OUString>(xPortion, "TextPortionType"));
+    CPPUNIT_ASSERT_EQUAL(OUString("X "), xPortion->getString());
+    xPortion.set(xPortions->nextElement(), uno::UNO_QUERY);
+    CPPUNIT_ASSERT_EQUAL(OUString("DocumentIndexMark"), getProperty<OUString>(xPortion, "TextPortionType"));
+    CPPUNIT_ASSERT(!getProperty<bool>(xPortion, "IsCollapsed"));
+    xPortion.set(xPortions->nextElement(), uno::UNO_QUERY);
+    CPPUNIT_ASSERT_EQUAL(OUString("Text"), getProperty<OUString>(xPortion, "TextPortionType"));
+    CPPUNIT_ASSERT_EQUAL(OUString(" "), xPortion->getString());
+    xPortion.set(xPortions->nextElement(), uno::UNO_QUERY);
+    CPPUNIT_ASSERT_EQUAL(OUString("DocumentIndexMark"), getProperty<OUString>(xPortion, "TextPortionType"));
+    CPPUNIT_ASSERT(!getProperty<bool>(xPortion, "IsCollapsed"));
+    xPortion.set(xPortions->nextElement(), uno::UNO_QUERY);
+    CPPUNIT_ASSERT_EQUAL(OUString("Text"), getProperty<OUString>(xPortion, "TextPortionType"));
+    CPPUNIT_ASSERT_EQUAL(OUString(" X"), xPortion->getString());
+    CPPUNIT_ASSERT(!xPortions->hasMoreElements());
+}
+
 DECLARE_ODFEXPORT_TEST(testFdo86963, "fdo86963.odt")
 {
     // Export of this document failed with beans::UnknownPropertyException.