writerfilter/source/dmapper/DomainMapper.cxx | 1 writerfilter/source/doctok/resources.xmi | 31 ------------------------- writerfilter/source/rtftok/rtfdocumentimpl.cxx | 2 - 3 files changed, 1 insertion(+), 33 deletions(-)
New commits: commit 61238e11837c6a25666a1edbf4914c27b53a310b Author: Miklos Vajna <vmik...@collabora.co.uk> Date: Thu Mar 6 18:07:49 2014 +0100 writerfilter: convert sprm:PFWidowControl Change-Id: I4ec9cfc07030ef83a44d6a2fdf7c9743242be602 diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index e30f83a..aae1066 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -1196,7 +1196,6 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext, SprmType break; // sprmPDxaFromText case NS_ooxml::LN_CT_FramePr_anchorLock: break; - case NS_sprm::LN_PFWidowControl: case NS_ooxml::LN_CT_PPrBase_widowControl: { uno::Any aVal( uno::makeAny( sal_Int8(nIntValue ? 2 : 0 ))); diff --git a/writerfilter/source/doctok/resources.xmi b/writerfilter/source/doctok/resources.xmi index 5f2b4d8..4990be8 100644 --- a/writerfilter/source/doctok/resources.xmi +++ b/writerfilter/source/doctok/resources.xmi @@ -7,37 +7,6 @@ <UML:Model name="WW8Document"> <UML:Namespace.ownedElement> <!--SPRMS--> - <!--SPRM sprmPFWidowControl--> - <UML:Class xmi.id="sprmPFWidowControl" name="sprmPFWidowControl"> - <UML:ModelElement.stereotype> - <UML:Stereotype xmi.idref="ww8sprm"/> - </UML:ModelElement.stereotype> - <UML:ModelElement.taggedValue> - <UML:TaggedValue> - <UML:TaggedValue.dataValue>0x2431</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:sprmPFWidowControl</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 sprmPFWidowControl--> <!--SPRM sprmCKul--> <UML:Class xmi.id="sprmCKul" name="sprmCKul"> <UML:ModelElement.stereotype> diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index a60d1a5..e9d43c0 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -2546,7 +2546,7 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword) case RTF_NOWIDCTLPAR: { RTFValue::Pointer_t pValue(new RTFValue(int(nKeyword == RTF_WIDCTLPAR))); - m_aStates.top().aParagraphSprms.set(NS_sprm::LN_PFWidowControl, pValue); + m_aStates.top().aParagraphSprms.set(NS_ooxml::LN_CT_PPrBase_widowControl, pValue); } break; case RTF_BOX: _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits