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 /vcl/inc/unx/gtk/gtkinst.hxx | |
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 'vcl/inc/unx/gtk/gtkinst.hxx')
-rw-r--r-- | vcl/inc/unx/gtk/gtkinst.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vcl/inc/unx/gtk/gtkinst.hxx b/vcl/inc/unx/gtk/gtkinst.hxx index cd38d12b6574..490cf698c2da 100644 --- a/vcl/inc/unx/gtk/gtkinst.hxx +++ b/vcl/inc/unx/gtk/gtkinst.hxx @@ -99,7 +99,7 @@ class GtkDropTarget : public cppu::WeakComponentImplHelper<css::datatransfer::dn std::list<css::uno::Reference<css::datatransfer::dnd::XDropTargetListener>> m_aListeners; public: GtkDropTarget(); - virtual ~GtkDropTarget(); + virtual ~GtkDropTarget() override; // XInitialization virtual void SAL_CALL initialize(const css::uno::Sequence<css::uno::Any>& rArgs) @@ -147,7 +147,7 @@ public: { } - virtual ~GtkDragSource(); + virtual ~GtkDragSource() override; // XDragSource virtual sal_Bool SAL_CALL isDragImageSupported() throw(std::exception) override; @@ -198,7 +198,7 @@ class GtkInstance : public X11SalInstance #endif public: GtkInstance( SalYieldMutex* pMutex ); - virtual ~GtkInstance(); + virtual ~GtkInstance() override; void EnsureInit(); virtual void AfterAppInit() override; |