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 /ucb/source/ucp/webdav-neon | |
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 'ucb/source/ucp/webdav-neon')
-rw-r--r-- | ucb/source/ucp/webdav-neon/DAVException.hxx | 2 | ||||
-rw-r--r-- | ucb/source/ucp/webdav-neon/DAVSessionFactory.hxx | 2 | ||||
-rw-r--r-- | ucb/source/ucp/webdav-neon/NeonInputStream.hxx | 2 | ||||
-rw-r--r-- | ucb/source/ucp/webdav-neon/NeonSession.hxx | 2 | ||||
-rw-r--r-- | ucb/source/ucp/webdav-neon/webdavcontent.hxx | 2 | ||||
-rw-r--r-- | ucb/source/ucp/webdav-neon/webdavdatasupplier.hxx | 2 | ||||
-rw-r--r-- | ucb/source/ucp/webdav-neon/webdavprovider.hxx | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/ucb/source/ucp/webdav-neon/DAVException.hxx b/ucb/source/ucp/webdav-neon/DAVException.hxx index 6abf981e0047..45fdedb9559b 100644 --- a/ucb/source/ucp/webdav-neon/DAVException.hxx +++ b/ucb/source/ucp/webdav-neon/DAVException.hxx @@ -155,7 +155,7 @@ class DAVException : public std::exception sal_uInt16 nStatusCode ) : mExceptionCode( inExceptionCode ), mData( rData ), mStatusCode( nStatusCode ) {}; - virtual ~DAVException() throw() {}; + virtual ~DAVException() throw() override {}; const ExceptionCode & getError() const { return mExceptionCode; } const OUString & getData() const { return mData; } diff --git a/ucb/source/ucp/webdav-neon/DAVSessionFactory.hxx b/ucb/source/ucp/webdav-neon/DAVSessionFactory.hxx index 7251826a7331..3292ad480adc 100644 --- a/ucb/source/ucp/webdav-neon/DAVSessionFactory.hxx +++ b/ucb/source/ucp/webdav-neon/DAVSessionFactory.hxx @@ -59,7 +59,7 @@ class DAVSession; class DAVSessionFactory : public salhelper::SimpleReferenceObject { public: - virtual ~DAVSessionFactory(); + virtual ~DAVSessionFactory() override; rtl::Reference< DAVSession > createDAVSession( const OUString & inUri, diff --git a/ucb/source/ucp/webdav-neon/NeonInputStream.hxx b/ucb/source/ucp/webdav-neon/NeonInputStream.hxx index 48a01f2da662..154f0fbe9195 100644 --- a/ucb/source/ucp/webdav-neon/NeonInputStream.hxx +++ b/ucb/source/ucp/webdav-neon/NeonInputStream.hxx @@ -52,7 +52,7 @@ class NeonInputStream : public css::io::XInputStream, public: NeonInputStream(); - virtual ~NeonInputStream(); + virtual ~NeonInputStream() override; // Add some data to the end of the stream void AddToStream( const char * inBuf, sal_Int32 inLen ); diff --git a/ucb/source/ucp/webdav-neon/NeonSession.hxx b/ucb/source/ucp/webdav-neon/NeonSession.hxx index 05556d62f2d0..62652c6b07bf 100644 --- a/ucb/source/ucp/webdav-neon/NeonSession.hxx +++ b/ucb/source/ucp/webdav-neon/NeonSession.hxx @@ -68,7 +68,7 @@ private: static NeonLockStore m_aNeonLockStore; protected: - virtual ~NeonSession(); + virtual ~NeonSession() override; public: NeonSession( const rtl::Reference< DAVSessionFactory > & rSessionFactory, diff --git a/ucb/source/ucp/webdav-neon/webdavcontent.hxx b/ucb/source/ucp/webdav-neon/webdavcontent.hxx index d213440e4778..1adf196cade7 100644 --- a/ucb/source/ucp/webdav-neon/webdavcontent.hxx +++ b/ucb/source/ucp/webdav-neon/webdavcontent.hxx @@ -234,7 +234,7 @@ public: rtl::Reference< DAVSessionFactory > const & rSessionFactory, bool isCollection ) throw (css::ucb::ContentCreationException, css::uno::RuntimeException); - virtual ~Content(); + virtual ~Content() override; // XInterface virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) diff --git a/ucb/source/ucp/webdav-neon/webdavdatasupplier.hxx b/ucb/source/ucp/webdav-neon/webdavdatasupplier.hxx index 057f49c3674c..141a6ee14a12 100644 --- a/ucb/source/ucp/webdav-neon/webdavdatasupplier.hxx +++ b/ucb/source/ucp/webdav-neon/webdavdatasupplier.hxx @@ -52,7 +52,7 @@ public: const rtl::Reference< Content >& rContent, sal_Int32 nOpenMode); - virtual ~DataSupplier(); + virtual ~DataSupplier() override; virtual OUString queryContentIdentifierString( sal_uInt32 nIndex ) override; virtual css::uno::Reference< css::ucb::XContentIdentifier > diff --git a/ucb/source/ucp/webdav-neon/webdavprovider.hxx b/ucb/source/ucp/webdav-neon/webdavprovider.hxx index 60ba57d74c2f..4a7557dfb4c5 100644 --- a/ucb/source/ucp/webdav-neon/webdavprovider.hxx +++ b/ucb/source/ucp/webdav-neon/webdavprovider.hxx @@ -77,7 +77,7 @@ class ContentProvider : public ::ucbhelper::ContentProviderImplHelper public: explicit ContentProvider( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); - virtual ~ContentProvider(); + virtual ~ContentProvider() override; // XInterface virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) |