writerfilter/source/dmapper/DomainMapper.cxx | 24 ++-- writerfilter/source/doctok/resources.xmi | 124 ------------------------- writerfilter/source/ooxml/model.xml | 8 - writerfilter/source/rtftok/rtfdocumentimpl.cxx | 8 - 4 files changed, 20 insertions(+), 144 deletions(-)
New commits: commit 675ff51f2e0e1bf0d9f689382162a3e62e0f0f48 Author: Miklos Vajna <vmik...@collabora.co.uk> Date: Sun Feb 23 10:50:20 2014 +0100 writerfilter: convert sprm:CF{Caps,SmallCaps,Strike,DStrike} Change-Id: Ib582a8266990a3a6ccccdd630baeca588ed68fdb diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index ea39f2c..80f1ed8 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -1312,13 +1312,13 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext, SprmType case NS_ooxml::LN_EG_RPrBase_bCs: case NS_ooxml::LN_EG_RPrBase_i: case NS_ooxml::LN_EG_RPrBase_iCs: - case NS_sprm::LN_CFStrike: //sprmCFStrike + case NS_ooxml::LN_EG_RPrBase_strike: + case NS_ooxml::LN_EG_RPrBase_dstrike: case NS_sprm::LN_CFOutline: //sprmCFOutline case NS_sprm::LN_CFShadow: //sprmCFShadow - case NS_sprm::LN_CFSmallCaps: //sprmCFSmallCaps - case NS_sprm::LN_CFCaps: //sprmCFCaps + case NS_ooxml::LN_EG_RPrBase_caps: + case NS_ooxml::LN_EG_RPrBase_smallCaps: case NS_sprm::LN_CFVanish: //sprmCFVanish - case NS_sprm::LN_CFDStrike: // sprmCFDStrike { PropertyIds ePropertyId = PROP_CHAR_WEIGHT; //initialized to prevent warning! switch( nSprmId ) @@ -1331,8 +1331,8 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext, SprmType case NS_ooxml::LN_EG_RPrBase_iCs: ePropertyId = nSprmId == NS_ooxml::LN_EG_RPrBase_i ? PROP_CHAR_POSTURE : PROP_CHAR_POSTURE_COMPLEX; break; - case NS_sprm::LN_CFStrike: /*sprmCFStrike*/ - case NS_sprm::LN_CFDStrike : /*sprmCFDStrike double strike through*/ + case NS_ooxml::LN_EG_RPrBase_strike: + case NS_ooxml::LN_EG_RPrBase_dstrike: ePropertyId = PROP_CHAR_STRIKEOUT; break; case NS_sprm::LN_CFOutline: /*sprmCFOutline*/ @@ -1341,8 +1341,8 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext, SprmType case NS_sprm::LN_CFShadow: /*sprmCFShadow*/ ePropertyId = PROP_CHAR_SHADOWED; break; - case NS_sprm::LN_CFSmallCaps: /*sprmCFSmallCaps*/ - case NS_sprm::LN_CFCaps: /*sprmCFCaps*/ + case NS_ooxml::LN_EG_RPrBase_caps: + case NS_ooxml::LN_EG_RPrBase_smallCaps: ePropertyId = PROP_CHAR_CASE_MAP; break; case NS_sprm::LN_CFVanish: /*sprmCFVanish*/ @@ -1416,11 +1416,11 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext, SprmType m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, "i", OUString::number(nIntValue)); } break; - case NS_sprm::LN_CFStrike: /*sprmCFStrike*/ + case NS_ooxml::LN_EG_RPrBase_strike: rContext->Insert(ePropertyId, uno::makeAny( nIntValue ? awt::FontStrikeout::SINGLE : awt::FontStrikeout::NONE ) ); break; - case NS_sprm::LN_CFDStrike : /*sprmCFDStrike double strike through*/ + case NS_ooxml::LN_EG_RPrBase_dstrike: rContext->Insert(ePropertyId, uno::makeAny( nIntValue ? awt::FontStrikeout::DOUBLE : awt::FontStrikeout::NONE ) ); break; @@ -1429,13 +1429,13 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext, SprmType case NS_sprm::LN_CFVanish: /*sprmCFVanish*/ rContext->Insert(ePropertyId, uno::makeAny( nIntValue ? true : false )); break; - case NS_sprm::LN_CFSmallCaps: /*sprmCFSmallCaps*/ + case NS_ooxml::LN_EG_RPrBase_smallCaps: // If smallcaps would be just disabled and an other casemap is already inserted, don't do anything. if (nIntValue || rContext->find(ePropertyId) == rContext->end()) rContext->Insert(ePropertyId, uno::makeAny( nIntValue ? style::CaseMap::SMALLCAPS : style::CaseMap::NONE)); m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, "smallCaps", OUString::number(nIntValue)); break; - case NS_sprm::LN_CFCaps: /*sprmCFCaps*/ + case NS_ooxml::LN_EG_RPrBase_caps: rContext->Insert(ePropertyId, uno::makeAny( nIntValue ? style::CaseMap::UPPERCASE : style::CaseMap::NONE)); m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, "caps", OUString::number(nIntValue)); diff --git a/writerfilter/source/doctok/resources.xmi b/writerfilter/source/doctok/resources.xmi index 0d04b51..c694807 100644 --- a/writerfilter/source/doctok/resources.xmi +++ b/writerfilter/source/doctok/resources.xmi @@ -286,37 +286,6 @@ </UML:ModelElement.taggedValue> </UML:Class> <!--SPRM sprmCKcd--> - <!--SPRM sprmCFStrike--> - <UML:Class xmi.id="sprmCFStrike" name="sprmCFStrike"> - <UML:ModelElement.stereotype> - <UML:Stereotype xmi.idref="ww8sprm"/> - </UML:ModelElement.stereotype> - <UML:ModelElement.taggedValue> - <UML:TaggedValue> - <UML:TaggedValue.dataValue>0x0837</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:sprmCFStrike</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 sprmCFStrike--> <!--SPRM sprmCFOutline--> <UML:Class xmi.id="sprmCFOutline" name="sprmCFOutline"> <UML:ModelElement.stereotype> @@ -379,68 +348,6 @@ </UML:ModelElement.taggedValue> </UML:Class> <!--SPRM sprmCFShadow--> - <!--SPRM sprmCFSmallCaps--> - <UML:Class xmi.id="sprmCFSmallCaps" name="sprmCFSmallCaps"> - <UML:ModelElement.stereotype> - <UML:Stereotype xmi.idref="ww8sprm"/> - </UML:ModelElement.stereotype> - <UML:ModelElement.taggedValue> - <UML:TaggedValue> - <UML:TaggedValue.dataValue>0x083A</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:sprmCFSmallCaps</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 sprmCFSmallCaps--> - <!--SPRM sprmCFCaps--> - <UML:Class xmi.id="sprmCFCaps" name="sprmCFCaps"> - <UML:ModelElement.stereotype> - <UML:Stereotype xmi.idref="ww8sprm"/> - </UML:ModelElement.stereotype> - <UML:ModelElement.taggedValue> - <UML:TaggedValue> - <UML:TaggedValue.dataValue>0x083B</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:sprmCFCaps</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 sprmCFCaps--> <!--SPRM sprmCFVanish--> <UML:Class xmi.id="sprmCFVanish" name="sprmCFVanish"> <UML:ModelElement.stereotype> @@ -813,37 +720,6 @@ </UML:ModelElement.taggedValue> </UML:Class> <!--SPRM sprmCCharScale--> - <!--SPRM sprmCFDStrike--> - <UML:Class xmi.id="sprmCFDStrike" name="sprmCFDStrike"> - <UML:ModelElement.stereotype> - <UML:Stereotype xmi.idref="ww8sprm"/> - </UML:ModelElement.stereotype> - <UML:ModelElement.taggedValue> - <UML:TaggedValue> - <UML:TaggedValue.dataValue>0x2A53</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:sprmCFDStrike</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 sprmCFDStrike--> <!--SPRM sprmCFImprint--> <UML:Class xmi.id="sprmCFImprint" name="sprmCFImprint"> <UML:ModelElement.stereotype> diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml index bab5704..69b97dd 100644 --- a/writerfilter/source/ooxml/model.xml +++ b/writerfilter/source/ooxml/model.xml @@ -23116,10 +23116,10 @@ <element name="bCs" tokenid="ooxml:EG_RPrBase_bCs"/> <element name="i" tokenid="ooxml:EG_RPrBase_i"/> <element name="iCs" tokenid="ooxml:EG_RPrBase_iCs"/> - <element name="caps" tokenid="sprm:CFCaps"/> - <element name="smallCaps" tokenid="sprm:CFSmallCaps"/> - <element name="strike" tokenid="sprm:CFStrike"/> - <element name="dstrike" tokenid="sprm:CFDStrike"/> + <element name="caps" tokenid="ooxml:EG_RPrBase_caps"/> + <element name="smallCaps" tokenid="ooxml:EG_RPrBase_smallCaps"/> + <element name="strike" tokenid="ooxml:EG_RPrBase_strike"/> + <element name="dstrike" tokenid="ooxml:EG_RPrBase_dstrike"/> <element name="outline" tokenid="sprm:CFOutline"/> <element name="shadow" tokenid="sprm:CFShadow"/> <element name="emboss" tokenid="sprm:CFEmboss"/> diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index 2824640..bececbe 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -3849,11 +3849,11 @@ int RTFDocumentImpl::dispatchToggle(RTFKeyword nKeyword, bool bParam, int nParam case RTF_OUTL: nSprm = NS_sprm::LN_CFOutline; break; case RTF_SHAD: nSprm = NS_sprm::LN_CFShadow; break; case RTF_V: nSprm = NS_sprm::LN_CFVanish; break; - case RTF_STRIKE: nSprm = NS_sprm::LN_CFStrike; break; - case RTF_STRIKED: nSprm = NS_sprm::LN_CFDStrike; break; - case RTF_SCAPS: nSprm = NS_sprm::LN_CFSmallCaps; break; + case RTF_STRIKE: nSprm = NS_ooxml::LN_EG_RPrBase_strike; break; + case RTF_STRIKED: nSprm = NS_ooxml::LN_EG_RPrBase_dstrike; break; + case RTF_SCAPS: nSprm = NS_ooxml::LN_EG_RPrBase_smallCaps; break; case RTF_IMPR: nSprm = NS_sprm::LN_CFImprint; break; - case RTF_CAPS: nSprm = NS_sprm::LN_CFCaps; break; + case RTF_CAPS: nSprm = NS_ooxml::LN_EG_RPrBase_caps; break; default: break; } if (nSprm >= 0) _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits