mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OOXMLFastContextHandler: remove unused stuff

Browse Source 
Change-Id: I02cc740f2701043ca35bbbdb026cbc7f6de200bc
Reviewed-on: https://gerrit.libreoffice.org/39300
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
This commit is contained in:
Mike Kaganski
2017-06-27 15:04:20 +03:00
parent 538c649f79
commit da4357fef9
2 changed files with 0 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
View File

@@ -17,14 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/ */
#include <iostream>
#include <set>
#include <comphelper/servicehelper.hxx>
#include <com/sun/star/drawing/XShapes.hpp>
#include <com/sun/star/lang/WrappedTargetRuntimeException.hpp> #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
#include <com/sun/star/xml/sax/FastShapeContextHandler.hpp> #include <com/sun/star/xml/sax/FastShapeContextHandler.hpp>
#include <com/sun/star/xml/sax/SAXException.hpp> #include <com/sun/star/xml/sax/SAXException.hpp>
#include <ooxml/QNameToString.hxx>
#include <ooxml/resourceids.hxx> #include <ooxml/resourceids.hxx>
#include <oox/token/namespaces.hxx> #include <oox/token/namespaces.hxx>
#include <comphelper/embeddedobjectcontainer.hxx> #include <comphelper/embeddedobjectcontainer.hxx>
@@ -54,14 +49,10 @@ using namespace ::com::sun::star;
using namespace oox; using namespace oox;
using namespace ::std; using namespace ::std;
static set<OOXMLFastContextHandler *> aSetContexts;
/* /*
class OOXMLFastContextHandler class OOXMLFastContextHandler
*/ */
sal_uInt32 OOXMLFastContextHandler::mnInstanceCount = 0;
OOXMLFastContextHandler::OOXMLFastContextHandler OOXMLFastContextHandler::OOXMLFastContextHandler
(uno::Reference< uno::XComponentContext > const & context) (uno::Reference< uno::XComponentContext > const & context)
: mpParent(nullptr), : mpParent(nullptr),
@@ -75,9 +66,6 @@ OOXMLFastContextHandler::OOXMLFastContextHandler
m_bDiscardChildren(false), m_bDiscardChildren(false),
m_bTookChoice(false) m_bTookChoice(false)
{ {
mnInstanceCount++;
aSetContexts.insert(this);
if (mpParserState.get() == nullptr) if (mpParserState.get() == nullptr)
mpParserState.reset(new OOXMLParserState()); mpParserState.reset(new OOXMLParserState());
@@ -101,14 +89,11 @@ OOXMLFastContextHandler::OOXMLFastContextHandler(OOXMLFastContextHandler * pCont
if (mpParserState.get() == nullptr) if (mpParserState.get() == nullptr)
mpParserState.reset(new OOXMLParserState()); mpParserState.reset(new OOXMLParserState());
mnInstanceCount++;
aSetContexts.insert(this);
mpParserState->incContextCount(); mpParserState->incContextCount();
} }
OOXMLFastContextHandler::~OOXMLFastContextHandler() OOXMLFastContextHandler::~OOXMLFastContextHandler()
{ {
aSetContexts.erase(this);
} }
bool OOXMLFastContextHandler::prepareMceContext(Token_t nElement, const uno::Reference<xml::sax::XFastAttributeList>& rAttribs) bool OOXMLFastContextHandler::prepareMceContext(Token_t nElement, const uno::Reference<xml::sax::XFastAttributeList>& rAttribs)

4
writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
View File

@@ -20,7 +20,6 @@
#ifndef INCLUDED_WRITERFILTER_SOURCE_OOXML_OOXMLFASTCONTEXTHANDLER_HXX #ifndef INCLUDED_WRITERFILTER_SOURCE_OOXML_OOXMLFASTCONTEXTHANDLER_HXX
#define INCLUDED_WRITERFILTER_SOURCE_OOXML_OOXMLFASTCONTEXTHANDLER_HXX #define INCLUDED_WRITERFILTER_SOURCE_OOXML_OOXMLFASTCONTEXTHANDLER_HXX
#include <string>
#include <set> #include <set>
#include <cppuhelper/implbase.hxx> #include <cppuhelper/implbase.hxx>
#include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/uno/XComponentContext.hpp>
@@ -28,7 +27,6 @@
#include <com/sun/star/xml/sax/XFastShapeContextHandler.hpp> #include <com/sun/star/xml/sax/XFastShapeContextHandler.hpp>
#include <oox/mathml/import.hxx> #include <oox/mathml/import.hxx>
#include <oox/mathml/importutils.hxx> #include <oox/mathml/importutils.hxx>
#include <svtools/embedhlp.hxx>
#include "OOXMLParserState.hxx" #include "OOXMLParserState.hxx"
#include "OOXMLPropertySet.hxx" #include "OOXMLPropertySet.hxx"
@@ -237,8 +235,6 @@ private:
bool m_bDiscardChildren; bool m_bDiscardChildren;
bool m_bTookChoice; ///< Did we take the Choice or want Fallback instead? bool m_bTookChoice; ///< Did we take the Choice or want Fallback instead?
static sal_uInt32 mnInstanceCount;
}; };
class OOXMLFastContextHandlerStream : public OOXMLFastContextHandler class OOXMLFastContextHandlerStream : public OOXMLFastContextHandler