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/converterbase.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/converterbase.hxx')
-rw-r--r-- | oox/inc/drawingml/chart/converterbase.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/oox/inc/drawingml/chart/converterbase.hxx b/oox/inc/drawingml/chart/converterbase.hxx index 77238914b517..42f763b86405 100644 --- a/oox/inc/drawingml/chart/converterbase.hxx +++ b/oox/inc/drawingml/chart/converterbase.hxx @@ -109,7 +109,7 @@ public: protected: explicit ConverterBase( const ConverterRoot& rParent, ModelType& rModel ) : ConverterRoot( rParent ), mrModel( rModel ) {} - virtual ~ConverterBase() {} + virtual ~ConverterBase() override {} protected: ModelType& mrModel; @@ -122,7 +122,7 @@ class LayoutConverter : public ConverterBase< LayoutModel > { public: explicit LayoutConverter( const ConverterRoot& rParent, LayoutModel& rModel ); - virtual ~LayoutConverter(); + virtual ~LayoutConverter() override; /** Tries to calculate the absolute position and size from the contained OOXML layout model. Returns true, if returned rectangle is valid. */ |