diff options
author | Noel Grandin <noel@peralex.com> | 2015-10-29 15:48:45 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-10-30 08:10:22 +0200 |
commit | 065c8b48a604b70140862d0d02deb584626d6994 (patch) | |
tree | 578c07b470b8ec9e5908d224c2fbf33cadda5adf /avmedia/source/win | |
parent | convert Sequence<XInterface> constructions to use initializer lists (diff) | |
download | core-065c8b48a604b70140862d0d02deb584626d6994.tar.gz core-065c8b48a604b70140862d0d02deb584626d6994.zip |
use uno::Reference::set method instead of assignment
Change-Id: I58410209f32f988f258a588364e0b037c2790211
Diffstat (limited to 'avmedia/source/win')
-rw-r--r-- | avmedia/source/win/manager.cxx | 2 | ||||
-rw-r--r-- | avmedia/source/win/player.cxx | 2 | ||||
-rw-r--r-- | avmedia/source/win/winuno.cxx | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/avmedia/source/win/manager.cxx b/avmedia/source/win/manager.cxx index 94e45af48950..bab1b5bf6580 100644 --- a/avmedia/source/win/manager.cxx +++ b/avmedia/source/win/manager.cxx @@ -50,7 +50,7 @@ uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const OUString& const INetURLObject aURL( rURL ); if( !pPlayer->create( aURL.GetMainURL( INetURLObject::DECODE_UNAMBIGUOUS ) ) ) - xRet = uno::Reference< media::XPlayer >(); + xRet.clear(); return xRet; } diff --git a/avmedia/source/win/player.cxx b/avmedia/source/win/player.cxx index a1f7e44d2c25..b04eaf99ab3f 100644 --- a/avmedia/source/win/player.cxx +++ b/avmedia/source/win/player.cxx @@ -437,7 +437,7 @@ uno::Reference< ::media::XPlayerWindow > SAL_CALL Player::createPlayerWindow( co xRet = pWindow; if( !pWindow->create( aArguments ) ) - xRet = uno::Reference< ::media::XPlayerWindow >(); + xRet.clear(); } return xRet; diff --git a/avmedia/source/win/winuno.cxx b/avmedia/source/win/winuno.cxx index c39c00af671e..a93fb9a5b146 100644 --- a/avmedia/source/win/winuno.cxx +++ b/avmedia/source/win/winuno.cxx @@ -40,7 +40,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL avmediawin_component_getFactory( { const OUString aServiceName( "com.sun.star.media.Manager_DirectX" ); - xFactory = uno::Reference< lang::XSingleServiceFactory >( ::cppu::createSingleFactory( + xFactory.set( ::cppu::createSingleFactory( reinterpret_cast< lang::XMultiServiceFactory* >( pServiceManager ), OUString("com.sun.star.comp.avmedia.Manager_DirectX" ), create_MediaPlayer, uno::Sequence< OUString >( &aServiceName, 1 ) ) ); |