writerfilter/source/dmapper/DomainMapper.cxx | 4 - writerfilter/source/doctok/resources.xmi | 62 ------------------------- writerfilter/source/ooxml/model.xml | 4 - writerfilter/source/rtftok/rtfdocumentimpl.cxx | 2 4 files changed, 5 insertions(+), 67 deletions(-)
New commits: commit 1fa144261ad7a224277bc41c11e6b55088f0a069 Author: Miklos Vajna <vmik...@collabora.co.uk> Date: Tue Feb 18 22:17:49 2014 +0100 writerfilter: sprm:P{Shd,FNoAutoHyph} -> CT_PrBase_{shd,suppressAutoHyphens} Change-Id: I3ca8805428469cebf67737fd9fce9a74641e88ce diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index 05c6978..5f692a0 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -1184,12 +1184,12 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext, SprmType break; case NS_ooxml::LN_CT_PBdr_bar: break; - case NS_sprm::LN_PFNoAutoHyph: // sprmPFNoAutoHyph + case NS_ooxml::LN_CT_PPrBase_suppressAutoHyphens: rContext->Insert(PROP_PARA_IS_HYPHENATION, uno::makeAny( nIntValue ? false : true )); break; case NS_ooxml::LN_CT_FramePr_h: break; - case NS_sprm::LN_PShd: // sprmPShd + case NS_ooxml::LN_CT_PrBase_shd: { //contains fore color, back color and shadow percentage, results in a brush writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps(); diff --git a/writerfilter/source/doctok/resources.xmi b/writerfilter/source/doctok/resources.xmi index 1b90437..f1a59ca 100644 --- a/writerfilter/source/doctok/resources.xmi +++ b/writerfilter/source/doctok/resources.xmi @@ -255,68 +255,6 @@ </UML:ModelElement.taggedValue> </UML:Class> <!--SPRM sprmPRow--> - <!--SPRM sprmPFNoAutoHyph--> - <UML:Class xmi.id="sprmPFNoAutoHyph" name="sprmPFNoAutoHyph"> - <UML:ModelElement.stereotype> - <UML:Stereotype xmi.idref="ww8sprm"/> - </UML:ModelElement.stereotype> - <UML:ModelElement.taggedValue> - <UML:TaggedValue> - <UML:TaggedValue.dataValue>0x242A</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:sprmPFNoAutoHyph</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 sprmPFNoAutoHyph--> - <!--SPRM sprmPShd--> - <UML:Class xmi.id="sprmPShd" name="sprmPShd"> - <UML:ModelElement.stereotype> - <UML:Stereotype xmi.idref="ww8sprm"/> - </UML:ModelElement.stereotype> - <UML:ModelElement.taggedValue> - <UML:TaggedValue> - <UML:TaggedValue.dataValue>0x442D</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:sprmPShd</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 sprmPShd--> <!--SPRM sprmPFWidowControl--> <UML:Class xmi.id="sprmPFWidowControl" name="sprmPFWidowControl"> <UML:ModelElement.stereotype> diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml index 38f7419..59fadd4 100644 --- a/writerfilter/source/ooxml/model.xml +++ b/writerfilter/source/ooxml/model.xml @@ -22346,9 +22346,9 @@ <element name="numPr" tokenid="ooxml:CT_PPrBase_numPr"/> <element name="suppressLineNumbers" tokenid="ooxml:CT_PPrBase_suppressLineNumbers"/> <element name="pBdr" tokenid="ooxml:CT_PrBase_pBdr"/> - <element name="shd" tokenid="sprm:PShd"/> + <element name="shd" tokenid="ooxml:CT_PrBase_shd"/> <element name="tabs" tokenid="ooxml:CT_PPrBase_tabs"/> - <element name="suppressAutoHyphens" tokenid="sprm:PFNoAutoHyph"/> + <element name="suppressAutoHyphens" tokenid="ooxml:CT_PPrBase_suppressAutoHyphens"/> <element name="kinsoku" tokenid="ooxml:CT_PPrBase_kinsoku"/> <element name="wordWrap" tokenid="ooxml:CT_PPrBase_wordWrap"/> <element name="overflowPunct" tokenid="sprm:PFOverflowPunct"/> diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index 4d49e89..a4a29e9 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -3086,7 +3086,7 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam) if (nParam) { RTFValue::Pointer_t pValue(new RTFValue(getColorTable(nParam))); - lcl_putNestedAttribute(m_aStates.top().aParagraphSprms, NS_sprm::LN_PShd, NS_ooxml::LN_CT_Shd_fill, pValue); + lcl_putNestedAttribute(m_aStates.top().aParagraphSprms, NS_ooxml::LN_CT_PrBase_shd, NS_ooxml::LN_CT_Shd_fill, pValue); } break; case RTF_ULC: _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits