summaryrefslogtreecommitdiff
path: root/avmedia
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-04-01 19:18:35 +0200
committerStephan Bergmann <sbergman@redhat.com>2014-04-01 19:22:54 +0200
commit362d4f0cd4e50111edfae9d30c90602c37ed65a2 (patch)
tree0b432c049d580dcac6130bca9fb028bab8af8fa8 /avmedia
parentb66d87086804460c1986df1b832fd6b2ea075a90 (diff)
Explicitly mark overriding destructors as "virtual"
It appears that the C++ standard allows overriding destructors to be marked "override," but at least some MSVC versions complain about it, so at least make sure such destructors are explicitly marked "virtual." Change-Id: I0e1cafa7584fd16ebdce61f569eae2373a71b0a1
Diffstat (limited to 'avmedia')
-rw-r--r--avmedia/source/framework/mediatoolbox.cxx2
-rw-r--r--avmedia/source/gstreamer/gstmanager.hxx2
-rw-r--r--avmedia/source/gstreamer/gstplayer.hxx2
-rw-r--r--avmedia/source/gstreamer/gstwindow.hxx2
-rw-r--r--avmedia/source/viewer/mediaevent_impl.hxx2
-rw-r--r--avmedia/source/viewer/mediawindow_impl.hxx4
-rw-r--r--avmedia/source/vlc/vlcmanager.hxx2
7 files changed, 8 insertions, 8 deletions
diff --git a/avmedia/source/framework/mediatoolbox.cxx b/avmedia/source/framework/mediatoolbox.cxx
index 3be0b0a08359..40c270e14317 100644
--- a/avmedia/source/framework/mediatoolbox.cxx
+++ b/avmedia/source/framework/mediatoolbox.cxx
@@ -40,7 +40,7 @@ class MediaToolBoxControl_Impl : public MediaControl
public:
MediaToolBoxControl_Impl( Window& rParent, MediaToolBoxControl& rControl );
- ~MediaToolBoxControl_Impl();
+ virtual ~MediaToolBoxControl_Impl();
void update() SAL_OVERRIDE;
void execute( const MediaItem& rItem ) SAL_OVERRIDE;
diff --git a/avmedia/source/gstreamer/gstmanager.hxx b/avmedia/source/gstreamer/gstmanager.hxx
index e031c19cb54c..e0283d196488 100644
--- a/avmedia/source/gstreamer/gstmanager.hxx
+++ b/avmedia/source/gstreamer/gstmanager.hxx
@@ -36,7 +36,7 @@ class Manager : public ::cppu::WeakImplHelper2 < ::com::sun::star::media::XManag
public:
Manager( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxMgr );
- ~Manager();
+ virtual ~Manager();
// XManager
virtual ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer > SAL_CALL createPlayer( const OUString& aURL ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
diff --git a/avmedia/source/gstreamer/gstplayer.hxx b/avmedia/source/gstreamer/gstplayer.hxx
index d50e51e62960..32e68db030e3 100644
--- a/avmedia/source/gstreamer/gstplayer.hxx
+++ b/avmedia/source/gstreamer/gstplayer.hxx
@@ -44,7 +44,7 @@ class Player : public ::cppu::BaseMutex,
public:
Player( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxMgr );
- ~Player();
+ virtual ~Player();
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 d7d14983df1c..df45af121a23 100644
--- a/avmedia/source/gstreamer/gstwindow.hxx
+++ b/avmedia/source/gstreamer/gstwindow.hxx
@@ -40,7 +40,7 @@ public:
Window( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxMgr,
Player& rPlayer );
- ~Window();
+ virtual ~Window();
bool create( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments );
void processGraphEvent();
diff --git a/avmedia/source/viewer/mediaevent_impl.hxx b/avmedia/source/viewer/mediaevent_impl.hxx
index ccefd23c4b24..6817df65df34 100644
--- a/avmedia/source/viewer/mediaevent_impl.hxx
+++ b/avmedia/source/viewer/mediaevent_impl.hxx
@@ -42,7 +42,7 @@ namespace avmedia
public:
MediaEventListenersImpl( Window& rNotifyWindow );
- ~MediaEventListenersImpl();
+ virtual ~MediaEventListenersImpl();
void cleanUp();
diff --git a/avmedia/source/viewer/mediawindow_impl.hxx b/avmedia/source/viewer/mediawindow_impl.hxx
index 80abf9574ea6..fd8bab7aa653 100644
--- a/avmedia/source/viewer/mediawindow_impl.hxx
+++ b/avmedia/source/viewer/mediawindow_impl.hxx
@@ -46,7 +46,7 @@ namespace avmedia
public:
MediaWindowControl( Window* pParent );
- ~MediaWindowControl();
+ virtual ~MediaWindowControl();
protected:
@@ -63,7 +63,7 @@ namespace avmedia
public:
MediaChildWindow( Window* pParent );
- ~MediaChildWindow();
+ virtual ~MediaChildWindow();
protected:
diff --git a/avmedia/source/vlc/vlcmanager.hxx b/avmedia/source/vlc/vlcmanager.hxx
index 928d2d311fb1..948464f8c871 100644
--- a/avmedia/source/vlc/vlcmanager.hxx
+++ b/avmedia/source/vlc/vlcmanager.hxx
@@ -34,7 +34,7 @@ class Manager : public ::cppu::WeakImplHelper2 < ::com::sun::star::media::XManag
wrapper::EventHandler mEventHandler;
public:
Manager( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxMgr );
- ~Manager();
+ virtual ~Manager();
::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer > SAL_CALL createPlayer( const rtl::OUString& aURL ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;