diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-04-01 19:18:35 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-04-01 19:22:54 +0200 |
| commit | 362d4f0cd4e50111edfae9d30c90602c37ed65a2 (patch) | |
| tree | 0b432c049d580dcac6130bca9fb028bab8af8fa8 /include/avmedia | |
| parent | svx: fix SID_OFFER_IMPORT and SID_ATTR_CHAR_GRABBAG having the same SID (diff) | |
| download | core-362d4f0cd4e50111edfae9d30c90602c37ed65a2.tar.gz core-362d4f0cd4e50111edfae9d30c90602c37ed65a2.zip | |
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 'include/avmedia')
| -rw-r--r-- | include/avmedia/mediaplayer.hxx | 4 | ||||
| -rw-r--r-- | include/avmedia/mediatoolbox.hxx | 2 |
2 files changed, 3 insertions, 3 deletions
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; |