From f004aa99514d385f3ee254bba735f5eaeb7d9ad8 Mon Sep 17 00:00:00 2001 From: Jacek Fraczek Date: Wed, 5 Oct 2016 22:00:51 +0200 Subject: tdf#89307: Removed SvRef::operator T*() Conditional statements are using SvRef::Is() method. Changed static_cast(svRef) occurances to svRef.get(). Added operator == and != to SvRef. SbxObject::Execute is using SbxVariableRef internally. SbxObject::FindQualified is using SbxVariableRef internally. Change-Id: I45b553e35d8fca9bf71163e6eefc60802a066395 Reviewed-on: https://gerrit.libreoffice.org/29621 Tested-by: Jenkins Reviewed-by: Stephan Bergmann --- sfx2/source/appl/macroloader.cxx | 4 ++-- sfx2/source/appl/xpackcreator.cxx | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'sfx2/source/appl') diff --git a/sfx2/source/appl/macroloader.cxx b/sfx2/source/appl/macroloader.cxx index 9cf3dade9e30..3ab011f3dac0 100644 --- a/sfx2/source/appl/macroloader.cxx +++ b/sfx2/source/appl/macroloader.cxx @@ -290,9 +290,9 @@ ErrCode SfxMacroLoader::loadMacro( const OUString& rURL, css::uno::Any& rRetval, // execute the method SbxVariableRef retValRef = new SbxVariable; - nErr = pBasMgr->ExecuteMacro( aQualifiedMethod, aArgs, retValRef ); + nErr = pBasMgr->ExecuteMacro( aQualifiedMethod, aArgs, retValRef.get() ); if ( nErr == ERRCODE_NONE ) - rRetval = sbxToUnoValue( retValRef ); + rRetval = sbxToUnoValue( retValRef.get() ); } if ( bSetGlobalThisComponent ) diff --git a/sfx2/source/appl/xpackcreator.cxx b/sfx2/source/appl/xpackcreator.cxx index 5297d927b009..8e1a2eec043d 100644 --- a/sfx2/source/appl/xpackcreator.cxx +++ b/sfx2/source/appl/xpackcreator.cxx @@ -85,7 +85,7 @@ void SAL_CALL OPackageStructureCreator::convertToPackage( const OUString& aFolde { pTempStream = new SvFileStream( aTempURL, StreamMode::STD_READWRITE ); tools::SvRef aTargetStorage = new SotStorage( true, *pTempStream ); - aStorage->CopyTo( aTargetStorage ); + aStorage->CopyTo( aTargetStorage.get() ); aTargetStorage->Commit(); if ( aStorage->GetError() || aTargetStorage->GetError() || pTempStream->GetError() ) -- cgit