diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-10-06 14:10:00 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-10-06 16:12:44 +0200 |
commit | 3035a8066ffc7120bb6a6da2c50d5b032611bb90 (patch) | |
tree | 8fa1c1b77d35f07a63f26ee7e9d4ae952378d6ac /sw/source/filter/xml/xmlexp.cxx | |
parent | 0d24dd25e6f506b5f9128d70d7eb21f0bb4dde89 (diff) |
use rtl::Reference in SvXMLEmbeddedObjectHelper
instead of manual ref-counting
Change-Id: I559ebb3871dd3dd4a160bd83a259e36dd2f7b4d6
Reviewed-on: https://gerrit.libreoffice.org/43200
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw/source/filter/xml/xmlexp.cxx')
-rw-r--r-- | sw/source/filter/xml/xmlexp.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sw/source/filter/xml/xmlexp.cxx b/sw/source/filter/xml/xmlexp.cxx index d4827e1ba4b6..7838281e699c 100644 --- a/sw/source/filter/xml/xmlexp.cxx +++ b/sw/source/filter/xml/xmlexp.cxx @@ -246,17 +246,16 @@ ErrCode SwXMLExport::exportDoc( enum XMLTokenEnum eClass ) SetGraphicResolver( xGraphicResolver ); } - SvXMLEmbeddedObjectHelper *pEmbeddedResolver = nullptr; + rtl::Reference<SvXMLEmbeddedObjectHelper> xEmbeddedResolver; if( !GetEmbeddedResolver().is() ) { SfxObjectShell *pPersist = pDoc->GetPersist(); if( pPersist ) { - pEmbeddedResolver = SvXMLEmbeddedObjectHelper::Create( + xEmbeddedResolver = SvXMLEmbeddedObjectHelper::Create( *pPersist, SvXMLEmbeddedObjectHelperMode::Write ); - Reference< XEmbeddedObjectResolver > xEmbeddedResolver( pEmbeddedResolver ); - SetEmbeddedResolver( xEmbeddedResolver ); + SetEmbeddedResolver( Reference<XEmbeddedObjectResolver>( xEmbeddedResolver.get() ) ); } } @@ -296,8 +295,9 @@ ErrCode SwXMLExport::exportDoc( enum XMLTokenEnum eClass ) if( pGraphicResolver ) SvXMLGraphicHelper::Destroy( pGraphicResolver ); - if( pEmbeddedResolver ) - SvXMLEmbeddedObjectHelper::Destroy( pEmbeddedResolver ); + if( xEmbeddedResolver ) + xEmbeddedResolver->dispose(); + xEmbeddedResolver.clear(); OSL_ENSURE( !m_pTableLines, "there are table columns infos left" ); |