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 /sw/source/core/docnode | |
| 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 'sw/source/core/docnode')
| -rw-r--r-- | sw/source/core/docnode/cancellablejob.hxx | 2 | ||||
| -rw-r--r-- | sw/source/core/docnode/finalthreadmanager.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sw/source/core/docnode/cancellablejob.hxx b/sw/source/core/docnode/cancellablejob.hxx index dabde55257e3..518e31e4a7b2 100644 --- a/sw/source/core/docnode/cancellablejob.hxx +++ b/sw/source/core/docnode/cancellablejob.hxx @@ -32,7 +32,7 @@ class CancellableJob : public ::cppu::WeakImplHelper<css::util::XCancellable> { public: explicit CancellableJob( const ::rtl::Reference< ObservableThread >& rThread ); - virtual ~CancellableJob() {} + virtual ~CancellableJob() override {} // css::util::XCancellable: virtual void SAL_CALL cancel() throw (css::uno::RuntimeException, std::exception) override; diff --git a/sw/source/core/docnode/finalthreadmanager.cxx b/sw/source/core/docnode/finalthreadmanager.cxx index 6a8363688472..1cbeffce6859 100644 --- a/sw/source/core/docnode/finalthreadmanager.cxx +++ b/sw/source/core/docnode/finalthreadmanager.cxx @@ -45,7 +45,7 @@ class CancelJobsThread : public osl::Thread { } - virtual ~CancelJobsThread() {} + virtual ~CancelJobsThread() override {} void addJobs( std::list< css::uno::Reference< css::util::XCancellable > >& rJobs ); bool allJobsCancelled() const; @@ -160,7 +160,7 @@ class TerminateOfficeThread : public osl::Thread { } - virtual ~TerminateOfficeThread() {} + virtual ~TerminateOfficeThread() override {} void StopOfficeTermination(); private: |