summaryrefslogtreecommitdiffstats
path: root/avmedia/source/vlc
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-10-12 16:04:04 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-10-12 17:52:29 +0200
commitb36963c0a6a09f70ca6d8d607dd3249a3496497d (patch)
tree33e06dc8d227957cb31355277fb5cf20b9918628 /avmedia/source/vlc
parentHAVE_CXX11_OVERRIDE is required on all supported toolchains (diff)
downloadcore-b36963c0a6a09f70ca6d8d607dd3249a3496497d.tar.gz
core-b36963c0a6a09f70ca6d8d607dd3249a3496497d.zip
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'avmedia/source/vlc')
-rw-r--r--avmedia/source/vlc/vlcframegrabber.hxx8
-rw-r--r--avmedia/source/vlc/vlcmanager.hxx8
-rw-r--r--avmedia/source/vlc/vlcplayer.hxx36
-rw-r--r--avmedia/source/vlc/vlcwindow.hxx54
-rw-r--r--avmedia/source/vlc/wrapper/EventHandler.hxx2
5 files changed, 54 insertions, 54 deletions
diff --git a/avmedia/source/vlc/vlcframegrabber.hxx b/avmedia/source/vlc/vlcframegrabber.hxx
index ce0fd809f718..2f5419dabc67 100644
--- a/avmedia/source/vlc/vlcframegrabber.hxx
+++ b/avmedia/source/vlc/vlcframegrabber.hxx
@@ -41,14 +41,14 @@ public:
VLCFrameGrabber( wrapper::EventHandler& eh, const rtl::OUString& url );
css::uno::Reference< css::graphic::XGraphic > SAL_CALL grabFrame( double fMediaTime )
- throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ throw ( css::uno::RuntimeException, std::exception ) override;
::rtl::OUString SAL_CALL getImplementationName()
- throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ throw ( css::uno::RuntimeException, std::exception ) override;
sal_Bool SAL_CALL supportsService( const ::rtl::OUString& serviceName )
- throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ throw ( css::uno::RuntimeException, std::exception ) override;
css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames()
- throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ throw ( css::uno::RuntimeException, std::exception ) override;
};
}
diff --git a/avmedia/source/vlc/vlcmanager.hxx b/avmedia/source/vlc/vlcmanager.hxx
index 5545aea3229e..a9d087d3cd7b 100644
--- a/avmedia/source/vlc/vlcmanager.hxx
+++ b/avmedia/source/vlc/vlcmanager.hxx
@@ -37,11 +37,11 @@ public:
explicit Manager( const css::uno::Reference< css::lang::XMultiServiceFactory >& rxMgr );
virtual ~Manager();
- css::uno::Reference< css::media::XPlayer > SAL_CALL createPlayer( const rtl::OUString& aURL ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ css::uno::Reference< css::media::XPlayer > SAL_CALL createPlayer( const rtl::OUString& aURL ) throw (css::uno::RuntimeException, std::exception) override;
- rtl::OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- sal_Bool SAL_CALL supportsService( const rtl::OUString& serviceName ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- css::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ rtl::OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override;
+ sal_Bool SAL_CALL supportsService( const rtl::OUString& serviceName ) throw (css::uno::RuntimeException, std::exception) override;
+ css::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override;
private:
css::uno::Reference< css::lang::XMultiServiceFactory > mxMgr;
diff --git a/avmedia/source/vlc/vlcplayer.hxx b/avmedia/source/vlc/vlcplayer.hxx
index b4d865716a13..89e974c35cc7 100644
--- a/avmedia/source/vlc/vlcplayer.hxx
+++ b/avmedia/source/vlc/vlcplayer.hxx
@@ -61,30 +61,30 @@ public:
void SAL_CALL setScale( float factor );
void SAL_CALL setWindowID( const intptr_t windowID );
- void SAL_CALL start() throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
- void SAL_CALL stop() throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
- sal_Bool SAL_CALL isPlaying() throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
- double SAL_CALL getDuration() throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
- void SAL_CALL setMediaTime( double fTime ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
- double SAL_CALL getMediaTime() throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
- void SAL_CALL setPlaybackLoop( sal_Bool bSet ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
- sal_Bool SAL_CALL isPlaybackLoop() throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
- void SAL_CALL setVolumeDB( ::sal_Int16 nDB ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
- ::sal_Int16 SAL_CALL getVolumeDB() throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
- void SAL_CALL setMute( sal_Bool bSet ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
- sal_Bool SAL_CALL isMute() throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
- css::awt::Size SAL_CALL getPreferredPlayerWindowSize() throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ void SAL_CALL start() throw ( css::uno::RuntimeException, std::exception ) override;
+ void SAL_CALL stop() throw ( css::uno::RuntimeException, std::exception ) override;
+ sal_Bool SAL_CALL isPlaying() throw ( css::uno::RuntimeException, std::exception ) override;
+ double SAL_CALL getDuration() throw ( css::uno::RuntimeException, std::exception ) override;
+ void SAL_CALL setMediaTime( double fTime ) throw ( css::uno::RuntimeException, std::exception ) override;
+ double SAL_CALL getMediaTime() throw ( css::uno::RuntimeException, std::exception ) override;
+ void SAL_CALL setPlaybackLoop( sal_Bool bSet ) throw ( css::uno::RuntimeException, std::exception ) override;
+ sal_Bool SAL_CALL isPlaybackLoop() throw ( css::uno::RuntimeException, std::exception ) override;
+ void SAL_CALL setVolumeDB( ::sal_Int16 nDB ) throw ( css::uno::RuntimeException, std::exception ) override;
+ ::sal_Int16 SAL_CALL getVolumeDB() throw ( css::uno::RuntimeException, std::exception ) override;
+ void SAL_CALL setMute( sal_Bool bSet ) throw ( css::uno::RuntimeException, std::exception ) override;
+ sal_Bool SAL_CALL isMute() throw ( css::uno::RuntimeException, std::exception ) override;
+ css::awt::Size SAL_CALL getPreferredPlayerWindowSize() throw ( css::uno::RuntimeException, std::exception ) override;
css::uno::Reference< css::media::XPlayerWindow > SAL_CALL createPlayerWindow( const css::uno::Sequence< css::uno::Any >& aArguments )
- throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ throw ( css::uno::RuntimeException, std::exception ) override;
css::uno::Reference< css::media::XFrameGrabber > SAL_CALL createFrameGrabber()
- throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ throw ( css::uno::RuntimeException, std::exception ) override;
::rtl::OUString SAL_CALL getImplementationName()
- throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ throw ( css::uno::RuntimeException, std::exception ) override;
sal_Bool SAL_CALL supportsService( const ::rtl::OUString& serviceName )
- throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;;
+ throw ( css::uno::RuntimeException, std::exception ) override;;
css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames()
- throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;;
+ throw ( css::uno::RuntimeException, std::exception ) override;;
private:
void replay();
diff --git a/avmedia/source/vlc/vlcwindow.hxx b/avmedia/source/vlc/vlcwindow.hxx
index b1950de41720..70f4c81b045a 100644
--- a/avmedia/source/vlc/vlcwindow.hxx
+++ b/avmedia/source/vlc/vlcwindow.hxx
@@ -37,36 +37,36 @@ public:
VLCWindow( VLCPlayer& player, const intptr_t prevWinID );
virtual ~VLCWindow();
- void SAL_CALL update() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- sal_Bool SAL_CALL setZoomLevel( css::media::ZoomLevel ZoomLevel ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- css::media::ZoomLevel SAL_CALL getZoomLevel() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- void SAL_CALL setPointerType( ::sal_Int32 SystemPointerType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ void SAL_CALL update() throw (css::uno::RuntimeException, std::exception) override;
+ sal_Bool SAL_CALL setZoomLevel( css::media::ZoomLevel ZoomLevel ) throw (css::uno::RuntimeException, std::exception) override;
+ css::media::ZoomLevel SAL_CALL getZoomLevel() throw (css::uno::RuntimeException, std::exception) override;
+ void SAL_CALL setPointerType( ::sal_Int32 SystemPointerType ) throw (css::uno::RuntimeException, std::exception) override;
- ::rtl::OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- sal_Bool SAL_CALL supportsService( const ::rtl::OUString& serviceName ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ ::rtl::OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override;
+ sal_Bool SAL_CALL supportsService( const ::rtl::OUString& serviceName ) throw (css::uno::RuntimeException, std::exception) override;
+ css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override;
- void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override;
+ void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+ void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
- void SAL_CALL setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- css::awt::Rectangle SAL_CALL getPosSize() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- void SAL_CALL setVisible( sal_Bool Visible ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- void SAL_CALL setEnable( sal_Bool Enable ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- void SAL_CALL setFocus() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- void SAL_CALL addWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- void SAL_CALL removeWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- void SAL_CALL addFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- void SAL_CALL removeFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- void SAL_CALL addKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- void SAL_CALL removeKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- void SAL_CALL addMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- void SAL_CALL removeMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- void SAL_CALL addMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- void SAL_CALL removeMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- void SAL_CALL addPaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- void SAL_CALL removePaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ void SAL_CALL setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) throw (css::uno::RuntimeException, std::exception) override;
+ css::awt::Rectangle SAL_CALL getPosSize() throw (css::uno::RuntimeException, std::exception) override;
+ void SAL_CALL setVisible( sal_Bool Visible ) throw (css::uno::RuntimeException, std::exception) override;
+ void SAL_CALL setEnable( sal_Bool Enable ) throw (css::uno::RuntimeException, std::exception) override;
+ void SAL_CALL setFocus() throw (css::uno::RuntimeException, std::exception) override;
+ void SAL_CALL addWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+ void SAL_CALL removeWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+ void SAL_CALL addFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+ void SAL_CALL removeFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+ void SAL_CALL addKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+ void SAL_CALL removeKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+ void SAL_CALL addMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+ void SAL_CALL removeMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+ void SAL_CALL addMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+ void SAL_CALL removeMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+ void SAL_CALL addPaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+ void SAL_CALL removePaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
};
}
diff --git a/avmedia/source/vlc/wrapper/EventHandler.hxx b/avmedia/source/vlc/wrapper/EventHandler.hxx
index 536d80b2b90b..0fd003351755 100644
--- a/avmedia/source/vlc/wrapper/EventHandler.hxx
+++ b/avmedia/source/vlc/wrapper/EventHandler.hxx
@@ -28,7 +28,7 @@ namespace wrapper
void stop();
protected:
- virtual void SAL_CALL run() SAL_OVERRIDE;
+ virtual void SAL_CALL run() override;
public:
typedef std::function< void() > TCallback;