diff options
author | Noel <noel.grandin@collabora.co.uk> | 2021-02-23 10:27:15 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-02-23 10:39:19 +0100 |
commit | 68837ab9b40af5425318d43836650840ba16fc17 (patch) | |
tree | 59420792b5c3f205cbfedd81947d63a4f0400a7d /writerfilter | |
parent | e0bee1a05bdad73d61fb89e25b1510a12deed1f1 (diff) |
loplugin:refcounting in writerfilter
Change-Id: I874f0ffc8758754960ab1964df333b3f5d9d9a6f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111375
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'writerfilter')
-rw-r--r-- | writerfilter/source/ooxml/OOXMLDocumentImpl.cxx | 10 | ||||
-rw-r--r-- | writerfilter/source/ooxml/OOXMLFastContextHandler.cxx | 4 |
2 files changed, 6 insertions, 8 deletions
diff --git a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx index d8b520cb2e1a..9ab9bb937bce 100644 --- a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx +++ b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx @@ -93,13 +93,12 @@ void OOXMLDocumentImpl::resolveFastSubStream(Stream & rStreamHandler, if (xParser.is()) { uno::Reference<uno::XComponentContext> xContext(mpStream->getContext()); - OOXMLFastDocumentHandler * pDocHandler = + rtl::Reference<OOXMLFastDocumentHandler> pDocHandler = new OOXMLFastDocumentHandler(xContext, &rStreamHandler, this, mnXNoteId); - uno::Reference<xml::sax::XFastDocumentHandler> xDocumentHandler(pDocHandler); uno::Reference<xml::sax::XFastTokenHandler> xTokenHandler(mpStream->getFastTokenHandler()); - xParser->setFastDocumentHandler(xDocumentHandler); + xParser->setFastDocumentHandler(pDocHandler); xParser->setTokenHandler(xTokenHandler); uno::Reference<io::XInputStream> xInputStream = pStream->getDocumentStream(); @@ -462,10 +461,9 @@ void OOXMLDocumentImpl::resolve(Stream & rStream) uno::Reference<uno::XComponentContext> xContext(mpStream->getContext()); - OOXMLFastDocumentHandler * pDocHandler = + rtl::Reference<OOXMLFastDocumentHandler> pDocHandler = new OOXMLFastDocumentHandler(xContext, &rStream, this, mnXNoteId); pDocHandler->setIsSubstream( mbIsSubstream ); - uno::Reference < xml::sax::XFastDocumentHandler > xDocumentHandler(pDocHandler); uno::Reference < xml::sax::XFastTokenHandler > xTokenHandler(mpStream->getFastTokenHandler()); resolveFastSubStream(rStream, OOXMLStream::SETTINGS); @@ -484,7 +482,7 @@ void OOXMLDocumentImpl::resolve(Stream & rStream) resolveFastSubStream(rStream, OOXMLStream::STYLES); resolveFastSubStream(rStream, OOXMLStream::NUMBERING); - xParser->setFastDocumentHandler( xDocumentHandler ); + xParser->setFastDocumentHandler( pDocHandler ); xParser->setTokenHandler( xTokenHandler ); xml::sax::InputSource aParserInput; diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx index f04391bd95db..e4bd09130c69 100644 --- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx +++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx @@ -1794,7 +1794,7 @@ OOXMLFastContextHandlerShape::lcl_createFastChildContext uno::Reference<XFastContextHandler> pChildContext = mrShapeContext->createFastChildContext(Element, Attribs); - OOXMLFastContextHandlerWrapper * pWrapper = + rtl::Reference<OOXMLFastContextHandlerWrapper> pWrapper = new OOXMLFastContextHandlerWrapper(this, pChildContext, this); @@ -1975,7 +1975,7 @@ OOXMLFastContextHandlerWrapper::lcl_createFastChildContext } else if (mxWrappedContext.is() && !bSkipImages) { - OOXMLFastContextHandlerWrapper * pWrapper = + rtl::Reference<OOXMLFastContextHandlerWrapper> pWrapper = new OOXMLFastContextHandlerWrapper (this, mxWrappedContext->createFastChildContext(Element, Attribs), mxShapeHandler); |