writerfilter/inc/resourcemodel/WW8ResourceModel.hxx | 6 -
writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx | 5 -
writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx | 5 -
writerfilter/source/ooxml/factoryimpl.xsl | 63 --------------------
writerfilter/source/rtftok/rtfsprm.cxx | 5 -
writerfilter/source/rtftok/rtfsprm.hxx | 1
6 files changed, 85 deletions(-)
New commits:
commit f46e392050a949c2d573b768eeb70d94fff550c2
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Sun Jul 6 19:41:47 2014 +0200
writerfilter: remove unused getKind()
Change-Id: I7d98d1fb400e1a73ca0d935d5cfbb82de43d795e
diff --git a/writerfilter/inc/resourcemodel/WW8ResourceModel.hxx
b/writerfilter/inc/resourcemodel/WW8ResourceModel.hxx
index 995dd55..d991a23 100644
--- a/writerfilter/inc/resourcemodel/WW8ResourceModel.hxx
+++ b/writerfilter/inc/resourcemodel/WW8ResourceModel.hxx
@@ -348,7 +348,6 @@ public:
SAL_WNODEPRECATED_DECLARATIONS_PUSH
typedef std::auto_ptr<Sprm> Pointer_t;
SAL_WNODEPRECATED_DECLARATIONS_POP
- enum Kind { UNKNOWN, CHARACTER, PARAGRAPH, TABLE };
/**
Returns id of the SPRM.
@@ -377,11 +376,6 @@ public:
virtual writerfilter::Reference<Properties>::Pointer_t getProps() = 0;
/**
- Returns the kind of this SPRM.
- */
- virtual Kind getKind() = 0;
-
- /**
Returns name of sprm.
*/
#ifdef DEBUG_DOMAINMAPPER
diff --git a/writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx
b/writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx
index c718a52..4061de2 100644
--- a/writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx
+++ b/writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx
@@ -143,11 +143,6 @@ string OOXMLPropertyImpl::toString() const
}
#endif
-Sprm::Kind OOXMLPropertyImpl::getKind()
-{
- return SprmKind(getId());
-}
-
Sprm * OOXMLPropertyImpl::clone()
{
return new OOXMLPropertyImpl(*this);
diff --git a/writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx
b/writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx
index e9ca21a..96197b6 100644
--- a/writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx
+++ b/writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx
@@ -78,9 +78,6 @@ public:
virtual writerfilter::Reference<Properties>::Pointer_t getProps()
SAL_OVERRIDE;
#ifdef DEBUG_DOMAINMAPPER
virtual std::string getName() const SAL_OVERRIDE;
-#endif
- virtual Kind getKind() SAL_OVERRIDE;
-#ifdef DEBUG_DOMAINMAPPER
virtual std::string toString() const SAL_OVERRIDE;
#endif
virtual Sprm * clone() SAL_OVERRIDE;
@@ -326,8 +323,6 @@ public:
int getValue() const { return mnValue;}
};
-Sprm::Kind SprmKind(sal_uInt32 nSprmCode);
-
} // namespace ooxml
} // namespace writerfilter
diff --git a/writerfilter/source/ooxml/factoryimpl.xsl
b/writerfilter/source/ooxml/factoryimpl.xsl
index f1fb236..986312e 100644
--- a/writerfilter/source/ooxml/factoryimpl.xsl
+++ b/writerfilter/source/ooxml/factoryimpl.xsl
@@ -223,68 +223,6 @@ string fastTokenToId(sal_uInt32 nToken)
</xsl:text>
</xsl:template>
- <!--
- Generates case labels for mapping from token ids to a single kind
- of sprm.
-
- @param kind the sprm kind for which to generate the case labels
- -->
-
- <xsl:template name="sprmkindcase">
- <xsl:param name="kind"/>
- <xsl:for-each select="key('resources-with-kind', $kind)/element">
- <xsl:if test="generate-id(.) = generate-id(key('sprms-with-code',
@tokenid))">
- <xsl:text>
- case </xsl:text>
- <xsl:call-template name="idtoqname">
- <xsl:with-param name="id" select="@tokenid"/>
- </xsl:call-template>
- <xsl:text>: //</xsl:text>
- <xsl:value-of select="ancestor::resource/@name"/>
- <xsl:text>, </xsl:text>
- <xsl:value-of select="@name"/>
- </xsl:if>
- </xsl:for-each>
- </xsl:template>
-
- <!--
- Generates SprmKind.
- -->
- <xsl:template name="sprmkind">
- <xsl:text>
-Sprm::Kind SprmKind(sal_uInt32 nSprmCode)
-{
- Sprm::Kind nResult = Sprm::UNKNOWN;
-
- switch (nSprmCode)
- {</xsl:text>
- <xsl:call-template name="sprmkindcase">
- <xsl:with-param name="kind">paragraph</xsl:with-param>
- </xsl:call-template>
- <xsl:text>
- nResult = Sprm::PARAGRAPH;
- break;</xsl:text>
- <xsl:call-template name="sprmkindcase">
- <xsl:with-param name="kind">character</xsl:with-param>
- </xsl:call-template>
- <xsl:text>
- nResult = Sprm::CHARACTER;
- break;</xsl:text>
- <xsl:call-template name="sprmkindcase">
- <xsl:with-param name="kind">table</xsl:with-param>
- </xsl:call-template>
- <xsl:text>
- nResult = Sprm::TABLE;
- break;</xsl:text>
- <xsl:text>
- default:
- break;
- }
-
- return nResult;
-}</xsl:text>
- </xsl:template>
-
<xsl:template name="getfastparser">
<xsl:text>
uno::Reference < xml::sax::XFastParser > OOXMLStreamImpl::getFastParser()
@@ -327,7 +265,6 @@ namespace ooxml {
<xsl:call-template name="factoryfornamespace"/>
<xsl:call-template name="factorycreatefromstart"/>
<xsl:call-template name="fasttokentoid"/>
- <xsl:call-template name="sprmkind"/>
<xsl:call-template name="getfastparser"/>
<xsl:text>
/// @endcond
diff --git a/writerfilter/source/rtftok/rtfsprm.cxx
b/writerfilter/source/rtftok/rtfsprm.cxx
index 53d4368..bf2b597 100644
--- a/writerfilter/source/rtftok/rtfsprm.cxx
+++ b/writerfilter/source/rtftok/rtfsprm.cxx
@@ -51,11 +51,6 @@ writerfilter::Reference<Properties>::Pointer_t
RTFSprm::getProps()
return m_pValue->getProperties();
}
-Sprm::Kind RTFSprm::getKind()
-{
- return Sprm::UNKNOWN;
-}
-
#ifdef DEBUG_DOMAINMAPPER
std::string RTFSprm::getName() const
{
diff --git a/writerfilter/source/rtftok/rtfsprm.hxx
b/writerfilter/source/rtftok/rtfsprm.hxx
index 576277c..b1142cf 100644
--- a/writerfilter/source/rtftok/rtfsprm.hxx
+++ b/writerfilter/source/rtftok/rtfsprm.hxx
@@ -110,7 +110,6 @@ public:
virtual writerfilter::Reference<BinaryObj>::Pointer_t getBinary()
SAL_OVERRIDE;
virtual writerfilter::Reference<Stream>::Pointer_t getStream()
SAL_OVERRIDE;
virtual writerfilter::Reference<Properties>::Pointer_t getProps()
SAL_OVERRIDE;
- virtual Kind getKind() SAL_OVERRIDE;
#ifdef DEBUG_DOMAINMAPPER
virtual std::string getName() const SAL_OVERRIDE;
virtual std::string toString() const SAL_OVERRIDE;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
