From 3035a8066ffc7120bb6a6da2c50d5b032611bb90 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Fri, 6 Oct 2017 14:10:00 +0200 Subject: use rtl::Reference in SvXMLEmbeddedObjectHelper instead of manual ref-counting Change-Id: I559ebb3871dd3dd4a160bd83a259e36dd2f7b4d6 Reviewed-on: https://gerrit.libreoffice.org/43200 Tested-by: Jenkins Reviewed-by: Noel Grandin --- reportdesign/source/core/api/ReportDefinition.cxx | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'reportdesign') diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx index a2a746474283..d26f42962e44 100644 --- a/reportdesign/source/core/api/ReportDefinition.cxx +++ b/reportdesign/source/core/api/ReportDefinition.cxx @@ -1340,9 +1340,7 @@ void SAL_CALL OReportDefinition::storeToStorage( const uno::Reference< embed::XS SvXMLGraphicHelper* pGraphicHelper = SvXMLGraphicHelper::Create(_xStorageToSaveTo,SvXMLGraphicHelperMode::Write); xGrfResolver = pGraphicHelper; pGraphicHelper->release(); - SvXMLEmbeddedObjectHelper* pEmbeddedObjectHelper = SvXMLEmbeddedObjectHelper::Create( _xStorageToSaveTo,*this, SvXMLEmbeddedObjectHelperMode::Write ); - xObjectResolver = pEmbeddedObjectHelper; - pEmbeddedObjectHelper->release(); + xObjectResolver = SvXMLEmbeddedObjectHelper::Create( _xStorageToSaveTo,*this, SvXMLEmbeddedObjectHelperMode::Write ).get(); aDelegatorArguments.realloc(nArgsLen+2); aDelegatorArguments[nArgsLen++] <<= xGrfResolver; @@ -2036,7 +2034,7 @@ uno::Reference< uno::XInterface > SAL_CALL OReportDefinition::createInstanceWith aValue.Value >>= xStorage; } m_pImpl->m_pObjectContainer->SwitchPersistence(xStorage); - xRet = static_cast< ::cppu::OWeakObject* >(SvXMLEmbeddedObjectHelper::Create( xStorage,*this, SvXMLEmbeddedObjectHelperMode::Read )); + xRet = static_cast< ::cppu::OWeakObject* >(SvXMLEmbeddedObjectHelper::Create( xStorage,*this, SvXMLEmbeddedObjectHelperMode::Read ).get()); } return xRet; } @@ -2123,9 +2121,9 @@ uno::Reference< uno::XInterface > SAL_CALL OReportDefinition::createInstance( co return m_pImpl->m_xMarkerTable; } else if ( aServiceSpecifier == "com.sun.star.document.ImportEmbeddedObjectResolver" ) - return static_cast< ::cppu::OWeakObject* >(SvXMLEmbeddedObjectHelper::Create( m_pImpl->m_xStorage,*this, SvXMLEmbeddedObjectHelperMode::Read )); + return static_cast< ::cppu::OWeakObject* >(SvXMLEmbeddedObjectHelper::Create( m_pImpl->m_xStorage,*this, SvXMLEmbeddedObjectHelperMode::Read ).get()); else if ( aServiceSpecifier == "com.sun.star.document.ExportEmbeddedObjectResolver" ) - return static_cast< ::cppu::OWeakObject* >(SvXMLEmbeddedObjectHelper::Create( m_pImpl->m_xStorage,*this, SvXMLEmbeddedObjectHelperMode::Write )); + return static_cast< ::cppu::OWeakObject* >(SvXMLEmbeddedObjectHelper::Create( m_pImpl->m_xStorage,*this, SvXMLEmbeddedObjectHelperMode::Write ).get()); else if ( aServiceSpecifier == "com.sun.star.document.ImportGraphicObjectResolver" ) { SvXMLGraphicHelper* pGraphicHelper = SvXMLGraphicHelper::Create(m_pImpl->m_xStorage,SvXMLGraphicHelperMode::Write); -- cgit