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 /unoxml/source | |
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 'unoxml/source')
-rw-r--r-- | unoxml/source/dom/document.hxx | 2 | ||||
-rw-r--r-- | unoxml/source/dom/elementlist.cxx | 2 | ||||
-rw-r--r-- | unoxml/source/dom/elementlist.hxx | 2 | ||||
-rw-r--r-- | unoxml/source/events/event.hxx | 2 | ||||
-rw-r--r-- | unoxml/source/events/mutationevent.hxx | 2 | ||||
-rw-r--r-- | unoxml/source/rdf/CBlankNode.cxx | 2 | ||||
-rw-r--r-- | unoxml/source/rdf/CLiteral.cxx | 2 | ||||
-rw-r--r-- | unoxml/source/rdf/CURI.cxx | 2 | ||||
-rw-r--r-- | unoxml/source/rdf/librdf_repository.cxx | 8 |
9 files changed, 12 insertions, 12 deletions
diff --git a/unoxml/source/dom/document.hxx b/unoxml/source/dom/document.hxx index f1a447c78462..fce0514b62a9 100644 --- a/unoxml/source/dom/document.hxx +++ b/unoxml/source/dom/document.hxx @@ -93,7 +93,7 @@ namespace DOM static ::rtl::Reference<CDocument> CreateCDocument(xmlDocPtr const pDoc); - virtual ~CDocument(); + virtual ~CDocument() override; // needed by CXPathAPI ::osl::Mutex & GetMutex() { return m_Mutex; } diff --git a/unoxml/source/dom/elementlist.cxx b/unoxml/source/dom/elementlist.cxx index 8867d38bbf43..3b38cc73ddb6 100644 --- a/unoxml/source/dom/elementlist.cxx +++ b/unoxml/source/dom/elementlist.cxx @@ -44,7 +44,7 @@ namespace { } - virtual ~WeakEventListener() + virtual ~WeakEventListener() override { } diff --git a/unoxml/source/dom/elementlist.hxx b/unoxml/source/dom/elementlist.hxx index a95258373911..d63b22b353c5 100644 --- a/unoxml/source/dom/elementlist.hxx +++ b/unoxml/source/dom/elementlist.hxx @@ -70,7 +70,7 @@ namespace DOM void registerListener(CElement & rElement); - virtual ~CElementListImpl(); + virtual ~CElementListImpl() override; /** The number of nodes in the list. diff --git a/unoxml/source/events/event.hxx b/unoxml/source/events/event.hxx index 929416838dea..e829ae496cfd 100644 --- a/unoxml/source/events/event.hxx +++ b/unoxml/source/events/event.hxx @@ -52,7 +52,7 @@ public: explicit CEvent(); - virtual ~CEvent(); + virtual ~CEvent() override; virtual OUString SAL_CALL getType() throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Reference< css::xml::dom::events::XEventTarget > SAL_CALL getTarget() throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Reference< css::xml::dom::events::XEventTarget > SAL_CALL getCurrentTarget() throw (css::uno::RuntimeException, std::exception) override; diff --git a/unoxml/source/events/mutationevent.hxx b/unoxml/source/events/mutationevent.hxx index 5dc6472d9dff..224d8943adb7 100644 --- a/unoxml/source/events/mutationevent.hxx +++ b/unoxml/source/events/mutationevent.hxx @@ -50,7 +50,7 @@ protected: public: explicit CMutationEvent(); - virtual ~CMutationEvent(); + virtual ~CMutationEvent() override; virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getRelatedNode() throw (css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getPrevValue() throw (css::uno::RuntimeException, std::exception) override; diff --git a/unoxml/source/rdf/CBlankNode.cxx b/unoxml/source/rdf/CBlankNode.cxx index 5db736e11769..47f5af263172 100644 --- a/unoxml/source/rdf/CBlankNode.cxx +++ b/unoxml/source/rdf/CBlankNode.cxx @@ -39,7 +39,7 @@ class CBlankNode: { public: CBlankNode(); - virtual ~CBlankNode() {} + virtual ~CBlankNode() override {} // css::lang::XServiceInfo: virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override; diff --git a/unoxml/source/rdf/CLiteral.cxx b/unoxml/source/rdf/CLiteral.cxx index a46a4a6f5c60..9d488d9e991b 100644 --- a/unoxml/source/rdf/CLiteral.cxx +++ b/unoxml/source/rdf/CLiteral.cxx @@ -41,7 +41,7 @@ class CLiteral: { public: explicit CLiteral(); - virtual ~CLiteral() {} + virtual ~CLiteral() override {} // css::lang::XServiceInfo: virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override; diff --git a/unoxml/source/rdf/CURI.cxx b/unoxml/source/rdf/CURI.cxx index 64f31ddee079..82413a07dc5b 100644 --- a/unoxml/source/rdf/CURI.cxx +++ b/unoxml/source/rdf/CURI.cxx @@ -40,7 +40,7 @@ class CURI: { public: explicit CURI(); - virtual ~CURI() {} + virtual ~CURI() override {} // css::lang::XServiceInfo: virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override; diff --git a/unoxml/source/rdf/librdf_repository.cxx b/unoxml/source/rdf/librdf_repository.cxx index 9e89c7914969..8dedfd37f341 100644 --- a/unoxml/source/rdf/librdf_repository.cxx +++ b/unoxml/source/rdf/librdf_repository.cxx @@ -269,7 +269,7 @@ public: explicit librdf_Repository( uno::Reference< uno::XComponentContext > const & i_xContext); - virtual ~librdf_Repository(); + virtual ~librdf_Repository() override; // css::lang::XServiceInfo: virtual OUString SAL_CALL getImplementationName() @@ -461,7 +461,7 @@ public: , m_pStream(i_pStream) { }; - virtual ~librdf_GraphResult() + virtual ~librdf_GraphResult() override { ::osl::MutexGuard g(m_rMutex); // lock mutex when destroying members const_cast<std::shared_ptr<librdf_stream>& >(m_pStream).reset(); @@ -575,7 +575,7 @@ public: , m_BindingNames(i_rBindingNames) { }; - virtual ~librdf_QuerySelectResult() + virtual ~librdf_QuerySelectResult() override { ::osl::MutexGuard g(m_rMutex); // lock mutex when destroying members const_cast<std::shared_ptr<librdf_query_results>& >(m_pQueryResult) @@ -695,7 +695,7 @@ public: , m_xName(i_xName) { }; - virtual ~librdf_NamedGraph() {} + virtual ~librdf_NamedGraph() override {} // css::rdf::XNode: virtual OUString SAL_CALL getStringValue() |