diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-10-16 11:40:16 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-10-16 13:39:33 +0200 |
| commit | 32eb4d56a4ea93e7dbfd947b62e18f05d8215421 (patch) | |
| tree | 4594949fcc3cc52878f63f491b9d9bc402975a3b /sw/source/filter/xml/wrtxml.cxx | |
| parent | 0c44f702a04db0fffd6884dcb014b28cdff5b21c (diff) | |
use rtl::Reference for SvXMLGraphicHelper
Change-Id: I0052b29660fb6157f7e98c4e124f030ba439d304
Reviewed-on: https://gerrit.libreoffice.org/43417
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw/source/filter/xml/wrtxml.cxx')
| -rw-r--r-- | sw/source/filter/xml/wrtxml.cxx | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sw/source/filter/xml/wrtxml.cxx b/sw/source/filter/xml/wrtxml.cxx index e7469aec35dc..b0afdaf0baa1 100644 --- a/sw/source/filter/xml/wrtxml.cxx +++ b/sw/source/filter/xml/wrtxml.cxx @@ -80,15 +80,15 @@ ErrCode SwXMLWriter::Write_( const uno::Reference < task::XStatusIndicator >& xS // Get data sink ... tools::SvRef<SotStorageStream> xDocStream; uno::Reference< document::XGraphicObjectResolver > xGraphicResolver; - SvXMLGraphicHelper *pGraphicHelper = nullptr; + rtl::Reference<SvXMLGraphicHelper> xGraphicHelper ; uno::Reference< document::XEmbeddedObjectResolver > xObjectResolver; rtl::Reference<SvXMLEmbeddedObjectHelper> xObjectHelper; OSL_ENSURE( xStg.is(), "Where is my storage?" ); - pGraphicHelper = SvXMLGraphicHelper::Create( xStg, + xGraphicHelper = SvXMLGraphicHelper::Create( xStg, SvXMLGraphicHelperMode::Write, false ); - xGraphicResolver = pGraphicHelper; + xGraphicResolver = xGraphicHelper.get(); SfxObjectShell *pPersist = pDoc->GetPersist(); if( pPersist ) @@ -388,8 +388,9 @@ ErrCode SwXMLWriter::Write_( const uno::Reference < task::XStatusIndicator >& xS } } - if( pGraphicHelper ) - SvXMLGraphicHelper::Destroy( pGraphicHelper ); + if( xGraphicHelper ) + xGraphicHelper->dispose(); + xGraphicHelper.clear(); xGraphicResolver = nullptr; if( xObjectHelper ) |