diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-02-22 20:16:40 +0100 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-02-22 20:36:20 +0100 |
commit | ed9d0db0807fcdeeebfa8c4baf2169309c101a52 (patch) | |
tree | e511f826b9b524ecb02107a9bd9c5d4d2a878f5e | |
parent | 87c32a391b4eda0be63ea92b4f6293fb16a624b5 (diff) |
writerfilter: sprm:SBkc -> ooxml:EG_SectPrContents_type
Change-Id: I6a6b73967e11a9346cd766dde9d04af63466c206
-rw-r--r-- | writerfilter/source/dmapper/DomainMapper.cxx | 2 | ||||
-rw-r--r-- | writerfilter/source/doctok/resources.xmi | 31 | ||||
-rw-r--r-- | writerfilter/source/ooxml/model.xml | 2 | ||||
-rw-r--r-- | writerfilter/source/rtftok/rtfdocumentimpl.cxx | 8 |
4 files changed, 6 insertions, 37 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index e9f57fa555e8..9aa4a856171f 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -1631,7 +1631,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext, SprmType } break; - case NS_sprm::LN_SBkc: // sprmSBkc + case NS_ooxml::LN_EG_SectPrContents_type: /* break type 0 - No break 1 - New Column diff --git a/writerfilter/source/doctok/resources.xmi b/writerfilter/source/doctok/resources.xmi index 0b8c40c35f1b..f7096fae846e 100644 --- a/writerfilter/source/doctok/resources.xmi +++ b/writerfilter/source/doctok/resources.xmi @@ -1278,37 +1278,6 @@ </UML:ModelElement.taggedValue> </UML:Class> <!--SPRM sprmCShd--> - <!--SPRM sprmSBkc--> - <UML:Class xmi.id="sprmSBkc" name="sprmSBkc"> - <UML:ModelElement.stereotype> - <UML:Stereotype xmi.idref="ww8sprm"/> - </UML:ModelElement.stereotype> - <UML:ModelElement.taggedValue> - <UML:TaggedValue> - <UML:TaggedValue.dataValue>0x3009</UML:TaggedValue.dataValue> - <UML:TaggedValue.type> - <UML:TagDefinition xmi.idref="sprmcode"/> - </UML:TaggedValue.type> - </UML:TaggedValue> - </UML:ModelElement.taggedValue> - <UML:ModelElement.taggedValue> - <UML:TaggedValue> - <UML:TaggedValue.dataValue>rtf:sprmSBkc</UML:TaggedValue.dataValue> - <UML:TaggedValue.type> - <UML:TagDefinition xmi.idref="sprmid"/> - </UML:TaggedValue.type> - </UML:TaggedValue> - </UML:ModelElement.taggedValue> - <UML:ModelElement.taggedValue> - <UML:TaggedValue> - <UML:TaggedValue.dataValue>unknown</UML:TaggedValue.dataValue> - <UML:TaggedValue.type> - <UML:TagDefinition xmi.idref="kind"/> - </UML:TaggedValue.type> - </UML:TaggedValue> - </UML:ModelElement.taggedValue> - </UML:Class> - <!--SPRM sprmSBkc--> <!--SPRM sprmSTextFlow--> <UML:Class xmi.id="sprmSTextFlow" name="sprmSTextFlow"> <UML:ModelElement.stereotype> diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml index d8a9192d22d1..75ad524fb005 100644 --- a/writerfilter/source/ooxml/model.xml +++ b/writerfilter/source/ooxml/model.xml @@ -22958,7 +22958,7 @@ <element name="rtlGutter" tokenid="ooxml:EG_SectPrContents_rtlGutter"/> <element name="textDirection" tokenid="ooxml:EG_SectPrContents_textDirection"/> <element name="titlePg" tokenid="ooxml:EG_SectPrContents_titlePg"/> - <element name="type" tokenid="sprm:SBkc"/> + <element name="type" tokenid="ooxml:EG_SectPrContents_type"/> <element name="vAlign" tokenid="ooxml:EG_SectPrContents_vAlign"/> </resource> <resource name="CT_SectPrBase" resource="Properties" tag="section"/> diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index 52e2c1920692..d87ddc209425 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -525,7 +525,7 @@ void RTFDocumentImpl::sectBreak(bool bFinal = false) { SAL_INFO("writerfilter", OSL_THIS_FUNC << ": final? " << bFinal << ", needed? " << m_bNeedSect); bool bNeedSect = m_bNeedSect; - RTFValue::Pointer_t pBreak = m_aStates.top().aSectionSprms.find(NS_sprm::LN_SBkc); + RTFValue::Pointer_t pBreak = m_aStates.top().aSectionSprms.find(NS_ooxml::LN_EG_SectPrContents_type); bool bContinuous = pBreak.get() && pBreak->getInt() == 0; // If there is no paragraph in this section, then insert a dummy one, as required by Writer, // unless this is the end of the doc, we had nothing since the last section break and this is not a continuous one. @@ -550,7 +550,7 @@ void RTFDocumentImpl::sectBreak(bool bFinal = false) { // In case the last section is a continuous one, we don't need to output a section break. if (bFinal && bContinuous) - m_aStates.top().aSectionSprms.erase(NS_sprm::LN_SBkc); + m_aStates.top().aSectionSprms.erase(NS_ooxml::LN_EG_SectPrContents_type); } // Section properties are a paragraph sprm. @@ -2019,7 +2019,7 @@ int RTFDocumentImpl::dispatchSymbol(RTFKeyword nKeyword) case RTF_PAGE: { // If we're inside a continuous section, we should send a section break, not a page one. - RTFValue::Pointer_t pBreak = m_aStates.top().aSectionSprms.find(NS_sprm::LN_SBkc); + RTFValue::Pointer_t pBreak = m_aStates.top().aSectionSprms.find(NS_ooxml::LN_EG_SectPrContents_type); // Unless we're on a title page. RTFValue::Pointer_t pTitlePg = m_aStates.top().aSectionSprms.find(NS_ooxml::LN_EG_SectPrContents_titlePg); if ((pBreak.get() && !pBreak->getInt()) && !(pTitlePg.get() && pTitlePg->getInt())) @@ -2208,7 +2208,7 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword) if (nParam >= 0) { RTFValue::Pointer_t pValue(new RTFValue(nParam)); - m_aStates.top().aSectionSprms.set(NS_sprm::LN_SBkc, pValue); + m_aStates.top().aSectionSprms.set(NS_ooxml::LN_EG_SectPrContents_type, pValue); return 0; } |