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 /xmlhelp | |
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 'xmlhelp')
-rw-r--r-- | xmlhelp/source/cxxhelp/inc/tvfactory.hxx | 2 | ||||
-rw-r--r-- | xmlhelp/source/cxxhelp/inc/tvread.hxx | 6 | ||||
-rw-r--r-- | xmlhelp/source/cxxhelp/provider/content.hxx | 2 | ||||
-rw-r--r-- | xmlhelp/source/cxxhelp/provider/inputstream.hxx | 2 | ||||
-rw-r--r-- | xmlhelp/source/cxxhelp/provider/provider.hxx | 2 | ||||
-rw-r--r-- | xmlhelp/source/cxxhelp/provider/resultset.hxx | 2 | ||||
-rw-r--r-- | xmlhelp/source/cxxhelp/provider/resultsetbase.hxx | 2 | ||||
-rw-r--r-- | xmlhelp/source/cxxhelp/provider/urlparameter.cxx | 2 |
8 files changed, 10 insertions, 10 deletions
diff --git a/xmlhelp/source/cxxhelp/inc/tvfactory.hxx b/xmlhelp/source/cxxhelp/inc/tvfactory.hxx index 41c3992ffcab..695889b4d4a6 100644 --- a/xmlhelp/source/cxxhelp/inc/tvfactory.hxx +++ b/xmlhelp/source/cxxhelp/inc/tvfactory.hxx @@ -41,7 +41,7 @@ class TVFactory: public cppu::WeakImplHelper < TVFactory( const css::uno::Reference< css::uno::XComponentContext >& xContext ); - virtual ~TVFactory(); + virtual ~TVFactory() override; // XServiceInfo virtual OUString SAL_CALL diff --git a/xmlhelp/source/cxxhelp/inc/tvread.hxx b/xmlhelp/source/cxxhelp/inc/tvread.hxx index 2a1b646fef94..628998468904 100644 --- a/xmlhelp/source/cxxhelp/inc/tvread.hxx +++ b/xmlhelp/source/cxxhelp/inc/tvread.hxx @@ -71,7 +71,7 @@ namespace treeview { public: - virtual ~TVBase() { } + virtual ~TVBase() override { } // XNameAccess @@ -168,7 +168,7 @@ namespace treeview { public: TVRead( const ConfigData& configData,TVDom* tvDom = nullptr ); - virtual ~TVRead(); + virtual ~TVRead() override; // XNameAccess @@ -214,7 +214,7 @@ namespace treeview { TVChildTarget( const css::uno::Reference< css::uno::XComponentContext >& xContext ); - virtual ~TVChildTarget(); + virtual ~TVChildTarget() override; virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) diff --git a/xmlhelp/source/cxxhelp/provider/content.hxx b/xmlhelp/source/cxxhelp/provider/content.hxx index c5e1ea947c9a..4120a9b31d86 100644 --- a/xmlhelp/source/cxxhelp/provider/content.hxx +++ b/xmlhelp/source/cxxhelp/provider/content.hxx @@ -48,7 +48,7 @@ namespace chelp const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier, Databases* pDatabases ); - virtual ~Content(); + virtual ~Content() override; // XInterface virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) diff --git a/xmlhelp/source/cxxhelp/provider/inputstream.hxx b/xmlhelp/source/cxxhelp/provider/inputstream.hxx index 5d2c42345dc0..d3d99e9dbc3d 100644 --- a/xmlhelp/source/cxxhelp/provider/inputstream.hxx +++ b/xmlhelp/source/cxxhelp/provider/inputstream.hxx @@ -40,7 +40,7 @@ namespace chelp { public: explicit XInputStream_impl( const OUString& aUncPath ); - virtual ~XInputStream_impl(); + virtual ~XInputStream_impl() override; /** * Returns an error code as given by filerror.hxx diff --git a/xmlhelp/source/cxxhelp/provider/provider.hxx b/xmlhelp/source/cxxhelp/provider/provider.hxx index 370bf3beeac3..3b62b6909c4a 100644 --- a/xmlhelp/source/cxxhelp/provider/provider.hxx +++ b/xmlhelp/source/cxxhelp/provider/provider.hxx @@ -54,7 +54,7 @@ namespace chelp { 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/xmlhelp/source/cxxhelp/provider/resultset.hxx b/xmlhelp/source/cxxhelp/provider/resultset.hxx index 00173669d187..f8836985d4bd 100644 --- a/xmlhelp/source/cxxhelp/provider/resultset.hxx +++ b/xmlhelp/source/cxxhelp/provider/resultset.hxx @@ -43,7 +43,7 @@ namespace chelp { const css::ucb::OpenCommandArgument2& rCommand, ResultSetFactory* pFactory ); - virtual ~DynamicResultSet(); + virtual ~DynamicResultSet() override; }; } diff --git a/xmlhelp/source/cxxhelp/provider/resultsetbase.hxx b/xmlhelp/source/cxxhelp/provider/resultsetbase.hxx index 4d6d36e04d66..250cdbb5d741 100644 --- a/xmlhelp/source/cxxhelp/provider/resultsetbase.hxx +++ b/xmlhelp/source/cxxhelp/provider/resultsetbase.hxx @@ -54,7 +54,7 @@ namespace chelp { const css::uno::Reference< css::ucb::XContentProvider >& xProvider, const css::uno::Sequence< css::beans::Property >& seq ); - virtual ~ResultSetBase(); + virtual ~ResultSetBase() override; // XInterface virtual css::uno::Any SAL_CALL diff --git a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx index 7792e65e4dcb..b135331750b2 100644 --- a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx +++ b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx @@ -322,7 +322,7 @@ public: Databases* pDatatabases, bool isRoot = false ); - virtual ~InputStreamTransformer(); + virtual ~InputStreamTransformer() override; virtual Any SAL_CALL queryInterface( const Type& rType ) throw( RuntimeException, std::exception ) override; virtual void SAL_CALL acquire() throw() override; |