diff options
| author | Oliver-Rainer Wittmann <orw@apache.org> | 2013-06-10 16:51:54 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-06-10 19:05:06 +0100 |
| commit | d94bda0c1fd3c618b98a63f76d71e129ad06d942 (patch) | |
| tree | dc719e0b97da4c0fa15237a0e7052c16c731ec2d /writerfilter/source/ooxml/OOXMLDocumentImpl.cxx | |
| parent | 7a878f9c5fde18e1e86ee0784d9a7f1252700e74 (diff) | |
Correct the XML document handler...
which is used to parse Microsoft Word OOXML documents in case of unknown XML
elements
(cherry picked from commit 22e334845346f4e3189c72e706d744385953af19)
Conflicts:
writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx
writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx
Change-Id: Ibcd3e808abfb35291bb04aa10190a7800f0837fa
Diffstat (limited to 'writerfilter/source/ooxml/OOXMLDocumentImpl.cxx')
| -rw-r--r-- | writerfilter/source/ooxml/OOXMLDocumentImpl.cxx | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx index 29c64ade8028..09ded156e1b5 100644 --- a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx +++ b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx @@ -66,10 +66,8 @@ void OOXMLDocumentImpl::resolveFastSubStream(Stream & rStreamHandler, { uno::Reference<uno::XComponentContext> xContext(mpStream->getContext()); OOXMLFastDocumentHandler * pDocHandler = - new OOXMLFastDocumentHandler(xContext); - pDocHandler->setStream(&rStreamHandler); - pDocHandler->setDocument(this); - pDocHandler->setXNoteId(mnXNoteId); + new OOXMLFastDocumentHandler( + xContext, &rStreamHandler, this, mnXNoteId ); uno::Reference < xml::sax::XFastDocumentHandler > xDocumentHandler (pDocHandler); @@ -317,10 +315,8 @@ void OOXMLDocumentImpl::resolve(Stream & rStream) uno::Reference<uno::XComponentContext> xContext(mpStream->getContext()); OOXMLFastDocumentHandler * pDocHandler = - new OOXMLFastDocumentHandler(xContext); - pDocHandler->setStream(&rStream); - pDocHandler->setDocument(this); - pDocHandler->setXNoteId(mnXNoteId); + new OOXMLFastDocumentHandler( + xContext, &rStream, this, mnXNoteId ); pDocHandler->setIsSubstream( mbIsSubstream ); uno::Reference < xml::sax::XFastDocumentHandler > xDocumentHandler (pDocHandler); |