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 /oox/inc/drawingml/chart/datasourceconverter.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 'oox/inc/drawingml/chart/datasourceconverter.hxx')
-rw-r--r-- | oox/inc/drawingml/chart/datasourceconverter.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/oox/inc/drawingml/chart/datasourceconverter.hxx b/oox/inc/drawingml/chart/datasourceconverter.hxx index 7ce02d838ffa..cdaae6574bff 100644 --- a/oox/inc/drawingml/chart/datasourceconverter.hxx +++ b/oox/inc/drawingml/chart/datasourceconverter.hxx @@ -37,7 +37,7 @@ class DataSequenceConverter : public ConverterBase< DataSequenceModel > { public: explicit DataSequenceConverter( const ConverterRoot& rParent, DataSequenceModel& rModel ); - virtual ~DataSequenceConverter(); + virtual ~DataSequenceConverter() override; /** Creates a data sequence object from the contained formula link. */ css::uno::Reference< css::chart2::data::XDataSequence > @@ -51,7 +51,7 @@ class DataSourceConverter : public ConverterBase< DataSourceModel > { public: explicit DataSourceConverter( const ConverterRoot& rParent, DataSourceModel& rModel ); - virtual ~DataSourceConverter(); + virtual ~DataSourceConverter() override; /** Creates a data sequence object from the contained series data. */ css::uno::Reference< css::chart2::data::XDataSequence > |