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 /include/canvas | |
| 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 'include/canvas')
| -rw-r--r-- | include/canvas/base/cachedprimitivebase.hxx | 2 | ||||
| -rw-r--r-- | include/canvas/parametricpolypolygon.hxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/canvas/base/cachedprimitivebase.hxx b/include/canvas/base/cachedprimitivebase.hxx index a467595202ba..23d98a3845b0 100644 --- a/include/canvas/base/cachedprimitivebase.hxx +++ b/include/canvas/base/cachedprimitivebase.hxx @@ -76,7 +76,7 @@ namespace canvas virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException, std::exception) override; protected: - virtual ~CachedPrimitiveBase(); // we're a ref-counted UNO class. _We_ destroy ourselves. + virtual ~CachedPrimitiveBase() override; // we're a ref-counted UNO class. _We_ destroy ourselves. private: CachedPrimitiveBase( const CachedPrimitiveBase& ) = delete; diff --git a/include/canvas/parametricpolypolygon.hxx b/include/canvas/parametricpolypolygon.hxx index 8e21228416ba..598a010e9c90 100644 --- a/include/canvas/parametricpolypolygon.hxx +++ b/include/canvas/parametricpolypolygon.hxx @@ -114,7 +114,7 @@ namespace canvas Values getValues() const; protected: - virtual ~ParametricPolyPolygon(); // we're a ref-counted UNO class. _We_ destroy ourselves. + virtual ~ParametricPolyPolygon() override; // we're a ref-counted UNO class. _We_ destroy ourselves. ParametricPolyPolygon(const ParametricPolyPolygon&) = delete; ParametricPolyPolygon& operator=( const ParametricPolyPolygon& ) = delete; |