diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-01-04 15:10:27 +0100 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-01-04 15:22:04 +0100 |
commit | fb30c9ed78e12493de9b50eac85db7ff490a8670 (patch) | |
tree | 5834260f1d069437493a85207893df9082d8d4e4 /writerfilter | |
parent | 24096f480206888610cba0e6dde8ceb86a6b141e (diff) |
writerfilter: remove unused operations section from doctok/resourceids.hxx
Change-Id: I82d552757fa89c43dbce6df2637e703db436565f
Diffstat (limited to 'writerfilter')
-rw-r--r-- | writerfilter/source/dmapper/GraphicImport.cxx | 13 | ||||
-rw-r--r-- | writerfilter/source/doctok/resourceids.xsl | 25 | ||||
-rw-r--r-- | writerfilter/source/doctok/resources.xmi | 65 |
3 files changed, 0 insertions, 103 deletions
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx index 233ffc4973fa..55e512e292f3 100644 --- a/writerfilter/source/dmapper/GraphicImport.cxx +++ b/writerfilter/source/dmapper/GraphicImport.cxx @@ -251,7 +251,6 @@ public: bool bSizeProtected; bool bPositionProtected; - bool bInShapeOptionMode; sal_Int32 nShapeOptionType; OUString sName; @@ -311,7 +310,6 @@ public: ,bVertFlip(false) ,bSizeProtected(false) ,bPositionProtected(false) - ,bInShapeOptionMode(false) {} void setXSize(sal_Int32 _nXSize) @@ -457,7 +455,6 @@ void GraphicImport::lcl_attribute(Id nName, Value & val) case NS_rtf::LN_LCB: break;//byte count case NS_rtf::LN_CBHEADER: break;//ignored case NS_rtf::LN_MFP: //MetafilePict - case NS_rtf::LN_shpopt: //shape options case NS_rtf::LN_shpfbse: //BLIP store entry case NS_rtf::LN_BRCTOP: //top border case NS_rtf::LN_BRCLEFT: //left border @@ -479,9 +476,6 @@ void GraphicImport::lcl_attribute(Id nName, Value & val) case NS_rtf::LN_BRCRIGHT: //right border m_pImpl->nCurrentBorderLine = BORDER_RIGHT; break; - case NS_rtf::LN_shpopt: - m_pImpl->bInShapeOptionMode = true; - break; default:; } writerfilter::Reference<Properties>::Pointer_t pProperties = val.getProperties(); @@ -489,13 +483,6 @@ void GraphicImport::lcl_attribute(Id nName, Value & val) { pProperties->resolve(*this); } - switch(nName) - { - case NS_rtf::LN_shpopt: - m_pImpl->bInShapeOptionMode = false; - break; - default:; - } } break; case NS_rtf::LN_payload : diff --git a/writerfilter/source/doctok/resourceids.xsl b/writerfilter/source/doctok/resourceids.xsl index 435cbce4fe15..6c00a77e0989 100644 --- a/writerfilter/source/doctok/resourceids.xsl +++ b/writerfilter/source/doctok/resourceids.xsl @@ -81,31 +81,6 @@ const Id </xsl:text> </xsl:for-each> </xsl:for-each> <xsl:text> - -/* Operations */</xsl:text> -<xsl:for-each select='.//UML:Operation[@name!="reserved"][count(.//UML:Stereotype[@xmi.idref="noqname"]) = 0]'> - <xsl:variable name="pos" select="position()"/> - <xsl:for-each select='.//UML:TaggedValue[.//UML:TagDefinition/@xmi.idref="opid"]'> - <xsl:choose> - <xsl:when test='generate-id(UML:TaggedValue.dataValue) != generate-id(key("same-valued-tagged-data", UML:TaggedValue.dataValue)[1])'/> - <xsl:otherwise> - <xsl:text> -const Id </xsl:text> -<xsl:call-template name='idtoqname'> - <xsl:with-param name='id'><xsl:value-of select='.//UML:TaggedValue.dataValue'/></xsl:with-param> -</xsl:call-template> -<xsl:text> = </xsl:text> -<xsl:variable name="id" select="20000 + $pos"/> -<xsl:value-of select='$id'/> -<xsl:text>; // 0x</xsl:text> -<xsl:call-template name="dectohex"> - <xsl:with-param name="number" select="$id"/> -</xsl:call-template> - </xsl:otherwise> - </xsl:choose> - </xsl:for-each> -</xsl:for-each> -<xsl:text> } } diff --git a/writerfilter/source/doctok/resources.xmi b/writerfilter/source/doctok/resources.xmi index 62bb34159a1f..cde593050ad6 100644 --- a/writerfilter/source/doctok/resources.xmi +++ b/writerfilter/source/doctok/resources.xmi @@ -38339,71 +38339,6 @@ </UML:Generalization.parent> </UML:Generalization> <!--DFF FSPGR--> - <!--DFF OPT--> - <UML:Class xmi.id="OPT" name="OPT"> - <UML:ModelElement.taggedValue> - <UML:TaggedValue> - <UML:TaggedValue.dataValue>0xf00b</UML:TaggedValue.dataValue> - <UML:TaggedValue.type> - <UML:TagDefinition xmi.idref="dffid"/> - </UML:TaggedValue.type> - </UML:TaggedValue> - </UML:ModelElement.taggedValue> - <UML:Classifier.feature> - <UML:Operation name="property"> - <UML:ModelElement.taggedValue> - <UML:TaggedValue> - <UML:TaggedValue.dataValue>rtf:shpopt</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="FOPTE"/> - </UML:Parameter.type> - </UML:Parameter> - </UML:BehavioralFeature.parameter> - <UML:ModelElement.stereotype> - <UML:Stereotype xmi.idref="array"/> - </UML:ModelElement.stereotype> - </UML:Operation> - <UML:Operation name="extraoffset"> - <UML:ModelElement.taggedValue> - <UML:TaggedValue> - <UML:TaggedValue.dataValue>rtf:shpoptextraoffset</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:ModelElement.stereotype> - <UML:Stereotype xmi.idref="noresolve"/> - </UML:ModelElement.stereotype> - </UML:Operation> - </UML:Classifier.feature> - </UML:Class> - <UML:Generalization isSpecification="false" xmi.id="OPT-Properties"> - <UML:Generalization.child> - <UML:Class xmi.idref="OPT"/> - </UML:Generalization.child> - <UML:Generalization.parent> - <UML:Class xmi.idref="Properties"/> - </UML:Generalization.parent> - </UML:Generalization> - <!--DFF OPT--> <!--DFF FSP--> <UML:Class xmi.id="FSP" name="FSP"> <UML:ModelElement.taggedValue> |