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 /editeng/source/xml | |
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 'editeng/source/xml')
-rw-r--r-- | editeng/source/xml/editsource.hxx | 2 | ||||
-rw-r--r-- | editeng/source/xml/xmltxtexp.cxx | 6 | ||||
-rw-r--r-- | editeng/source/xml/xmltxtimp.cxx | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/editeng/source/xml/editsource.hxx b/editeng/source/xml/editsource.hxx index a22728f34e4b..335427808690 100644 --- a/editeng/source/xml/editsource.hxx +++ b/editeng/source/xml/editsource.hxx @@ -29,7 +29,7 @@ class SvxEditEngineSource : public SvxEditSource { public: explicit SvxEditEngineSource( EditEngine* pEditEngine ); - virtual ~SvxEditEngineSource(); + virtual ~SvxEditEngineSource() override; virtual SvxEditSource* Clone() const override; virtual SvxTextForwarder* GetTextForwarder() override; diff --git a/editeng/source/xml/xmltxtexp.cxx b/editeng/source/xml/xmltxtexp.cxx index 348aa2e73eb7..cb4f208ca649 100644 --- a/editeng/source/xml/xmltxtexp.cxx +++ b/editeng/source/xml/xmltxtexp.cxx @@ -65,7 +65,7 @@ private: EditEngine* mpEditEngine; SvxTextForwarder* mpTextForwarder; - virtual ~SvxEditEngineSourceImpl(); + virtual ~SvxEditEngineSourceImpl() override; public: explicit SvxEditEngineSourceImpl( EditEngine* pEditEngine ); @@ -130,7 +130,7 @@ class SvxSimpleUnoModel : public cppu::WeakAggImplHelper4< { public: SvxSimpleUnoModel(); - virtual ~SvxSimpleUnoModel(); + virtual ~SvxSimpleUnoModel() override; // XMultiServiceFactory @@ -301,7 +301,7 @@ public: const OUString& rFileName, const css::uno::Reference< css::xml::sax::XDocumentHandler >& rHandler ); - virtual ~SvxXMLTextExportComponent(); + virtual ~SvxXMLTextExportComponent() override; // methods without content: virtual void ExportAutoStyles_() override; diff --git a/editeng/source/xml/xmltxtimp.cxx b/editeng/source/xml/xmltxtimp.cxx index 8cedcbc3a8e9..8a09a5732121 100644 --- a/editeng/source/xml/xmltxtimp.cxx +++ b/editeng/source/xml/xmltxtimp.cxx @@ -56,7 +56,7 @@ class SvxXMLTextImportContext : public SvXMLImportContext { public: SvxXMLTextImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const uno::Reference< XAttributeList >& xAttrList, const uno::Reference< XText >& xText ); - virtual ~SvxXMLTextImportContext(); + virtual ~SvxXMLTextImportContext() override; virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList ) override; @@ -108,7 +108,7 @@ public: const css::uno::Reference< css::uno::XComponentContext >& rContext, const uno::Reference< XText > & rText ); - virtual ~SvxXMLXTextImportComponent() throw (); + virtual ~SvxXMLXTextImportComponent() throw () override; private: const uno::Reference< XText > mxText; |