diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-01-04 13:50:28 +0100 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-01-04 15:22:02 +0100 |
commit | 660127241f23bf1d665b1a3b64e0f16155488d9b (patch) | |
tree | 54a548b79e9cc8f4e9240044f1450b9da2904e7e | |
parent | c1e9629ce1565b32df5068bff0625c02394bed10 (diff) |
writerfilter: unused rtf{cellLeftColor,cellRightColor,shpblipbname,shptypename}
Change-Id: I9210c756d47afa5c7a79fab7bfbcd32c7fe95798
-rw-r--r-- | writerfilter/source/dmapper/CellColorHandler.cxx | 4 | ||||
-rw-r--r-- | writerfilter/source/dmapper/DomainMapper.cxx | 5 | ||||
-rw-r--r-- | writerfilter/source/dmapper/GraphicImport.cxx | 5 | ||||
-rw-r--r-- | writerfilter/source/doctok/resources.xmi | 158 |
4 files changed, 0 insertions, 172 deletions
diff --git a/writerfilter/source/dmapper/CellColorHandler.cxx b/writerfilter/source/dmapper/CellColorHandler.cxx index ab4b847fd1e5..ebd38b6175d0 100644 --- a/writerfilter/source/dmapper/CellColorHandler.cxx +++ b/writerfilter/source/dmapper/CellColorHandler.cxx @@ -102,10 +102,6 @@ void CellColorHandler::lcl_attribute(Id rName, Value & rVal) sal_Int32 nIntValue = rVal.getInt(); switch( rName ) { - case NS_rtf::LN_cellLeftColor: - case NS_rtf::LN_cellRightColor: - // nIntValue contains the color, directly - break; case NS_ooxml::LN_CT_Shd_val: { createGrabBag("val", lcl_ConvertShd(nIntValue)); diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index 668fe4b638f5..699dea5b606d 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -743,11 +743,6 @@ void DomainMapper::lcl_attribute(Id nName, Value & val) case NS_rtf::LN_UNUSED0_6: // really unused break; - case NS_rtf::LN_cellLeftColor: - case NS_rtf::LN_cellRightColor: - OSL_FAIL("handled by DomainMapperTableManager"); - break; - case NS_ooxml::LN_NUMBERING: break; case NS_ooxml::LN_FONTTABLE: diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx index 39f1977e1dfa..f9a6cfdb66d4 100644 --- a/writerfilter/source/dmapper/GraphicImport.cxx +++ b/writerfilter/source/dmapper/GraphicImport.cxx @@ -624,8 +624,6 @@ void GraphicImport::lcl_attribute(Id nName, Value & val) break;// Background shape case NS_rtf::LN_shpfHaveSpt: break;// Shape has a shape type property - case NS_rtf::LN_shptypename: - break;// shape type name case NS_rtf::LN_shpfBid: break; //ignored case NS_rtf::LN_shpfComplex: @@ -656,9 +654,6 @@ void GraphicImport::lcl_attribute(Id nName, Value & val) break; //border properties - case NS_rtf::LN_shpblipbname : - break; - case NS_ooxml::LN_CT_Border_sz: m_pImpl->aBorders[m_pImpl->nCurrentBorderLine].nLineWidth = nIntValue; break; diff --git a/writerfilter/source/doctok/resources.xmi b/writerfilter/source/doctok/resources.xmi index 4ec3e237c396..9f49d2208d42 100644 --- a/writerfilter/source/doctok/resources.xmi +++ b/writerfilter/source/doctok/resources.xmi @@ -34951,36 +34951,6 @@ </UML:TaggedValue.type> </UML:TaggedValue> </UML:ModelElement.taggedValue> - <UML:Classifier.feature> - <UML:Operation name="cellLeftColor"> - <UML:ModelElement.taggedValue> - <UML:TaggedValue> - <UML:TaggedValue.dataValue>rtf:cellLeftColor</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="U32"/> - </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="sprmTCellLeftColor-Properties"> <UML:Generalization.child> @@ -35043,36 +35013,6 @@ </UML:TaggedValue.type> </UML:TaggedValue> </UML:ModelElement.taggedValue> - <UML:Classifier.feature> - <UML:Operation name="cellRightColor"> - <UML:ModelElement.taggedValue> - <UML:TaggedValue> - <UML:TaggedValue.dataValue>rtf:cellRightColor</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="U32"/> - </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="sprmTCellRightColor-Properties"> <UML:Generalization.child> @@ -35614,36 +35554,6 @@ </UML:TaggedValue.type> </UML:TaggedValue> </UML:ModelElement.taggedValue> - <UML:Classifier.feature> - <UML:Operation name="cellShadow"> - <UML:ModelElement.taggedValue> - <UML:TaggedValue> - <UML:TaggedValue.dataValue>rtf:CELLSHADOW</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="CellShd"/> - </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="sprmTCellShadow-Properties"> <UML:Generalization.child> @@ -38575,28 +38485,6 @@ </UML:Attribute> </UML:Classifier.feature> <UML:Classifier.feature> - <UML:Operation name="shptypename"> - <UML:ModelElement.taggedValue> - <UML:TaggedValue> - <UML:TaggedValue.dataValue>rtf:shptypename</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:Attribute name="shpid"> <UML:ModelElement.taggedValue> <UML:TaggedValue> @@ -39586,52 +39474,6 @@ </UML:ModelElement.stereotype> </UML:Attribute> </UML:Classifier.feature> - <UML:Classifier.feature> - <UML:Operation name="blipname"> - <UML:ModelElement.taggedValue> - <UML:TaggedValue> - <UML:TaggedValue.dataValue>rtf:shpblipbname</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="binary"> - <UML:ModelElement.taggedValue> - <UML:TaggedValue> - <UML:TaggedValue.dataValue>rtf:binary</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="Binary"/> - </UML:Parameter.type> - </UML:Parameter> - </UML:BehavioralFeature.parameter> - <UML:ModelElement.stereotype> - <UML:Stereotype xmi.idref="binary"/> - </UML:ModelElement.stereotype> - </UML:Operation> - </UML:Classifier.feature> - --> </UML:Class> <UML:Generalization isSpecification="false" xmi.id="BSE-Properties"> <UML:Generalization.child> |