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 /sc/source/filter/inc/xichart.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 'sc/source/filter/inc/xichart.hxx')
-rw-r--r-- | sc/source/filter/inc/xichart.hxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sc/source/filter/inc/xichart.hxx b/sc/source/filter/inc/xichart.hxx index 9c95cabde818..6d26ed2bdb46 100644 --- a/sc/source/filter/inc/xichart.hxx +++ b/sc/source/filter/inc/xichart.hxx @@ -84,7 +84,7 @@ class XclImpChRoot : public XclImpRoot { public: explicit XclImpChRoot( const XclImpRoot& rRoot, XclImpChChart& rChartData ); - virtual ~XclImpChRoot(); + virtual ~XclImpChRoot() override; /** Returns this root instance - for code readability in derived classes. */ inline const XclImpChRoot& GetChRoot() const { return *this; } @@ -377,7 +377,7 @@ class XclImpChSourceLink : protected XclImpChRoot { public: explicit XclImpChSourceLink( const XclImpChRoot& rRoot ); - virtual ~XclImpChSourceLink(); + virtual ~XclImpChSourceLink() override; /** Reads the CHSOURCELINK record (link to source data). */ void ReadChSourceLink( XclImpStream& rStrm ); @@ -1280,7 +1280,7 @@ class XclImpChChart : public XclImpChGroupBase, protected XclImpChRoot { public: explicit XclImpChChart( const XclImpRoot& rRoot ); - virtual ~XclImpChChart(); + virtual ~XclImpChChart() override; /** Reads the CHCHART record (called by base class). */ virtual void ReadHeaderRecord( XclImpStream& rStrm ) override; @@ -1382,7 +1382,7 @@ public: /** Constructs a new chart object. @param bOwnTab True = chart is on an own sheet; false = chart is an embedded object. */ explicit XclImpChart( const XclImpRoot& rRoot, bool bOwnTab ); - virtual ~XclImpChart(); + virtual ~XclImpChart() override; /** Reads the complete chart substream (BOF/EOF block). @descr The passed stream must be located in the BOF record of the chart substream. */ |