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 /sfx2 | |
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 'sfx2')
68 files changed, 89 insertions, 89 deletions
diff --git a/sfx2/inc/inettbc.hxx b/sfx2/inc/inettbc.hxx index 322f744f119a..d96b33e882d5 100644 --- a/sfx2/inc/inettbc.hxx +++ b/sfx2/inc/inettbc.hxx @@ -51,7 +51,7 @@ public: SFX_DECL_TOOLBOX_CONTROL(); SfxURLToolBoxControl_Impl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rBox ); - virtual ~SfxURLToolBoxControl_Impl(); + virtual ~SfxURLToolBoxControl_Impl() override; virtual VclPtr<vcl::Window> CreateItemWindow( vcl::Window* pParent ) override; virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) override; diff --git a/sfx2/inc/sorgitm.hxx b/sfx2/inc/sorgitm.hxx index 45b5d795803f..521eaa8967cb 100644 --- a/sfx2/inc/sorgitm.hxx +++ b/sfx2/inc/sorgitm.hxx @@ -32,7 +32,7 @@ public: static SfxPoolItem* CreateDefault(); SfxScriptOrganizerItem(); SfxScriptOrganizerItem( const SfxScriptOrganizerItem& ); - virtual ~SfxScriptOrganizerItem(); + virtual ~SfxScriptOrganizerItem() override; virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; virtual bool operator==( const SfxPoolItem& ) const override; diff --git a/sfx2/inc/srchdlg.hxx b/sfx2/inc/srchdlg.hxx index 728fd86986dc..5152b8e2d952 100644 --- a/sfx2/inc/srchdlg.hxx +++ b/sfx2/inc/srchdlg.hxx @@ -57,7 +57,7 @@ private: public: SearchDialog( vcl::Window* pWindow, const OUString& rConfigName ); - virtual ~SearchDialog(); + virtual ~SearchDialog() override; virtual void dispose() override; void SetFindHdl( const Link<SearchDialog&,void>& rLink ) { m_aFindHdl = rLink; } diff --git a/sfx2/inc/uitest/sfx_uiobject.hxx b/sfx2/inc/uitest/sfx_uiobject.hxx index 470e70053a57..2feb03135236 100644 --- a/sfx2/inc/uitest/sfx_uiobject.hxx +++ b/sfx2/inc/uitest/sfx_uiobject.hxx @@ -22,7 +22,7 @@ public: SfxTabDialogUIObject(VclPtr<SfxTabDialog> xTabDialog); - virtual ~SfxTabDialogUIObject(); + virtual ~SfxTabDialogUIObject() override; virtual StringMap get_state() override; diff --git a/sfx2/qa/cppunit/test_controlleritem.cxx b/sfx2/qa/cppunit/test_controlleritem.cxx index e7efb98b37ac..f32d3ddfdbba 100644 --- a/sfx2/qa/cppunit/test_controlleritem.cxx +++ b/sfx2/qa/cppunit/test_controlleritem.cxx @@ -36,7 +36,7 @@ static bool bDeleted = false; class FooController : public SfxControllerItem { public: FooController() : SfxControllerItem() {} - virtual ~FooController() { bDeleted = true; } + virtual ~FooController() override { bDeleted = true; } }; void ControllerItemTest::test() diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx index 65cabfe7e553..af0cf2ce28bd 100644 --- a/sfx2/source/appl/appcfg.cxx +++ b/sfx2/source/appl/appcfg.cxx @@ -88,7 +88,7 @@ public: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; explicit SfxEventAsyncer_Impl(const SfxEventHint& rHint); - virtual ~SfxEventAsyncer_Impl(); + virtual ~SfxEventAsyncer_Impl() override; DECL_LINK_TYPED( IdleHdl, Idle*, void ); }; diff --git a/sfx2/source/appl/fileobj.hxx b/sfx2/source/appl/fileobj.hxx index 7f91bc635d9d..8d8810a0dc4f 100644 --- a/sfx2/source/appl/fileobj.hxx +++ b/sfx2/source/appl/fileobj.hxx @@ -58,7 +58,7 @@ class SvFileObject : public sfx2::SvLinkSource DECL_LINK_TYPED( DialogClosedHdl, sfx2::FileDialogHelper*, void ); protected: - virtual ~SvFileObject(); + virtual ~SvFileObject() override; public: SvFileObject(); diff --git a/sfx2/source/appl/helpdispatch.hxx b/sfx2/source/appl/helpdispatch.hxx index 55b970e3e2e9..dce297d4647c 100644 --- a/sfx2/source/appl/helpdispatch.hxx +++ b/sfx2/source/appl/helpdispatch.hxx @@ -34,7 +34,7 @@ private: public: HelpDispatch_Impl( HelpInterceptor_Impl& _rInterceptor, const css::uno::Reference< css::frame::XDispatch >& _xDisp ); - virtual ~HelpDispatch_Impl(); + virtual ~HelpDispatch_Impl() override; // XDispatch virtual void SAL_CALL dispatch( const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& aArgs ) throw(css::uno::RuntimeException, std::exception) override; diff --git a/sfx2/source/appl/helpinterceptor.hxx b/sfx2/source/appl/helpinterceptor.hxx index 77285b34ea7b..96836a09415f 100644 --- a/sfx2/source/appl/helpinterceptor.hxx +++ b/sfx2/source/appl/helpinterceptor.hxx @@ -71,7 +71,7 @@ friend class SfxHelpWindow_Impl; public: HelpInterceptor_Impl(); - virtual ~HelpInterceptor_Impl(); + virtual ~HelpInterceptor_Impl() override; void setInterception( const css::uno::Reference< css::frame::XFrame >& xFrame ); const OUString& GetCurrentURL() const { return m_aCurrentURL; } @@ -143,7 +143,7 @@ public: HelpStatusListener_Impl( css::uno::Reference < css::frame::XDispatch > const & xDispatch, css::util::URL& rURL); - virtual ~HelpStatusListener_Impl(); + virtual ~HelpStatusListener_Impl() override; virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) throw( css::uno::RuntimeException, std::exception ) override; diff --git a/sfx2/source/appl/imestatuswindow.cxx b/sfx2/source/appl/imestatuswindow.cxx index 242313389c18..8f7ef6f49632 100644 --- a/sfx2/source/appl/imestatuswindow.cxx +++ b/sfx2/source/appl/imestatuswindow.cxx @@ -55,7 +55,7 @@ class WeakPropertyChangeListener : public ::cppu::WeakImplHelper<css::beans::XPr { } - virtual ~WeakPropertyChangeListener() + virtual ~WeakPropertyChangeListener() override { } diff --git a/sfx2/source/appl/imestatuswindow.hxx b/sfx2/source/appl/imestatuswindow.hxx index eb2b374e44d9..8af134a21016 100644 --- a/sfx2/source/appl/imestatuswindow.hxx +++ b/sfx2/source/appl/imestatuswindow.hxx @@ -90,7 +90,7 @@ private: ImeStatusWindow(ImeStatusWindow &) = delete; void operator =(const ImeStatusWindow&) = delete; - virtual ~ImeStatusWindow(); + virtual ~ImeStatusWindow() override; virtual void SAL_CALL disposing(css::lang::EventObject const & rSource) diff --git a/sfx2/source/appl/impldde.cxx b/sfx2/source/appl/impldde.cxx index d139e0653187..52727441489c 100644 --- a/sfx2/source/appl/impldde.cxx +++ b/sfx2/source/appl/impldde.cxx @@ -62,7 +62,7 @@ class SvDDELinkEditDialog : public ModalDialog DECL_LINK_TYPED( EditHdl_Impl, Edit&, void ); public: SvDDELinkEditDialog( vcl::Window* pParent, SvBaseLink* ); - virtual ~SvDDELinkEditDialog(); + virtual ~SvDDELinkEditDialog() override; virtual void dispose() override; OUString GetCmd() const; }; diff --git a/sfx2/source/appl/impldde.hxx b/sfx2/source/appl/impldde.hxx index 18208cf39a09..1888246c4194 100644 --- a/sfx2/source/appl/impldde.hxx +++ b/sfx2/source/appl/impldde.hxx @@ -48,7 +48,7 @@ class SvDDEObject : public SvLinkSource DECL_LINK_TYPED( ImplDoneDDEData, bool, void ); protected: - virtual ~SvDDEObject(); + virtual ~SvDDEObject() override; public: SvDDEObject(); diff --git a/sfx2/source/appl/lnkbase2.cxx b/sfx2/source/appl/lnkbase2.cxx index dcd71af622a5..2d4907d58bdd 100644 --- a/sfx2/source/appl/lnkbase2.cxx +++ b/sfx2/source/appl/lnkbase2.cxx @@ -105,7 +105,7 @@ public: bIsInDTOR( false ) {} #endif - virtual ~ImplDdeItem(); + virtual ~ImplDdeItem() override; virtual DdeData* Get( SotClipboardFormatId ) override; virtual bool Put( const DdeData* ) override; diff --git a/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx index c23fcb7c58c2..a7b82d417050 100644 --- a/sfx2/source/appl/newhelp.hxx +++ b/sfx2/source/appl/newhelp.hxx @@ -58,7 +58,7 @@ private: public: ContentListBox_Impl(vcl::Window* pParent, WinBits nStyle); - virtual ~ContentListBox_Impl(); + virtual ~ContentListBox_Impl() override; virtual void dispose() override; virtual void RequestingChildren( SvTreeListEntry* pParent ) override; @@ -80,7 +80,7 @@ protected: public: HelpTabPage_Impl(vcl::Window* pParent, SfxHelpIndexWindow_Impl* _pIdxWin, const OString& rID, const OUString& rUIXMLDescription); - virtual ~HelpTabPage_Impl(); + virtual ~HelpTabPage_Impl() override; virtual void dispose() override; virtual Control* GetLastFocusControl() = 0; @@ -95,7 +95,7 @@ private: public: ContentTabPage_Impl(vcl::Window* pParent, SfxHelpIndexWindow_Impl* _pIdxWin); - virtual ~ContentTabPage_Impl(); + virtual ~ContentTabPage_Impl() override; virtual void dispose() override; virtual void ActivatePage() override; @@ -143,7 +143,7 @@ private: public: IndexTabPage_Impl( vcl::Window* pParent, SfxHelpIndexWindow_Impl* _pIdxWin ); - virtual ~IndexTabPage_Impl(); + virtual ~IndexTabPage_Impl() override; virtual void dispose() override; virtual void ActivatePage() override; @@ -221,7 +221,7 @@ private: public: SearchTabPage_Impl( vcl::Window* pParent, SfxHelpIndexWindow_Impl* _pIdxWin ); - virtual ~SearchTabPage_Impl(); + virtual ~SearchTabPage_Impl() override; virtual void dispose() override; virtual void ActivatePage() override; @@ -247,7 +247,7 @@ private: public: BookmarksBox_Impl(vcl::Window* pParent, WinBits nStyle); - virtual ~BookmarksBox_Impl(); + virtual ~BookmarksBox_Impl() override; virtual void dispose() override; virtual bool Notify( NotifyEvent& rNEvt ) override; @@ -263,7 +263,7 @@ private: public: BookmarksTabPage_Impl( vcl::Window* pParent, SfxHelpIndexWindow_Impl* _pIdxWin ); - virtual ~BookmarksTabPage_Impl(); + virtual ~BookmarksTabPage_Impl() override; virtual void dispose() override; virtual void ActivatePage() override; @@ -323,7 +323,7 @@ private: public: explicit SfxHelpIndexWindow_Impl( SfxHelpWindow_Impl* pParent ); - virtual ~SfxHelpIndexWindow_Impl(); + virtual ~SfxHelpIndexWindow_Impl() override; virtual void dispose() override; virtual void Resize() override; @@ -462,7 +462,7 @@ private: public: explicit SfxHelpTextWindow_Impl( SfxHelpWindow_Impl* pParent ); - virtual ~SfxHelpTextWindow_Impl(); + virtual ~SfxHelpTextWindow_Impl() override; virtual void dispose() override; virtual void Resize() override; @@ -529,7 +529,7 @@ friend class SfxHelpIndexWindow_Impl; public: SfxHelpWindow_Impl( const css::uno::Reference < css::frame::XFrame2 >& rFrame, vcl::Window* pParent, WinBits nBits ); - virtual ~SfxHelpWindow_Impl(); + virtual ~SfxHelpWindow_Impl() override; virtual void dispose() override; virtual bool PreNotify( NotifyEvent& rNEvt ) override; @@ -567,7 +567,7 @@ private: VclPtr<Edit> m_pTitleED; public: SfxAddHelpBookmarkDialog_Impl( vcl::Window* pParent, bool bRename = true ); - virtual ~SfxAddHelpBookmarkDialog_Impl(); + virtual ~SfxAddHelpBookmarkDialog_Impl() override; virtual void dispose() override; void SetTitle( const OUString& rTitle ); diff --git a/sfx2/source/appl/sfxpicklist.cxx b/sfx2/source/appl/sfxpicklist.cxx index f0e409b78fe0..be48209473a5 100644 --- a/sfx2/source/appl/sfxpicklist.cxx +++ b/sfx2/source/appl/sfxpicklist.cxx @@ -66,7 +66,7 @@ class StringLength : public ::cppu::WeakImplHelper< XStringWidth > { public: StringLength() {} - virtual ~StringLength() {} + virtual ~StringLength() override {} // XStringWidth sal_Int32 SAL_CALL queryStringWidth( const OUString& aString ) diff --git a/sfx2/source/appl/shutdownicon.hxx b/sfx2/source/appl/shutdownicon.hxx index ef95eead5e1a..cefeebb4b98f 100644 --- a/sfx2/source/appl/shutdownicon.hxx +++ b/sfx2/source/appl/shutdownicon.hxx @@ -80,7 +80,7 @@ class SFX2_DLLPUBLIC ShutdownIcon : public ShutdownIconServiceBase public: explicit ShutdownIcon( const css::uno::Reference< css::uno::XComponentContext > & rxContext ); - virtual ~ShutdownIcon(); + virtual ~ShutdownIcon() override; virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override; diff --git a/sfx2/source/bastyp/fltlst.cxx b/sfx2/source/bastyp/fltlst.cxx index 8792c008f56f..046e0ee9fe6b 100644 --- a/sfx2/source/bastyp/fltlst.cxx +++ b/sfx2/source/bastyp/fltlst.cxx @@ -47,7 +47,7 @@ class SfxRefreshListener : public ::cppu::WeakImplHelper<css::util::XRefreshList { } - virtual ~SfxRefreshListener() + virtual ~SfxRefreshListener() override { } diff --git a/sfx2/source/control/querystatus.cxx b/sfx2/source/control/querystatus.cxx index 2fd76fdac580..e53d812c3a11 100644 --- a/sfx2/source/control/querystatus.cxx +++ b/sfx2/source/control/querystatus.cxx @@ -50,7 +50,7 @@ class SfxQueryStatus_Impl: public: SfxQueryStatus_Impl( const css::uno::Reference< css::frame::XDispatchProvider >& rDispatchProvider, sal_uInt16 nSlotId, const OUString& aCommand ); - virtual ~SfxQueryStatus_Impl(); + virtual ~SfxQueryStatus_Impl() override; SfxQueryStatus_Impl(const SfxQueryStatus_Impl&) = delete; SfxQueryStatus_Impl& operator=(const SfxQueryStatus_Impl&) = delete; diff --git a/sfx2/source/control/request.cxx b/sfx2/source/control/request.cxx index fb437c795641..ccefe9573b9f 100644 --- a/sfx2/source/control/request.cxx +++ b/sfx2/source/control/request.cxx @@ -84,7 +84,7 @@ struct SfxRequest_Impl: public SfxListener , pInternalArgs( nullptr ) , pViewFrame(nullptr) {} - virtual ~SfxRequest_Impl() { delete pInternalArgs; } + virtual ~SfxRequest_Impl() override { delete pInternalArgs; } void SetPool( SfxItemPool *pNewPool ); diff --git a/sfx2/source/control/shell.cxx b/sfx2/source/control/shell.cxx index 2dd19e1b24f0..c2b903f09dff 100644 --- a/sfx2/source/control/shell.cxx +++ b/sfx2/source/control/shell.cxx @@ -82,7 +82,7 @@ struct SfxShell_Impl: public SfxBroadcaster { } - virtual ~SfxShell_Impl() { delete pExecuter; delete pUpdater;} + virtual ~SfxShell_Impl() override { delete pExecuter; delete pUpdater;} }; diff --git a/sfx2/source/control/thumbnailviewacc.hxx b/sfx2/source/control/thumbnailviewacc.hxx index 4b2f3953aadb..744970835e28 100644 --- a/sfx2/source/control/thumbnailviewacc.hxx +++ b/sfx2/source/control/thumbnailviewacc.hxx @@ -55,7 +55,7 @@ class ThumbnailViewAcc : public: ThumbnailViewAcc( ThumbnailView* pParent, bool bIsTransientChildrenDisabled ); - virtual ~ThumbnailViewAcc(); + virtual ~ThumbnailViewAcc() override; void FireAccessibleEvent( short nEventId, const css::uno::Any& rOldValue, @@ -177,7 +177,7 @@ private: public: ThumbnailViewItemAcc( ThumbnailViewItem* pParent, bool bIsTransientChildrenDisabled ); - virtual ~ThumbnailViewItemAcc(); + virtual ~ThumbnailViewItemAcc() override; void FireAccessibleEvent( short nEventId, const css::uno::Any& rOldValue, diff --git a/sfx2/source/dialog/backingcomp.cxx b/sfx2/source/dialog/backingcomp.cxx index 248733206e2d..3ba48e3f94fa 100644 --- a/sfx2/source/dialog/backingcomp.cxx +++ b/sfx2/source/dialog/backingcomp.cxx @@ -100,7 +100,7 @@ private: public: explicit BackingComp(const css::uno::Reference< css::uno::XComponentContext >& xContext); - virtual ~BackingComp( ); + virtual ~BackingComp( ) override; // XInterface virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw(css::uno::RuntimeException, std::exception) override; diff --git a/sfx2/source/dialog/backingwindow.hxx b/sfx2/source/dialog/backingwindow.hxx index abb68e9c765b..7fe9369e8c43 100644 --- a/sfx2/source/dialog/backingwindow.hxx +++ b/sfx2/source/dialog/backingwindow.hxx @@ -115,7 +115,7 @@ class BackingWindow : public vcl::Window, public VclBuilderContainer public: explicit BackingWindow(vcl::Window* pParent); - virtual ~BackingWindow(); + virtual ~BackingWindow() override; virtual void dispose() override; virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) override; diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx index 017ef84dd18a..b074dc05e17d 100644 --- a/sfx2/source/dialog/dinfdlg.cxx +++ b/sfx2/source/dialog/dinfdlg.cxx @@ -1271,7 +1271,7 @@ class DurationDialog_Impl : public ModalDialog public: DurationDialog_Impl( vcl::Window* pParent, const util::Duration& rDuration ); - virtual ~DurationDialog_Impl(); + virtual ~DurationDialog_Impl() override; virtual void dispose() override; util::Duration GetDuration() const; }; diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx index 137ad50c3181..66ec34b3d8d3 100644 --- a/sfx2/source/dialog/dockwin.cxx +++ b/sfx2/source/dialog/dockwin.cxx @@ -69,7 +69,7 @@ public: SfxChildWindow* pChildWin , vcl::Window* pParent , WinBits nBits); - virtual ~SfxTitleDockingWindow(); + virtual ~SfxTitleDockingWindow() override; virtual void dispose() override; vcl::Window* GetWrappedWindow() const { return m_pWrappedWindow; } diff --git a/sfx2/source/dialog/filedlgimpl.hxx b/sfx2/source/dialog/filedlgimpl.hxx index 7d4697dbb541..d3f0a3c793ea 100644 --- a/sfx2/source/dialog/filedlgimpl.hxx +++ b/sfx2/source/dialog/filedlgimpl.hxx @@ -179,7 +179,7 @@ namespace sfx2 const OUString& sStandardDir = OUString(), const css::uno::Sequence< OUString >& rBlackList = css::uno::Sequence< OUString >() ); - virtual ~FileDialogHelper_Impl(); + virtual ~FileDialogHelper_Impl() override; ErrCode execute( std::vector<OUString>& rpURLList, SfxItemSet *& rpSet, diff --git a/sfx2/source/dialog/infobar.cxx b/sfx2/source/dialog/infobar.cxx index e48aaaab8201..df620f809334 100644 --- a/sfx2/source/dialog/infobar.cxx +++ b/sfx2/source/dialog/infobar.cxx @@ -63,7 +63,7 @@ public: lclDetermineLightDarkColor(m_aBackgroundColor, m_aForegroundColor); } - virtual ~SfxCloseButton() {} + virtual ~SfxCloseButton() override {} virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) override; diff --git a/sfx2/source/dialog/mailmodel.cxx b/sfx2/source/dialog/mailmodel.cxx index 9d6e6b3ae1ca..e9bc1be90f0e 100644 --- a/sfx2/source/dialog/mailmodel.cxx +++ b/sfx2/source/dialog/mailmodel.cxx @@ -90,7 +90,7 @@ class PrepareListener_Impl : public ::cppu::WeakImplHelper< css::frame::XStatusL bool m_bState; public: PrepareListener_Impl(); - virtual ~PrepareListener_Impl(); + virtual ~PrepareListener_Impl() override; // css.frame.XStatusListener virtual void SAL_CALL statusChanged(const css::frame::FeatureStateEvent& aEvent) diff --git a/sfx2/source/dialog/splitwin.cxx b/sfx2/source/dialog/splitwin.cxx index bbe836309a11..1fbeab0a80dd 100644 --- a/sfx2/source/dialog/splitwin.cxx +++ b/sfx2/source/dialog/splitwin.cxx @@ -114,7 +114,7 @@ public: ShowFadeInHideButton(); } - virtual ~SfxEmptySplitWin_Impl() + virtual ~SfxEmptySplitWin_Impl() override { disposeOnce(); } virtual void dispose() override { diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index 9ba17a57b8c1..2519c8ae9f85 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -88,7 +88,7 @@ public: StyleLBoxString(const OUString& sText, const SfxStyleFamily& eStyleFamily); - virtual ~StyleLBoxString(); + virtual ~StyleLBoxString() override; virtual void Paint(const Point& aPos, SvTreeListBox& rDevice, diff --git a/sfx2/source/doc/Metadatable.cxx b/sfx2/source/doc/Metadatable.cxx index f6f3ae963672..52d7eace89f9 100644 --- a/sfx2/source/doc/Metadatable.cxx +++ b/sfx2/source/doc/Metadatable.cxx @@ -143,7 +143,7 @@ class XmlIdRegistry : public sfx2::IXmlIdRegistry public: XmlIdRegistry(); - virtual ~XmlIdRegistry(); + virtual ~XmlIdRegistry() override; /** get the ODF element with the given metadata reference. */ virtual css::uno::Reference< css::rdf::XMetadatable > @@ -214,7 +214,7 @@ class XmlIdRegistryDocument : public XmlIdRegistry public: XmlIdRegistryDocument(); - virtual ~XmlIdRegistryDocument(); + virtual ~XmlIdRegistryDocument() override; virtual void RegisterMetadatableAndCreateID(Metadatable& i_xObject) override; @@ -306,7 +306,7 @@ class XmlIdRegistryClipboard : public XmlIdRegistry public: XmlIdRegistryClipboard(); - virtual ~XmlIdRegistryClipboard(); + virtual ~XmlIdRegistryClipboard() override; virtual void RegisterMetadatableAndCreateID(Metadatable& i_xObject) override; diff --git a/sfx2/source/doc/SfxDocumentMetaData.cxx b/sfx2/source/doc/SfxDocumentMetaData.cxx index 4914aad7e365..cc2ecc61f6d4 100644 --- a/sfx2/source/doc/SfxDocumentMetaData.cxx +++ b/sfx2/source/doc/SfxDocumentMetaData.cxx @@ -287,7 +287,7 @@ public: throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; protected: - virtual ~SfxDocumentMetaData() {} + virtual ~SfxDocumentMetaData() override {} virtual SfxDocumentMetaData* createMe( css::uno::Reference< css::uno::XComponentContext > const & context ) { return new SfxDocumentMetaData( context ); }; const css::uno::Reference< css::uno::XComponentContext > m_xContext; diff --git a/sfx2/source/doc/doctempl.cxx b/sfx2/source/doc/doctempl.cxx index 844516478365..24933ce425ae 100644 --- a/sfx2/source/doc/doctempl.cxx +++ b/sfx2/source/doc/doctempl.cxx @@ -207,7 +207,7 @@ private: public: SfxDocTemplate_Impl(); - virtual ~SfxDocTemplate_Impl(); + virtual ~SfxDocTemplate_Impl() override; void IncrementLock(); void DecrementLock(); diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx index 2da4daae3dfd..d9b0bc1ef4ec 100644 --- a/sfx2/source/doc/doctemplates.cxx +++ b/sfx2/source/doc/doctemplates.cxx @@ -133,7 +133,7 @@ class WaitWindow_Impl : public WorkWindow public: WaitWindow_Impl(); - virtual ~WaitWindow_Impl(); + virtual ~WaitWindow_Impl() override; virtual void dispose() override; virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) override; }; @@ -2169,7 +2169,7 @@ class SfxDocTplService: public ::cppu::WeakImplHelper< css::lang::XLocalizable, public: explicit SfxDocTplService( const css::uno::Reference < uno::XComponentContext >& xContext ); - virtual ~SfxDocTplService(); + virtual ~SfxDocTplService() override; virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override diff --git a/sfx2/source/doc/doctemplateslocal.hxx b/sfx2/source/doc/doctemplateslocal.hxx index 3b41fc87a5b4..4c8bb09843b9 100644 --- a/sfx2/source/doc/doctemplateslocal.hxx +++ b/sfx2/source/doc/doctemplateslocal.hxx @@ -46,7 +46,7 @@ class DocTemplLocaleHelper : public cppu::WeakImplHelper < css::xml::sax::XDocum throw( css::uno::Exception ); public: - virtual ~DocTemplLocaleHelper(); + virtual ~DocTemplLocaleHelper() override; // returns sequence of pairs ( GroupName, GroupUIName ) static diff --git a/sfx2/source/doc/iframe.cxx b/sfx2/source/doc/iframe.cxx index 10fa37f42f36..a72d58b47974 100644 --- a/sfx2/source/doc/iframe.cxx +++ b/sfx2/source/doc/iframe.cxx @@ -65,7 +65,7 @@ class IFrameObject : public ::cppu::WeakImplHelper < public: IFrameObject(const css::uno::Reference < css::uno::XComponentContext>& rxContext, const css::uno::Sequence< css::uno::Any >& aArguments) throw (css::uno::Exception, css::uno::RuntimeException); - virtual ~IFrameObject(); + virtual ~IFrameObject() override; virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override diff --git a/sfx2/source/doc/ownsubfilterservice.cxx b/sfx2/source/doc/ownsubfilterservice.cxx index 8cb5fff8774d..57c2eecc2d05 100644 --- a/sfx2/source/doc/ownsubfilterservice.cxx +++ b/sfx2/source/doc/ownsubfilterservice.cxx @@ -45,7 +45,7 @@ public: explicit OwnSubFilterService(const css::uno::Sequence< css::uno::Any >& aArguments) throw (uno::Exception, uno::RuntimeException); - virtual ~OwnSubFilterService(); + virtual ~OwnSubFilterService() override; // XFilter virtual sal_Bool SAL_CALL filter( const uno::Sequence< beans::PropertyValue >& aDescriptor ) throw (uno::RuntimeException, std::exception) override; diff --git a/sfx2/source/doc/printhelper.hxx b/sfx2/source/doc/printhelper.hxx index a75549edf0e0..aedd9e211b6c 100644 --- a/sfx2/source/doc/printhelper.hxx +++ b/sfx2/source/doc/printhelper.hxx @@ -46,7 +46,7 @@ class SfxPrintHelper : public cppu::WeakImplHelper public: SfxPrintHelper() ; - virtual ~SfxPrintHelper() ; + virtual ~SfxPrintHelper() override ; void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addPrintJobListener( const css::uno::Reference< css::view::XPrintJobListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx index 62e87918b82b..a421ea81fbed 100644 --- a/sfx2/source/doc/sfxbasemodel.cxx +++ b/sfx2/source/doc/sfxbasemodel.cxx @@ -152,7 +152,7 @@ public: : m_rShell(i_rDoc) { }; - virtual ~SfxDocInfoListener_Impl(); + virtual ~SfxDocInfoListener_Impl() override; virtual void SAL_CALL disposing( const lang::EventObject& ) throw ( RuntimeException, std::exception ) override; diff --git a/sfx2/source/doc/sfxmodelfactory.cxx b/sfx2/source/doc/sfxmodelfactory.cxx index 5a03d07880d4..60f72492b209 100644 --- a/sfx2/source/doc/sfxmodelfactory.cxx +++ b/sfx2/source/doc/sfxmodelfactory.cxx @@ -84,7 +84,7 @@ namespace sfx2 virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (RuntimeException, std::exception) override; protected: - virtual ~SfxModelFactory(); + virtual ~SfxModelFactory() override; private: Reference< XInterface > impl_createInstance( const SfxModelFlags _nCreationFlags ) const; diff --git a/sfx2/source/explorer/nochaos.cxx b/sfx2/source/explorer/nochaos.cxx index f19d39395926..9141d049bd10 100644 --- a/sfx2/source/explorer/nochaos.cxx +++ b/sfx2/source/explorer/nochaos.cxx @@ -60,7 +60,7 @@ class CntItemPool: public SfxItemPool protected: CntItemPool(); - virtual ~CntItemPool(); + virtual ~CntItemPool() override; public: static CntItemPool* Acquire(); diff --git a/sfx2/source/inc/alienwarn.hxx b/sfx2/source/inc/alienwarn.hxx index 02cc724842f1..fc4a52bfad1a 100644 --- a/sfx2/source/inc/alienwarn.hxx +++ b/sfx2/source/inc/alienwarn.hxx @@ -32,7 +32,7 @@ private: public: SfxAlienWarningDialog(vcl::Window* pParent, const OUString& _rFormatName, const OUString& _rDefaultExtension, bool rDefaultIsAlien); - virtual ~SfxAlienWarningDialog(); + virtual ~SfxAlienWarningDialog() override; virtual void dispose() override; }; diff --git a/sfx2/source/inc/documentfontsdialog.hxx b/sfx2/source/inc/documentfontsdialog.hxx index 4c3bd5f552a2..ce601faba498 100644 --- a/sfx2/source/inc/documentfontsdialog.hxx +++ b/sfx2/source/inc/documentfontsdialog.hxx @@ -31,7 +31,7 @@ class SfxDocumentFontsPage: public SfxTabPage { public: SfxDocumentFontsPage( vcl::Window* parent, const SfxItemSet& set ); - virtual ~SfxDocumentFontsPage(); + virtual ~SfxDocumentFontsPage() override; virtual void dispose() override; static VclPtr<SfxTabPage> Create( vcl::Window* parent, const SfxItemSet* set ); protected: diff --git a/sfx2/source/inc/docundomanager.hxx b/sfx2/source/inc/docundomanager.hxx index 81e90ea4c589..b675ca2ddf1f 100644 --- a/sfx2/source/inc/docundomanager.hxx +++ b/sfx2/source/inc/docundomanager.hxx @@ -108,7 +108,7 @@ namespace sfx2 public: DocumentUndoManager( SfxBaseModel& i_document ); - virtual ~DocumentUndoManager(); + virtual ~DocumentUndoManager() override; DocumentUndoManager(const DocumentUndoManager&) = delete; DocumentUndoManager& operator=(const DocumentUndoManager&) = delete; diff --git a/sfx2/source/inc/eventsupplier.hxx b/sfx2/source/inc/eventsupplier.hxx index c5bb5db6dcda..2a3a0cfbf01e 100644 --- a/sfx2/source/inc/eventsupplier.hxx +++ b/sfx2/source/inc/eventsupplier.hxx @@ -60,7 +60,7 @@ class SfxEvents_Impl : public ::cppu::WeakImplHelper< css::container::XNameRepla public: SfxEvents_Impl( SfxObjectShell* pShell, css::uno::Reference< css::document::XEventBroadcaster > const & xBroadcaster ); - virtual ~SfxEvents_Impl(); + virtual ~SfxEvents_Impl() override; // --- XNameReplace --- virtual void SAL_CALL replaceByName( const OUString & aName, const css::uno::Any & aElement ) diff --git a/sfx2/source/inc/openurlhint.hxx b/sfx2/source/inc/openurlhint.hxx index ae8356ede52a..229194bea743 100644 --- a/sfx2/source/inc/openurlhint.hxx +++ b/sfx2/source/inc/openurlhint.hxx @@ -30,7 +30,7 @@ class SfxOpenUrlHint: public SfxSimpleHint public: SfxOpenUrlHint(const OUString& sDocumentURL); const OUString& GetDocumentURL() const; - virtual ~SfxOpenUrlHint(); + virtual ~SfxOpenUrlHint() override; }; #endif diff --git a/sfx2/source/inc/partwnd.hxx b/sfx2/source/inc/partwnd.hxx index 730c603c0789..07f873ce76da 100644 --- a/sfx2/source/inc/partwnd.hxx +++ b/sfx2/source/inc/partwnd.hxx @@ -48,7 +48,7 @@ public: SfxChildWinInfo* pInfo ); SFX_DECL_CHILDWINDOW(SfxPartChildWnd_Impl); - virtual ~SfxPartChildWnd_Impl(); + virtual ~SfxPartChildWnd_Impl() override; virtual bool QueryClose() override; }; diff --git a/sfx2/source/inc/recfloat.hxx b/sfx2/source/inc/recfloat.hxx index fd02b24b70b0..d3bfd427949f 100644 --- a/sfx2/source/inc/recfloat.hxx +++ b/sfx2/source/inc/recfloat.hxx @@ -31,7 +31,7 @@ public: sal_uInt16 nId , SfxBindings* pBindings , SfxChildWinInfo* pInfo ); - virtual ~SfxRecordingFloatWrapper_Impl(); + virtual ~SfxRecordingFloatWrapper_Impl() override; SFX_DECL_CHILDWINDOW(SfxRecordingFloatWrapper_Impl); virtual bool QueryClose() override; @@ -43,7 +43,7 @@ public: SfxRecordingFloat_Impl( SfxBindings* pBindings , SfxChildWindow* pChildWin , vcl::Window* pParent ); - virtual ~SfxRecordingFloat_Impl(); + virtual ~SfxRecordingFloat_Impl() override; virtual bool Close() override; virtual void FillInfo( SfxChildWinInfo& rInfo ) const override; virtual void StateChanged( StateChangedType nStateChange ) override; diff --git a/sfx2/source/inc/sfxpicklist.hxx b/sfx2/source/inc/sfxpicklist.hxx index 9f1fe7816d5c..e77d6ed69c17 100644 --- a/sfx2/source/inc/sfxpicklist.hxx +++ b/sfx2/source/inc/sfxpicklist.hxx @@ -35,7 +35,7 @@ class SfxPickList : public SfxListener css::uno::Reference< css::util::XStringWidth > m_xStringLength; SfxPickList( sal_uInt32 nMenuSize ); - virtual ~SfxPickList(); + virtual ~SfxPickList() override; /** * Adds the given document to the pick list (recent documents) if it satisfies diff --git a/sfx2/source/inc/splitwin.hxx b/sfx2/source/inc/splitwin.hxx index 389384b37906..2ef9c1f9582d 100644 --- a/sfx2/source/inc/splitwin.hxx +++ b/sfx2/source/inc/splitwin.hxx @@ -78,7 +78,7 @@ public: SfxSplitWindow( vcl::Window* pParent, SfxChildAlignment eAl, SfxWorkWindow *pW, bool bWithButtons ); - virtual ~SfxSplitWindow(); + virtual ~SfxSplitWindow() override; virtual void dispose() override; void ReleaseWindow_Impl(SfxDockingWindow *pWin, bool bSaveConfig=true); diff --git a/sfx2/source/inc/templatesearchviewitem.hxx b/sfx2/source/inc/templatesearchviewitem.hxx index f2b6801860f6..fe5a511bbf1d 100644 --- a/sfx2/source/inc/templatesearchviewitem.hxx +++ b/sfx2/source/inc/templatesearchviewitem.hxx @@ -19,7 +19,7 @@ struct TemplateSearchViewItem : public TemplateViewItem , mnAssocId(0) {} - virtual ~TemplateSearchViewItem () + virtual ~TemplateSearchViewItem () override {} sal_uInt16 mnAssocId; //Associated item id to the TemplateViews diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx index d641b83f8ea8..526078cc7fab 100644 --- a/sfx2/source/inc/templdgi.hxx +++ b/sfx2/source/inc/templdgi.hxx @@ -284,7 +284,7 @@ protected: public: SfxCommonTemplateDialog_Impl( SfxBindings* pB, vcl::Window*, bool ); - virtual ~SfxCommonTemplateDialog_Impl(); + virtual ~SfxCommonTemplateDialog_Impl() override; DECL_LINK_TYPED( MenuSelectHdl, Menu*, bool ); DECL_LINK_TYPED( MenuSelectAsyncHdl, void*, void ); @@ -376,7 +376,7 @@ public: friend class SfxTemplateDialog; SfxTemplateDialog_Impl( SfxBindings*, SfxTemplatePanelControl* pDlgWindow ); - virtual ~SfxTemplateDialog_Impl(); + virtual ~SfxTemplateDialog_Impl() override; void Initialize(); }; diff --git a/sfx2/source/inc/tplcitem.hxx b/sfx2/source/inc/tplcitem.hxx index ff823fa66cc6..01f62f6e7682 100644 --- a/sfx2/source/inc/tplcitem.hxx +++ b/sfx2/source/inc/tplcitem.hxx @@ -36,7 +36,7 @@ protected: public: SfxTemplateControllerItem(sal_uInt16 nId, SfxCommonTemplateDialog_Impl& rDialog, SfxBindings& rBindings); - virtual ~SfxTemplateControllerItem(); + virtual ~SfxTemplateControllerItem() override; }; #endif diff --git a/sfx2/source/inc/versdlg.hxx b/sfx2/source/inc/versdlg.hxx index 04a48a6b120f..0d99c641e20e 100644 --- a/sfx2/source/inc/versdlg.hxx +++ b/sfx2/source/inc/versdlg.hxx @@ -65,7 +65,7 @@ class SfxVersionDialog : public SfxModalDialog public: SfxVersionDialog ( SfxViewFrame* pFrame, bool ); - virtual ~SfxVersionDialog (); + virtual ~SfxVersionDialog () override; virtual void dispose() override; bool IsSaveVersionOnClose() const { return m_bIsSaveVersionOnClose; } }; @@ -84,7 +84,7 @@ class SfxViewVersionDialog_Impl : public SfxModalDialog public: SfxViewVersionDialog_Impl(vcl::Window *pParent, SfxVersionInfo& rInfo, bool bEdit); - virtual ~SfxViewVersionDialog_Impl(); + virtual ~SfxViewVersionDialog_Impl() override; virtual void dispose() override; }; @@ -102,7 +102,7 @@ class SfxCmisVersionsDialog : public SfxModalDialog public: SfxCmisVersionsDialog ( SfxViewFrame* pFrame ); - virtual ~SfxCmisVersionsDialog (); + virtual ~SfxCmisVersionsDialog () override; virtual void dispose() override; }; diff --git a/sfx2/source/inc/workwin.hxx b/sfx2/source/inc/workwin.hxx index 6643cf2a01a8..3b111fda6581 100644 --- a/sfx2/source/inc/workwin.hxx +++ b/sfx2/source/inc/workwin.hxx @@ -160,7 +160,7 @@ class LayoutManagerListener : public ::cppu::WeakImplHelper< { public: LayoutManagerListener( SfxWorkWindow* pWrkWin ); - virtual ~LayoutManagerListener(); + virtual ~LayoutManagerListener() override; void setFrame( const css::uno::Reference< css::frame::XFrame >& rFrame ); diff --git a/sfx2/source/notebookbar/DropdownBox.cxx b/sfx2/source/notebookbar/DropdownBox.cxx index 63bf89cd8e53..dd162cdf9f39 100644 --- a/sfx2/source/notebookbar/DropdownBox.cxx +++ b/sfx2/source/notebookbar/DropdownBox.cxx @@ -45,7 +45,7 @@ public: m_pBox->SetSizePixel(Size(100, 75)); } - virtual ~Popup() + virtual ~Popup() override { disposeOnce(); } diff --git a/sfx2/source/notify/globalevents.cxx b/sfx2/source/notify/globalevents.cxx index 0711b66a5a5f..9cecd83e5740 100644 --- a/sfx2/source/notify/globalevents.cxx +++ b/sfx2/source/notify/globalevents.cxx @@ -73,7 +73,7 @@ class SfxGlobalEvents_Impl : public ModelCollectionMutexBase public: explicit SfxGlobalEvents_Impl(const css::uno::Reference < css::uno::XComponentContext >& rxContext); - virtual ~SfxGlobalEvents_Impl(); + virtual ~SfxGlobalEvents_Impl() override; virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override diff --git a/sfx2/source/sidebar/ControllerItem.cxx b/sfx2/source/sidebar/ControllerItem.cxx index 9ca665ae61ad..5443020364af 100644 --- a/sfx2/source/sidebar/ControllerItem.cxx +++ b/sfx2/source/sidebar/ControllerItem.cxx @@ -56,7 +56,7 @@ namespace if (mxFrame.is()) mxFrame->addFrameActionListener(this); } - virtual ~FrameActionListener() + virtual ~FrameActionListener() override { } virtual void SAL_CALL disposing() override diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx index f11745844bdc..b76167087b0f 100644 --- a/sfx2/source/toolbox/tbxitem.cxx +++ b/sfx2/source/toolbox/tbxitem.cxx @@ -726,7 +726,7 @@ class SfxFrameStatusListener : public svt::FrameStatusListener SfxFrameStatusListener( const css::uno::Reference< css::uno::XComponentContext >& rxContext, const css::uno::Reference< css::frame::XFrame >& xFrame, SfxPopupWindow* pCallee ); - virtual ~SfxFrameStatusListener(); + virtual ~SfxFrameStatusListener() override; // XStatusListener virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) diff --git a/sfx2/source/view/classificationcontroller.cxx b/sfx2/source/view/classificationcontroller.cxx index af9152310c08..eaa94b752738 100644 --- a/sfx2/source/view/classificationcontroller.cxx +++ b/sfx2/source/view/classificationcontroller.cxx @@ -62,7 +62,7 @@ class ClassificationCategoriesController : public ClassificationCategoriesContro public: explicit ClassificationCategoriesController(const uno::Reference<uno::XComponentContext>& rContext); - virtual ~ClassificationCategoriesController(); + virtual ~ClassificationCategoriesController() override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() throw (uno::RuntimeException, std::exception) override; @@ -91,7 +91,7 @@ class SAL_WARN_UNUSED ClassificationControl : public vcl::Window public: explicit ClassificationControl(vcl::Window* pParent); - virtual ~ClassificationControl(); + virtual ~ClassificationControl() override; virtual void dispose() override; virtual void Resize() override; const VclPtr<ListBox>& getCategories(SfxClassificationPolicyType eType); diff --git a/sfx2/source/view/classificationhelper.cxx b/sfx2/source/view/classificationhelper.cxx index f1914a37d191..500e2797e77e 100644 --- a/sfx2/source/view/classificationhelper.cxx +++ b/sfx2/source/view/classificationhelper.cxx @@ -117,7 +117,7 @@ public: SfxClassificationCategory* m_pCategory; SfxClassificationParser(); - virtual ~SfxClassificationParser(); + virtual ~SfxClassificationParser() override; virtual void SAL_CALL startDocument() throw (xml::sax::SAXException, uno::RuntimeException, std::exception) override; diff --git a/sfx2/source/view/frmload.cxx b/sfx2/source/view/frmload.cxx index 4077e9dbc0fe..829e1c96ebf4 100644 --- a/sfx2/source/view/frmload.cxx +++ b/sfx2/source/view/frmload.cxx @@ -119,7 +119,7 @@ public: virtual void SAL_CALL cancel() throw( css::uno::RuntimeException, std::exception ) override; protected: - virtual ~SfxFrameLoader_Impl(); + virtual ~SfxFrameLoader_Impl() override; private: std::shared_ptr<const SfxFilter> impl_getFilterFromServiceName_nothrow( diff --git a/sfx2/source/view/impframe.hxx b/sfx2/source/view/impframe.hxx index 1229b4469733..9939d8b9ec9f 100644 --- a/sfx2/source/view/impframe.hxx +++ b/sfx2/source/view/impframe.hxx @@ -72,7 +72,7 @@ public: { } - virtual ~SfxFrame_Impl() { } + virtual ~SfxFrame_Impl() override { } }; #endif diff --git a/sfx2/source/view/ipclient.cxx b/sfx2/source/view/ipclient.cxx index b1d983e17a75..4954e4ddd745 100644 --- a/sfx2/source/view/ipclient.cxx +++ b/sfx2/source/view/ipclient.cxx @@ -120,7 +120,7 @@ public: , m_bResizeNoScale( false ) {} - virtual ~SfxInPlaceClient_Impl(); + virtual ~SfxInPlaceClient_Impl() override; void SizeHasChanged(); DECL_LINK_TYPED(TimerHdl, Timer *, void); diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx index e2db91966619..55403850a63a 100644 --- a/sfx2/source/view/sfxbasecontroller.cxx +++ b/sfx2/source/view/sfxbasecontroller.cxx @@ -320,7 +320,7 @@ class IMPL_SfxBaseController_ListenerHelper : public ::cppu::WeakImplHelper< fra { public: explicit IMPL_SfxBaseController_ListenerHelper( SfxBaseController* pController ) ; - virtual ~IMPL_SfxBaseController_ListenerHelper() ; + virtual ~IMPL_SfxBaseController_ListenerHelper() override ; virtual void SAL_CALL frameAction( const frame::FrameActionEvent& aEvent ) throw (RuntimeException, std::exception) override ; virtual void SAL_CALL disposing( const lang::EventObject& aEvent ) throw (RuntimeException, std::exception) override ; @@ -334,7 +334,7 @@ class IMPL_SfxBaseController_CloseListenerHelper : public ::cppu::WeakImplHelper { public: explicit IMPL_SfxBaseController_CloseListenerHelper( SfxBaseController* pController ) ; - virtual ~IMPL_SfxBaseController_CloseListenerHelper() ; + virtual ~IMPL_SfxBaseController_CloseListenerHelper() override ; virtual void SAL_CALL queryClosing( const lang::EventObject& aEvent, sal_Bool bDeliverOwnership ) throw (RuntimeException, util::CloseVetoException, std::exception) override ; virtual void SAL_CALL notifyClosing( const lang::EventObject& aEvent ) throw (RuntimeException, std::exception) override ; diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx index 2bc571e3bffd..e2f91107fba0 100644 --- a/sfx2/source/view/viewprn.cxx +++ b/sfx2/source/view/viewprn.cxx @@ -85,7 +85,7 @@ public: const uno::Sequence< beans::PropertyValue >& rProps ); - virtual ~SfxPrinterController(); + virtual ~SfxPrinterController() override; virtual void Notify( SfxBroadcaster&, const SfxHint& ) override; virtual int getPageCount() const override; diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx index e2d2473f71c5..9af6d8f48169 100644 --- a/sfx2/source/view/viewsh.cxx +++ b/sfx2/source/view/viewsh.cxx @@ -104,7 +104,7 @@ class SfxClipboardChangeListener : public ::cppu::WeakImplHelper< { public: SfxClipboardChangeListener( SfxViewShell* pView, const uno::Reference< datatransfer::clipboard::XClipboardNotifier >& xClpbrdNtfr ); - virtual ~SfxClipboardChangeListener(); + virtual ~SfxClipboardChangeListener() override; // XEventListener virtual void SAL_CALL disposing( const lang::EventObject& rEventObject ) |