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/svx/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 'include/svx/sidebar')
-rw-r--r-- | include/svx/sidebar/AreaPropertyPanelBase.hxx | 2 | ||||
-rw-r--r-- | include/svx/sidebar/AreaTransparencyGradientPopup.hxx | 2 | ||||
-rw-r--r-- | include/svx/sidebar/LinePropertyPanelBase.hxx | 2 | ||||
-rw-r--r-- | include/svx/sidebar/LineWidthPopup.hxx | 2 | ||||
-rw-r--r-- | include/svx/sidebar/PanelLayout.hxx | 2 | ||||
-rw-r--r-- | include/svx/sidebar/PopupContainer.hxx | 2 | ||||
-rw-r--r-- | include/svx/sidebar/SelectionChangeHandler.hxx | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/include/svx/sidebar/AreaPropertyPanelBase.hxx b/include/svx/sidebar/AreaPropertyPanelBase.hxx index a30bf7328ebf..f6827b54612e 100644 --- a/include/svx/sidebar/AreaPropertyPanelBase.hxx +++ b/include/svx/sidebar/AreaPropertyPanelBase.hxx @@ -89,7 +89,7 @@ public: vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame); - virtual ~AreaPropertyPanelBase(); + virtual ~AreaPropertyPanelBase() override; virtual void setFillTransparence(const XFillTransparenceItem& rItem) = 0; virtual void setFillFloatTransparence(const XFillFloatTransparenceItem& rItem) = 0; diff --git a/include/svx/sidebar/AreaTransparencyGradientPopup.hxx b/include/svx/sidebar/AreaTransparencyGradientPopup.hxx index 8c74dff80a62..c7aee94b6f48 100644 --- a/include/svx/sidebar/AreaTransparencyGradientPopup.hxx +++ b/include/svx/sidebar/AreaTransparencyGradientPopup.hxx @@ -36,7 +36,7 @@ public: AreaTransparencyGradientPopup ( vcl::Window* pParent, ::std::function<PopupControl*(PopupContainer*)> const& rControlCreator); - virtual ~AreaTransparencyGradientPopup(); + virtual ~AreaTransparencyGradientPopup() override; void Rearrange (XFillFloatTransparenceItem* pItem); }; diff --git a/include/svx/sidebar/LinePropertyPanelBase.hxx b/include/svx/sidebar/LinePropertyPanelBase.hxx index 91d963221c8d..0d173380c527 100644 --- a/include/svx/sidebar/LinePropertyPanelBase.hxx +++ b/include/svx/sidebar/LinePropertyPanelBase.hxx @@ -68,7 +68,7 @@ namespace sidebar class SVX_DLLPUBLIC LinePropertyPanelBase : public PanelLayout { public: - virtual ~LinePropertyPanelBase(); + virtual ~LinePropertyPanelBase() override; virtual void dispose() override; virtual void DataChanged( diff --git a/include/svx/sidebar/LineWidthPopup.hxx b/include/svx/sidebar/LineWidthPopup.hxx index c24ce65e9031..bdeeebe6c50f 100644 --- a/include/svx/sidebar/LineWidthPopup.hxx +++ b/include/svx/sidebar/LineWidthPopup.hxx @@ -37,7 +37,7 @@ class LineWidthPopup : public FloatingWindow public: LineWidthPopup(LinePropertyPanelBase& rParent); virtual void dispose() override; - virtual ~LineWidthPopup(); + virtual ~LineWidthPopup() override; void SetWidthSelect (long lValue, bool bValuable, MapUnit eMapUnit); diff --git a/include/svx/sidebar/PanelLayout.hxx b/include/svx/sidebar/PanelLayout.hxx index ddc2a0e5e084..7b1c15cdb853 100644 --- a/include/svx/sidebar/PanelLayout.hxx +++ b/include/svx/sidebar/PanelLayout.hxx @@ -34,7 +34,7 @@ private: public: PanelLayout(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const css::uno::Reference<css::frame::XFrame> &rFrame); - virtual ~PanelLayout(); + virtual ~PanelLayout() override; virtual void dispose() override; virtual Size GetOptimalSize() const override; diff --git a/include/svx/sidebar/PopupContainer.hxx b/include/svx/sidebar/PopupContainer.hxx index 851c38fa62fd..f46e77eddbe9 100644 --- a/include/svx/sidebar/PopupContainer.hxx +++ b/include/svx/sidebar/PopupContainer.hxx @@ -34,7 +34,7 @@ class SVX_DLLPUBLIC PopupContainer { public: PopupContainer (vcl::Window* pParent); - virtual ~PopupContainer(); + virtual ~PopupContainer() override; virtual bool Notify (NotifyEvent& rNEvt) override; }; diff --git a/include/svx/sidebar/SelectionChangeHandler.hxx b/include/svx/sidebar/SelectionChangeHandler.hxx index 38d72ab2cca4..d0c4d460e90d 100644 --- a/include/svx/sidebar/SelectionChangeHandler.hxx +++ b/include/svx/sidebar/SelectionChangeHandler.hxx @@ -51,7 +51,7 @@ public: const std::function<rtl::OUString ()>& rSelectionChangeCallback, const css::uno::Reference<css::frame::XController>& rxController, const vcl::EnumContext::Context eDefaultContext); - virtual ~SelectionChangeHandler(); + virtual ~SelectionChangeHandler() override; virtual void SAL_CALL selectionChanged (const css::lang::EventObject& rEvent) throw (css::uno::RuntimeException, std::exception) override; |