diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-09-13 13:09:01 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-09-13 13:19:22 +0200 |
| commit | 91dd2db17bd6cb9b357d1d69b187174e31eabef0 (patch) | |
| tree | d634de3a1a6820904b5699c2136b79b1a5a807c7 /include/avmedia | |
| parent | 6f8ea7e89ea190b9462c945d55a3ad8777b2f3ef (diff) | |
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
Diffstat (limited to 'include/avmedia')
| -rw-r--r-- | include/avmedia/mediaitem.hxx | 2 | ||||
| -rw-r--r-- | include/avmedia/mediaplayer.hxx | 4 | ||||
| -rw-r--r-- | include/avmedia/mediatoolbox.hxx | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/include/avmedia/mediaitem.hxx b/include/avmedia/mediaitem.hxx index 1144885aa870..4819d62c9d87 100644 --- a/include/avmedia/mediaitem.hxx +++ b/include/avmedia/mediaitem.hxx @@ -68,7 +68,7 @@ public: explicit MediaItem( sal_uInt16 i_nWhich = 0, AVMediaSetMask nMaskSet = AVMediaSetMask::NONE ); MediaItem( const MediaItem& rMediaItem ); - virtual ~MediaItem(); + virtual ~MediaItem() override; virtual bool operator==( const SfxPoolItem& ) const override; virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; diff --git a/include/avmedia/mediaplayer.hxx b/include/avmedia/mediaplayer.hxx index 878954325d8c..ac45b92d42ed 100644 --- a/include/avmedia/mediaplayer.hxx +++ b/include/avmedia/mediaplayer.hxx @@ -32,7 +32,7 @@ class AVMEDIA_DLLPUBLIC MediaPlayer : public SfxChildWindow { public: MediaPlayer( vcl::Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo* ); - virtual ~MediaPlayer(); + virtual ~MediaPlayer() override; SFX_DECL_CHILDWINDOW_WITHID( MediaPlayer ); }; @@ -44,7 +44,7 @@ class AVMEDIA_DLLPUBLIC MediaFloater : public SfxDockingWindow public: MediaFloater( SfxBindings* pBindings, SfxChildWindow* pCW, vcl::Window* pParent ); - virtual ~MediaFloater(); + virtual ~MediaFloater() override; virtual void dispose() override; void setURL( const OUString& rURL, const OUString& rReferer, bool bPlayImmediately ); diff --git a/include/avmedia/mediatoolbox.hxx b/include/avmedia/mediatoolbox.hxx index 89e6083cf986..887db1a0b697 100644 --- a/include/avmedia/mediatoolbox.hxx +++ b/include/avmedia/mediatoolbox.hxx @@ -38,7 +38,7 @@ public: SFX_DECL_TOOLBOX_CONTROL(); MediaToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbX ); - virtual ~MediaToolBoxControl(); + virtual ~MediaToolBoxControl() override; virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) override; virtual VclPtr<vcl::Window> CreateItemWindow( vcl::Window* pParent ) override; |