From da4357fef9a4de2b51ab0e080c864d9e90e15b77 Mon Sep 17 00:00:00 2001 From: Mike Kaganski Date: Tue, 27 Jun 2017 15:04:20 +0300 Subject: [PATCH] OOXMLFastContextHandler: remove unused stuff Change-Id: I02cc740f2701043ca35bbbdb026cbc7f6de200bc Reviewed-on: https://gerrit.libreoffice.org/39300 Tested-by: Jenkins Reviewed-by: Mike Kaganski --- .../source/ooxml/OOXMLFastContextHandler.cxx | 15 --------------- .../source/ooxml/OOXMLFastContextHandler.hxx | 4 ---- 2 files changed, 19 deletions(-) diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx index 5c5290d75e45..e208e60b4920 100644 --- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx +++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx @@ -17,14 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include -#include -#include -#include #include #include #include -#include #include #include #include @@ -54,14 +49,10 @@ using namespace ::com::sun::star; using namespace oox; using namespace ::std; -static set aSetContexts; - /* class OOXMLFastContextHandler */ -sal_uInt32 OOXMLFastContextHandler::mnInstanceCount = 0; - OOXMLFastContextHandler::OOXMLFastContextHandler (uno::Reference< uno::XComponentContext > const & context) : mpParent(nullptr), @@ -75,9 +66,6 @@ OOXMLFastContextHandler::OOXMLFastContextHandler m_bDiscardChildren(false), m_bTookChoice(false) { - mnInstanceCount++; - aSetContexts.insert(this); - if (mpParserState.get() == nullptr) mpParserState.reset(new OOXMLParserState()); @@ -101,14 +89,11 @@ OOXMLFastContextHandler::OOXMLFastContextHandler(OOXMLFastContextHandler * pCont if (mpParserState.get() == nullptr) mpParserState.reset(new OOXMLParserState()); - mnInstanceCount++; - aSetContexts.insert(this); mpParserState->incContextCount(); } OOXMLFastContextHandler::~OOXMLFastContextHandler() { - aSetContexts.erase(this); } bool OOXMLFastContextHandler::prepareMceContext(Token_t nElement, const uno::Reference& rAttribs) diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx index d7ec09e48e4d..aabbc7eb2056 100644 --- a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx +++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_WRITERFILTER_SOURCE_OOXML_OOXMLFASTCONTEXTHANDLER_HXX #define INCLUDED_WRITERFILTER_SOURCE_OOXML_OOXMLFASTCONTEXTHANDLER_HXX -#include #include #include #include @@ -28,7 +27,6 @@ #include #include #include -#include #include "OOXMLParserState.hxx" #include "OOXMLPropertySet.hxx" @@ -237,8 +235,6 @@ private: bool m_bDiscardChildren; bool m_bTookChoice; ///< Did we take the Choice or want Fallback instead? - static sal_uInt32 mnInstanceCount; - }; class OOXMLFastContextHandlerStream : public OOXMLFastContextHandler