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 /sd | |
| 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 'sd')
| -rw-r--r-- | sd/source/filter/xml/sdxmlwrp.cxx | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx index 00b61eb92859..efcb9ed9ccd0 100644 --- a/sd/source/filter/xml/sdxmlwrp.cxx +++ b/sd/source/filter/xml/sdxmlwrp.cxx @@ -507,7 +507,7 @@ bool SdXMLFilter::Import( ErrCode& nError ) } Reference< document::XGraphicObjectResolver > xGraphicResolver; - SvXMLGraphicHelper *pGraphicHelper = nullptr; + rtl::Reference<SvXMLGraphicHelper> xGraphicHelper; Reference< document::XEmbeddedObjectResolver > xObjectResolver; rtl::Reference<SvXMLEmbeddedObjectHelper> xObjectHelper; @@ -556,10 +556,10 @@ bool SdXMLFilter::Import( ErrCode& nError ) if( ERRCODE_NONE == nRet ) { - pGraphicHelper = SvXMLGraphicHelper::Create( xStorage, + xGraphicHelper = SvXMLGraphicHelper::Create( xStorage, SvXMLGraphicHelperMode::Read, false ); - xGraphicResolver = pGraphicHelper; + xGraphicResolver = xGraphicHelper.get(); xObjectHelper = SvXMLEmbeddedObjectHelper::Create( xStorage, *pDoc->GetPersist(), SvXMLEmbeddedObjectHelperMode::Read ); @@ -649,8 +649,9 @@ bool SdXMLFilter::Import( ErrCode& nError ) } } - if( pGraphicHelper ) - SvXMLGraphicHelper::Destroy( pGraphicHelper ); + if( xGraphicHelper ) + xGraphicHelper->dispose(); + xGraphicHelper.clear(); xGraphicResolver = nullptr; if( xObjectHelper.is() ) xObjectHelper->dispose(); @@ -785,7 +786,7 @@ bool SdXMLFilter::Import( ErrCode& nError ) bool SdXMLFilter::Export() { rtl::Reference<SvXMLEmbeddedObjectHelper> xObjectHelper; - SvXMLGraphicHelper* pGraphicHelper = nullptr; + rtl::Reference<SvXMLGraphicHelper> xGraphicHelper; bool bDocRet = false; if( !mxModel.is() ) @@ -878,8 +879,8 @@ bool SdXMLFilter::Export() xObjectHelper = SvXMLEmbeddedObjectHelper::Create( xStorage, *mrDocShell.GetDoc()->GetPersist(), SvXMLEmbeddedObjectHelperMode::Write ); xObjectResolver = xObjectHelper.get(); - pGraphicHelper = SvXMLGraphicHelper::Create( xStorage, SvXMLGraphicHelperMode::Write, false ); - xGrfResolver = pGraphicHelper; + xGraphicHelper = SvXMLGraphicHelper::Create( xStorage, SvXMLGraphicHelperMode::Write, false ); + xGrfResolver = xGraphicHelper.get(); } CreateStatusIndicator(); @@ -997,8 +998,9 @@ bool SdXMLFilter::Export() if ( !bLocked ) mxModel->unlockControllers(); - if( pGraphicHelper ) - SvXMLGraphicHelper::Destroy( pGraphicHelper ); + if( xGraphicHelper ) + xGraphicHelper->dispose(); + xGraphicHelper.clear(); if( xObjectHelper ) xObjectHelper->dispose(); |