diff options
Diffstat (limited to 'avmedia')
-rw-r--r-- | avmedia/source/viewer/mediawindow.cxx | 14 | ||||
-rw-r--r-- | avmedia/source/viewer/mediawindow_impl.hxx | 2 | ||||
-rw-r--r-- | avmedia/source/vlc/vlcmanager.hxx | 6 |
3 files changed, 11 insertions, 11 deletions
diff --git a/avmedia/source/viewer/mediawindow.cxx b/avmedia/source/viewer/mediawindow.cxx index 22326a60fdff..7912bf5ddef5 100644 --- a/avmedia/source/viewer/mediawindow.cxx +++ b/avmedia/source/viewer/mediawindow.cxx @@ -20,7 +20,6 @@ #include <stdio.h> #include <avmedia/mediawindow.hxx> -#include <boost/scoped_ptr.hpp> #include "mediawindow_impl.hxx" #include "mediamisc.hxx" #include "mediawindow.hrc" @@ -34,6 +33,7 @@ #include "com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp" #include "com/sun/star/ui/dialogs/TemplateDescription.hpp" #include "com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp" +#include <memory> #define AVMEDIA_FRAMEGRABBER_DEFAULTFRAME_MEDIATIME 3.0 @@ -404,7 +404,7 @@ uno::Reference< graphic::XGraphic > MediaWindow::grabFrame( const OUString& rURL { uno::Reference< media::XPlayer > xPlayer( createPlayer( rURL, rReferer, &sMimeType ) ); uno::Reference< graphic::XGraphic > xRet; - boost::scoped_ptr< Graphic > apGraphic; + std::unique_ptr< Graphic > xGraphic; if( xPlayer.is() ) { @@ -428,19 +428,19 @@ uno::Reference< graphic::XGraphic > MediaWindow::grabFrame( const OUString& rURL if( !aPrefSize.Width && !aPrefSize.Height ) { const BitmapEx aBmpEx( getAudioLogo() ); - apGraphic.reset( new Graphic( aBmpEx ) ); + xGraphic.reset( new Graphic( aBmpEx ) ); } } } - if( !xRet.is() && !apGraphic.get() ) + if( !xRet.is() && !xGraphic.get() ) { const BitmapEx aBmpEx( getEmptyLogo() ); - apGraphic.reset( new Graphic( aBmpEx ) ); + xGraphic.reset( new Graphic( aBmpEx ) ); } - if( apGraphic.get() ) - xRet = apGraphic->GetXGraphic(); + if( xGraphic.get() ) + xRet = xGraphic->GetXGraphic(); return xRet; } diff --git a/avmedia/source/viewer/mediawindow_impl.hxx b/avmedia/source/viewer/mediawindow_impl.hxx index ce2c24bb9ab9..c5c65fa41aa0 100644 --- a/avmedia/source/viewer/mediawindow_impl.hxx +++ b/avmedia/source/viewer/mediawindow_impl.hxx @@ -173,7 +173,7 @@ namespace avmedia ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > mxEventsIf; MediaEventListenersImpl* mpEvents; bool mbEventTransparent; - boost::scoped_ptr<MediaChildWindow> mpChildWindow; + std::unique_ptr<MediaChildWindow> mpChildWindow; MediaWindowControl* mpMediaWindowControl; BitmapEx* mpEmptyBmpEx; BitmapEx* mpAudioBmpEx; diff --git a/avmedia/source/vlc/vlcmanager.hxx b/avmedia/source/vlc/vlcmanager.hxx index 36eebceb9e2c..f9b1a1c81816 100644 --- a/avmedia/source/vlc/vlcmanager.hxx +++ b/avmedia/source/vlc/vlcmanager.hxx @@ -19,10 +19,10 @@ #ifndef INCLUDED_AVMEDIA_SOURCE_VLC_VLCMANAGER_HXX #define INCLUDED_AVMEDIA_SOURCE_VLC_VLCMANAGER_HXX -#include <boost/scoped_ptr.hpp> #include <com/sun/star/media/XManager.hpp> #include "vlccommon.hxx" #include "wrapper/Wrapper.hxx" +#include <memory> namespace avmedia { namespace vlc { @@ -30,7 +30,7 @@ namespace vlc { class Manager : public ::cppu::WeakImplHelper2 < ::com::sun::star::media::XManager, ::com::sun::star::lang::XServiceInfo > { - boost::scoped_ptr<wrapper::Instance> mInstance; + std::unique_ptr<wrapper::Instance> mInstance; wrapper::EventHandler mEventHandler; public: Manager( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxMgr ); @@ -55,4 +55,4 @@ private: #endif -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |