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

writerfilter: NS_sprm::LN_PDx/yaFromText -> NS_ooxml::LN_CT_FramePr_h/vSpace

Browse Source 
Change-Id: I651a1fd5279afa07929e6cfae4440f5b008d6215
This commit is contained in:
Miklos Vajna 2014-02-13 22:49:03 +01:00
parent a76261ac9e
commit 53e3d79c63
4 changed files with 18 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -618,8 +618,8 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
case NS_ooxml::LN_CT_FramePr_w: case NS_ooxml::LN_CT_FramePr_w:
case NS_ooxml::LN_CT_FramePr_h: case NS_ooxml::LN_CT_FramePr_h:
case NS_sprm::LN_PWr: case NS_sprm::LN_PWr:
case NS_sprm::LN_PDxaFromText: case NS_ooxml::LN_CT_FramePr_hSpace:
case NS_sprm::LN_PDyaFromText: case NS_ooxml::LN_CT_FramePr_vSpace:
{ {
ParagraphProperties* pParaProperties = dynamic_cast< ParagraphProperties*>( ParagraphProperties* pParaProperties = dynamic_cast< ParagraphProperties*>(
m_pImpl->GetTopContextOfType( CONTEXT_PARAGRAPH ).get() ); m_pImpl->GetTopContextOfType( CONTEXT_PARAGRAPH ).get() );
@ -736,10 +736,10 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
case NS_ooxml::LN_CT_FramePr_h: case NS_ooxml::LN_CT_FramePr_h:
pParaProperties->Seth(ConversionHelper::convertTwipToMM100(nIntValue)); pParaProperties->Seth(ConversionHelper::convertTwipToMM100(nIntValue));
break; break;
case NS_sprm::LN_PDxaFromText: case NS_ooxml::LN_CT_FramePr_hSpace:
pParaProperties->SethSpace( ConversionHelper::convertTwipToMM100(nIntValue )); pParaProperties->SethSpace( ConversionHelper::convertTwipToMM100(nIntValue ));
break; break;
case NS_sprm::LN_PDyaFromText: case NS_ooxml::LN_CT_FramePr_vSpace:
pParaProperties->SetvSpace( ConversionHelper::convertTwipToMM100(nIntValue )); pParaProperties->SetvSpace( ConversionHelper::convertTwipToMM100(nIntValue ));
break; break;
default:; default:;
@ -1202,9 +1202,9 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext, SprmType
} }
} }
break; break;
case NS_sprm::LN_PDyaFromText: case NS_ooxml::LN_CT_FramePr_vSpace:
break; // sprmPDyaFromText break; // sprmPDyaFromText
case NS_sprm::LN_PDxaFromText: case NS_ooxml::LN_CT_FramePr_hSpace:
break; // sprmPDxaFromText break; // sprmPDxaFromText
case NS_sprm::LN_PFLocked: case NS_sprm::LN_PFLocked:
break; // sprmPFLocked break; // sprmPFLocked

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

@ -573,68 +573,6 @@
</UML:ModelElement.taggedValue> </UML:ModelElement.taggedValue>
</UML:Class> </UML:Class>
<!--SPRM sprmPShd--> <!--SPRM sprmPShd-->
<!--SPRM sprmPDyaFromText-->
<UML:Class xmi.id="sprmPDyaFromText" name="sprmPDyaFromText">
<UML:ModelElement.stereotype>
<UML:Stereotype xmi.idref="ww8sprm"/>
</UML:ModelElement.stereotype>
<UML:ModelElement.taggedValue>
<UML:TaggedValue>
<UML:TaggedValue.dataValue>0x842E</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:sprmPDyaFromText</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 sprmPDyaFromText-->
<!--SPRM sprmPDxaFromText-->
<UML:Class xmi.id="sprmPDxaFromText" name="sprmPDxaFromText">
<UML:ModelElement.stereotype>
<UML:Stereotype xmi.idref="ww8sprm"/>
</UML:ModelElement.stereotype>
<UML:ModelElement.taggedValue>
<UML:TaggedValue>
<UML:TaggedValue.dataValue>0x842F</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:sprmPDxaFromText</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 sprmPDxaFromText-->
<!--SPRM sprmPFLocked--> <!--SPRM sprmPFLocked-->
<UML:Class xmi.id="sprmPFLocked" name="sprmPFLocked"> <UML:Class xmi.id="sprmPFLocked" name="sprmPFLocked">
<UML:ModelElement.stereotype> <UML:ModelElement.stereotype>

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

