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/orcusinterface.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/orcusinterface.hxx')
-rw-r--r-- | sc/source/filter/inc/orcusinterface.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sc/source/filter/inc/orcusinterface.hxx b/sc/source/filter/inc/orcusinterface.hxx index 48fed0944f82..3046b4460c49 100644 --- a/sc/source/filter/inc/orcusinterface.hxx +++ b/sc/source/filter/inc/orcusinterface.hxx @@ -85,7 +85,7 @@ class ScOrcusConditionalFormat : public orcus::spreadsheet::iface::import_condit { public: ScOrcusConditionalFormat(SCTAB nTab, ScDocument& rDoc); - virtual ~ScOrcusConditionalFormat(); + virtual ~ScOrcusConditionalFormat() override; virtual void set_color(orcus::spreadsheet::color_elem_t alpha, orcus::spreadsheet::color_elem_t red, orcus::spreadsheet::color_elem_t green, orcus::spreadsheet::color_elem_t blue) override; @@ -148,7 +148,7 @@ class ScOrcusAutoFilter : public orcus::spreadsheet::iface::import_auto_filter public: ScOrcusAutoFilter(ScDocument& rDoc); - virtual ~ScOrcusAutoFilter(); + virtual ~ScOrcusAutoFilter() override; virtual void set_range(const char* p_ref, size_t n_ref) override; @@ -170,7 +170,7 @@ class ScOrcusSheetProperties : public orcus::spreadsheet::iface::import_sheet_pr SCTAB mnTab; public: ScOrcusSheetProperties(SCTAB nTab, ScDocumentImport& rDoc); - virtual ~ScOrcusSheetProperties(); + virtual ~ScOrcusSheetProperties() override; virtual void set_column_width(orcus::spreadsheet::col_t col, double width, orcus::length_unit_t unit) override; |