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/hierarchy | |
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/hierarchy')
5 files changed, 5 insertions, 5 deletions
diff --git a/ucb/source/ucp/hierarchy/hierarchycontent.hxx b/ucb/source/ucp/hierarchy/hierarchycontent.hxx index 19d813fdb9a0..f1570e82736f 100644 --- a/ucb/source/ucp/hierarchy/hierarchycontent.hxx +++ b/ucb/source/ucp/hierarchy/hierarchycontent.hxx @@ -196,7 +196,7 @@ public: const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier, const css::ucb::ContentInfo& Info ); - virtual ~HierarchyContent(); + virtual ~HierarchyContent() override; // XInterface virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) diff --git a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx index c662e650f793..87d1353ac7dc 100644 --- a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx +++ b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx @@ -89,7 +89,7 @@ public: HierarchyDataAccess( const uno::Reference< uno::XInterface > & xConfigAccess, bool bReadOnly ); - virtual ~HierarchyDataAccess(); + virtual ~HierarchyDataAccess() override; // XInterface virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) diff --git a/ucb/source/ucp/hierarchy/hierarchydatasource.hxx b/ucb/source/ucp/hierarchy/hierarchydatasource.hxx index 2889bef40f87..1ea2a3cdf068 100644 --- a/ucb/source/ucp/hierarchy/hierarchydatasource.hxx +++ b/ucb/source/ucp/hierarchy/hierarchydatasource.hxx @@ -47,7 +47,7 @@ class HierarchyDataSource : public cppu::OWeakObject, public: explicit HierarchyDataSource( const css::uno::Reference< css::uno::XComponentContext > & rxContext ); - virtual ~HierarchyDataSource(); + virtual ~HierarchyDataSource() override; // XInterface virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) diff --git a/ucb/source/ucp/hierarchy/hierarchydatasupplier.hxx b/ucb/source/ucp/hierarchy/hierarchydatasupplier.hxx index f04b716ecc98..d3f36c8abd51 100644 --- a/ucb/source/ucp/hierarchy/hierarchydatasupplier.hxx +++ b/ucb/source/ucp/hierarchy/hierarchydatasupplier.hxx @@ -44,7 +44,7 @@ public: const css::uno::Reference< css::uno::XComponentContext >& rxContext, const rtl::Reference< HierarchyContent >& rContent, sal_Int32 nOpenMode = css::ucb::OpenMode::ALL ); - virtual ~HierarchyResultSetDataSupplier(); + virtual ~HierarchyResultSetDataSupplier() override; virtual OUString queryContentIdentifierString( sal_uInt32 nIndex ) override; virtual css::uno::Reference< css::ucb::XContentIdentifier > diff --git a/ucb/source/ucp/hierarchy/hierarchyprovider.hxx b/ucb/source/ucp/hierarchy/hierarchyprovider.hxx index d8c3ac184362..8eb74d17519a 100644 --- a/ucb/source/ucp/hierarchy/hierarchyprovider.hxx +++ b/ucb/source/ucp/hierarchy/hierarchyprovider.hxx @@ -71,7 +71,7 @@ class HierarchyContentProvider : public ::ucbhelper::ContentProviderImplHelper, public: explicit HierarchyContentProvider( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); - virtual ~HierarchyContentProvider(); + virtual ~HierarchyContentProvider() override; // XInterface virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) |