implement import of RTF_M{STRIKEH,BORDERBOX,BORDERBOXPR}

Change-Id: I3249b6a2cb5d8c100e8045f650997cea3f1d2e30

2 files changed, 27 insertions, 1 deletions

diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 71831f7a3d15..b9badd107f8c 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -954,6 +954,7 @@ void RTFDocumentImpl::text(OUString& rString)
         case DESTINATION_MCHR:
         case DESTINATION_MPOS:
         case DESTINATION_MVERTJC:
+        case DESTINATION_MSTRIKEH:
         case DESTINATION_MBEGCHR:
         case DESTINATION_MENDCHR:
         case DESTINATION_MSUBHIDE:
@@ -1461,6 +1462,16 @@ int RTFDocumentImpl::dispatchDestination(RTFKeyword nKeyword)
         case RTF_MVERTJC:
             m_aStates.top().nDestinationState = DESTINATION_MVERTJC;
             break;
+        case RTF_MSTRIKEH:
+            m_aStates.top().nDestinationState = DESTINATION_MSTRIKEH;
+            break;
+        case RTF_MHIDETOP:
+        case RTF_MHIDEBOT:
+        case RTF_MHIDELEFT:
+        case RTF_MHIDERIGHT:
+            // SmOoxmlImport::handleBorderBox will ignore these anyway, so silently ignore for now.
+            m_aStates.top().nDestinationState = DESTINATION_SKIP;
+            break;
         case RTF_MSUBHIDE:
             m_aStates.top().nDestinationState = DESTINATION_MSUBHIDE;
             break;
@@ -1553,6 +1564,14 @@ int RTFDocumentImpl::dispatchDestination(RTFKeyword nKeyword)
             m_aMathBuffer.appendOpeningTag(M_TOKEN(groupChrPr));
             m_aStates.top().nDestinationState = DESTINATION_MGROUPCHRPR;
             break;
+        case RTF_MBORDERBOX:
+            m_aMathBuffer.appendOpeningTag(M_TOKEN(borderBox));
+            m_aStates.top().nDestinationState = DESTINATION_MBORDERBOX;
+            break;
+        case RTF_MBORDERBOXPR:
+            m_aMathBuffer.appendOpeningTag(M_TOKEN(borderBoxPr));
+            m_aStates.top().nDestinationState = DESTINATION_MBORDERBOXPR;
+            break;
         default:
             SAL_INFO("writerfilter", OSL_THIS_FUNC << ": TODO handle destination '" << lcl_RtfToString(nKeyword) << "'");
             // Make sure we skip destinations (even without \*) till we don't handle them
@@ -3697,6 +3716,7 @@ int RTFDocumentImpl::popState()
     case DESTINATION_MCHR:
     case DESTINATION_MPOS:
     case DESTINATION_MVERTJC:
+    case DESTINATION_MSTRIKEH:
     case DESTINATION_MBEGCHR:
     case DESTINATION_MENDCHR:
     case DESTINATION_MSUBHIDE:
@@ -3709,6 +3729,7 @@ int RTFDocumentImpl::popState()
         {
             case DESTINATION_MCHR: nToken = M_TOKEN(chr); break;
             case DESTINATION_MPOS: nToken = M_TOKEN(pos); break;
+            case DESTINATION_MSTRIKEH: nToken = M_TOKEN(strikeH); break;
             case DESTINATION_MVERTJC: nToken = M_TOKEN(pos); break;
             case DESTINATION_MBEGCHR: nToken = M_TOKEN(begChr); break;
             case DESTINATION_MENDCHR: nToken = M_TOKEN(endChr); break;
@@ -3742,6 +3763,8 @@ int RTFDocumentImpl::popState()
     case DESTINATION_MLIMUPPPR: m_aMathBuffer.appendClosingTag(M_TOKEN(limUppPr)); break;
     case DESTINATION_MGROUPCHR: m_aMathBuffer.appendClosingTag(M_TOKEN(groupChr)); break;
     case DESTINATION_MGROUPCHRPR: m_aMathBuffer.appendClosingTag(M_TOKEN(groupChrPr)); break;
+    case DESTINATION_MBORDERBOX: m_aMathBuffer.appendClosingTag(M_TOKEN(borderBox)); break;
+    case DESTINATION_MBORDERBOXPR: m_aMathBuffer.appendClosingTag(M_TOKEN(borderBoxPr)); break;
     default: break;
     }
 
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
index 32c60a037114..1289a82a07fa 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
@@ -132,6 +132,7 @@ namespace writerfilter {
             DESTINATION_MCHR,
             DESTINATION_MPOS,
             DESTINATION_MVERTJC,
+            DESTINATION_MSTRIKEH,
             DESTINATION_ME,
             DESTINATION_MBAR,
             DESTINATION_MBARPR,
@@ -157,7 +158,9 @@ namespace writerfilter {
             DESTINATION_MLIMUPP,
             DESTINATION_MLIMUPPPR,
             DESTINATION_MGROUPCHR,
-            DESTINATION_MGROUPCHRPR
+            DESTINATION_MGROUPCHRPR,
+            DESTINATION_MBORDERBOX,
+            DESTINATION_MBORDERBOXPR
         };
 
         enum RTFBorderState