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 /xmloff/inc/xmlversion.hxx | |
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 'xmloff/inc/xmlversion.hxx')
-rw-r--r-- | xmloff/inc/xmlversion.hxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/xmloff/inc/xmlversion.hxx b/xmloff/inc/xmlversion.hxx index c31e39337c01..df29a971927c 100644 --- a/xmloff/inc/xmlversion.hxx +++ b/xmloff/inc/xmlversion.hxx @@ -42,7 +42,7 @@ public: const css::uno::Sequence < css::util::RevisionTag >& rVersions, const OUString &rFileName, css::uno::Reference< css::xml::sax::XDocumentHandler > &rHandler ); - virtual ~XMLVersionListExport() {} + virtual ~XMLVersionListExport() override {} sal_uInt32 exportDoc( enum ::xmloff::token::XMLTokenEnum eClass = ::xmloff::token::XML_TOKEN_INVALID ) override; void ExportAutoStyles_() override {} @@ -68,7 +68,7 @@ public: XMLVersionListImport( const css::uno::Reference< css::uno::XComponentContext >& rContext, css::uno::Sequence < css::util::RevisionTag >& rVersions ); - virtual ~XMLVersionListImport() throw(); + virtual ~XMLVersionListImport() throw() override; css::uno::Sequence < css::util::RevisionTag >& GetList() { return maVersions; } @@ -86,7 +86,7 @@ public: const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ); - virtual ~XMLVersionListContext(); + virtual ~XMLVersionListContext() override; virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, @@ -110,7 +110,7 @@ public: const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ); - virtual ~XMLVersionContext(); + virtual ~XMLVersionContext() override; }; class XMLVersionListPersistence : public ::cppu::WeakImplHelper< css::document::XDocumentRevisionListPersistence, css::lang::XServiceInfo > |