summaryrefslogtreecommitdiff
path: root/writerfilter
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2014-01-04 12:27:33 +0100
committerMiklos Vajna <vmiklos@collabora.co.uk>2014-01-04 15:22:01 +0100
commitcf0c282f03c5b0e86745a1cbec5665fb297e5a9d (patch)
tree48b7e4e91e055645929e270dc37106d82ebb88a7 /writerfilter
parent0459682b4186b7522783e33cca3791420559817a (diff)
writerfilter: drop unused rtf:{tbdAdd,rgbrc,cellx,tc} tokens
Change-Id: I269c2ca52f4b7f724138d74ef0ca43ea9360002e
Diffstat (limited to 'writerfilter')
-rw-r--r--writerfilter/source/dmapper/BorderHandler.cxx13
-rw-r--r--writerfilter/source/dmapper/DomainMapper.cxx14
-rw-r--r--writerfilter/source/dmapper/TDefTableHandler.cxx17
-rw-r--r--writerfilter/source/doctok/resources.xmi126
4 files changed, 0 insertions, 170 deletions
diff --git a/writerfilter/source/dmapper/BorderHandler.cxx b/writerfilter/source/dmapper/BorderHandler.cxx
index 0becb84774db..8749a7a8c14f 100644
--- a/writerfilter/source/dmapper/BorderHandler.cxx
+++ b/writerfilter/source/dmapper/BorderHandler.cxx
@@ -58,19 +58,6 @@ void BorderHandler::lcl_attribute(Id rName, Value & rVal)
sal_Int32 nIntValue = rVal.getInt();
switch( rName )
{
- case NS_rtf::LN_rgbrc:
- {
- writerfilter::Reference<Properties>::Pointer_t pProperties = rVal.getProperties();
- if( pProperties.get())
- {
- pProperties->resolve(*this);
- ConversionHelper::MakeBorderLine( m_nLineWidth, m_nLineType, m_nLineColor,
- m_aBorderLines[m_nCurrentBorderPosition], m_bOOXML );
- OSL_ENSURE(m_nCurrentBorderPosition < BORDER_COUNT, "too many border values");
- ++m_nCurrentBorderPosition;
- }
- }
- break;
case NS_ooxml::LN_CT_Border_sz:
// width of a single line in 1/8 pt, max of 32 pt -> twip * 5 / 2.
m_nLineWidth = nIntValue * 5 / 2;
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index 320750e78a98..67de5818baec 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -734,18 +734,6 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
break;
case NS_rtf::LN_XSTZNAME1:
break;
- case NS_rtf::LN_tbdAdd:
- //
- {
- writerfilter::Reference<Properties>::Pointer_t pProperties = val.getProperties();
- if( pProperties.get())
- {
- pProperties->resolve(*this);
- //increment to the next tab stop
- m_pImpl->NextTabStop();
- }
- }
- break;
case NS_rtf::LN_TLC:
//tab leading characters - for decimal tabs
case NS_rtf::LN_JC:
@@ -755,8 +743,6 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
case NS_rtf::LN_UNUSED0_6:
// really unused
break;
- case NS_rtf::LN_rgbrc:
- break;
case NS_rtf::LN_shd:
break;
case NS_rtf::LN_cellShd:
diff --git a/writerfilter/source/dmapper/TDefTableHandler.cxx b/writerfilter/source/dmapper/TDefTableHandler.cxx
index d1892f1f2573..9f3b58d4b98a 100644
--- a/writerfilter/source/dmapper/TDefTableHandler.cxx
+++ b/writerfilter/source/dmapper/TDefTableHandler.cxx
@@ -283,23 +283,6 @@ void TDefTableHandler::lcl_attribute(Id rName, Value & rVal)
(void)rName;
switch( rName )
{
- case NS_rtf::LN_cellx:
- // nIntValue contains the vert. line position
- //TODO: nIntValue is wrong for negative values!
- if( nIntValue > 0x7fff )
- nIntValue -= 0xffff;
- m_aCellBorderPositions.push_back( ConversionHelper::convertTwipToMM100( nIntValue ) );
- break;
- case NS_rtf::LN_tc:
- {
- writerfilter::Reference<Properties>::Pointer_t pProperties = rVal.getProperties();
- if( pProperties.get())
- {
- pProperties->resolve( *this );
- }
- }
- break;
- //from LN_tc
case NS_rtf::LN_FFIRSTMERGED:
case NS_rtf::LN_FMERGED:
case NS_rtf::LN_FVERTICAL:
diff --git a/writerfilter/source/doctok/resources.xmi b/writerfilter/source/doctok/resources.xmi
index b5655e714b45..d9728151a50e 100644
--- a/writerfilter/source/doctok/resources.xmi
+++ b/writerfilter/source/doctok/resources.xmi
@@ -27198,44 +27198,6 @@
</UML:TaggedValue.type>
</UML:TaggedValue>
</UML:ModelElement.taggedValue>
- <UML:Classifier.feature>
- <UML:Operation name="tbdAdd">
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>rtf:tbdAdd</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="opid"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>array of tab descriptors corresponding to rgdxaAdd</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="comment"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:BehavioralFeature.parameter>
- <UML:Parameter kind="return" name="return">
- <UML:Parameter.type>
- <UML:Class xmi.idref="TBD"/>
- </UML:Parameter.type>
- </UML:Parameter>
- </UML:BehavioralFeature.parameter>
- <UML:ModelElement.stereotype>
- <UML:Stereotype xmi.idref="array"/>
- </UML:ModelElement.stereotype>
- </UML:Operation>
- </UML:Classifier.feature>
- <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 sprmPChgTabsPapx-->
<!--SPRM sprmPDxaRight-->
@@ -33564,45 +33526,7 @@
</UML:TaggedValue.type>
</UML:TaggedValue>
</UML:ModelElement.taggedValue>
- <UML:Classifier.feature>
- <UML:Operation name="rgbbrc">
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>rtf:rgbrc</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="opid"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:BehavioralFeature.parameter>
- <UML:Parameter kind="return" name="return">
- <UML:Parameter.type>
- <UML:Class xmi.idref="BRC"/>
- </UML:Parameter.type>
- </UML:Parameter>
- </UML:BehavioralFeature.parameter>
- <UML:ModelElement.stereotype>
- <UML:Stereotype xmi.idref="array"/>
- </UML:ModelElement.stereotype>
- </UML:Operation>
- </UML:Classifier.feature>
- <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>
- <UML:Generalization isSpecification="false" xmi.id="sprmTTableBorders-Properties">
- <UML:Generalization.child>
- <UML:Class xmi.idref="sprmTTableBorders"/>
- </UML:Generalization.child>
- <UML:Generalization.parent>
- <UML:Class xmi.idref="Properties"/>
- </UML:Generalization.parent>
- </UML:Generalization>
<!--SPRM sprmTTableBorders-->
<!--SPRM sprmTDefTable10-->
<UML:Class xmi.id="sprmTDefTable10" name="sprmTDefTable10">
@@ -33687,56 +33611,6 @@
</UML:TaggedValue.type>
</UML:TaggedValue>
</UML:ModelElement.taggedValue>
- <UML:Classifier.feature>
- <UML:Operation name="cellx">
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>rtf:cellx</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="opid"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:BehavioralFeature.parameter>
- <UML:Parameter kind="return" name="return">
- <UML:Parameter.type>
- <UML:Class xmi.idref="U16"/>
- </UML:Parameter.type>
- </UML:Parameter>
- </UML:BehavioralFeature.parameter>
- <UML:ModelElement.stereotype>
- <UML:Stereotype xmi.idref="array"/>
- </UML:ModelElement.stereotype>
- </UML:Operation>
- <UML:Operation name="tc">
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>rtf:tc</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="opid"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:BehavioralFeature.parameter>
- <UML:Parameter kind="return" name="return">
- <UML:Parameter.type>
- <UML:Class xmi.idref="TC"/>
- </UML:Parameter.type>
- </UML:Parameter>
- </UML:BehavioralFeature.parameter>
- <UML:ModelElement.stereotype>
- <UML:Stereotype xmi.idref="array"/>
- </UML:ModelElement.stereotype>
- </UML:Operation>
- </UML:Classifier.feature>
- <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>
<UML:Generalization isSpecification="false" xmi.id="sprmTDefTable-Properties">
<UML:Generalization.child>