diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-03-01 17:08:34 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-03-01 17:30:47 +0100 |
| commit | cd79d4a25df3a7d7b2241a4239a2714b50dcf0be (patch) | |
| tree | de55a59f6c40623945239cde708a0875c0c46d1c /writerfilter | |
| parent | fdo#71043 - Use STACK lint tool to clean code (diff) | |
| download | core-cd79d4a25df3a7d7b2241a4239a2714b50dcf0be.tar.gz core-cd79d4a25df3a7d7b2241a4239a2714b50dcf0be.zip | |
writerfilter: remove last sprm tokens from ooxml/model.xml
Change-Id: I3b18ed95bd0144240a586fefb2b1deb0bcd658c4
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/dmapper/TablePropertiesHandler.cxx | 3 | ||||
| -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 | 2 |
4 files changed, 4 insertions, 67 deletions
diff --git a/writerfilter/source/dmapper/TablePropertiesHandler.cxx b/writerfilter/source/dmapper/TablePropertiesHandler.cxx index 37e99b208ee0..323f288740df 100644 --- a/writerfilter/source/dmapper/TablePropertiesHandler.cxx +++ b/writerfilter/source/dmapper/TablePropertiesHandler.cxx @@ -169,8 +169,7 @@ namespace dmapper { } } break; - case 0x3403: // sprmTFCantSplit - case NS_sprm::LN_TCantSplit: // 0x3644 + case NS_ooxml::LN_CT_TrPrBase_cantSplit: { //row can't break across pages if nIntValue == 1 TablePropertyMapPtr pPropMap( new TablePropertyMap ); diff --git a/writerfilter/source/doctok/resources.xmi b/writerfilter/source/doctok/resources.xmi index b80eb205cd87..d6539ee20629 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 sprmTCantSplit--> - <UML:Class xmi.id="sprmTCantSplit" name="sprmTCantSplit"> - <UML:ModelElement.stereotype> - <UML:Stereotype xmi.idref="ww8sprm"/> - </UML:ModelElement.stereotype> - <UML:ModelElement.taggedValue> - <UML:TaggedValue> - <UML:TaggedValue.dataValue>0x3644</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:sprmTCantSplit</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>table</UML:TaggedValue.dataValue> - <UML:TaggedValue.type> - <UML:TagDefinition xmi.idref="kind"/> - </UML:TaggedValue.type> - </UML:TaggedValue> - </UML:ModelElement.taggedValue> - </UML:Class> - <!--SPRM sprmTCantSplit--> <!--SPRM sprmPDxaRight--> <UML:Class xmi.id="sprmPDxaRight" name="sprmPDxaRight"> <UML:ModelElement.stereotype> @@ -410,37 +379,6 @@ </UML:ModelElement.taggedValue> </UML:Class> <!--SPRM sprmCRgFtc2--> - <!--SPRM sprmCFspecVanish--> - <UML:Class xmi.id="sprmCFspecVanish" name="sprmCFspecVanish"> - <UML:ModelElement.stereotype> - <UML:Stereotype xmi.idref="ww8sprm"/> - </UML:ModelElement.stereotype> - <UML:ModelElement.taggedValue> - <UML:TaggedValue> - <UML:TaggedValue.dataValue>0x0818</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:sprmCFspecVanish</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>character</UML:TaggedValue.dataValue> - <UML:TaggedValue.type> - <UML:TagDefinition xmi.idref="kind"/> - </UML:TaggedValue.type> - </UML:TaggedValue> - </UML:ModelElement.taggedValue> - </UML:Class> - <!--SPRM sprmCFspecVanish--> <!--SPRM sprmCLidBi--> <UML:Class xmi.id="sprmCLidBi" name="sprmCLidBi"> <UML:ModelElement.stereotype> diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml index ab7215eb77ca..9e2296bd6889 100644 --- a/writerfilter/source/ooxml/model.xml +++ b/writerfilter/source/ooxml/model.xml @@ -24393,7 +24393,7 @@ <element name="em" tokenid="ooxml:EG_RPrBase_em"/> <element name="lang" tokenid="ooxml:EG_RPrBase_lang"/> <element name="eastAsianLayout" tokenid="ooxml:EG_RPrBase_eastAsianLayout"/> - <element name="specVanish" tokenid="sprm:CFspecVanish"/> + <element name="specVanish" tokenid="ooxml:EG_RPrBase_specVanish"/> <element name="oMath" tokenid="ooxml:EG_RPrBase_oMath"/> <element name="w14:glow" tokenid="ooxml:EG_RPrBase_w14_glow"/> <element name="w14:shadow" tokenid="ooxml:EG_RPrBase_w14_shadow"/> @@ -24693,7 +24693,7 @@ <element name="gridAfter" tokenid="ooxml:CT_TrPrBase_gridAfter"/> <element name="wBefore" tokenid="ooxml:CT_TrPrBase_wBefore"/> <element name="wAfter" tokenid="ooxml:CT_TrPrBase_wAfter"/> - <element name="cantSplit" tokenid="sprm:TCantSplit"/> + <element name="cantSplit" tokenid="ooxml:CT_TrPrBase_cantSplit"/> <element name="trHeight" tokenid="ooxml:CT_TrPrBase_trHeight"/> <element name="tblHeader" tokenid="ooxml:CT_TrPrBase_tblHeader"/> <element name="tblCellSpacing" tokenid="ooxml:CT_TrPrBase_tblCellSpacing"/> diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index 9381cb1e0c19..6c9511bc8ae2 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -2654,7 +2654,7 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword) case RTF_TRKEEP: { RTFValue::Pointer_t pValue(new RTFValue(1)); - m_aStates.top().aTableRowSprms.set(NS_sprm::LN_TCantSplit, pValue); + m_aStates.top().aTableRowSprms.set(NS_ooxml::LN_CT_TrPrBase_cantSplit, pValue); } case RTF_SECTUNLOCKED: { |