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/ui/Accessibility | |
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/ui/Accessibility')
-rw-r--r-- | sc/source/ui/Accessibility/AccessibleDocument.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx | 4 | ||||
-rw-r--r-- | sc/source/ui/Accessibility/AccessibleText.cxx | 16 |
3 files changed, 11 insertions, 11 deletions
diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx index 703f61db7b64..76a0997d3946 100644 --- a/sc/source/ui/Accessibility/AccessibleDocument.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx @@ -253,7 +253,7 @@ class ScChildrenShapes : public SfxListener, { public: ScChildrenShapes(ScAccessibleDocument* pAccessibleDocument, ScTabViewShell* pViewShell, ScSplitPos eSplitPos); - virtual ~ScChildrenShapes(); + virtual ~ScChildrenShapes() override; ///===== SfxListener ===================================================== diff --git a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx index d3a599c305c4..d5ee45bd533a 100644 --- a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx @@ -482,7 +482,7 @@ public: ScIAccessibleViewForwarder(ScPreviewShell* pViewShell, ScAccessibleDocumentPagePreview* pAccDoc, const MapMode& aMapMode); - virtual ~ScIAccessibleViewForwarder(); + virtual ~ScIAccessibleViewForwarder() override; ///===== IAccessibleViewForwarder ======================================== @@ -614,7 +614,7 @@ class ScShapeChildren : public SfxListener, { public: ScShapeChildren(ScPreviewShell* pViewShell, ScAccessibleDocumentPagePreview* pAccDoc); - virtual ~ScShapeChildren(); + virtual ~ScShapeChildren() override; ///===== SfxListener ===================================================== diff --git a/sc/source/ui/Accessibility/AccessibleText.cxx b/sc/source/ui/Accessibility/AccessibleText.cxx index 35a6a01e6f39..80f7393e76fc 100644 --- a/sc/source/ui/Accessibility/AccessibleText.cxx +++ b/sc/source/ui/Accessibility/AccessibleText.cxx @@ -52,7 +52,7 @@ class ScViewForwarder : public SvxViewForwarder ScSplitPos meSplitPos; public: ScViewForwarder(ScTabViewShell* pViewShell, ScSplitPos eSplitPos, const ScAddress& rCell); - virtual ~ScViewForwarder(); + virtual ~ScViewForwarder() override; virtual bool IsValid() const override; virtual Rectangle GetVisArea() const override; @@ -150,7 +150,7 @@ class ScEditObjectViewForwarder : public SvxViewForwarder public: ScEditObjectViewForwarder( vcl::Window* pWindow, const EditView* _pEditView); - virtual ~ScEditObjectViewForwarder(); + virtual ~ScEditObjectViewForwarder() override; virtual bool IsValid() const override; virtual Rectangle GetVisArea() const override; @@ -248,7 +248,7 @@ protected: ScPreviewShell* mpViewShell; public: explicit ScPreviewViewForwarder(ScPreviewShell* pViewShell); - virtual ~ScPreviewViewForwarder(); + virtual ~ScPreviewViewForwarder() override; virtual bool IsValid() const override; virtual Rectangle GetVisArea() const override; @@ -376,7 +376,7 @@ class ScPreviewHeaderFooterViewForwarder : public ScPreviewViewForwarder bool mbHeader; public: ScPreviewHeaderFooterViewForwarder(ScPreviewShell* pViewShell, bool bHeader); - virtual ~ScPreviewHeaderFooterViewForwarder(); + virtual ~ScPreviewHeaderFooterViewForwarder() override; virtual Rectangle GetVisArea() const override; }; @@ -418,7 +418,7 @@ class ScPreviewCellViewForwarder : public ScPreviewViewForwarder public: ScPreviewCellViewForwarder(ScPreviewShell* pViewShell, ScAddress aCellPos); - virtual ~ScPreviewCellViewForwarder(); + virtual ~ScPreviewCellViewForwarder() override; virtual Rectangle GetVisArea() const override; }; @@ -460,7 +460,7 @@ public: ScPreviewHeaderCellViewForwarder(ScPreviewShell* pViewShell, ScAddress aCellPos, bool bColHeader); - virtual ~ScPreviewHeaderCellViewForwarder(); + virtual ~ScPreviewHeaderCellViewForwarder() override; virtual Rectangle GetVisArea() const override; }; @@ -504,7 +504,7 @@ public: ScPreviewNoteViewForwarder(ScPreviewShell* pViewShell, ScAddress aCellPos, bool bNoteMark); - virtual ~ScPreviewNoteViewForwarder(); + virtual ~ScPreviewNoteViewForwarder() override; virtual Rectangle GetVisArea() const override; }; @@ -546,7 +546,7 @@ class ScEditViewForwarder : public SvxEditViewForwarder VclPtr<vcl::Window> mpWindow; public: ScEditViewForwarder(EditView* pEditView, vcl::Window* pWin); - virtual ~ScEditViewForwarder(); + virtual ~ScEditViewForwarder() override; virtual bool IsValid() const override; virtual Rectangle GetVisArea() const override; |