diff options
| author | Noel Grandin <noel@peralex.com> | 2015-11-04 15:36:26 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-11-05 07:41:29 +0200 |
| commit | 1d67ca08da4b206a52e34723551ac331808f7b29 (patch) | |
| tree | 71637f3ee66499ee1d70362fc26fb6dfb52e5d9b /sd/source/ui/remotecontrol | |
| parent | 0eb9f56db5dad711f12283d097e1d56a801ba526 (diff) | |
use uno::Reference::set method instead of assignment
Change-Id: Ib224c60d3e5afc968bf4ef5ff58c3a71893b811c
Diffstat (limited to 'sd/source/ui/remotecontrol')
| -rw-r--r-- | sd/source/ui/remotecontrol/Communicator.cxx | 6 | ||||
| -rw-r--r-- | sd/source/ui/remotecontrol/Listener.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/remotecontrol/Receiver.cxx | 9 |
3 files changed, 7 insertions, 10 deletions
diff --git a/sd/source/ui/remotecontrol/Communicator.cxx b/sd/source/ui/remotecontrol/Communicator.cxx index bf399cae8ceb..33f05f228246 100644 --- a/sd/source/ui/remotecontrol/Communicator.cxx +++ b/sd/source/ui/remotecontrol/Communicator.cxx @@ -67,10 +67,10 @@ void Communicator::execute() uno::Reference<presentation::XPresentationSupplier> xPS; if( xFrame.is() ) - xPS = uno::Reference<presentation::XPresentationSupplier>( xFrame->getController()->getModel(), uno::UNO_QUERY ); + xPS.set( xFrame->getController()->getModel(), uno::UNO_QUERY ); uno::Reference<presentation::XPresentation2> xPresentation; if( xPS.is() ) - xPresentation = uno::Reference<presentation::XPresentation2>( xPS->getPresentation(), uno::UNO_QUERY ); + xPresentation.set( xPS->getPresentation(), uno::UNO_QUERY ); if ( xPresentation.is() && xPresentation->isRunning() ) { presentationStarted( xPresentation->getController() ); @@ -142,7 +142,7 @@ void Communicator::presentationStarted( const css::uno::Reference< { if ( pTransmitter ) { - mListener = rtl::Reference<Listener>( new Listener( this, pTransmitter ) ); + mListener.set( new Listener( this, pTransmitter ) ); mListener->init( rController ); } } diff --git a/sd/source/ui/remotecontrol/Listener.cxx b/sd/source/ui/remotecontrol/Listener.cxx index afa7cded78d7..72b3c95b8d3b 100644 --- a/sd/source/ui/remotecontrol/Listener.cxx +++ b/sd/source/ui/remotecontrol/Listener.cxx @@ -37,7 +37,7 @@ void Listener::init( const css::uno::Reference< css::presentation::XSlideShowCon { if ( aController.is() ) { - mController = css::uno::Reference< css::presentation::XSlideShowController >( aController ); + mController.set( aController ); aController->addSlideShowListener( this ); sal_Int32 aSlides = aController->getSlideCount(); diff --git a/sd/source/ui/remotecontrol/Receiver.cxx b/sd/source/ui/remotecontrol/Receiver.cxx index 892d72b98653..d540f09d6608 100644 --- a/sd/source/ui/remotecontrol/Receiver.cxx +++ b/sd/source/ui/remotecontrol/Receiver.cxx @@ -75,13 +75,10 @@ void Receiver::executeCommand( const std::vector<OString> &aCommand ) uno::Reference< frame::XDesktop2 > xFramesSupplier = frame::Desktop::create( ::comphelper::getProcessComponentContext() ); uno::Reference< frame::XFrame > xFrame ( xFramesSupplier->getActiveFrame(), uno::UNO_QUERY_THROW ); uno::Reference<presentation::XPresentationSupplier> xPS ( xFrame->getController()->getModel(), uno::UNO_QUERY_THROW); - xPresentation = uno::Reference<presentation::XPresentation2>( - xPS->getPresentation(), uno::UNO_QUERY_THROW); + xPresentation.set( xPS->getPresentation(), uno::UNO_QUERY_THROW); // Throws an exception if now slideshow running - xSlideShowController = uno::Reference<presentation::XSlideShowController>( - xPresentation->getController(), uno::UNO_QUERY_THROW ); - xSlideShow = uno::Reference<presentation::XSlideShow>( - xSlideShowController->getSlideShow(), uno::UNO_QUERY_THROW ); + xSlideShowController.set( xPresentation->getController(), uno::UNO_QUERY_THROW ); + xSlideShow.set( xSlideShowController->getSlideShow(), uno::UNO_QUERY_THROW ); } catch (uno::RuntimeException &) { |