mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

writerfilter: convert sprm:P{WAlignFont,TightWrap,OutLvl}

Browse Source 
Change-Id: Id2090637953d98e899481a2e802815cdc6244e50
This commit is contained in:
Miklos Vajna
2014-02-21 22:18:12 +01:00
parent 27a03eb3ba
commit 4b544037c4
4 changed files with 8 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
writerfilter/source/dmapper/DomainMapper.cxx
View File

@@ -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)

93
writerfilter/source/doctok/resources.xmi
View File

@@ -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>

6
writerfilter/source/ooxml/model.xml
View File

@@ -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>

2
writerfilter/source/rtftok/rtfdocumentimpl.cxx
View File

@@ -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;
}