diff options
| author | Miklos Vajna <vmiklos@suse.cz> | 2012-07-24 14:11:02 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@suse.cz> | 2012-07-24 14:16:06 +0200 |
| commit | d93eba476b45ca99792e9963064160539a9ddc19 (patch) | |
| tree | 59750c26713e4b7f5bcdcda79fbd768e0edee808 /writerfilter | |
| parent | 42922c40362f414ee06e65636f61798ef28cdcde (diff) | |
implement import of RTF_{MM,MMPR,MMR}
Change-Id: I6e21159af832c5850db77a6dfe630a0fc0bb6238
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/rtftok/rtfdocumentimpl.cxx | 19 | ||||
| -rw-r--r-- | writerfilter/source/rtftok/rtfdocumentimpl.hxx | 5 |
2 files changed, 22 insertions, 2 deletions
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index 015252d950ff..5957194e6669 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -1493,6 +1493,18 @@ int RTFDocumentImpl::dispatchDestination(RTFKeyword nKeyword) m_aMathBuffer.appendOpeningTag(M_TOKEN(lim)); m_aStates.top().nDestinationState = DESTINATION_MLIM; break; + case RTF_MM: + m_aMathBuffer.appendOpeningTag(M_TOKEN(m)); + m_aStates.top().nDestinationState = DESTINATION_MM; + break; + case RTF_MMPR: + m_aMathBuffer.appendOpeningTag(M_TOKEN(mPr)); + m_aStates.top().nDestinationState = DESTINATION_MMPR; + break; + case RTF_MMR: + m_aMathBuffer.appendOpeningTag(M_TOKEN(mr)); + m_aStates.top().nDestinationState = DESTINATION_MMR; + 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 @@ -3155,7 +3167,9 @@ int RTFDocumentImpl::pushState() (m_aStates.top().nDestinationState == DESTINATION_FIELDINSTRUCTION && !m_bEq) || m_aStates.top().nDestinationState == DESTINATION_MNUM || m_aStates.top().nDestinationState == DESTINATION_MDEN || - m_aStates.top().nDestinationState == DESTINATION_ME) + m_aStates.top().nDestinationState == DESTINATION_ME || + m_aStates.top().nDestinationState == DESTINATION_MFNAME || + m_aStates.top().nDestinationState == DESTINATION_MLIM) m_aStates.top().nDestinationState = DESTINATION_NORMAL; else if (m_aStates.top().nDestinationState == DESTINATION_FIELDINSTRUCTION && m_bEq) m_aStates.top().nDestinationState = DESTINATION_EQINSTRUCTION; @@ -3659,6 +3673,9 @@ int RTFDocumentImpl::popState() case DESTINATION_MLIMLOW: m_aMathBuffer.appendClosingTag(M_TOKEN(limLow)); break; case DESTINATION_MLIMLOWPR: m_aMathBuffer.appendClosingTag(M_TOKEN(limLowPr)); break; case DESTINATION_MLIM: m_aMathBuffer.appendClosingTag(M_TOKEN(lim)); break; + case DESTINATION_MM: m_aMathBuffer.appendClosingTag(M_TOKEN(m)); break; + case DESTINATION_MMPR: m_aMathBuffer.appendClosingTag(M_TOKEN(mPr)); break; + case DESTINATION_MMR: m_aMathBuffer.appendClosingTag(M_TOKEN(mr)); break; default: break; } diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx b/writerfilter/source/rtftok/rtfdocumentimpl.hxx index 70d7c86abfea..06f7f053aef5 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx @@ -142,7 +142,10 @@ namespace writerfilter { DESTINATION_MFNAME, DESTINATION_MLIMLOW, DESTINATION_MLIMLOWPR, - DESTINATION_MLIM + DESTINATION_MLIM, + DESTINATION_MM, + DESTINATION_MMPR, + DESTINATION_MMR }; enum RTFBorderState |