From 362d4f0cd4e50111edfae9d30c90602c37ed65a2 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Tue, 1 Apr 2014 19:18:35 +0200
Subject: 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
---
 include/avmedia/mediaplayer.hxx  | 4 ++--
 include/avmedia/mediatoolbox.hxx | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'include/avmedia')

diff --git a/include/avmedia/mediaplayer.hxx b/include/avmedia/mediaplayer.hxx
index d1b5cb45cd01..e7c16c8c67d9 100644
--- a/include/avmedia/mediaplayer.hxx
+++ b/include/avmedia/mediaplayer.hxx
@@ -32,7 +32,7 @@ class AVMEDIA_DLLPUBLIC MediaPlayer : public SfxChildWindow
 {
 public:
                         MediaPlayer( Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo* );
-                        ~MediaPlayer();
+                        virtual ~MediaPlayer();
 
                         SFX_DECL_CHILDWINDOW_WITHID( MediaPlayer );
 };
@@ -44,7 +44,7 @@ class AVMEDIA_DLLPUBLIC MediaFloater : public SfxDockingWindow
 public:
 
                             MediaFloater( SfxBindings* pBindings, SfxChildWindow* pCW, Window* pParent );
-                            ~MediaFloater();
+                            virtual ~MediaFloater();
 
     void                    setURL( const OUString& rURL, const OUString& rReferer, bool bPlayImmediately );
 
diff --git a/include/avmedia/mediatoolbox.hxx b/include/avmedia/mediatoolbox.hxx
index bcf040071d22..3e4d636ca7d0 100644
--- a/include/avmedia/mediatoolbox.hxx
+++ b/include/avmedia/mediatoolbox.hxx
@@ -42,7 +42,7 @@ public:
                                 SFX_DECL_TOOLBOX_CONTROL();
 
                                 MediaToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbX );
-                                ~MediaToolBoxControl();
+                                virtual ~MediaToolBoxControl();
 
     virtual void                StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) SAL_OVERRIDE;
     virtual Window*             CreateItemWindow( Window* pParent ) SAL_OVERRIDE;
-- 
cgit