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/inc/nameuno.hxx | |
parent | avoid loading all calendars of a locale (diff) | |
download | core-91dd2db17bd6cb9b357d1d69b187174e31eabef0.tar.gz core-91dd2db17bd6cb9b357d1d69b187174e31eabef0.zip |
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/inc/nameuno.hxx')
-rw-r--r-- | sc/inc/nameuno.hxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sc/inc/nameuno.hxx b/sc/inc/nameuno.hxx index ecdedee8adfc..befd15efe3bf 100644 --- a/sc/inc/nameuno.hxx +++ b/sc/inc/nameuno.hxx @@ -70,7 +70,7 @@ friend class ScVbaName; public: ScNamedRangeObj( rtl::Reference< ScNamedRangesObj > const & xParent, ScDocShell* pDocSh, const OUString& rNm, css::uno::Reference< css::container::XNamed > const & xSheet = css::uno::Reference< css::container::XNamed > ()); - virtual ~ScNamedRangeObj(); + virtual ~ScNamedRangeObj() override; virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; @@ -192,7 +192,7 @@ protected: public: ScNamedRangesObj(ScDocShell* pDocSh); - virtual ~ScNamedRangesObj(); + virtual ~ScNamedRangesObj() override; virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; @@ -303,7 +303,7 @@ private: public: ScGlobalNamedRangesObj(ScDocShell* pDocSh); - virtual ~ScGlobalNamedRangesObj(); + virtual ~ScGlobalNamedRangesObj() override; }; class ScLocalNamedRangesObj: public ScNamedRangesObj @@ -319,7 +319,7 @@ private: css::uno::Reference< css::container::XNamed > mxSheet; public: ScLocalNamedRangesObj(ScDocShell* pDocSh, css::uno::Reference< css::container::XNamed > const & xNamed ); - virtual ~ScLocalNamedRangesObj(); + virtual ~ScLocalNamedRangesObj() override; }; class ScLabelRangeObj : public ::cppu::WeakImplHelper< @@ -338,7 +338,7 @@ private: public: ScLabelRangeObj(ScDocShell* pDocSh, bool bCol, const ScRange& rR); - virtual ~ScLabelRangeObj(); + virtual ~ScLabelRangeObj() override; virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; @@ -375,7 +375,7 @@ private: public: ScLabelRangesObj(ScDocShell* pDocSh, bool bCol); - virtual ~ScLabelRangesObj(); + virtual ~ScLabelRangesObj() override; virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; |