[Libreoffice-commits] core.git: writerfilter/source
Miklos Vajna
vmiklos at collabora.co.uk
Fri Feb 21 13:24:06 PST 2014
writerfilter/source/dmapper/DomainMapper.cxx | 8 +-
writerfilter/source/doctok/resources.xmi | 93 -------------------------
writerfilter/source/ooxml/model.xml | 6 -
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 2
4 files changed, 8 insertions(+), 101 deletions(-)
New commits:
commit 4b544037c4fdbcb8958723bb9ea3d9a33f43e6ee
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Fri Feb 21 22:18:12 2014 +0100
writerfilter: convert sprm:P{WAlignFont,TightWrap,OutLvl}
Change-Id: Id2090637953d98e899481a2e802815cdc6244e50
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index acd7f8b..e9f57fa 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -1234,7 +1234,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext, SprmType
break;
case NS_ooxml::LN_CT_PPrBase_autoSpaceDN:
break;
- case NS_sprm::LN_PWAlignFont:
+ case NS_ooxml::LN_CT_PPrBase_textAlignment:
{
sal_Int16 nAlignment = 0;
switch (nIntValue)
@@ -1257,10 +1257,10 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext, SprmType
}
rContext->Insert( PROP_PARA_VERT_ALIGNMENT, uno::makeAny( nAlignment) );
}
- break; // sprmPWAlignFont
+ break;
case NS_ooxml::LN_CT_PPrBase_textDirection:
break;
- case NS_sprm::LN_POutLvl:
+ case NS_ooxml::LN_CT_PPrBase_outlineLvl:
{
sal_Int16 nLvl = static_cast< sal_Int16 >( nIntValue );
if( m_pImpl->IsStyleSheetImport() )
@@ -1275,7 +1275,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext, SprmType
rContext->Insert(PROP_OUTLINE_LEVEL, uno::makeAny ( nLvl ));
}
}
- break; // sprmPOutLvl
+ break;
case NS_ooxml::LN_CT_PPrBase_bidi:
{
if (nIntValue != 0)
diff --git a/writerfilter/source/doctok/resources.xmi b/writerfilter/source/doctok/resources.xmi
index 18d9e64..0b8c40c 100644
--- a/writerfilter/source/doctok/resources.xmi
+++ b/writerfilter/source/doctok/resources.xmi
@@ -224,68 +224,6 @@
</UML:ModelElement.taggedValue>
</UML:Class>
<!--SPRM sprmPFWidowControl-->
- <!--SPRM sprmPWAlignFont-->
- <UML:Class xmi.id="sprmPWAlignFont" name="sprmPWAlignFont">
- <UML:ModelElement.stereotype>
- <UML:Stereotype xmi.idref="ww8sprm"/>
- </UML:ModelElement.stereotype>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>0x4439</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:sprmPWAlignFont</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 sprmPWAlignFont-->
- <!--SPRM sprmPOutLvl-->
- <UML:Class xmi.id="sprmPOutLvl" name="sprmPOutLvl">
- <UML:ModelElement.stereotype>
- <UML:Stereotype xmi.idref="ww8sprm"/>
- </UML:ModelElement.stereotype>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>0x2640</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:sprmPOutLvl</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 sprmPOutLvl-->
<!--SPRM sprmCHighlight-->
<UML:Class xmi.id="sprmCHighlight" name="sprmCHighlight">
<UML:ModelElement.stereotype>
@@ -1092,37 +1030,6 @@
</UML:ModelElement.taggedValue>
</UML:Class>
<!--SPRM sprmCComplexScript-->
- <!--SPRM sprmPTightWrap-->
- <UML:Class xmi.id="sprmPTightWrap" name="sprmPTightWrap">
- <UML:ModelElement.stereotype>
- <UML:Stereotype xmi.idref="ww8sprm"/>
- </UML:ModelElement.stereotype>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>0x2471</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:sprmPTightWrap</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 sprmPTightWrap-->
<!--SPRM sprmCFEmboss-->
<UML:Class xmi.id="sprmCFEmboss" name="sprmCFEmboss">
<UML:ModelElement.stereotype>
diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml
index 10ded76..0a00ea2 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -22592,9 +22592,9 @@
<element name="suppressOverlap" tokenid="ooxml:CT_PPrBase_suppressOverlap"/>
<element name="jc" tokenid="ooxml:CT_PPrBase_jc"/>
<element name="textDirection" tokenid="ooxml:CT_PPrBase_textDirection"/>
- <element name="textAlignment" tokenid="sprm:PWAlignFont"/>
- <element name="textboxTightWrap" tokenid="sprm:PTightWrap"/>
- <element name="outlineLvl" tokenid="sprm:POutLvl"/>
+ <element name="textAlignment" tokenid="ooxml:CT_PPrBase_textAlignment"/>
+ <element name="textboxTightWrap" tokenid="ooxml:CT_PPrBase_textboxTightWrap"/>
+ <element name="outlineLvl" tokenid="ooxml:CT_PPrBase_outlineLvl"/>
<element name="divId" tokenid="ooxml:CT_PPrBase_divId"/>
<element name="cnfStyle" tokenid="ooxml:CT_PPrBase_cnfStyle"/>
</resource>
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index b761328..52e2c19 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -2126,7 +2126,7 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword)
if (nParam >= 0)
{
RTFValue::Pointer_t pValue(new RTFValue(nParam));
- m_aStates.top().aParagraphSprms.set(NS_sprm::LN_PWAlignFont, pValue);
+ m_aStates.top().aParagraphSprms.set(NS_ooxml::LN_CT_PPrBase_textAlignment, pValue);
return 0;
}
More information about the Libreoffice-commits
mailing list