[Libreoffice-commits] core.git: writerfilter/source
Miklos Vajna
vmiklos at collabora.co.uk
Sat Mar 1 01:50:45 PST 2014
writerfilter/source/dmapper/DomainMapper.cxx | 10 +-
writerfilter/source/doctok/resources.xmi | 124 -------------------------
writerfilter/source/ooxml/model.xml | 8 -
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 4
4 files changed, 11 insertions(+), 135 deletions(-)
New commits:
commit c3c6d7f886088b57869b6978309e7a39cba32bbb
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Sat Mar 1 10:45:08 2014 +0100
writerfilter: convert sprm:C{Shd,FBiDi,ComplexScript,Kcd}
Change-Id: Ia1dd99f0850d444fe9521fdcd0645e92bfc905a5
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index aa81f65..8aa8e64 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -1307,9 +1307,9 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext, SprmType
rContext->Insert(PROP_CHAR_BACK_COLOR, uno::makeAny( mnBackgroundColor ));
}
break;
- case NS_sprm::LN_CKcd:
+ case NS_ooxml::LN_EG_RPrBase_em:
rContext->Insert(PROP_CHAR_EMPHASIS, uno::makeAny ( getEmphasisValue (nIntValue)));
- break; // sprmCKcd
+ break;
case NS_ooxml::LN_EG_RPrBase_emboss:
case NS_ooxml::LN_EG_RPrBase_b:
case NS_ooxml::LN_EG_RPrBase_bCs:
@@ -1590,9 +1590,9 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext, SprmType
else
rContext->Insert(PROP_CHAR_FLASH, uno::makeAny( false ));
break;
- case NS_sprm::LN_CFBiDi:
- break; // sprmCFBiDi
- case NS_sprm::LN_CShd:
+ case NS_ooxml::LN_EG_RPrBase_rtl:
+ break;
+ case NS_ooxml::LN_EG_RPrBase_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 2a9e933..b80eb20 100644
--- a/writerfilter/source/doctok/resources.xmi
+++ b/writerfilter/source/doctok/resources.xmi
@@ -224,37 +224,6 @@
</UML:ModelElement.taggedValue>
</UML:Class>
<!--SPRM sprmPFWidowControl-->
- <!--SPRM sprmCKcd-->
- <UML:Class xmi.id="sprmCKcd" name="sprmCKcd">
- <UML:ModelElement.stereotype>
- <UML:Stereotype xmi.idref="ww8sprm"/>
- </UML:ModelElement.stereotype>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>0x2A34</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:sprmCKcd</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 sprmCKcd-->
<!--SPRM sprmCKul-->
<UML:Class xmi.id="sprmCKul" name="sprmCKul">
<UML:ModelElement.stereotype>
@@ -472,68 +441,6 @@
</UML:ModelElement.taggedValue>
</UML:Class>
<!--SPRM sprmCFspecVanish-->
- <!--SPRM sprmCComplexScript-->
- <UML:Class xmi.id="sprmCComplexScript" name="sprmCComplexScript">
- <UML:ModelElement.stereotype>
- <UML:Stereotype xmi.idref="ww8sprm"/>
- </UML:ModelElement.stereotype>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>0x882</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:sprmCComplexScript</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 sprmCComplexScript-->
- <!--SPRM sprmCFBiDi-->
- <UML:Class xmi.id="sprmCFBiDi" name="sprmCFBiDi">
- <UML:ModelElement.stereotype>
- <UML:Stereotype xmi.idref="ww8sprm"/>
- </UML:ModelElement.stereotype>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>0x085A</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:sprmCFBiDi</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 sprmCFBiDi-->
<!--SPRM sprmCLidBi-->
<UML:Class xmi.id="sprmCLidBi" name="sprmCLidBi">
<UML:ModelElement.stereotype>
@@ -565,37 +472,6 @@
</UML:ModelElement.taggedValue>
</UML:Class>
<!--SPRM sprmCLidBi-->
- <!--SPRM sprmCShd-->
- <UML:Class xmi.id="sprmCShd" name="sprmCShd">
- <UML:ModelElement.stereotype>
- <UML:Stereotype xmi.idref="ww8sprm"/>
- </UML:ModelElement.stereotype>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>0x4866</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:sprmCShd</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 sprmCShd-->
<!--SPRM sprmSTextFlow-->
<UML:Class xmi.id="sprmSTextFlow" name="sprmSTextFlow">
<UML:ModelElement.stereotype>
diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml
index 187820f..ab7215e 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -24385,12 +24385,12 @@
<element name="u" tokenid="ooxml:EG_RPrBase_u"/>
<element name="effect" tokenid="ooxml:EG_RPrBase_effect"/>
<element name="bdr" tokenid="ooxml:EG_RPrBase_bdr"/>
- <element name="shd" tokenid="sprm:CShd"/>
+ <element name="shd" tokenid="ooxml:EG_RPrBase_shd"/>
<element name="fitText" tokenid="ooxml:EG_RPrBase_fitText"/>
<element name="vertAlign" tokenid="ooxml:EG_RPrBase_vertAlign"/>
- <element name="rtl" tokenid="sprm:CFBiDi"/>
- <element name="cs" tokenid="sprm:CComplexScript"/>
- <element name="em" tokenid="sprm:CKcd"/>
+ <element name="rtl" tokenid="ooxml:EG_RPrBase_rtl"/>
+ <element name="cs" tokenid="ooxml:EG_RPrBase_cs"/>
+ <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"/>
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index b70784a..9381cb1 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -3201,7 +3201,7 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam)
case RTF_CHCBPAT:
{
RTFValue::Pointer_t pValue(new RTFValue(nParam ? getColorTable(nParam) : COL_AUTO));
- lcl_putNestedAttribute(m_aStates.top().aCharacterSprms, NS_sprm::LN_CShd, NS_ooxml::LN_CT_Shd_fill, pValue);
+ lcl_putNestedAttribute(m_aStates.top().aCharacterSprms, NS_ooxml::LN_EG_RPrBase_shd, NS_ooxml::LN_CT_Shd_fill, pValue);
}
break;
case RTF_CLCBPAT:
@@ -3977,7 +3977,7 @@ int RTFDocumentImpl::dispatchToggle(RTFKeyword nKeyword, bool bParam, int nParam
if (nSprm >= 0)
{
RTFValue::Pointer_t pValue(new RTFValue((!bParam || nParam != 0) ? nSprm : 0));
- m_aStates.top().aCharacterSprms.set(NS_sprm::LN_CKcd, pValue);
+ m_aStates.top().aCharacterSprms.set(NS_ooxml::LN_EG_RPrBase_em, pValue);
return 0;
}
More information about the Libreoffice-commits
mailing list