unusedcode.easy | 1 writerfilter/source/ooxml/OOXMLFastContextHandler.cxx | 10 ------ writerfilter/source/ooxml/OOXMLFastContextHandler.hxx | 2 - writerfilter/source/ooxml/OOXMLFastHelper.hxx | 28 ------------------ writerfilter/source/ooxml/factoryimpl_ns.xsl | 10 ------ 5 files changed, 51 deletions(-)
New commits: commit 957676441635d236743b61ccb74128821d07d0d0 Author: Petr Vorel <petr.vo...@gmail.com> Date: Thu Jan 9 08:35:11 2014 +0100 remove unused code from writerfilter Not sure whether void OOXMLFastHelper<T>::mark(OOXMLFastContextHandler * pHandler, Id nId, const OUString & rValue) is really unused (tested on linux build seems to be unused). If it IS unused the commit should NOT be included and writerfilter::ooxml::OOXMLFastContextHandler::mark(unsigned int const&, boost::shared_ptr<writerfilter::ooxml::OOXMLValue>) is to be put into unusedcode.exclude. Change-Id: I5ae08427e62f89df3d4112486837d8eb5fa752f0 Reviewed-on: https://gerrit.libreoffice.org/7327 Reviewed-by: Miklos Vajna <vmik...@collabora.co.uk> Tested-by: Miklos Vajna <vmik...@collabora.co.uk> diff --git a/unusedcode.easy b/unusedcode.easy index 6eb8fa6..35f844a 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -210,4 +210,3 @@ writerfilter::dump(writerfilter::OutputWithDepth<std::basic_string<char, std::ch writerfilter::dump(writerfilter::OutputWithDepth<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >&, char const*, boost::shared_ptr<writerfilter::Reference<writerfilter::Properties> >) writerfilter::dump(writerfilter::OutputWithDepth<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >&, char const*, rtl::OUString const&) writerfilter::dump(writerfilter::OutputWithDepth<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >&, char const*, unsigned int) -writerfilter::ooxml::OOXMLFastContextHandler::mark(unsigned int const&, boost::shared_ptr<writerfilter::ooxml::OOXMLValue>) diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx index 2d192ad..b1af30f 100644 --- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx +++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx @@ -550,16 +550,6 @@ Token_t OOXMLFastContextHandler::getToken() const return mnToken; } -void OOXMLFastContextHandler::mark(const Id & rId, OOXMLValue::Pointer_t pVal) -{ - OOXMLPropertySetImpl::Pointer_t pPropSet(new OOXMLPropertySetImpl()); - OOXMLPropertyImpl::Pointer_t pProperty - (new OOXMLPropertyImpl(rId, pVal, OOXMLPropertyImpl::ATTRIBUTE)); - - pPropSet->add(pProperty); - mpStream->props(pPropSet); -} - void OOXMLFastContextHandler::setParent (OOXMLFastContextHandler * pParent) { diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx index 86a3b25..c5909bf 100644 --- a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx +++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx @@ -151,8 +151,6 @@ public: virtual void setToken(Token_t nToken); virtual Token_t getToken() const; - void mark(const Id & rId, OOXMLValue::Pointer_t pVal); - void resolveFootnote(const sal_Int32 nId); void resolveEndnote(const sal_Int32 nId); void resolveComment(const sal_Int32 nId); diff --git a/writerfilter/source/ooxml/OOXMLFastHelper.hxx b/writerfilter/source/ooxml/OOXMLFastHelper.hxx index 7198494..9a5f941 100644 --- a/writerfilter/source/ooxml/OOXMLFastHelper.hxx +++ b/writerfilter/source/ooxml/OOXMLFastHelper.hxx @@ -52,10 +52,6 @@ public: static void newProperty(OOXMLFastContextHandler * pHandler, Id nId, sal_Int32 nValue); - static void mark(OOXMLFastContextHandler * pHandler, - Id nId, - const OUString & rValue); - static void attributes (OOXMLFastContextHandler * pContext, const uno::Reference < xml::sax::XFastAttributeList > & Attribs); @@ -216,30 +212,6 @@ void OOXMLFastHelper<T>::newProperty(OOXMLFastContextHandler * pHandler, pHandler->newProperty(nId, pVal); } -template <class T> -void OOXMLFastHelper<T>::mark(OOXMLFastContextHandler * pHandler, - Id nId, - const OUString & rValue) -{ - OOXMLValue::Pointer_t pVal(new T(rValue)); - -#ifdef DEBUG_HELPER - string aStr = (*QNameToString::Instance())(nId); - - debug_logger->startElement("helper.mark"); - debug_logger->attribute("name", aStr); - debug_logger->attribute("value", - OUStringToOString - (rValue, RTL_TEXTENCODING_ASCII_US).getStr()); - - if (aStr.empty()) - debug_logger->element("unknown-qname"); - - debug_logger->endElement(); -#endif - - pHandler->mark(nId, pVal); -} }} #endif // INCLUDED_FAST_HELPER_HXX diff --git a/writerfilter/source/ooxml/factoryimpl_ns.xsl b/writerfilter/source/ooxml/factoryimpl_ns.xsl index bd913d6..e92fda1 100644 --- a/writerfilter/source/ooxml/factoryimpl_ns.xsl +++ b/writerfilter/source/ooxml/factoryimpl_ns.xsl @@ -532,16 +532,6 @@ CreateElementMapPointer </xsl:text> <xsl:value-of select="@value"/> <xsl:text>");</xsl:text> </xsl:when> - <xsl:when test="@action='mark'"> - <xsl:text> - OOXMLFastHelper<OOXMLIntegerValue>::mark(pHandler, </xsl:text> - <xsl:call-template name="idtoqname"> - <xsl:with-param name="id" select="@sendtokenid"/> - </xsl:call-template> - <xsl:text>, "</xsl:text> - <xsl:value-of select="@value"/> - <xsl:text>");</xsl:text> - </xsl:when> <xsl:when test="@action='tokenproperty'"> <xsl:text> OOXMLFastHelper<OOXMLIntegerValue>::newProperty(pHandler, </xsl:text> _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits