[Libreoffice-commits] core.git: writerfilter/source
Miklos Vajna
vmiklos at collabora.co.uk
Thu Jan 2 12:58:20 PST 2014
writerfilter/source/dmapper/DomainMapper.cxx | 4
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 24 ---
writerfilter/source/dmapper/GraphicImport.cxx | 3
writerfilter/source/doctok/resources.xmi | 148 ----------------------
4 files changed, 2 insertions(+), 177 deletions(-)
New commits:
commit 0fb94d6d41a1429d2c81a96a24fdc348060205e2
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Thu Jan 2 21:43:12 2014 +0100
writerfilter: drop unused rtf:{shape,shpname,dxaDel,dxaAdd} tokens
Change-Id: I829a3d11675aeea20094140efbc51ad2bcb86cc4
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index 93f6e6d..320750e 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -746,10 +746,6 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
}
}
break;
- case NS_rtf::LN_dxaDel:
- //deleted tab
- case NS_rtf::LN_dxaAdd:
- //set tab
case NS_rtf::LN_TLC:
//tab leading characters - for decimal tabs
case NS_rtf::LN_JC:
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 0e166c8..55f7a8f 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -476,10 +476,10 @@ void DomainMapper_Impl::InitTabStopFromStyle( const uno::Sequence< style::TabSto
void DomainMapper_Impl::ModifyCurrentTabStop( Id nId, sal_Int32 nValue)
{
- OSL_ENSURE(nId == NS_rtf::LN_dxaAdd || m_nCurrentTabStopIndex < m_aCurrentTabStops.size(),
+ OSL_ENSURE(m_nCurrentTabStopIndex < m_aCurrentTabStops.size(),
"tab stop creation error");
- if( nId != NS_rtf::LN_dxaAdd && m_nCurrentTabStopIndex >= m_aCurrentTabStops.size())
+ if( m_nCurrentTabStopIndex >= m_aCurrentTabStops.size())
return;
static const style::TabAlign aTabAlignFromWord[] =
{
@@ -501,26 +501,6 @@ void DomainMapper_Impl::ModifyCurrentTabStop( Id nId, sal_Int32 nValue)
switch(nId)
{
- case NS_rtf::LN_dxaAdd: //set tab
- m_aCurrentTabStops.push_back(
- DeletableTabStop(style::TabStop(ConversionHelper::convertTwipToMM100(nValue), style::TabAlign_LEFT, ' ', ' ')));
- break;
- case NS_rtf::LN_dxaDel: //deleted tab
- {
- //mark the tab stop at the given position as deleted
- ::std::vector<DeletableTabStop>::iterator aIt = m_aCurrentTabStops.begin();
- ::std::vector<DeletableTabStop>::iterator aEndIt = m_aCurrentTabStops.end();
- sal_Int32 nConverted = ConversionHelper::convertTwipToMM100(nValue);
- for( ; aIt != aEndIt; ++aIt)
- {
- if( aIt->Position == nConverted )
- {
- aIt->bDeleted = true;
- break;
- }
- }
- }
- break;
case NS_rtf::LN_TLC: //tab leading characters - for decimal tabs
// 0 - no leader, 1- dotted, 2 - hyphenated, 3 - single line, 4 - heavy line, 5 - middle dot
if( nValue >= 0 && nValue < sal::static_int_cast<sal_Int32>(sizeof(aTabFillCharWord) / sizeof (sal_Unicode)))
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx
index 5d35976..39f1977e 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -463,7 +463,6 @@ void GraphicImport::lcl_attribute(Id nName, Value & val)
case NS_rtf::LN_BRCLEFT: //left border
case NS_rtf::LN_BRCBOTTOM: //bottom border
case NS_rtf::LN_BRCRIGHT: //right border
- case NS_rtf::LN_shape: //shape
case NS_rtf::LN_blip: //the binary graphic data in a shape
{
switch(nName)
@@ -631,8 +630,6 @@ void GraphicImport::lcl_attribute(Id nName, Value & val)
break; //ignored
case NS_rtf::LN_shpfComplex:
break;
- case NS_rtf::LN_shpname:
- break;
//BLIP store entry
case NS_rtf::LN_shpbtWin32:
diff --git a/writerfilter/source/doctok/resources.xmi b/writerfilter/source/doctok/resources.xmi
index 8813862..b5655e7 100644
--- a/writerfilter/source/doctok/resources.xmi
+++ b/writerfilter/source/doctok/resources.xmi
@@ -23842,21 +23842,6 @@
</UML:ModelElement.stereotype>
</UML:Attribute>
</UML:Classifier.feature>
- <UML:Classifier.feature>
- <UML:Operation name="shape">
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>rtf:shape</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="opid"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.stereotype>
- <UML:Stereotype xmi.idref="attribute"/>
- </UML:ModelElement.stereotype>
- </UML:Operation>
- </UML:Classifier.feature>
</UML:Class>
<UML:Generalization isSpecification="false" xmi.id="FSPA-Properties">
<UML:Generalization.child>
@@ -24457,53 +24442,6 @@
</UML:ModelElement.stereotype>
</UML:Attribute>
</UML:Classifier.feature>
- <UML:Classifier.feature>
- <UML:Operation name="name">
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>rtf:shpname</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="String"/>
- </UML:Parameter.type>
- </UML:Parameter>
- </UML:BehavioralFeature.parameter>
- <UML:ModelElement.stereotype>
- <UML:Stereotype xmi.idref="attribute"/>
- </UML:ModelElement.stereotype>
- </UML:Operation>
- </UML:Classifier.feature>
- <UML:Classifier.feature>
- <UML:Operation name="stringValue">
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>rtf:shpstringvalue</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="Value"/>
- </UML:Parameter.type>
- </UML:Parameter>
- </UML:BehavioralFeature.parameter>
- <UML:ModelElement.stereotype>
- <UML:Stereotype xmi.idref="attribute"/>
- </UML:ModelElement.stereotype>
- <UML:ModelElement.stereotype>
- <UML:Stereotype xmi.idref="noresolve"/>
- </UML:ModelElement.stereotype>
- </UML:Operation>
- </UML:Classifier.feature>
</UML:Class>
<UML:Generalization isSpecification="false" xmi.id="FOPTE-Properties">
<UML:Generalization.child>
@@ -25948,36 +25886,6 @@
</UML:ModelElement.stereotype>
</UML:Attribute>
</UML:Classifier.feature>
- <UML:Classifier.feature>
- <UML:Operation name="xstUsrInitl">
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>rtf:xstUsrInitl</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>pascal-style string holding initials of annotation author</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="String"/>
- </UML:Parameter.type>
- </UML:Parameter>
- </UML:BehavioralFeature.parameter>
- <UML:ModelElement.stereotype>
- <UML:Stereotype xmi.idref="attribute"/>
- </UML:ModelElement.stereotype>
- </UML:Operation>
- </UML:Classifier.feature>
</UML:Class>
<UML:Generalization isSpecification="false" xmi.id="ATRD-Properties">
<UML:Generalization.child>
@@ -27291,62 +27199,6 @@
</UML:TaggedValue>
</UML:ModelElement.taggedValue>
<UML:Classifier.feature>
- <UML:Operation name="dxaDel">
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>rtf:dxaDel</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 positions for which tabs should be deleted</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="S16"/>
- </UML:Parameter.type>
- </UML:Parameter>
- </UML:BehavioralFeature.parameter>
- <UML:ModelElement.stereotype>
- <UML:Stereotype xmi.idref="array"/>
- </UML:ModelElement.stereotype>
- </UML:Operation>
- <UML:Operation name="dxaAdd">
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>rtf:dxaAdd</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 positions for which tabs should be added</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="S16"/>
- </UML:Parameter.type>
- </UML:Parameter>
- </UML:BehavioralFeature.parameter>
- <UML:ModelElement.stereotype>
- <UML:Stereotype xmi.idref="array"/>
- </UML:ModelElement.stereotype>
- </UML:Operation>
<UML:Operation name="tbdAdd">
<UML:ModelElement.taggedValue>
<UML:TaggedValue>
More information about the Libreoffice-commits
mailing list