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 /svx/source/sidebar | |
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 'svx/source/sidebar')
18 files changed, 19 insertions, 19 deletions
diff --git a/svx/source/sidebar/EmptyPanel.hxx b/svx/source/sidebar/EmptyPanel.hxx index 06221a9d5de7..3fcd07e5910e 100644 --- a/svx/source/sidebar/EmptyPanel.hxx +++ b/svx/source/sidebar/EmptyPanel.hxx @@ -35,7 +35,7 @@ class EmptyPanel { public: explicit EmptyPanel (vcl::Window* pParent); - virtual ~EmptyPanel(); + virtual ~EmptyPanel() override; virtual void dispose() override; virtual void Resize() override; diff --git a/svx/source/sidebar/PanelFactory.cxx b/svx/source/sidebar/PanelFactory.cxx index 97817e0283fb..574145b8c43b 100644 --- a/svx/source/sidebar/PanelFactory.cxx +++ b/svx/source/sidebar/PanelFactory.cxx @@ -65,7 +65,7 @@ class PanelFactory { public: PanelFactory(); - virtual ~PanelFactory(); + virtual ~PanelFactory() override; PanelFactory(const PanelFactory&) = delete; PanelFactory& operator=(const PanelFactory&) = delete; diff --git a/svx/source/sidebar/area/AreaPropertyPanel.hxx b/svx/source/sidebar/area/AreaPropertyPanel.hxx index f8fc55faeeb3..458ace7ce6c4 100644 --- a/svx/source/sidebar/area/AreaPropertyPanel.hxx +++ b/svx/source/sidebar/area/AreaPropertyPanel.hxx @@ -66,7 +66,7 @@ public: const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings); - virtual ~AreaPropertyPanel(); + virtual ~AreaPropertyPanel() override; virtual void setFillTransparence(const XFillTransparenceItem& rItem) override; virtual void setFillFloatTransparence(const XFillFloatTransparenceItem& rItem) override; diff --git a/svx/source/sidebar/area/AreaTransparencyGradientControl.hxx b/svx/source/sidebar/area/AreaTransparencyGradientControl.hxx index bf900d9ae56d..04b6b6d67b17 100644 --- a/svx/source/sidebar/area/AreaTransparencyGradientControl.hxx +++ b/svx/source/sidebar/area/AreaTransparencyGradientControl.hxx @@ -41,7 +41,7 @@ public: AreaTransparencyGradientControl ( vcl::Window* pParent, AreaPropertyPanelBase& rPanel); - virtual ~AreaTransparencyGradientControl(); + virtual ~AreaTransparencyGradientControl() override; virtual void dispose() override; void Rearrange(XFillFloatTransparenceItem* pGradientItem); diff --git a/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx b/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx index 4555b7d9177e..dfdc375804da 100644 --- a/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx +++ b/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx @@ -38,7 +38,7 @@ class GraphicPropertyPanel public ::sfx2::sidebar::ControllerItem::ItemUpdateReceiverInterface { public: - virtual ~GraphicPropertyPanel(); + virtual ~GraphicPropertyPanel() override; virtual void dispose() override; static VclPtr<vcl::Window> Create( diff --git a/svx/source/sidebar/line/LinePropertyPanel.hxx b/svx/source/sidebar/line/LinePropertyPanel.hxx index 19b2cdd5f937..4d6531ad5bc4 100644 --- a/svx/source/sidebar/line/LinePropertyPanel.hxx +++ b/svx/source/sidebar/line/LinePropertyPanel.hxx @@ -62,7 +62,7 @@ class LinePropertyPanel : public LinePropertyPanelBase, public sfx2::sidebar::ControllerItem::ItemUpdateReceiverInterface { public: - virtual ~LinePropertyPanel(); + virtual ~LinePropertyPanel() override; virtual void dispose() override; static VclPtr<vcl::Window> Create( diff --git a/svx/source/sidebar/line/LineWidthValueSet.hxx b/svx/source/sidebar/line/LineWidthValueSet.hxx index ca7e1041dcbf..f2747d5311ea 100644 --- a/svx/source/sidebar/line/LineWidthValueSet.hxx +++ b/svx/source/sidebar/line/LineWidthValueSet.hxx @@ -29,7 +29,7 @@ class LineWidthValueSet { public: explicit LineWidthValueSet(vcl::Window* pParent); - virtual ~LineWidthValueSet(); + virtual ~LineWidthValueSet() override; virtual void dispose() override; void SetUnit(OUString* str); diff --git a/svx/source/sidebar/media/MediaPlaybackPanel.hxx b/svx/source/sidebar/media/MediaPlaybackPanel.hxx index 0a4bd5ebf441..4ba851b2333c 100644 --- a/svx/source/sidebar/media/MediaPlaybackPanel.hxx +++ b/svx/source/sidebar/media/MediaPlaybackPanel.hxx @@ -53,7 +53,7 @@ public: vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings); - virtual ~MediaPlaybackPanel(); + virtual ~MediaPlaybackPanel() override; virtual void dispose() override; protected: diff --git a/svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx b/svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx index c804cc92ea2f..e0df457776be 100644 --- a/svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx +++ b/svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx @@ -31,7 +31,7 @@ class ParaLineSpacingControl : public SfxPopupWindow { public: explicit ParaLineSpacingControl(sal_uInt16 nId); - virtual ~ParaLineSpacingControl(); + virtual ~ParaLineSpacingControl() override; virtual void dispose() override; private: diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx index 90411f4e913b..fabb1cb62865 100644 --- a/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx +++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx @@ -43,7 +43,7 @@ class ParaPropertyPanel public ::sfx2::sidebar::ControllerItem::ItemUpdateReceiverInterface { public: - virtual ~ParaPropertyPanel(); + virtual ~ParaPropertyPanel() override; virtual void dispose() override; static VclPtr<vcl::Window> Create ( diff --git a/svx/source/sidebar/paragraph/ParaSpacingWindow.hxx b/svx/source/sidebar/paragraph/ParaSpacingWindow.hxx index d0a16d5701b9..b396cd50b74f 100644 --- a/svx/source/sidebar/paragraph/ParaSpacingWindow.hxx +++ b/svx/source/sidebar/paragraph/ParaSpacingWindow.hxx @@ -39,7 +39,7 @@ class ParaULSpacingWindow : public VclVBox, { public: explicit ParaULSpacingWindow(vcl::Window* pParent, css::uno::Reference<css::frame::XFrame>& xFrame); - virtual ~ParaULSpacingWindow(); + virtual ~ParaULSpacingWindow() override; virtual void dispose() override; void SetValue(const SvxULSpaceItem* pItem); @@ -59,7 +59,7 @@ class ParaLRSpacingWindow : public VclVBox, { public: explicit ParaLRSpacingWindow(vcl::Window* pParent, css::uno::Reference<css::frame::XFrame>& xFrame); - virtual ~ParaLRSpacingWindow(); + virtual ~ParaLRSpacingWindow() override; virtual void dispose() override; void SetValue(SfxItemState eState, const SfxPoolItem* pState); diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx index f514df21d7f5..9501c11987f0 100644 --- a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx +++ b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx @@ -52,7 +52,7 @@ class PosSizePropertyPanel public ::sfx2::sidebar::ControllerItem::ItemUpdateReceiverInterface { public: - virtual ~PosSizePropertyPanel(); + virtual ~PosSizePropertyPanel() override; virtual void dispose() override; static VclPtr<vcl::Window> Create( diff --git a/svx/source/sidebar/shadow/ShadowPropertyPanel.hxx b/svx/source/sidebar/shadow/ShadowPropertyPanel.hxx index 23f5cbaae7d1..b4b5f4fcedd5 100644 --- a/svx/source/sidebar/shadow/ShadowPropertyPanel.hxx +++ b/svx/source/sidebar/shadow/ShadowPropertyPanel.hxx @@ -33,7 +33,7 @@ class ShadowPropertyPanel public ::sfx2::sidebar::ControllerItem::ItemUpdateReceiverInterface { public: - virtual ~ShadowPropertyPanel(); + virtual ~ShadowPropertyPanel() override; virtual void dispose() override; static VclPtr<vcl::Window> Create( diff --git a/svx/source/sidebar/shapes/DefaultShapesPanel.hxx b/svx/source/sidebar/shapes/DefaultShapesPanel.hxx index 5da2f184a845..6a57eb3af0db 100644 --- a/svx/source/sidebar/shapes/DefaultShapesPanel.hxx +++ b/svx/source/sidebar/shapes/DefaultShapesPanel.hxx @@ -46,7 +46,7 @@ public: static VclPtr<vcl::Window> Create( vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame); - virtual ~DefaultShapesPanel(); + virtual ~DefaultShapesPanel() override; virtual void dispose() override; private: diff --git a/svx/source/sidebar/styles/StylesPropertyPanel.hxx b/svx/source/sidebar/styles/StylesPropertyPanel.hxx index dcbd210086ad..c38ae0754f1b 100644 --- a/svx/source/sidebar/styles/StylesPropertyPanel.hxx +++ b/svx/source/sidebar/styles/StylesPropertyPanel.hxx @@ -19,7 +19,7 @@ class StylesPropertyPanel: public PanelLayout { public: - virtual ~StylesPropertyPanel(); + virtual ~StylesPropertyPanel() override; static VclPtr<vcl::Window> Create ( vcl::Window* pParent, diff --git a/svx/source/sidebar/text/TextCharacterSpacingControl.hxx b/svx/source/sidebar/text/TextCharacterSpacingControl.hxx index 76df39d9ca23..7e4893b81323 100644 --- a/svx/source/sidebar/text/TextCharacterSpacingControl.hxx +++ b/svx/source/sidebar/text/TextCharacterSpacingControl.hxx @@ -36,7 +36,7 @@ class TextCharacterSpacingControl : public SfxPopupWindow { public: explicit TextCharacterSpacingControl(sal_uInt16 nId); - virtual ~TextCharacterSpacingControl(); + virtual ~TextCharacterSpacingControl() override; virtual void dispose() override; short GetLastCustomState() { return mnLastCus;} diff --git a/svx/source/sidebar/text/TextPropertyPanel.hxx b/svx/source/sidebar/text/TextPropertyPanel.hxx index a61ea40e9962..d005ac740e82 100644 --- a/svx/source/sidebar/text/TextPropertyPanel.hxx +++ b/svx/source/sidebar/text/TextPropertyPanel.hxx @@ -44,7 +44,7 @@ class TextPropertyPanel public ::sfx2::sidebar::ControllerItem::ItemUpdateReceiverInterface { public: - virtual ~TextPropertyPanel(); + virtual ~TextPropertyPanel() override; virtual void dispose() override; static VclPtr<vcl::Window> Create ( diff --git a/svx/source/sidebar/text/TextUnderlineControl.hxx b/svx/source/sidebar/text/TextUnderlineControl.hxx index 333f039eaf15..7e82602a03fc 100644 --- a/svx/source/sidebar/text/TextUnderlineControl.hxx +++ b/svx/source/sidebar/text/TextUnderlineControl.hxx @@ -33,7 +33,7 @@ class TextUnderlineControl : public SfxPopupWindow { public: explicit TextUnderlineControl(sal_uInt16 nId); - virtual ~TextUnderlineControl(); + virtual ~TextUnderlineControl() override; virtual void dispose() override; private: |