From edc6079bbf61717de040bd8f473dba79ac22f24b Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Fri, 16 Mar 2012 13:49:00 +0100 Subject: fdo#43965 fix RTF import of \up and \dn with custom parameters MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Cédric Bosdonnat --- writerfilter/source/rtftok/rtfdocumentimpl.cxx | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index 4299e5a8fcc8..241e05d7dfce 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -2258,18 +2258,11 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam) m_aStates.top().aCharacterSprms->push_back(make_pair(0x6877, pValue)); } break; - case RTF_UP: // TODO handle when point size is not shrinking - { - OUString aValue(RTL_CONSTASCII_USTRINGPARAM("superscript")); - RTFValue::Pointer_t pValue(new RTFValue(aValue)); - m_aStates.top().aCharacterSprms->push_back(make_pair(NS_ooxml::LN_EG_RPrBase_vertAlign, pValue)); - } - break; + case RTF_UP: case RTF_DN: { - OUString aValue(RTL_CONSTASCII_USTRINGPARAM("subscript")); - RTFValue::Pointer_t pValue(new RTFValue(aValue)); - m_aStates.top().aCharacterSprms->push_back(make_pair(NS_ooxml::LN_EG_RPrBase_vertAlign, pValue)); + RTFValue::Pointer_t pValue(new RTFValue(nParam * (nKeyword == RTF_UP ? 1 : -1))); + m_aStates.top().aCharacterSprms->push_back(make_pair(NS_sprm::LN_CHpsPos, pValue)); } break; case RTF_HORZVERT: -- cgit v1.2.3