diff options
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper.cxx | 4 | ||||
| -rw-r--r-- | writerfilter/source/doctok/resources.xmi | 62 | ||||
| -rw-r--r-- | writerfilter/source/ooxml/model.xml | 4 | ||||
| -rw-r--r-- | writerfilter/source/rtftok/rtfdocumentimpl.cxx | 4 |
4 files changed, 6 insertions, 68 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index 17d5d49c24d9..34601faea7b8 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -994,10 +994,10 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext, SprmType case NS_sprm::LN_PJc: // sprmPJc handleParaJustification(nIntValue, rContext, ExchangeLeftRight( rContext, m_pImpl )); break; - case NS_sprm::LN_PFKeep: // sprmPFKeep + case NS_ooxml::LN_CT_PPrBase_keepLines: rContext->Insert(PROP_PARA_SPLIT, uno::makeAny(nIntValue ? false : true)); break; - case NS_sprm::LN_PFKeepFollow: // sprmPFKeepFollow + case NS_ooxml::LN_CT_PPrBase_keepNext: rContext->Insert(PROP_PARA_KEEP_TOGETHER, uno::makeAny( nIntValue ? true : false) ); break; case NS_sprm::LN_PFPageBreakBefore: diff --git a/writerfilter/source/doctok/resources.xmi b/writerfilter/source/doctok/resources.xmi index 8f05029386ab..c3ae23bcd0e7 100644 --- a/writerfilter/source/doctok/resources.xmi +++ b/writerfilter/source/doctok/resources.xmi @@ -100,68 +100,6 @@ </UML:ModelElement.taggedValue> </UML:Class> <!--SPRM sprmPJc--> - <!--SPRM sprmPFKeep--> - <UML:Class xmi.id="sprmPFKeep" name="sprmPFKeep"> - <UML:ModelElement.stereotype> - <UML:Stereotype xmi.idref="ww8sprm"/> - </UML:ModelElement.stereotype> - <UML:ModelElement.taggedValue> - <UML:TaggedValue> - <UML:TaggedValue.dataValue>0x2405</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:sprmPFKeep</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>paragraph</UML:TaggedValue.dataValue> - <UML:TaggedValue.type> - <UML:TagDefinition xmi.idref="kind"/> - </UML:TaggedValue.type> - </UML:TaggedValue> - </UML:ModelElement.taggedValue> - </UML:Class> - <!--SPRM sprmPFKeep--> - <!--SPRM sprmPFKeepFollow--> - <UML:Class xmi.id="sprmPFKeepFollow" name="sprmPFKeepFollow"> - <UML:ModelElement.stereotype> - <UML:Stereotype xmi.idref="ww8sprm"/> - </UML:ModelElement.stereotype> - <UML:ModelElement.taggedValue> - <UML:TaggedValue> - <UML:TaggedValue.dataValue>0x2406</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:sprmPFKeepFollow</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>paragraph</UML:TaggedValue.dataValue> - <UML:TaggedValue.type> - <UML:TagDefinition xmi.idref="kind"/> - </UML:TaggedValue.type> - </UML:TaggedValue> - </UML:ModelElement.taggedValue> - </UML:Class> - <!--SPRM sprmPFKeepFollow--> <!--SPRM sprmPFPageBreakBefore--> <UML:Class xmi.id="sprmPFPageBreakBefore" name="sprmPFPageBreakBefore"> <UML:ModelElement.stereotype> diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml index 87dc6c9b24a5..e833fc92fb4b 100644 --- a/writerfilter/source/ooxml/model.xml +++ b/writerfilter/source/ooxml/model.xml @@ -22338,8 +22338,8 @@ <resource name="CT_PPrBase" resource="Properties" tag="paragraph"> <kind name="paragraph"/> <element name="pStyle" tokenid="ooxml:CT_PPrBase_pStyle"/> - <element name="keepNext" tokenid="sprm:PFKeepFollow"/> - <element name="keepLines" tokenid="sprm:PFKeep"/> + <element name="keepNext" tokenid="ooxml:CT_PPrBase_keepNext"/> + <element name="keepLines" tokenid="ooxml:CT_PPrBase_keepLines"/> <element name="pageBreakBefore" tokenid="sprm:PFPageBreakBefore"/> <element name="framePr" tokenid="ooxml:CT_PPrBase_framePr"/> <element name="widowControl" tokenid="ooxml:CT_PPrBase_widowControl"/> diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index 61c813c2d702..336bd1706c31 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -2270,11 +2270,11 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword) { case RTF_KEEP: if (m_aStates.top().pCurrentBuffer != &m_aTableBuffer) - nParam = NS_sprm::LN_PFKeep; + nParam = NS_ooxml::LN_CT_PPrBase_keepLines; break; case RTF_KEEPN: if (m_aStates.top().pCurrentBuffer != &m_aTableBuffer) - nParam = NS_sprm::LN_PFKeepFollow; + nParam = NS_ooxml::LN_CT_PPrBase_keepNext; break; case RTF_INTBL: { |