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 /sw/source/uibase/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 'sw/source/uibase/sidebar')
-rw-r--r-- | sw/source/uibase/sidebar/PageColumnControl.hxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/sidebar/PageFooterPanel.hxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/sidebar/PageFormatPanel.hxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/sidebar/PageHeaderPanel.hxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/sidebar/PageMarginControl.hxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/sidebar/PageOrientationControl.hxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/sidebar/PagePropertyPanel.hxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/sidebar/PageSizeControl.hxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/sidebar/PageStylesPanel.hxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/sidebar/StylePresetsPanel.hxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/sidebar/SwPanelFactory.cxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/sidebar/ThemePanel.hxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/sidebar/WrapPropertyPanel.hxx | 2 |
13 files changed, 13 insertions, 13 deletions
diff --git a/sw/source/uibase/sidebar/PageColumnControl.hxx b/sw/source/uibase/sidebar/PageColumnControl.hxx index b116d5c41403..e59128a29ad1 100644 --- a/sw/source/uibase/sidebar/PageColumnControl.hxx +++ b/sw/source/uibase/sidebar/PageColumnControl.hxx @@ -31,7 +31,7 @@ class PageColumnControl : public SfxPopupWindow public: PageColumnControl( sal_uInt16 nId ); - virtual ~PageColumnControl(); + virtual ~PageColumnControl() override; virtual void dispose() override; private: diff --git a/sw/source/uibase/sidebar/PageFooterPanel.hxx b/sw/source/uibase/sidebar/PageFooterPanel.hxx index adc647951f9c..161aa0c0186d 100644 --- a/sw/source/uibase/sidebar/PageFooterPanel.hxx +++ b/sw/source/uibase/sidebar/PageFooterPanel.hxx @@ -69,7 +69,7 @@ public: vcl::Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rxFrame, SfxBindings* pBindings); - virtual ~PageFooterPanel(); + virtual ~PageFooterPanel() override; virtual void dispose() override; private: diff --git a/sw/source/uibase/sidebar/PageFormatPanel.hxx b/sw/source/uibase/sidebar/PageFormatPanel.hxx index 2d81bc33c431..c483a65cf598 100644 --- a/sw/source/uibase/sidebar/PageFormatPanel.hxx +++ b/sw/source/uibase/sidebar/PageFormatPanel.hxx @@ -70,7 +70,7 @@ public: vcl::Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rxFrame, SfxBindings* pBindings); - virtual ~PageFormatPanel(); + virtual ~PageFormatPanel() override; virtual void dispose() override; static FieldUnit GetCurrentUnit( SfxItemState eState, const SfxPoolItem* pState ); diff --git a/sw/source/uibase/sidebar/PageHeaderPanel.hxx b/sw/source/uibase/sidebar/PageHeaderPanel.hxx index 754fbc41bfdb..2aa7149b15cd 100644 --- a/sw/source/uibase/sidebar/PageHeaderPanel.hxx +++ b/sw/source/uibase/sidebar/PageHeaderPanel.hxx @@ -69,7 +69,7 @@ public: vcl::Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rxFrame, SfxBindings* pBindings); - virtual ~PageHeaderPanel(); + virtual ~PageHeaderPanel() override; virtual void dispose() override; private: diff --git a/sw/source/uibase/sidebar/PageMarginControl.hxx b/sw/source/uibase/sidebar/PageMarginControl.hxx index 25c114bf74a4..1956d5d6d801 100644 --- a/sw/source/uibase/sidebar/PageMarginControl.hxx +++ b/sw/source/uibase/sidebar/PageMarginControl.hxx @@ -61,7 +61,7 @@ public: const bool bLandscape, const FieldUnit eFUnit, const MapUnit eUnit ); - virtual ~PageMarginControl(); + virtual ~PageMarginControl() override; virtual void dispose() override; private: diff --git a/sw/source/uibase/sidebar/PageOrientationControl.hxx b/sw/source/uibase/sidebar/PageOrientationControl.hxx index 53b72706022c..cba45a7fa00d 100644 --- a/sw/source/uibase/sidebar/PageOrientationControl.hxx +++ b/sw/source/uibase/sidebar/PageOrientationControl.hxx @@ -36,7 +36,7 @@ class PageOrientationControl : public SfxPopupWindow { public: PageOrientationControl(sal_uInt16 nId); - virtual ~PageOrientationControl(); + virtual ~PageOrientationControl() override; virtual void dispose() override; private: diff --git a/sw/source/uibase/sidebar/PagePropertyPanel.hxx b/sw/source/uibase/sidebar/PagePropertyPanel.hxx index 539ce91e298a..a798c43cfc09 100644 --- a/sw/source/uibase/sidebar/PagePropertyPanel.hxx +++ b/sw/source/uibase/sidebar/PagePropertyPanel.hxx @@ -89,7 +89,7 @@ namespace sw { namespace sidebar { const css::uno::Reference< css::frame::XFrame>& rxFrame, SfxBindings* pBindings ); private: - virtual ~PagePropertyPanel(); + virtual ~PagePropertyPanel() override; virtual void dispose() override; SfxBindings* mpBindings; diff --git a/sw/source/uibase/sidebar/PageSizeControl.hxx b/sw/source/uibase/sidebar/PageSizeControl.hxx index 60d9aff2f404..26253afde62c 100644 --- a/sw/source/uibase/sidebar/PageSizeControl.hxx +++ b/sw/source/uibase/sidebar/PageSizeControl.hxx @@ -46,7 +46,7 @@ class PageSizeControl : public SfxPopupWindow { public: PageSizeControl(sal_uInt16 nId); - virtual ~PageSizeControl(); + virtual ~PageSizeControl() override; virtual void dispose() override; private: diff --git a/sw/source/uibase/sidebar/PageStylesPanel.hxx b/sw/source/uibase/sidebar/PageStylesPanel.hxx index f4ff4d3de5e9..55aa09535f09 100644 --- a/sw/source/uibase/sidebar/PageStylesPanel.hxx +++ b/sw/source/uibase/sidebar/PageStylesPanel.hxx @@ -73,7 +73,7 @@ public: vcl::Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rxFrame, SfxBindings* pBindings); - virtual ~PageStylesPanel(); + virtual ~PageStylesPanel() override; virtual void dispose() override; private: diff --git a/sw/source/uibase/sidebar/StylePresetsPanel.hxx b/sw/source/uibase/sidebar/StylePresetsPanel.hxx index 552e96c6ae45..fa5c8b03fd35 100644 --- a/sw/source/uibase/sidebar/StylePresetsPanel.hxx +++ b/sw/source/uibase/sidebar/StylePresetsPanel.hxx @@ -70,7 +70,7 @@ private: StylePresetsPanel(vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame); - virtual ~StylePresetsPanel(); + virtual ~StylePresetsPanel() override; virtual void dispose() override; VclPtr<ValueSet> mpValueSet; diff --git a/sw/source/uibase/sidebar/SwPanelFactory.cxx b/sw/source/uibase/sidebar/SwPanelFactory.cxx index 33c3132ae5ed..985000c491f5 100644 --- a/sw/source/uibase/sidebar/SwPanelFactory.cxx +++ b/sw/source/uibase/sidebar/SwPanelFactory.cxx @@ -60,7 +60,7 @@ private: public: SwPanelFactory(); - virtual ~SwPanelFactory(); + virtual ~SwPanelFactory() override; // XUIElementFactory css::uno::Reference<css::ui::XUIElement> SAL_CALL createUIElement( diff --git a/sw/source/uibase/sidebar/ThemePanel.hxx b/sw/source/uibase/sidebar/ThemePanel.hxx index 07d89dab34be..bc1b0cd69b22 100644 --- a/sw/source/uibase/sidebar/ThemePanel.hxx +++ b/sw/source/uibase/sidebar/ThemePanel.hxx @@ -58,7 +58,7 @@ public: private: ThemePanel(vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame); - virtual ~ThemePanel(); + virtual ~ThemePanel() override; virtual void dispose() override; diff --git a/sw/source/uibase/sidebar/WrapPropertyPanel.hxx b/sw/source/uibase/sidebar/WrapPropertyPanel.hxx index a0a62a8831ec..8421ec858b03 100644 --- a/sw/source/uibase/sidebar/WrapPropertyPanel.hxx +++ b/sw/source/uibase/sidebar/WrapPropertyPanel.hxx @@ -47,7 +47,7 @@ namespace sw { namespace sidebar { const SfxPoolItem* pState, const bool bIsEnabled) override; - virtual ~WrapPropertyPanel(); + virtual ~WrapPropertyPanel() override; virtual void dispose() override; WrapPropertyPanel( |