@ -21956,8 +21956,8 @@
<attribute name="lines" tokenid="ooxml:CT_FramePr_lines"/> <attribute name="lines" tokenid="ooxml:CT_FramePr_lines"/>
<attribute name="w" tokenid="ooxml:CT_FramePr_w"/> <attribute name="w" tokenid="ooxml:CT_FramePr_w"/>
<attribute name="h" tokenid="ooxml:CT_FramePr_h"/> <attribute name="h" tokenid="ooxml:CT_FramePr_h"/>
<attribute name="vSpace" tokenid="sprm:PDyaFromText"/> <attribute name="vSpace" tokenid="ooxml:CT_FramePr_vSpace"/>
<attribute name="hSpace" tokenid="sprm:PDxaFromText"/> <attribute name="hSpace" tokenid="ooxml:CT_FramePr_hSpace"/>
<attribute name="wrap" tokenid="sprm:PWr"/> <attribute name="wrap" tokenid="sprm:PWr"/>
<attribute name="hAnchor" tokenid="ooxml:CT_FramePr_hAnchor"/> <attribute name="hAnchor" tokenid="ooxml:CT_FramePr_hAnchor"/>
<attribute name="vAnchor" tokenid="ooxml:CT_FramePr_vAnchor"/> <attribute name="vAnchor" tokenid="ooxml:CT_FramePr_vAnchor"/>

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

@ -3555,15 +3555,15 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam)
NS_ooxml::LN_EG_SectPrContents_endnotePr, NS_ooxml::LN_EG_FtnEdnNumProps_numStart, pIntValue); NS_ooxml::LN_EG_SectPrContents_endnotePr, NS_ooxml::LN_EG_FtnEdnNumProps_numStart, pIntValue);
break; break;
case RTF_DFRMTXTX: case RTF_DFRMTXTX:
m_aStates.top().aFrame.setSprm(NS_sprm::LN_PDxaFromText, nParam); m_aStates.top().aFrame.setSprm(NS_ooxml::LN_CT_FramePr_hSpace, nParam);
break; break;
case RTF_DFRMTXTY: case RTF_DFRMTXTY:
m_aStates.top().aFrame.setSprm(NS_sprm::LN_PDyaFromText, nParam); m_aStates.top().aFrame.setSprm(NS_ooxml::LN_CT_FramePr_vSpace, nParam);
break; break;
case RTF_DXFRTEXT: case RTF_DXFRTEXT:
{ {
m_aStates.top().aFrame.setSprm(NS_sprm::LN_PDxaFromText, nParam); m_aStates.top().aFrame.setSprm(NS_ooxml::LN_CT_FramePr_hSpace, nParam);
m_aStates.top().aFrame.setSprm(NS_sprm::LN_PDyaFromText, nParam); m_aStates.top().aFrame.setSprm(NS_ooxml::LN_CT_FramePr_vSpace, nParam);
} }
break; break;
case RTF_FLYVERT: case RTF_FLYVERT:
@ -5105,10 +5105,10 @@ void RTFFrame::setSprm(Id nId, Id nValue)
case NS_ooxml::LN_CT_FramePr_y: case NS_ooxml::LN_CT_FramePr_y:
nY = nValue; nY = nValue;
break; break;
case NS_sprm::LN_PDxaFromText: case NS_ooxml::LN_CT_FramePr_hSpace:
nHoriPadding = nValue; nHoriPadding = nValue;
break; break;
case NS_sprm::LN_PDyaFromText: case NS_ooxml::LN_CT_FramePr_vSpace:
nVertPadding = nValue; nVertPadding = nValue;
break; break;
case NS_ooxml::LN_CT_FramePr_xAlign: case NS_ooxml::LN_CT_FramePr_xAlign:
@ -5142,8 +5142,8 @@ RTFSprms RTFFrame::getSprms()
NS_ooxml::LN_CT_FramePr_hRule, // Make sure nHRule is processed before nH NS_ooxml::LN_CT_FramePr_hRule, // Make sure nHRule is processed before nH
NS_ooxml::LN_CT_FramePr_h, NS_ooxml::LN_CT_FramePr_h,
NS_ooxml::LN_CT_FramePr_w, NS_ooxml::LN_CT_FramePr_w,
NS_sprm::LN_PDxaFromText, NS_ooxml::LN_CT_FramePr_hSpace,
NS_sprm::LN_PDyaFromText, NS_ooxml::LN_CT_FramePr_vSpace,
NS_ooxml::LN_CT_FramePr_hAnchor, NS_ooxml::LN_CT_FramePr_hAnchor,
NS_ooxml::LN_CT_FramePr_vAnchor, NS_ooxml::LN_CT_FramePr_vAnchor,
NS_ooxml::LN_CT_FramePr_xAlign, NS_ooxml::LN_CT_FramePr_xAlign,
@ -5181,11 +5181,11 @@ RTFSprms RTFFrame::getSprms()
if ( nW != 0 ) if ( nW != 0 )
pValue.reset(new RTFValue(nW)); pValue.reset(new RTFValue(nW));
break; break;
case NS_sprm::LN_PDxaFromText: case NS_ooxml::LN_CT_FramePr_hSpace:
if ( nHoriPadding != 0 ) if ( nHoriPadding != 0 )
pValue.reset(new RTFValue(nHoriPadding)); pValue.reset(new RTFValue(nHoriPadding));
break; break;
case NS_sprm::LN_PDyaFromText: case NS_ooxml::LN_CT_FramePr_vSpace:
if ( nVertPadding != 0 ) if ( nVertPadding != 0 )
pValue.reset(new RTFValue(nVertPadding)); pValue.reset(new RTFValue(nVertPadding));
break; break;