writerfilter/source/dmapper/DomainMapper.cxx | 20 ++--
writerfilter/source/doctok/resources.xmi | 124 -------------------------
writerfilter/source/ooxml/model.xml | 8 -
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 6 -
4 files changed, 17 insertions(+), 141 deletions(-)
New commits:
commit 6e38e82b7ce2aeb3d7628ad518437c9af6eec0a8
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Sun Feb 23 21:53:28 2014 +0100
writerfilter: convert sprm:CF{Outline,Shadow,Emboss,Imprint}
Change-Id: I03a2d24d5ff6b868cd67c7b3e1d19c6a2243b92f
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index b3c419b..68731b5 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -1307,15 +1307,15 @@ void DomainMapper::sprmWithProps( Sprm& rSprm,
PropertyMapPtr rContext, SprmType
case NS_sprm::LN_CKcd:
rContext->Insert(PROP_CHAR_EMPHASIS, uno::makeAny ( getEmphasisValue
(nIntValue)));
break; // sprmCKcd
- case NS_sprm::LN_CFEmboss:// sprmCFEmboss
+ case NS_ooxml::LN_EG_RPrBase_emboss:
case NS_ooxml::LN_EG_RPrBase_b:
case NS_ooxml::LN_EG_RPrBase_bCs:
case NS_ooxml::LN_EG_RPrBase_i:
case NS_ooxml::LN_EG_RPrBase_iCs:
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_ooxml::LN_EG_RPrBase_outline:
+ case NS_ooxml::LN_EG_RPrBase_shadow:
case NS_ooxml::LN_EG_RPrBase_caps:
case NS_ooxml::LN_EG_RPrBase_smallCaps:
case NS_sprm::LN_CFVanish: //sprmCFVanish
@@ -1335,10 +1335,10 @@ void DomainMapper::sprmWithProps( Sprm& rSprm,
PropertyMapPtr rContext, SprmType
case NS_ooxml::LN_EG_RPrBase_dstrike:
ePropertyId = PROP_CHAR_STRIKEOUT;
break;
- case NS_sprm::LN_CFOutline: /*sprmCFOutline*/
+ case NS_ooxml::LN_EG_RPrBase_outline:
ePropertyId = PROP_CHAR_CONTOURED;
break;
- case NS_sprm::LN_CFShadow: /*sprmCFShadow*/
+ case NS_ooxml::LN_EG_RPrBase_shadow:
ePropertyId = PROP_CHAR_SHADOWED;
break;
case NS_ooxml::LN_EG_RPrBase_caps:
@@ -1348,7 +1348,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm,
PropertyMapPtr rContext, SprmType
case NS_sprm::LN_CFVanish: /*sprmCFVanish*/
ePropertyId = PROP_CHAR_HIDDEN;
break;
- case NS_sprm::LN_CFEmboss: /*sprmCFEmboss*/
+ case NS_ooxml::LN_EG_RPrBase_emboss:
ePropertyId = PROP_CHAR_RELIEF;
break;
}
@@ -1424,8 +1424,8 @@ void DomainMapper::sprmWithProps( Sprm& rSprm,
PropertyMapPtr rContext, SprmType
rContext->Insert(ePropertyId,
uno::makeAny( nIntValue ?
awt::FontStrikeout::DOUBLE : awt::FontStrikeout::NONE ) );
break;
- case NS_sprm::LN_CFOutline: /*sprmCFOutline*/
- case NS_sprm::LN_CFShadow: /*sprmCFShadow*/
+ case NS_ooxml::LN_EG_RPrBase_outline:
+ case NS_ooxml::LN_EG_RPrBase_shadow:
case NS_sprm::LN_CFVanish: /*sprmCFVanish*/
rContext->Insert(ePropertyId, uno::makeAny( nIntValue
? true : false ));
break;
@@ -1440,7 +1440,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm,
PropertyMapPtr rContext, SprmType
uno::makeAny( nIntValue ?
style::CaseMap::UPPERCASE : style::CaseMap::NONE));
m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag,
"caps", OUString::number(nIntValue));
break;
- case NS_sprm::LN_CFEmboss: /*sprmCFEmboss*/
+ case NS_ooxml::LN_EG_RPrBase_emboss:
rContext->Insert(ePropertyId,
uno::makeAny( nIntValue ?
awt::FontRelief::EMBOSSED : awt::FontRelief::NONE ));
break;
@@ -1573,7 +1573,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm,
PropertyMapPtr rContext, SprmType
rContext->Insert(PROP_CHAR_SCALE_WIDTH,
uno::makeAny( sal_Int16(nIntValue) ));
break;
- case NS_sprm::LN_CFImprint: // sprmCFImprint 1 or 0
+ case NS_ooxml::LN_EG_RPrBase_imprint:
// FontRelief: NONE, EMBOSSED, ENGRAVED
rContext->Insert(PROP_CHAR_RELIEF,
uno::makeAny( nIntValue ? awt::FontRelief::ENGRAVED :
awt::FontRelief::NONE ));
diff --git a/writerfilter/source/doctok/resources.xmi
b/writerfilter/source/doctok/resources.xmi
index c694807..e013410 100644
--- a/writerfilter/source/doctok/resources.xmi
+++ b/writerfilter/source/doctok/resources.xmi
@@ -286,68 +286,6 @@
</UML:ModelElement.taggedValue>
</UML:Class>
<!--SPRM sprmCKcd-->
- <!--SPRM sprmCFOutline-->
- <UML:Class xmi.id="sprmCFOutline" name="sprmCFOutline">
- <UML:ModelElement.stereotype>
- <UML:Stereotype xmi.idref="ww8sprm"/>
- </UML:ModelElement.stereotype>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>0x0838</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:sprmCFOutline</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 sprmCFOutline-->
- <!--SPRM sprmCFShadow-->
- <UML:Class xmi.id="sprmCFShadow" name="sprmCFShadow">
- <UML:ModelElement.stereotype>
- <UML:Stereotype xmi.idref="ww8sprm"/>
- </UML:ModelElement.stereotype>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>0x0839</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:sprmCFShadow</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 sprmCFShadow-->
<!--SPRM sprmCFVanish-->
<UML:Class xmi.id="sprmCFVanish" name="sprmCFVanish">
<UML:ModelElement.stereotype>
@@ -720,37 +658,6 @@
</UML:ModelElement.taggedValue>
</UML:Class>
<!--SPRM sprmCCharScale-->
- <!--SPRM sprmCFImprint-->
- <UML:Class xmi.id="sprmCFImprint" name="sprmCFImprint">
- <UML:ModelElement.stereotype>
- <UML:Stereotype xmi.idref="ww8sprm"/>
- </UML:ModelElement.stereotype>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>0x0854</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:sprmCFImprint</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 sprmCFImprint-->
<!--SPRM sprmCFNoProof-->
<UML:Class xmi.id="sprmCFNoProof" name="sprmCFNoProof">
<UML:ModelElement.stereotype>
@@ -844,37 +751,6 @@
</UML:ModelElement.taggedValue>
</UML:Class>
<!--SPRM sprmCComplexScript-->
- <!--SPRM sprmCFEmboss-->
- <UML:Class xmi.id="sprmCFEmboss" name="sprmCFEmboss">
- <UML:ModelElement.stereotype>
- <UML:Stereotype xmi.idref="ww8sprm"/>
- </UML:ModelElement.stereotype>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>0x0858</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:sprmCFEmboss</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 sprmCFEmboss-->
<!--SPRM sprmCSfxText-->
<UML:Class xmi.id="sprmCSfxText" name="sprmCSfxText">
<UML:ModelElement.stereotype>
diff --git a/writerfilter/source/ooxml/model.xml
b/writerfilter/source/ooxml/model.xml
index 1f90369..fed4cda 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -23395,10 +23395,10 @@
<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"/>
- <element name="imprint" tokenid="sprm:CFImprint"/>
+ <element name="outline" tokenid="ooxml:EG_RPrBase_outline"/>
+ <element name="shadow" tokenid="ooxml:EG_RPrBase_shadow"/>
+ <element name="emboss" tokenid="ooxml:EG_RPrBase_emboss"/>
+ <element name="imprint" tokenid="ooxml:EG_RPrBase_imprint"/>
<element name="noProof" tokenid="sprm:CFNoProof"/>
<element name="snapToGrid" tokenid="ooxml:EG_RPrBase_snapToGrid"/>
<element name="vanish" tokenid="sprm:CFVanish"/>
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index bececbe..92201b7 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -3846,13 +3846,13 @@ int RTFDocumentImpl::dispatchToggle(RTFKeyword
nKeyword, bool bParam, int nParam
case RTF_I: nSprm = NS_ooxml::LN_EG_RPrBase_i; break;
case RTF_AI: nSprm = NS_ooxml::LN_EG_RPrBase_iCs; break;
case RTF_UL: nSprm = NS_sprm::LN_CKul; break;
- case RTF_OUTL: nSprm = NS_sprm::LN_CFOutline; break;
- case RTF_SHAD: nSprm = NS_sprm::LN_CFShadow; break;
+ case RTF_OUTL: nSprm = NS_ooxml::LN_EG_RPrBase_outline; break;
+ case RTF_SHAD: nSprm = NS_ooxml::LN_EG_RPrBase_shadow; break;
case RTF_V: nSprm = NS_sprm::LN_CFVanish; 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_IMPR: nSprm = NS_ooxml::LN_EG_RPrBase_imprint; break;
case RTF_CAPS: nSprm = NS_ooxml::LN_EG_RPrBase_caps; break;
default: break;
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
