From 91dd2db17bd6cb9b357d1d69b187174e31eabef0 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Tue, 13 Sep 2016 13:09:01 +0200 Subject: loplugin:override: No more need for the "MSVC dtor override" workaround The issue of 362d4f0cd4e50111edfae9d30c90602c37ed65a2 "Explicitly mark overriding destructors as 'virtual'" appears to no longer be a problem with MSVC 2013. (The little change in the rewriting code of compilerplugins/clang/override.cxx was necessary to prevent an endless loop when adding "override" to OOO_DLLPUBLIC_CHARTTOOLS virtual ~CloseableLifeTimeManager(); in chart2/source/inc/LifeTime.hxx, getting stuck in the leading OOO_DLLPUBLIC_CHARTTOOLS macro. Can't remember what that isAtEndOfImmediateMacroExpansion thing was originally necessary for, anyway.) Change-Id: I534c634504d7216b9bb632c2775c04eaf27e927e --- avmedia/inc/mediacontrol.hxx | 2 +- avmedia/source/framework/soundhandler.hxx | 2 +- avmedia/source/gstreamer/gstframegrabber.hxx | 2 +- avmedia/source/gstreamer/gstmanager.hxx | 2 +- avmedia/source/gstreamer/gstplayer.hxx | 2 +- avmedia/source/gstreamer/gstwindow.hxx | 2 +- avmedia/source/opengl/oglframegrabber.hxx | 2 +- avmedia/source/opengl/oglmanager.hxx | 2 +- avmedia/source/opengl/oglplayer.hxx | 2 +- avmedia/source/opengl/oglwindow.hxx | 2 +- avmedia/source/viewer/mediaevent_impl.hxx | 2 +- avmedia/source/viewer/mediawindow_impl.hxx | 2 +- avmedia/source/vlc/vlcmanager.hxx | 2 +- avmedia/source/vlc/vlcwindow.hxx | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) (limited to 'avmedia') diff --git a/avmedia/inc/mediacontrol.hxx b/avmedia/inc/mediacontrol.hxx index 851af3622f73..de0cde0c32b4 100644 --- a/avmedia/inc/mediacontrol.hxx +++ b/avmedia/inc/mediacontrol.hxx @@ -45,7 +45,7 @@ class MediaControl : public Control, public MediaControlBase public: MediaControl( vcl::Window* pParent, MediaControlStyle eControlStyle ); - virtual ~MediaControl(); + virtual ~MediaControl() override; virtual void dispose() override; const Size& getMinSizePixel() const; diff --git a/avmedia/source/framework/soundhandler.hxx b/avmedia/source/framework/soundhandler.hxx index 19bbe97cad59..b9f041445c22 100644 --- a/avmedia/source/framework/soundhandler.hxx +++ b/avmedia/source/framework/soundhandler.hxx @@ -74,7 +74,7 @@ class SoundHandler : // interfaces // constructor / destructor SoundHandler(); - virtual ~SoundHandler( ); + virtual ~SoundHandler( ) override; // XInterface, XTypeProvider, XServiceInfo virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw( css::uno::RuntimeException, std::exception ) override; diff --git a/avmedia/source/gstreamer/gstframegrabber.hxx b/avmedia/source/gstreamer/gstframegrabber.hxx index 0d2f89dd8069..51c9d6b39619 100644 --- a/avmedia/source/gstreamer/gstframegrabber.hxx +++ b/avmedia/source/gstreamer/gstframegrabber.hxx @@ -42,7 +42,7 @@ public: // static create method instead of public Ctor static FrameGrabber* create( const OUString &rURL ); - virtual ~FrameGrabber(); + virtual ~FrameGrabber() override; // XFrameGrabber virtual css::uno::Reference< css::graphic::XGraphic > SAL_CALL grabFrame( double fMediaTime ) throw (css::uno::RuntimeException, std::exception) override; diff --git a/avmedia/source/gstreamer/gstmanager.hxx b/avmedia/source/gstreamer/gstmanager.hxx index 48a07f645f90..d415559f41b5 100644 --- a/avmedia/source/gstreamer/gstmanager.hxx +++ b/avmedia/source/gstreamer/gstmanager.hxx @@ -32,7 +32,7 @@ class Manager : public ::cppu::WeakImplHelper< css::media::XManager, public: explicit Manager(); - virtual ~Manager(); + virtual ~Manager() override; // XManager virtual css::uno::Reference< css::media::XPlayer > SAL_CALL createPlayer( const OUString& aURL ) throw (css::uno::RuntimeException, std::exception) override; diff --git a/avmedia/source/gstreamer/gstplayer.hxx b/avmedia/source/gstreamer/gstplayer.hxx index 4bf2f8edfef0..3a61eba88625 100644 --- a/avmedia/source/gstreamer/gstplayer.hxx +++ b/avmedia/source/gstreamer/gstplayer.hxx @@ -45,7 +45,7 @@ class Player : public ::cppu::BaseMutex, public: explicit Player(); - virtual ~Player(); + virtual ~Player() override; void preparePlaybin( const OUString& rURL, GstElement *pSink ); bool create( const OUString& rURL ); diff --git a/avmedia/source/gstreamer/gstwindow.hxx b/avmedia/source/gstreamer/gstwindow.hxx index 9246a4497165..da090a8df1f0 100644 --- a/avmedia/source/gstreamer/gstwindow.hxx +++ b/avmedia/source/gstreamer/gstwindow.hxx @@ -36,7 +36,7 @@ class Window : public ::cppu::WeakImplHelper< css::media::XPlayerWindow, public: explicit Window(); - virtual ~Window(); + virtual ~Window() override; // XPlayerWindow virtual void SAL_CALL update( ) throw (css::uno::RuntimeException, std::exception) override; diff --git a/avmedia/source/opengl/oglframegrabber.hxx b/avmedia/source/opengl/oglframegrabber.hxx index 664e1ad16065..1c3799f616de 100644 --- a/avmedia/source/opengl/oglframegrabber.hxx +++ b/avmedia/source/opengl/oglframegrabber.hxx @@ -26,7 +26,7 @@ class OGLFrameGrabber : public FrameGrabber_BASE public: explicit OGLFrameGrabber( libgltf::glTFHandle& rHandle ); - virtual ~OGLFrameGrabber(); + virtual ~OGLFrameGrabber() override; // XFrameGrabber virtual css::uno::Reference< css::graphic::XGraphic > SAL_CALL grabFrame( double fMediaTime ) throw (css::uno::RuntimeException, std::exception) override; diff --git a/avmedia/source/opengl/oglmanager.hxx b/avmedia/source/opengl/oglmanager.hxx index 2f7fb05b68d2..d6f147304e12 100644 --- a/avmedia/source/opengl/oglmanager.hxx +++ b/avmedia/source/opengl/oglmanager.hxx @@ -22,7 +22,7 @@ class OGLManager : public ::cppu::WeakImplHelper< css::media::XManager, css::lan public: explicit OGLManager(); - virtual ~OGLManager(); + virtual ~OGLManager() override; // XManager virtual css::uno::Reference< css::media::XPlayer > SAL_CALL createPlayer( const OUString& rURL ) throw (css::uno::RuntimeException, std::exception) override; diff --git a/avmedia/source/opengl/oglplayer.hxx b/avmedia/source/opengl/oglplayer.hxx index 0e82d87aef9f..8a43fc7e28c3 100644 --- a/avmedia/source/opengl/oglplayer.hxx +++ b/avmedia/source/opengl/oglplayer.hxx @@ -34,7 +34,7 @@ class OGLPlayer : public cppu::BaseMutex, public: OGLPlayer(); - virtual ~OGLPlayer(); + virtual ~OGLPlayer() override; bool create( const OUString& rURL ); void releaseInputFiles(); diff --git a/avmedia/source/opengl/oglwindow.hxx b/avmedia/source/opengl/oglwindow.hxx index f93903776534..c6bd9cd857b1 100644 --- a/avmedia/source/opengl/oglwindow.hxx +++ b/avmedia/source/opengl/oglwindow.hxx @@ -28,7 +28,7 @@ class OGLWindow : public ::cppu::WeakImplHelper< css::media::XPlayerWindow, css: { public: OGLWindow( libgltf::glTFHandle& rHandle, const rtl::Reference & rContext, vcl::Window& rEventHandlerParent ); - virtual ~OGLWindow(); + virtual ~OGLWindow() override; virtual void SAL_CALL update() throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL setZoomLevel( css::media::ZoomLevel ZoomLevel ) throw (css::uno::RuntimeException, std::exception) override; diff --git a/avmedia/source/viewer/mediaevent_impl.hxx b/avmedia/source/viewer/mediaevent_impl.hxx index 468176c1fdfc..e73e2968882c 100644 --- a/avmedia/source/viewer/mediaevent_impl.hxx +++ b/avmedia/source/viewer/mediaevent_impl.hxx @@ -43,7 +43,7 @@ namespace avmedia public: explicit MediaEventListenersImpl( vcl::Window& rNotifyWindow ); - virtual ~MediaEventListenersImpl(); + virtual ~MediaEventListenersImpl() override; void cleanUp(); diff --git a/avmedia/source/viewer/mediawindow_impl.hxx b/avmedia/source/viewer/mediawindow_impl.hxx index 43fba4e17e4c..543807123d33 100644 --- a/avmedia/source/viewer/mediawindow_impl.hxx +++ b/avmedia/source/viewer/mediawindow_impl.hxx @@ -79,7 +79,7 @@ class MediaWindowImpl : public Control, public DropTargetHelper, public DragSour { public: MediaWindowImpl(vcl::Window* parent, MediaWindow* pMediaWindow, bool bInternalMediaControl); - virtual ~MediaWindowImpl(); + virtual ~MediaWindowImpl() override; virtual void dispose() override; diff --git a/avmedia/source/vlc/vlcmanager.hxx b/avmedia/source/vlc/vlcmanager.hxx index a9d087d3cd7b..cbc6f5ed1cac 100644 --- a/avmedia/source/vlc/vlcmanager.hxx +++ b/avmedia/source/vlc/vlcmanager.hxx @@ -35,7 +35,7 @@ class Manager : public ::cppu::WeakImplHelper< css::media::XManager, wrapper::EventHandler mEventHandler; public: explicit Manager( const css::uno::Reference< css::lang::XMultiServiceFactory >& rxMgr ); - virtual ~Manager(); + virtual ~Manager() override; css::uno::Reference< css::media::XPlayer > SAL_CALL createPlayer( const rtl::OUString& aURL ) throw (css::uno::RuntimeException, std::exception) override; diff --git a/avmedia/source/vlc/vlcwindow.hxx b/avmedia/source/vlc/vlcwindow.hxx index 70f4c81b045a..2fc3991874e9 100644 --- a/avmedia/source/vlc/vlcwindow.hxx +++ b/avmedia/source/vlc/vlcwindow.hxx @@ -35,7 +35,7 @@ class VLCWindow : public ::cppu::WeakImplHelper< css::media::XPlayerWindow, css::awt::Rectangle mSize; public: VLCWindow( VLCPlayer& player, const intptr_t prevWinID ); - virtual ~VLCWindow(); + virtual ~VLCWindow() 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; -- cgit v1.2.3