OOXMLFastTokenHandler doesn't need an UNO context

Change-Id: I476d7e26d35e38d458f62c01f478ed2b54eed355

6 files changed, 10 insertions, 18 deletions

diff --git a/writerfilter/inc/ooxml/OOXMLDocument.hxx b/writerfilter/inc/ooxml/OOXMLDocument.hxx
index 18c21da314e7..9dda5336f65b 100644
--- a/writerfilter/inc/ooxml/OOXMLDocument.hxx
+++ b/writerfilter/inc/ooxml/OOXMLDocument.hxx
@@ -111,7 +111,7 @@ public:
     virtual const OUString & getTarget() const = 0;
 
     virtual css::uno::Reference<css::xml::sax::XFastTokenHandler>
-    getFastTokenHandler(css::uno::Reference<css::uno::XComponentContext> rContext) = 0;
+    getFastTokenHandler() = 0;
 
 };
 
diff --git a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
index aca59c1d3a3f..1bef14ed8364 100644
--- a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
+++ b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
@@ -94,8 +94,7 @@ void OOXMLDocumentImpl::resolveFastSubStream(Stream & rStreamHandler,
 
         uno::Reference < xml::sax::XFastDocumentHandler > xDocumentHandler
             (pDocHandler);
-        uno::Reference < xml::sax::XFastTokenHandler > xTokenHandler
-            (mpStream->getFastTokenHandler(xContext));
+        uno::Reference < xml::sax::XFastTokenHandler > xTokenHandler(mpStream->getFastTokenHandler());
 
         xParser->setFastDocumentHandler(xDocumentHandler);
         xParser->setTokenHandler(xTokenHandler);
@@ -471,8 +470,7 @@ void OOXMLDocumentImpl::resolve(Stream & rStream)
         pDocHandler->setIsSubstream( mbIsSubstream );
         uno::Reference < xml::sax::XFastDocumentHandler > xDocumentHandler
             (pDocHandler);
-        uno::Reference < xml::sax::XFastTokenHandler > xTokenHandler
-            (mpStream->getFastTokenHandler(xContext));
+        uno::Reference < xml::sax::XFastTokenHandler > xTokenHandler(mpStream->getFastTokenHandler());
 
         resolveFastSubStream(rStream, OOXMLStream::SETTINGS);
         mxThemeDom = importSubStream(OOXMLStream::THEME);
diff --git a/writerfilter/source/ooxml/OOXMLFastTokenHandler.cxx b/writerfilter/source/ooxml/OOXMLFastTokenHandler.cxx
index b90b1e392eb2..12957165a85f 100644
--- a/writerfilter/source/ooxml/OOXMLFastTokenHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastTokenHandler.cxx
@@ -41,10 +41,9 @@ namespace ooxml
 
 using namespace ::std;
 
-OOXMLFastTokenHandler::OOXMLFastTokenHandler
-(css::uno::Reference< css::uno::XComponentContext > const & context)
-: m_xContext(context)
-{}
+OOXMLFastTokenHandler::OOXMLFastTokenHandler()
+{
+}
 
 // ::com::sun::star::xml::sax::XFastTokenHandler:
 ::sal_Int32 SAL_CALL OOXMLFastTokenHandler::getToken(const OUString & Identifier)
diff --git a/writerfilter/source/ooxml/OOXMLFastTokenHandler.hxx b/writerfilter/source/ooxml/OOXMLFastTokenHandler.hxx
index d1dc7e435ee3..9a79749b80cb 100644
--- a/writerfilter/source/ooxml/OOXMLFastTokenHandler.hxx
+++ b/writerfilter/source/ooxml/OOXMLFastTokenHandler.hxx
@@ -36,7 +36,7 @@ class OOXMLFastTokenHandler:
     public sax_fastparser::FastTokenHandlerBase
 {
 public:
-    explicit OOXMLFastTokenHandler(css::uno::Reference< css::uno::XComponentContext > const & context);
+    explicit OOXMLFastTokenHandler();
 
     // ::com::sun::star::xml::sax::XFastTokenHandler:
     virtual ::sal_Int32 SAL_CALL getToken(const OUString & Identifier) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
@@ -52,8 +52,6 @@ private:
     void operator =(OOXMLFastTokenHandler &); // not defined
 
     virtual ~OOXMLFastTokenHandler() {}
-
-    css::uno::Reference< css::uno::XComponentContext > m_xContext;
 };
 
 }}
diff --git a/writerfilter/source/ooxml/OOXMLStreamImpl.cxx b/writerfilter/source/ooxml/OOXMLStreamImpl.cxx
index 52b10289b368..64b8f8ef601a 100644
--- a/writerfilter/source/ooxml/OOXMLStreamImpl.cxx
+++ b/writerfilter/source/ooxml/OOXMLStreamImpl.cxx
@@ -409,12 +409,10 @@ uno::Reference<uno::XComponentContext> OOXMLStreamImpl::getContext()
     return mxContext;
 }
 
-uno::Reference <xml::sax::XFastTokenHandler>
-OOXMLStreamImpl::getFastTokenHandler
-(uno::Reference<uno::XComponentContext> xContext)
+uno::Reference <xml::sax::XFastTokenHandler> OOXMLStreamImpl::getFastTokenHandler()
 {
     if (! mxFastTokenHandler.is())
-        mxFastTokenHandler.set(new OOXMLFastTokenHandler(xContext));
+        mxFastTokenHandler.set(new OOXMLFastTokenHandler());
 
     return mxFastTokenHandler;
 }
diff --git a/writerfilter/source/ooxml/OOXMLStreamImpl.hxx b/writerfilter/source/ooxml/OOXMLStreamImpl.hxx
index 5c83bfd44db9..52224f3e3e00 100644
--- a/writerfilter/source/ooxml/OOXMLStreamImpl.hxx
+++ b/writerfilter/source/ooxml/OOXMLStreamImpl.hxx
@@ -80,8 +80,7 @@ public:
     virtual OUString getTargetForId(const OUString & rId) SAL_OVERRIDE;
     virtual const OUString & getTarget() const SAL_OVERRIDE;
 
-    virtual css::uno::Reference<css::xml::sax::XFastTokenHandler>
-    getFastTokenHandler(css::uno::Reference<css::uno::XComponentContext> rContext) SAL_OVERRIDE;
+    virtual css::uno::Reference<css::xml::sax::XFastTokenHandler> getFastTokenHandler() SAL_OVERRIDE;
 
     void setInputStream(css::uno::Reference<css::io::XInputStream> rxInputStream);
     // Giving access to mxDocumentStream. It is needed by resolving custom xml to get list of customxml's used in document.