[Libreoffice-commits] core.git: writerfilter/source
Miklos Vajna
vmiklos at collabora.co.uk
Fri Mar 7 12:01:51 PST 2014
writerfilter/source/dmapper/DomainMapper.cxx | 20 ----
writerfilter/source/doctok/resources.xmi | 124 -------------------------
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 15 +--
3 files changed, 5 insertions(+), 154 deletions(-)
New commits:
commit 90ea06df6b9e4b29223eb90a9638c617c4fcb3b0
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Fri Mar 7 21:01:04 2014 +0100
writerfilter: get rid of sprm:{CKul,CIco,STextFlow,TTextFlow}
Change-Id: I819ee11fa11ef425b3ebb86eb2a8b6a6f90effc2
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index 45d77e1..f414f7c 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -1430,22 +1430,6 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext )
}
}
break;
- case NS_sprm::LN_CKul: // sprmCKul
- {
- // Parameter: 0 = none, 1 = single, 2 = by Word,
- // 3 = double, 4 = dotted, 5 = hidden
- // 6 = thick, 7 = dash, 8 = dot(not used)
- // 9 = dotdash 10 = dotdotdash 11 = wave
- handleUnderlineType(nIntValue, rContext);
- }
- break;
- case NS_sprm::LN_CIco:
- {
- sal_Int32 nColor = 0;
- if (getColorFromIndex(nIntValue, nColor))
- rContext->Insert(PROP_CHAR_COLOR, uno::makeAny( nColor ) );
- }
- break; // sprmCIco
case NS_ooxml::LN_EG_RPrBase_sz:
case NS_ooxml::LN_EG_RPrBase_szCs:
{
@@ -1579,7 +1563,6 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext )
case 0x703a: //undocumented, grid related?
OSL_FAIL( "TODO: not handled yet"); //nIntValue like 0x008a2373 ?
break;
- case NS_sprm::LN_STextFlow:
case NS_ooxml::LN_EG_SectPrContents_textDirection:
{
/* 0 HoriLR 1 Vert TR 2 Vert TR 3 Vert TT 4 HoriLT
@@ -1611,9 +1594,6 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext )
pTargetContext->Insert(PROP_WRITING_MODE, uno::makeAny( nDirection ) );
}
break; // sprmSTextFlow
- case 164: // sprmTSetShd
- case NS_sprm::LN_TTextFlow:
- break; // sprmTTextFlow
// the following are not part of the official documentation
case 0x6870: //TxtForeColor
{
diff --git a/writerfilter/source/doctok/resources.xmi b/writerfilter/source/doctok/resources.xmi
index 4990be8..f145cfab 100644
--- a/writerfilter/source/doctok/resources.xmi
+++ b/writerfilter/source/doctok/resources.xmi
@@ -7,130 +7,6 @@
<UML:Model name="WW8Document">
<UML:Namespace.ownedElement>
<!--SPRMS-->
- <!--SPRM sprmCKul-->
- <UML:Class xmi.id="sprmCKul" name="sprmCKul">
- <UML:ModelElement.stereotype>
- <UML:Stereotype xmi.idref="ww8sprm"/>
- </UML:ModelElement.stereotype>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>0x2A3E</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:sprmCKul</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 sprmCKul-->
- <!--SPRM sprmCIco-->
- <UML:Class xmi.id="sprmCIco" name="sprmCIco">
- <UML:ModelElement.stereotype>
- <UML:Stereotype xmi.idref="ww8sprm"/>
- </UML:ModelElement.stereotype>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>0x2A42</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:sprmCIco</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 sprmCIco-->
- <!--SPRM sprmSTextFlow-->
- <UML:Class xmi.id="sprmSTextFlow" name="sprmSTextFlow">
- <UML:ModelElement.stereotype>
- <UML:Stereotype xmi.idref="ww8sprm"/>
- </UML:ModelElement.stereotype>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>0x5033</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:sprmSTextFlow</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>unknown</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="kind"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- </UML:Class>
- <!--SPRM sprmSTextFlow-->
- <!--SPRM sprmTTextFlow-->
- <UML:Class xmi.id="sprmTTextFlow" name="sprmTTextFlow">
- <UML:ModelElement.stereotype>
- <UML:Stereotype xmi.idref="ww8sprm"/>
- </UML:ModelElement.stereotype>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>0x7629</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:sprmTTextFlow</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>table</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="kind"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- </UML:Class>
- <!--SPRM sprmTTextFlow-->
<!--SPRMS-->
</UML:Namespace.ownedElement>
</UML:Model>
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index e9d43c0..7887865 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -2256,7 +2256,7 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword)
if (nSprm >= 0)
{
RTFValue::Pointer_t pValue(new RTFValue(nSprm));
- m_aStates.top().aCharacterSprms.set(NS_sprm::LN_CKul, pValue);
+ m_aStates.top().aCharacterAttributes.set(NS_ooxml::LN_CT_Underline_val, pValue);
return 0;
}
@@ -2562,7 +2562,7 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword)
case RTF_RTLSECT:
{
RTFValue::Pointer_t pValue(new RTFValue(nKeyword == RTF_LTRSECT ? 0 : 1));
- m_aStates.top().aParagraphSprms.set(NS_sprm::LN_STextFlow, pValue);
+ m_aStates.top().aParagraphSprms.set(NS_ooxml::LN_EG_SectPrContents_textDirection, pValue);
}
break;
case RTF_LTRPAR:
@@ -2574,10 +2574,7 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword)
break;
case RTF_LTRROW:
case RTF_RTLROW:
- {
- RTFValue::Pointer_t pValue(new RTFValue(nKeyword == RTF_LTRROW ? 0 : 1));
- m_aStates.top().aParagraphSprms.set(NS_sprm::LN_TTextFlow, pValue);
- }
+ // dmapper does not support these.
break;
case RTF_LTRCH:
// dmapper does not support this.
@@ -2589,7 +2586,7 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword)
case RTF_ULNONE:
{
RTFValue::Pointer_t pValue(new RTFValue(0));
- m_aStates.top().aCharacterSprms.set(NS_sprm::LN_CKul, pValue);
+ m_aStates.top().aCharacterAttributes.set(NS_ooxml::LN_CT_Underline_val, pValue);
}
break;
case RTF_NONSHPPICT:
@@ -3211,7 +3208,6 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam)
case RTF_CF:
{
RTFSprms aAttributes;
- // NS_sprm::LN_CIco won't work, that would be an index in a static table
RTFValue::Pointer_t pValue(new RTFValue(getColorTable(nParam)));
aAttributes.set(NS_ooxml::LN_CT_Color_val, pValue);
m_aStates.top().aCharacterSprms.set(NS_ooxml::LN_EG_RPrBase_color, RTFValue::Pointer_t(new RTFValue(aAttributes)));
@@ -4035,7 +4031,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_CKul, pValue);
+ m_aStates.top().aCharacterAttributes.set(NS_ooxml::LN_CT_Underline_val, pValue);
return 0;
}
@@ -4063,7 +4059,6 @@ int RTFDocumentImpl::dispatchToggle(RTFKeyword nKeyword, bool bParam, int nParam
case RTF_AB: nSprm = NS_ooxml::LN_EG_RPrBase_bCs; break;
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_ooxml::LN_EG_RPrBase_outline; break;
case RTF_SHAD: nSprm = NS_ooxml::LN_EG_RPrBase_shadow; break;
case RTF_V: nSprm = NS_ooxml::LN_EG_RPrBase_vanish; break;
More information about the Libreoffice-commits
mailing list