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/cmis | |
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/cmis')
-rw-r--r-- | ucb/source/ucp/cmis/cmis_content.hxx | 2 | ||||
-rw-r--r-- | ucb/source/ucp/cmis/cmis_datasupplier.hxx | 2 | ||||
-rw-r--r-- | ucb/source/ucp/cmis/cmis_provider.hxx | 2 | ||||
-rw-r--r-- | ucb/source/ucp/cmis/cmis_repo_content.hxx | 2 | ||||
-rw-r--r-- | ucb/source/ucp/cmis/std_inputstream.hxx | 2 | ||||
-rw-r--r-- | ucb/source/ucp/cmis/std_outputstream.hxx | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/ucb/source/ucp/cmis/cmis_content.hxx b/ucb/source/ucp/cmis/cmis_content.hxx index 0396c7b2615a..429ec21ef0e6 100644 --- a/ucb/source/ucp/cmis/cmis_content.hxx +++ b/ucb/source/ucp/cmis/cmis_content.hxx @@ -137,7 +137,7 @@ public: bool bIsFolder) throw ( css::ucb::ContentCreationException ); - virtual ~Content(); + virtual ~Content() override; virtual css::uno::Sequence< css::beans::Property > getProperties( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) override; diff --git a/ucb/source/ucp/cmis/cmis_datasupplier.hxx b/ucb/source/ucp/cmis/cmis_datasupplier.hxx index 3002a887fb95..de4903e4ae3e 100644 --- a/ucb/source/ucp/cmis/cmis_datasupplier.hxx +++ b/ucb/source/ucp/cmis/cmis_datasupplier.hxx @@ -49,7 +49,7 @@ namespace cmis public: DataSupplier( ChildrenProvider* pChildrenProvider, 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/cmis/cmis_provider.hxx b/ucb/source/ucp/cmis/cmis_provider.hxx index bf818a6a7f87..3915c0664e81 100644 --- a/ucb/source/ucp/cmis/cmis_provider.hxx +++ b/ucb/source/ucp/cmis/cmis_provider.hxx @@ -24,7 +24,7 @@ private: 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 ) diff --git a/ucb/source/ucp/cmis/cmis_repo_content.hxx b/ucb/source/ucp/cmis/cmis_repo_content.hxx index 5ddde855e3fb..82200e96b876 100644 --- a/ucb/source/ucp/cmis/cmis_repo_content.hxx +++ b/ucb/source/ucp/cmis/cmis_repo_content.hxx @@ -78,7 +78,7 @@ public: std::vector< libcmis::RepositoryPtr > const & aRepos = std::vector< libcmis::RepositoryPtr > ( ) ) throw ( css::ucb::ContentCreationException ); - virtual ~RepoContent(); + virtual ~RepoContent() override; virtual css::uno::Sequence< css::beans::Property > getProperties( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) override; diff --git a/ucb/source/ucp/cmis/std_inputstream.hxx b/ucb/source/ucp/cmis/std_inputstream.hxx index 664fa0ad9810..ba7338c76375 100644 --- a/ucb/source/ucp/cmis/std_inputstream.hxx +++ b/ucb/source/ucp/cmis/std_inputstream.hxx @@ -34,7 +34,7 @@ namespace cmis StdInputStream( boost::shared_ptr< std::istream > const & pStream ); - virtual ~StdInputStream(); + virtual ~StdInputStream() override; virtual css::uno::Any SAL_CALL queryInterface ( const css::uno::Type& rType ) throw ( css::uno::RuntimeException, std::exception ) override; diff --git a/ucb/source/ucp/cmis/std_outputstream.hxx b/ucb/source/ucp/cmis/std_outputstream.hxx index 84d79ba41cc8..1521bbd211db 100644 --- a/ucb/source/ucp/cmis/std_outputstream.hxx +++ b/ucb/source/ucp/cmis/std_outputstream.hxx @@ -31,7 +31,7 @@ namespace cmis StdOutputStream( boost::shared_ptr< std::ostream > const & pStream ); - virtual ~StdOutputStream( ); + virtual ~StdOutputStream( ) override; virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType ) throw ( css::uno::RuntimeException, std::exception ) override; |