fdo#84685: writerfilter: RTF import: support \xe index entry

Change-Id: Ia957541a5997961aa86b2eb8537ebd29d3092691
(cherry picked from commit f14e6e06b9e3c82c267649d63512a3538e5ee2f5)

4 files changed, 36 insertions, 0 deletions

diff --git a/sw/qa/extras/rtfimport/data/fdo84685.rtf b/sw/qa/extras/rtfimport/data/fdo84685.rtf
new file mode 100644
index 000000000000..431dbd3fea22
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/fdo84685.rtf
@@ -0,0 +1,5 @@
+{\rtf1\ansi\ansicpg1252\uc1

+\pard

+{\v {\xe {\v {\f0\fs20 Key the 1st}}}} Some text

+\par

+}

diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx
index 61a386473c6e..fafb2b07d9d0 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -32,6 +32,7 @@
 #include <com/sun/star/text/SizeType.hpp>
 #include <com/sun/star/text/TableColumnSeparator.hpp>
 #include <com/sun/star/text/TextContentAnchorType.hpp>
+#include <com/sun/star/text/XDocumentIndexMark.hpp>
 #include <com/sun/star/text/XFootnotesSupplier.hpp>
 #include <com/sun/star/text/XPageCursor.hpp>
 #include <com/sun/star/text/XTextGraphicObjectsSupplier.hpp>
@@ -2082,6 +2083,17 @@ DECLARE_RTFIMPORT_TEST(testUnbalancedColumns, "unbalanced-columns.rtf")
     CPPUNIT_ASSERT_EQUAL(true, getProperty<bool>(xTextSections->getByIndex(0), "DontBalanceTextColumns"));
 }
 
+DECLARE_RTFIMPORT_TEST(testFdo84685, "fdo84685.rtf")
+{
+    // index mark was not imported
+    uno::Reference<text::XDocumentIndexMark> xMark(
+        getProperty<uno::Reference<text::XDocumentIndexMark>>(
+            getRun(getParagraph(1), 1),
+            "DocumentIndexMark"));
+    CPPUNIT_ASSERT(xMark.is());
+    CPPUNIT_ASSERT_EQUAL(OUString("Key the 1st"), getProperty<OUString>(xMark, "PrimaryKey"));
+}
+
 DECLARE_RTFIMPORT_TEST(testFdo83204, "fdo83204.rtf")
 {
     // This was Standard, \sN was ignored after \bkmkstart and \pard.
diff --git a/writerfilter/source/rtftok/rtfcontrolwords.hxx b/writerfilter/source/rtftok/rtfcontrolwords.hxx
index b55c2f2f485d..ac45593ac7ef 100644
--- a/writerfilter/source/rtftok/rtfcontrolwords.hxx
+++ b/writerfilter/source/rtftok/rtfcontrolwords.hxx
@@ -149,6 +149,7 @@ enum RTFDestinationState
     DESTINATION_BACKGROUND,
     DESTINATION_SHAPEGROUP,
     DESTINATION_FOOTNOTESEPARATOR,
+    DESTINATION_INDEXENTRY,
 };
 
 enum RTFKeyword
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 5fb1225567ec..68fcbfda0fcf 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -1261,6 +1261,7 @@ void RTFDocumentImpl::text(OUString& rString)
     case DESTINATION_MSUPHIDE:
     case DESTINATION_MTYPE:
     case DESTINATION_MGROW:
+    case DESTINATION_INDEXENTRY:
         m_aStates.top().pDestinationText->append(rString);
         break;
     default:
@@ -1731,6 +1732,9 @@ int RTFDocumentImpl::dispatchDestination(RTFKeyword nKeyword)
         case RTF_BKMKEND:
             m_aStates.top().nDestinationState = DESTINATION_BOOKMARKEND;
             break;
+        case RTF_XE:
+            m_aStates.top().nDestinationState = DESTINATION_INDEXENTRY;
+            break;
         case RTF_REVTBL:
             m_aStates.top().nDestinationState = DESTINATION_REVISIONTABLE;
             break;
@@ -5198,6 +5202,20 @@ int RTFDocumentImpl::popState()
         Mapper().props(lcl_getBookmarkProperties(m_aBookmarks[aStr], aStr));
     }
     break;
+    case DESTINATION_INDEXENTRY:
+    {
+        if (&m_aStates.top().aDestinationText != m_aStates.top().pDestinationText)
+            break; // not for nested group
+        OUString str(m_aStates.top().pDestinationText->makeStringAndClear());
+        // dmapper expects this as a field, so let's fake something...
+        str = "XE \"" + str.replaceAll("\"", "\\\"") + "\"";
+        singleChar(0x13);
+        Mapper().utext(reinterpret_cast<sal_uInt8 const*>(str.getStr()), str.getLength());
+        singleChar(0x14);
+        // no result
+        singleChar(0x15);
+    }
+    break;
     case DESTINATION_FORMFIELDNAME:
     {
         if (&m_aStates.top().aDestinationText != m_aStates.top().pDestinationText)