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/source/components | |
| 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/source/components')
| -rw-r--r-- | vcl/source/components/dtranscomp.cxx | 8 | ||||
| -rw-r--r-- | vcl/source/components/fontident.cxx | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/vcl/source/components/dtranscomp.cxx b/vcl/source/components/dtranscomp.cxx index 610868196601..c58835b32b2b 100644 --- a/vcl/source/components/dtranscomp.cxx +++ b/vcl/source/components/dtranscomp.cxx @@ -68,7 +68,7 @@ public: XServiceInfo >( m_aMutex ) {} - virtual ~GenericClipboard(); + virtual ~GenericClipboard() override; /* * XServiceInfo @@ -209,7 +209,7 @@ class ClipboardFactory : public ::cppu::WeakComponentImplHelper< osl::Mutex m_aMutex; public: ClipboardFactory(); - virtual ~ClipboardFactory(); + virtual ~ClipboardFactory() override; /* * XSingleServiceFactory @@ -273,7 +273,7 @@ class GenericDragSource : public cppu::WeakComponentImplHelper< osl::Mutex m_aMutex; public: GenericDragSource() : WeakComponentImplHelper( m_aMutex ) {} - virtual ~GenericDragSource(); + virtual ~GenericDragSource() override; // XDragSource virtual sal_Bool SAL_CALL isDragImageSupported() throw(std::exception) override; @@ -389,7 +389,7 @@ class GenericDropTarget : public cppu::WeakComponentImplHelper< public: GenericDropTarget() : WeakComponentImplHelper( m_aMutex ) {} - virtual ~GenericDropTarget(); + virtual ~GenericDropTarget() override; // XInitialization virtual void SAL_CALL initialize( const Sequence< Any >& args ) throw ( Exception, std::exception ) override; diff --git a/vcl/source/components/fontident.cxx b/vcl/source/components/fontident.cxx index 3315e1b937db..11d441830855 100644 --- a/vcl/source/components/fontident.cxx +++ b/vcl/source/components/fontident.cxx @@ -50,7 +50,7 @@ class FontIdentificator : public ::cppu::WeakAggImplHelper3< XMaterialHolder, XI Font m_aFont; public: FontIdentificator() {} - virtual ~FontIdentificator(); + virtual ~FontIdentificator() override; // XServiceInfo virtual OUString SAL_CALL getImplementationName( ) throw (RuntimeException, std::exception) override; |