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/svtools | |
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/svtools')
65 files changed, 90 insertions, 90 deletions
diff --git a/include/svtools/DocumentInfoPreview.hxx b/include/svtools/DocumentInfoPreview.hxx index d7b02e73de76..0194520facdb 100644 --- a/include/svtools/DocumentInfoPreview.hxx +++ b/include/svtools/DocumentInfoPreview.hxx @@ -42,7 +42,7 @@ class SVT_DLLPUBLIC ODocumentInfoPreview: public vcl::Window { public: ODocumentInfoPreview(vcl::Window * pParent, WinBits nBits); - virtual ~ODocumentInfoPreview(); + virtual ~ODocumentInfoPreview() override; virtual void dispose() override; virtual void Resize() override; diff --git a/include/svtools/GraphicExportOptionsDialog.hxx b/include/svtools/GraphicExportOptionsDialog.hxx index 420b3ba21e33..41090dd68e21 100644 --- a/include/svtools/GraphicExportOptionsDialog.hxx +++ b/include/svtools/GraphicExportOptionsDialog.hxx @@ -62,7 +62,7 @@ private: public: GraphicExportOptionsDialog( vcl::Window* pWindow, const css::uno::Reference<css::lang::XComponent>& rxSourceDocument ); - virtual ~GraphicExportOptionsDialog(); + virtual ~GraphicExportOptionsDialog() override; virtual void dispose() override; css::uno::Sequence<css::beans::PropertyValue> getFilterData(); }; diff --git a/include/svtools/PlaceEditDialog.hxx b/include/svtools/PlaceEditDialog.hxx index b2f65b530f0a..975789971dee 100644 --- a/include/svtools/PlaceEditDialog.hxx +++ b/include/svtools/PlaceEditDialog.hxx @@ -64,7 +64,7 @@ public : PlaceEditDialog( vcl::Window* pParent); PlaceEditDialog(vcl::Window* pParent, const std::shared_ptr<Place> &rPlace ); - virtual ~PlaceEditDialog(); + virtual ~PlaceEditDialog() override; virtual void dispose() override; // Returns a place instance with given information diff --git a/include/svtools/ServerDetailsControls.hxx b/include/svtools/ServerDetailsControls.hxx index aaef76f90998..a0a20157d2c9 100644 --- a/include/svtools/ServerDetailsControls.hxx +++ b/include/svtools/ServerDetailsControls.hxx @@ -73,7 +73,7 @@ class HostDetailsContainer : public DetailsContainer public: HostDetailsContainer( VclBuilderContainer* pBuilder, sal_uInt16 nPort, const OUString& sScheme ); - virtual ~HostDetailsContainer( ) { }; + virtual ~HostDetailsContainer( ) override { }; virtual void show( bool bShow = true ) override; virtual INetURLObject getUrl( ) override; @@ -95,7 +95,7 @@ class DavDetailsContainer : public HostDetailsContainer public: DavDetailsContainer( VclBuilderContainer* pBuilder ); - virtual ~DavDetailsContainer( ) { }; + virtual ~DavDetailsContainer( ) override { }; virtual void show( bool bShow = true ) override; virtual bool enableUserCredentials( ) override { return false; }; @@ -115,7 +115,7 @@ class SmbDetailsContainer : public DetailsContainer public: SmbDetailsContainer( VclBuilderContainer* pBuilder ); - virtual ~SmbDetailsContainer( ) { }; + virtual ~SmbDetailsContainer( ) override { }; virtual INetURLObject getUrl( ) override; virtual bool setUrl( const INetURLObject& rUrl ) override; @@ -140,7 +140,7 @@ class CmisDetailsContainer : public DetailsContainer public: CmisDetailsContainer(VclBuilderContainer* pBuilder, Dialog* pParentDialog, OUString const & sBinding); - virtual ~CmisDetailsContainer( ) { }; + virtual ~CmisDetailsContainer( ) override { }; virtual void show( bool bShow = true ) override; virtual INetURLObject getUrl( ) override; diff --git a/include/svtools/accessibilityoptions.hxx b/include/svtools/accessibilityoptions.hxx index 9c642a4bbcc3..1cc78a7dc9f5 100644 --- a/include/svtools/accessibilityoptions.hxx +++ b/include/svtools/accessibilityoptions.hxx @@ -35,7 +35,7 @@ private: public: SvtAccessibilityOptions(); - virtual ~SvtAccessibilityOptions(); + virtual ~SvtAccessibilityOptions() override; // get & set config entries bool GetIsForPagePreviews() const; diff --git a/include/svtools/accessiblefactory.hxx b/include/svtools/accessiblefactory.hxx index 7898426803b7..d9f3271d4490 100644 --- a/include/svtools/accessiblefactory.hxx +++ b/include/svtools/accessiblefactory.hxx @@ -159,7 +159,7 @@ namespace svt ) const = 0; protected: - virtual ~IAccessibleFactory() {} + virtual ~IAccessibleFactory() override {} }; diff --git a/include/svtools/accessibleruler.hxx b/include/svtools/accessibleruler.hxx index b7747877bd8a..ddc63a4e0898 100644 --- a/include/svtools/accessibleruler.hxx +++ b/include/svtools/accessibleruler.hxx @@ -67,7 +67,7 @@ public: SvtRulerAccessible( const css::uno::Reference< css::accessibility::XAccessible>& rxParent, Ruler& rRepresentation, const ::rtl::OUString& rName ); protected: - virtual ~SvtRulerAccessible(); + virtual ~SvtRulerAccessible() override; public: bool SAL_CALL diff --git a/include/svtools/addresstemplate.hxx b/include/svtools/addresstemplate.hxx index e52b17a51b0e..47e89f574291 100644 --- a/include/svtools/addresstemplate.hxx +++ b/include/svtools/addresstemplate.hxx @@ -97,7 +97,7 @@ namespace svt const css::uno::Sequence< css::util::AliasProgrammaticPair >& _rMapping ); - virtual ~AddressBookSourceDialog(); + virtual ~AddressBookSourceDialog() override; virtual void dispose() override; // to be used if the object was constructed for editing a field mapping only diff --git a/include/svtools/apearcfg.hxx b/include/svtools/apearcfg.hxx index 98cd37c57aa5..f7a4019f7cfd 100644 --- a/include/svtools/apearcfg.hxx +++ b/include/svtools/apearcfg.hxx @@ -59,7 +59,7 @@ class SVT_DLLPUBLIC SvtTabAppearanceCfg : public utl::ConfigItem public: SvtTabAppearanceCfg( ); - virtual ~SvtTabAppearanceCfg( ); + virtual ~SvtTabAppearanceCfg( ) override; virtual void Notify( const css::uno::Sequence< OUString >& _rPropertyNames) override; diff --git a/include/svtools/breadcrumb.hxx b/include/svtools/breadcrumb.hxx index 6eff94445ff8..ac23e9b427b2 100644 --- a/include/svtools/breadcrumb.hxx +++ b/include/svtools/breadcrumb.hxx @@ -50,7 +50,7 @@ class SVT_DLLPUBLIC Breadcrumb : public VclHBox public: Breadcrumb( vcl::Window* pParent ); - virtual ~Breadcrumb(); + virtual ~Breadcrumb() override; void dispose() override; void EnableFields( bool bEnable ); diff --git a/include/svtools/brwbox.hxx b/include/svtools/brwbox.hxx index f3bb8a34914f..30cee3c8331c 100644 --- a/include/svtools/brwbox.hxx +++ b/include/svtools/brwbox.hxx @@ -395,7 +395,7 @@ public: BrowserMode nMode = BrowserMode::NONE ); BrowseBox( vcl::Window* pParent, const ResId& rId, BrowserMode nMode = BrowserMode::NONE ); - virtual ~BrowseBox(); + virtual ~BrowseBox() override; virtual void dispose() override; // override inherited handler diff --git a/include/svtools/brwhead.hxx b/include/svtools/brwhead.hxx index 3f07347db07e..0520007cb247 100644 --- a/include/svtools/brwhead.hxx +++ b/include/svtools/brwhead.hxx @@ -31,7 +31,7 @@ class SVT_DLLPUBLIC BrowserHeader: public HeaderBar VclPtr<BrowseBox> _pBrowseBox; public: - virtual ~BrowserHeader(); + virtual ~BrowserHeader() override; virtual void dispose() override; protected: virtual void Command( const CommandEvent& rCEvt ) override; diff --git a/include/svtools/calendar.hxx b/include/svtools/calendar.hxx index 3814d11a702b..cb69224ba288 100644 --- a/include/svtools/calendar.hxx +++ b/include/svtools/calendar.hxx @@ -247,7 +247,7 @@ protected: public: Calendar( vcl::Window* pParent, WinBits nWinStyle = 0 ); - virtual ~Calendar(); + virtual ~Calendar() override; virtual void dispose() override; virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; @@ -350,7 +350,7 @@ private: public: CalendarField( vcl::Window* pParent, WinBits nWinStyle ); - virtual ~CalendarField(); + virtual ~CalendarField() override; virtual void dispose() override; virtual bool ShowDropDown( bool bShow ) override; diff --git a/include/svtools/cliplistener.hxx b/include/svtools/cliplistener.hxx index b73dff5e43fe..c6364ded6400 100644 --- a/include/svtools/cliplistener.hxx +++ b/include/svtools/cliplistener.hxx @@ -38,7 +38,7 @@ class SVT_DLLPUBLIC TransferableClipboardListener : public ::cppu::WeakImplHelpe public: // Link is called with a TransferableDataHelper pointer TransferableClipboardListener( const Link<TransferableDataHelper*,void>& rCallback ); - virtual ~TransferableClipboardListener(); + virtual ~TransferableClipboardListener() override; void AddListener( vcl::Window* pWin ) { AddRemoveListener(pWin, true); } void RemoveListener( vcl::Window* pWin ) { AddRemoveListener(pWin, false); } diff --git a/include/svtools/colorcfg.hxx b/include/svtools/colorcfg.hxx index b5e153b1fff4..ad3672d7b83b 100644 --- a/include/svtools/colorcfg.hxx +++ b/include/svtools/colorcfg.hxx @@ -98,7 +98,7 @@ private: static ColorConfig_Impl* m_pImpl; public: ColorConfig(); - virtual ~ColorConfig(); + virtual ~ColorConfig() override; // get the configured value - if bSmart is set the default color setting is provided // instead of the automatic color diff --git a/include/svtools/ctrlbox.hxx b/include/svtools/ctrlbox.hxx index a679e496b5eb..b068b556b5c2 100644 --- a/include/svtools/ctrlbox.hxx +++ b/include/svtools/ctrlbox.hxx @@ -154,7 +154,7 @@ public: ColorListBox( vcl::Window* pParent, WinBits nWinStyle = WB_BORDER ); ColorListBox( vcl::Window* pParent, const ResId& rResId ); - virtual ~ColorListBox(); + virtual ~ColorListBox() override; virtual void dispose() override; virtual void UserDraw( const UserDrawEvent& rUDEvt ) override; @@ -306,7 +306,7 @@ public: typedef Color (*ColorDistFunc)(Color, Color); LineListBox( vcl::Window* pParent, WinBits nWinStyle = WB_BORDER ); - virtual ~LineListBox(); + virtual ~LineListBox() override; virtual void dispose() override; /** Set the width in Twips */ @@ -388,7 +388,7 @@ protected: public: FontNameBox( vcl::Window* pParent, WinBits nWinStyle = WB_SORT ); - virtual ~FontNameBox(); + virtual ~FontNameBox() override; virtual void dispose() override; virtual void UserDraw( const UserDrawEvent& rUDEvt ) override; diff --git a/include/svtools/editbrowsebox.hxx b/include/svtools/editbrowsebox.hxx index e2f699875954..9dcba3ba6a12 100644 --- a/include/svtools/editbrowsebox.hxx +++ b/include/svtools/editbrowsebox.hxx @@ -91,7 +91,7 @@ namespace svt public: CellController(Control* pW); - virtual ~CellController(); + virtual ~CellController() override; Control& GetWindow() const { return *const_cast< CellController* >( this )->pWindow; } @@ -237,7 +237,7 @@ namespace svt public: EditCellController( Edit* _pEdit ); EditCellController( IEditImplementation* _pImplementation ); - virtual ~EditCellController( ); + virtual ~EditCellController( ) override; const IEditImplementation* GetEditImplementation( ) const { return m_pEditImplementation; } IEditImplementation* GetEditImplementation( ) { return m_pEditImplementation; } @@ -284,7 +284,7 @@ namespace svt public: CheckBoxControl(vcl::Window* pParent); - virtual ~CheckBoxControl(); + virtual ~CheckBoxControl() override; virtual void dispose() override; virtual void GetFocus() override; @@ -587,7 +587,7 @@ namespace svt public: EditBrowseBox(vcl::Window* pParent, EditBrowseBoxFlags nBrowserFlags = EditBrowseBoxFlags::NONE, WinBits nBits = WB_TABSTOP, BrowserMode nMode = BrowserMode::NONE ); EditBrowseBox(vcl::Window* pParent, const ResId& rId, EditBrowseBoxFlags nBrowserFlags = EditBrowseBoxFlags::NONE, BrowserMode nMode = BrowserMode::NONE ); - virtual ~EditBrowseBox(); + virtual ~EditBrowseBox() override; virtual void dispose() override; bool IsEditing() const {return aController.Is();} diff --git a/include/svtools/ehdl.hxx b/include/svtools/ehdl.hxx index 844c79285caf..7649e1361d6c 100644 --- a/include/svtools/ehdl.hxx +++ b/include/svtools/ehdl.hxx @@ -51,7 +51,7 @@ class SVT_DLLPUBLIC SfxErrorHandler : private ErrorHandler { public: SfxErrorHandler(sal_uInt16 nId, sal_uLong lStart, sal_uLong lEnd, ResMgr *pMgr=nullptr); - virtual ~SfxErrorHandler(); + virtual ~SfxErrorHandler() override; protected: bool GetErrorString(sal_uLong lErrId, OUString &, sal_uInt16&) const; diff --git a/include/svtools/embedtransfer.hxx b/include/svtools/embedtransfer.hxx index c76c5b4b9734..35a45987607f 100644 --- a/include/svtools/embedtransfer.hxx +++ b/include/svtools/embedtransfer.hxx @@ -46,7 +46,7 @@ public: SvEmbedTransferHelper( const css::uno::Reference< css::embed::XEmbeddedObject >& xObj, const Graphic* pGraphic, sal_Int64 nAspect ); - virtual ~SvEmbedTransferHelper(); + virtual ~SvEmbedTransferHelper() override; void SetParentShellID( const OUString& rShellID ); diff --git a/include/svtools/extcolorcfg.hxx b/include/svtools/extcolorcfg.hxx index be0982870171..2f3c9559c41b 100644 --- a/include/svtools/extcolorcfg.hxx +++ b/include/svtools/extcolorcfg.hxx @@ -64,7 +64,7 @@ private: static ExtendedColorConfig_Impl* m_pImpl; public: ExtendedColorConfig(); - virtual ~ExtendedColorConfig(); + virtual ~ExtendedColorConfig() override; virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; diff --git a/include/svtools/filectrl.hxx b/include/svtools/filectrl.hxx index 1ba522d46612..0e976bb45cbd 100644 --- a/include/svtools/filectrl.hxx +++ b/include/svtools/filectrl.hxx @@ -62,7 +62,7 @@ protected: public: FileControl( vcl::Window* pParent, WinBits nStyle ); - virtual ~FileControl(); + virtual ~FileControl() override; virtual void dispose() override; Edit& GetEdit() { return *maEdit.get(); } diff --git a/include/svtools/fileview.hxx b/include/svtools/fileview.hxx index cd1dde7e38ea..e1a02465e391 100644 --- a/include/svtools/fileview.hxx +++ b/include/svtools/fileview.hxx @@ -82,7 +82,7 @@ protected: public: SvtFileView( vcl::Window* pParent, WinBits nBits, bool bOnlyFolder, bool bMultiSelection, bool bShowType = true ); - virtual ~SvtFileView(); + virtual ~SvtFileView() override; virtual void dispose() override; virtual Size GetOptimalSize() const override; @@ -219,7 +219,7 @@ private: public: QueryDeleteDlg_Impl(vcl::Window* pParent, const OUString& rName); - virtual ~QueryDeleteDlg_Impl(); + virtual ~QueryDeleteDlg_Impl() override; virtual void dispose() override; void EnableAllButton() { m_pAllButton->Enable(); } diff --git a/include/svtools/fmtfield.hxx b/include/svtools/fmtfield.hxx index 53b525ae6d9c..7a441530e00a 100644 --- a/include/svtools/fmtfield.hxx +++ b/include/svtools/fmtfield.hxx @@ -265,7 +265,7 @@ public: ResetConformanceTester(); } - virtual ~DoubleNumericField(); + virtual ~DoubleNumericField() override; virtual void dispose() override; protected: diff --git a/include/svtools/fontsubstconfig.hxx b/include/svtools/fontsubstconfig.hxx index 77cc78a88511..fdb64cf74d06 100644 --- a/include/svtools/fontsubstconfig.hxx +++ b/include/svtools/fontsubstconfig.hxx @@ -44,7 +44,7 @@ private: public: SvtFontSubstConfig(); - virtual ~SvtFontSubstConfig(); + virtual ~SvtFontSubstConfig() override; virtual void Notify( const css::uno::Sequence< OUString >& _rPropertyNames) override; diff --git a/include/svtools/framestatuslistener.hxx b/include/svtools/framestatuslistener.hxx index 1add42a7922c..d2c211f99cf7 100644 --- a/include/svtools/framestatuslistener.hxx +++ b/include/svtools/framestatuslistener.hxx @@ -45,7 +45,7 @@ class SVT_DLLPUBLIC FrameStatusListener : public css::frame::XStatusListener, public: FrameStatusListener( const css::uno::Reference< css::uno::XComponentContext >& rxContext, const css::uno::Reference< css::frame::XFrame >& xFrame ); - virtual ~FrameStatusListener(); + virtual ~FrameStatusListener() override; // methods to support status forwarder, known by the old sfx2 toolbox controller implementation void addStatusListener( const OUString& aCommandURL ); diff --git a/include/svtools/generictoolboxcontroller.hxx b/include/svtools/generictoolboxcontroller.hxx index 65fb6619ec7c..e90a6b6e9a54 100644 --- a/include/svtools/generictoolboxcontroller.hxx +++ b/include/svtools/generictoolboxcontroller.hxx @@ -36,7 +36,7 @@ class SVT_DLLPUBLIC GenericToolboxController : public svt::ToolboxController ToolBox* pToolBox, sal_uInt16 nID, const OUString& aCommand ); - virtual ~GenericToolboxController(); + virtual ~GenericToolboxController() override; // XComponent virtual void SAL_CALL dispose() throw ( css::uno::RuntimeException, std::exception ) override; diff --git a/include/svtools/genericunodialog.hxx b/include/svtools/genericunodialog.hxx index a651471a21fa..53885eddda96 100644 --- a/include/svtools/genericunodialog.hxx +++ b/include/svtools/genericunodialog.hxx @@ -87,7 +87,7 @@ namespace svt protected: OGenericUnoDialog(const css::uno::Reference< css::uno::XComponentContext >& _rxContext); - virtual ~OGenericUnoDialog(); + virtual ~OGenericUnoDialog() override; public: // UNO diff --git a/include/svtools/grfmgr.hxx b/include/svtools/grfmgr.hxx index 82e6081f3ad1..076f6737ef7d 100644 --- a/include/svtools/grfmgr.hxx +++ b/include/svtools/grfmgr.hxx @@ -328,7 +328,7 @@ public: GraphicObject( const Graphic& rGraphic ); GraphicObject( const GraphicObject& rCacheObj, const GraphicManager* pMgr = nullptr ); explicit GraphicObject( const OString& rUniqueID ); - virtual ~GraphicObject(); + virtual ~GraphicObject() override; GraphicObject& operator=( const GraphicObject& rCacheObj ); bool operator==( const GraphicObject& rCacheObj ) const; diff --git a/include/svtools/headbar.hxx b/include/svtools/headbar.hxx index b609a8a670c7..dbe8022d007f 100644 --- a/include/svtools/headbar.hxx +++ b/include/svtools/headbar.hxx @@ -269,7 +269,7 @@ private: public: HeaderBar( vcl::Window* pParent, WinBits nWinBits = WB_STDHEADERBAR ); - virtual ~HeaderBar(); + virtual ~HeaderBar() override; virtual void dispose() override; virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; diff --git a/include/svtools/helpopt.hxx b/include/svtools/helpopt.hxx index 365146903c6c..3e7210f09820 100644 --- a/include/svtools/helpopt.hxx +++ b/include/svtools/helpopt.hxx @@ -34,7 +34,7 @@ class SVT_DLLPUBLIC SvtHelpOptions: public utl::detail::Options public: SvtHelpOptions(); - virtual ~SvtHelpOptions(); + virtual ~SvtHelpOptions() override; void SetExtendedHelp( bool b ); bool IsExtendedHelp() const; diff --git a/include/svtools/htmlcfg.hxx b/include/svtools/htmlcfg.hxx index 5e46488d126c..18b6d351ecd3 100644 --- a/include/svtools/htmlcfg.hxx +++ b/include/svtools/htmlcfg.hxx @@ -45,7 +45,7 @@ class SVT_DLLPUBLIC SvxHtmlOptions : public utl::ConfigItem public: SvxHtmlOptions(); - virtual ~SvxHtmlOptions(); + virtual ~SvxHtmlOptions() override; virtual void Notify( const css::uno::Sequence< OUString >& _rPropertyNames) override; diff --git a/include/svtools/hyperlabel.hxx b/include/svtools/hyperlabel.hxx index 4fcb914d875b..94546f0e972e 100644 --- a/include/svtools/hyperlabel.hxx +++ b/include/svtools/hyperlabel.hxx @@ -50,7 +50,7 @@ namespace svt public: HyperLabel( vcl::Window* _pParent, WinBits _nWinStyle = 0 ); - virtual ~HyperLabel( ); + virtual ~HyperLabel( ) override; virtual void dispose() override; virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; diff --git a/include/svtools/imapcirc.hxx b/include/svtools/imapcirc.hxx index ba2513b51c53..f8c1273b6e7a 100644 --- a/include/svtools/imapcirc.hxx +++ b/include/svtools/imapcirc.hxx @@ -49,7 +49,7 @@ public: const OUString& rName, bool bActive = true, bool bPixelCoords = true ); - virtual ~IMapCircleObject() {} + virtual ~IMapCircleObject() override {} virtual sal_uInt16 GetType() const override; virtual bool IsHit( const Point& rPoint ) const override; diff --git a/include/svtools/imappoly.hxx b/include/svtools/imappoly.hxx index af48e04fa851..5242edb5561a 100644 --- a/include/svtools/imappoly.hxx +++ b/include/svtools/imappoly.hxx @@ -50,7 +50,7 @@ public: const OUString& rName, bool bActive = true, bool bPixelCoords = true ); - virtual ~IMapPolygonObject() {} + virtual ~IMapPolygonObject() override {} virtual sal_uInt16 GetType() const override; virtual bool IsHit( const Point& rPoint ) const override; diff --git a/include/svtools/imaprect.hxx b/include/svtools/imaprect.hxx index ce3eae645fbf..ba564ae1970c 100644 --- a/include/svtools/imaprect.hxx +++ b/include/svtools/imaprect.hxx @@ -48,7 +48,7 @@ public: const OUString& rName, bool bActive = true, bool bPixelCoords = true ); - virtual ~IMapRectangleObject() {}; + virtual ~IMapRectangleObject() override {}; virtual sal_uInt16 GetType() const override; virtual bool IsHit( const Point& rPoint ) const override; diff --git a/include/svtools/inettbc.hxx b/include/svtools/inettbc.hxx index d46d420293fd..5ad086592e32 100644 --- a/include/svtools/inettbc.hxx +++ b/include/svtools/inettbc.hxx @@ -59,7 +59,7 @@ protected: public: SvtURLBox( vcl::Window* pParent, INetProtocol eSmart = INetProtocol::NotValid, bool bSetDefaultHelpID = true ); SvtURLBox( vcl::Window* pParent, WinBits _nStyle, INetProtocol eSmart = INetProtocol::NotValid, bool bSetDefaultHelpID = true ); - virtual ~SvtURLBox(); + virtual ~SvtURLBox() override; virtual void dispose() override; void SetBaseURL( const OUString& rURL ); diff --git a/include/svtools/ivctrl.hxx b/include/svtools/ivctrl.hxx index d3a02da88687..dd4d8e6ece34 100644 --- a/include/svtools/ivctrl.hxx +++ b/include/svtools/ivctrl.hxx @@ -230,7 +230,7 @@ protected: public: SvtIconChoiceCtrl( vcl::Window* pParent, WinBits nWinStyle = WB_ICON | WB_BORDER ); - virtual ~SvtIconChoiceCtrl(); + virtual ~SvtIconChoiceCtrl() override; virtual void dispose() override; void SetStyle( WinBits nWinStyle ); diff --git a/include/svtools/menuoptions.hxx b/include/svtools/menuoptions.hxx index 64bdc735f625..4bf4f208fa8e 100644 --- a/include/svtools/menuoptions.hxx +++ b/include/svtools/menuoptions.hxx @@ -45,7 +45,7 @@ class SAL_WARN_UNUSED SVT_DLLPUBLIC SvtMenuOptions: public utl::detail::Options { public: SvtMenuOptions(); - virtual ~SvtMenuOptions(); + virtual ~SvtMenuOptions() override; /*-**************************************************************************************************** @short interface methods to get and set value of config key "org.openoffice.Office.Common/View/Menu/..." diff --git a/include/svtools/miscopt.hxx b/include/svtools/miscopt.hxx index aa926907ef1f..70e0d0ee539e 100644 --- a/include/svtools/miscopt.hxx +++ b/include/svtools/miscopt.hxx @@ -48,7 +48,7 @@ class SVT_DLLPUBLIC SvtMiscOptions: public utl::detail::Options { public: SvtMiscOptions(); - virtual ~SvtMiscOptions(); + virtual ~SvtMiscOptions() override; void AddListenerLink( const Link<LinkParamNone*,void>& rLink ); void RemoveListenerLink( const Link<LinkParamNone*,void>& rLink ); diff --git a/include/svtools/openfiledroptargetlistener.hxx b/include/svtools/openfiledroptargetlistener.hxx index d88b6d63ae97..78ee372722be 100644 --- a/include/svtools/openfiledroptargetlistener.hxx +++ b/include/svtools/openfiledroptargetlistener.hxx @@ -50,7 +50,7 @@ class SVT_DLLPUBLIC OpenFileDropTargetListener : public ::cppu::WeakImplHelper1< public: OpenFileDropTargetListener( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::frame::XFrame >& xFrame ); - virtual ~OpenFileDropTargetListener(); + virtual ~OpenFileDropTargetListener() override; public: // XEventListener diff --git a/include/svtools/parhtml.hxx b/include/svtools/parhtml.hxx index 6a2d65201aba..f48106695a4a 100644 --- a/include/svtools/parhtml.hxx +++ b/include/svtools/parhtml.hxx @@ -155,7 +155,7 @@ protected: // scan next token virtual int GetNextToken_() override; - virtual ~HTMLParser(); + virtual ~HTMLParser() override; void FinishHeader( bool bBody ) { bIsInHeader = false; bIsInBody = bBody; } diff --git a/include/svtools/parrtf.hxx b/include/svtools/parrtf.hxx index b913a993e684..7206a31c9cb0 100644 --- a/include/svtools/parrtf.hxx +++ b/include/svtools/parrtf.hxx @@ -56,7 +56,7 @@ protected: void ReadBitmapData(); void ReadOLEData(); - virtual ~SvRTFParser(); + virtual ~SvRTFParser() override; rtl_TextEncoding GetCodeSet() const { return eCodeSet; } void SetEncoding( rtl_TextEncoding eEnc ); diff --git a/include/svtools/popupmenucontrollerbase.hxx b/include/svtools/popupmenucontrollerbase.hxx index c9353f400e12..a01e04afca70 100644 --- a/include/svtools/popupmenucontrollerbase.hxx +++ b/include/svtools/popupmenucontrollerbase.hxx @@ -60,7 +60,7 @@ namespace svt { public: PopupMenuControllerBase( const css::uno::Reference< css::uno::XComponentContext >& xContext ); - virtual ~PopupMenuControllerBase(); + virtual ~PopupMenuControllerBase() override; // XServiceInfo virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException, std::exception) override = 0; diff --git a/include/svtools/popupwindowcontroller.hxx b/include/svtools/popupwindowcontroller.hxx index 0d87f1792950..a6e78da2dc33 100644 --- a/include/svtools/popupwindowcontroller.hxx +++ b/include/svtools/popupwindowcontroller.hxx @@ -39,7 +39,7 @@ public: PopupWindowController( const css::uno::Reference< css::uno::XComponentContext >& rxContext, const css::uno::Reference< css::frame::XFrame >& xFrame, const OUString& aCommandURL ); - virtual ~PopupWindowController(); + virtual ~PopupWindowController() override; virtual VclPtr<vcl::Window> createPopupWindow( vcl::Window* pParent ) = 0; diff --git a/include/svtools/printoptions.hxx b/include/svtools/printoptions.hxx index 8025a01228fe..f06a53d5ae44 100644 --- a/include/svtools/printoptions.hxx +++ b/include/svtools/printoptions.hxx @@ -45,7 +45,7 @@ public: public: SvtBasePrintOptions(); - virtual ~SvtBasePrintOptions(); + virtual ~SvtBasePrintOptions() override; bool IsReduceTransparency() const; sal_Int16 GetReducedTransparencyMode() const; @@ -88,7 +88,7 @@ private: public: SvtPrinterOptions(); - virtual ~SvtPrinterOptions(); + virtual ~SvtPrinterOptions() override; }; @@ -102,7 +102,7 @@ private: public: SvtPrintFileOptions(); - virtual ~SvtPrintFileOptions(); + virtual ~SvtPrintFileOptions() override; }; #endif // INCLUDED_SVTOOLS_PRINTOPTIONS_HXX diff --git a/include/svtools/prnsetup.hxx b/include/svtools/prnsetup.hxx index 007294e52656..075b1fb2885b 100644 --- a/include/svtools/prnsetup.hxx +++ b/include/svtools/prnsetup.hxx @@ -56,7 +56,7 @@ private: public: PrinterSetupDialog( vcl::Window* pWindow ); - virtual ~PrinterSetupDialog(); + virtual ~PrinterSetupDialog() override; virtual void dispose() override; void SetPrinter( Printer* pNewPrinter ) { mpPrinter = pNewPrinter; } diff --git a/include/svtools/roadmapwizard.hxx b/include/svtools/roadmapwizard.hxx index c028250b7938..cc4ced797fd2 100644 --- a/include/svtools/roadmapwizard.hxx +++ b/include/svtools/roadmapwizard.hxx @@ -72,7 +72,7 @@ namespace svt RoadmapWizard( vcl::Window* _pParent ); - virtual ~RoadmapWizard( ); + virtual ~RoadmapWizard( ) override; virtual void dispose() override; void SetRoadmapHelpId( const OString& _rId ); diff --git a/include/svtools/ruler.hxx b/include/svtools/ruler.hxx index 33719035cf06..c1ce6de22596 100644 --- a/include/svtools/ruler.hxx +++ b/include/svtools/ruler.hxx @@ -712,7 +712,7 @@ protected: public: Ruler( vcl::Window* pParent, WinBits nWinStyle = WB_STDRULER ); - virtual ~Ruler(); + virtual ~Ruler() override; virtual void dispose() override; virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; diff --git a/include/svtools/scrwin.hxx b/include/svtools/scrwin.hxx index 825b827a30b0..4e5571ab9421 100644 --- a/include/svtools/scrwin.hxx +++ b/include/svtools/scrwin.hxx @@ -63,7 +63,7 @@ private: public: ScrollableWindow( vcl::Window* pParent ); - virtual ~ScrollableWindow(); + virtual ~ScrollableWindow() override; virtual void dispose() override; virtual void Resize() override; diff --git a/include/svtools/simptabl.hxx b/include/svtools/simptabl.hxx index 55d21fd64741..7e4627552b36 100644 --- a/include/svtools/simptabl.hxx +++ b/include/svtools/simptabl.hxx @@ -36,7 +36,7 @@ protected: public: SvSimpleTableContainer( vcl::Window* pParent, WinBits nBits = WB_BORDER ); - virtual ~SvSimpleTableContainer(); + virtual ~SvSimpleTableContainer() override; virtual void dispose() override; void SetTable(SvSimpleTable* pTable); @@ -87,7 +87,7 @@ protected: public: SvSimpleTable(SvSimpleTableContainer& rParent, WinBits nBits = WB_BORDER); - virtual ~SvSimpleTable(); + virtual ~SvSimpleTable() override; virtual void dispose() override; void UpdateViewSize(); diff --git a/include/svtools/slidesorterbaropt.hxx b/include/svtools/slidesorterbaropt.hxx index d92dd583c00d..9908ed074bde 100644 --- a/include/svtools/slidesorterbaropt.hxx +++ b/include/svtools/slidesorterbaropt.hxx @@ -43,7 +43,7 @@ class SVT_DLLPUBLIC SvtSlideSorterBarOptions: public utl::detail::Options { public: SvtSlideSorterBarOptions(); - virtual ~SvtSlideSorterBarOptions(); + virtual ~SvtSlideSorterBarOptions() override; bool GetVisibleImpressView() const; void SetVisibleImpressView( bool bVisible ); diff --git a/include/svtools/statusbarcontroller.hxx b/include/svtools/statusbarcontroller.hxx index 190fa24e8676..5fb6b2693ea7 100644 --- a/include/svtools/statusbarcontroller.hxx +++ b/include/svtools/statusbarcontroller.hxx @@ -48,7 +48,7 @@ class SVT_DLLPUBLIC StatusbarController : const OUString& aCommandURL, unsigned short nID ); StatusbarController(); - virtual ~StatusbarController(); + virtual ~StatusbarController() override; css::uno::Reference< css::frame::XFrame > getFrameInterface() const; css::uno::Reference< css::util::XURLTransformer > getURLTransformer() const; diff --git a/include/svtools/svlbitm.hxx b/include/svtools/svlbitm.hxx index 159ef350f160..f3fba9d32fa8 100644 --- a/include/svtools/svlbitm.hxx +++ b/include/svtools/svlbitm.hxx @@ -108,7 +108,7 @@ protected: public: SvLBoxString(const OUString& rText); SvLBoxString(); - virtual ~SvLBoxString(); + virtual ~SvLBoxString() override; virtual SvLBoxItemType GetType() const override; virtual void InitViewData(SvTreeListBox* pView, @@ -149,7 +149,7 @@ public: // for that kind). SvLBoxButton( SvLBoxButtonKind eTheKind, SvLBoxButtonData* pBData ); SvLBoxButton(); - virtual ~SvLBoxButton(); + virtual ~SvLBoxButton() override; virtual void InitViewData(SvTreeListBox* pView, SvTreeListEntry* pEntry, SvViewDataItem* pViewData = nullptr) override; @@ -232,7 +232,7 @@ public: Image aBmp2, bool bExpanded); SvLBoxContextBmp(); - virtual ~SvLBoxContextBmp(); + virtual ~SvLBoxContextBmp() override; virtual SvLBoxItemType GetType() const override; virtual void InitViewData(SvTreeListBox* pView, diff --git a/include/svtools/svparser.hxx b/include/svtools/svparser.hxx index 9946402d3690..9406dd5743ee 100644 --- a/include/svtools/svparser.hxx +++ b/include/svtools/svparser.hxx @@ -98,7 +98,7 @@ protected: virtual void NextToken( int nToken ); // at times of SvRefBase derivation, not everybody may delete - virtual ~SvParser(); + virtual ~SvParser() override; void ClearTxtConvContext(); @@ -227,7 +227,7 @@ public: /** Construction/Destruction. */ SvKeyValueIterator(); - virtual ~SvKeyValueIterator(); + virtual ~SvKeyValueIterator() override; SvKeyValueIterator(const SvKeyValueIterator&) = delete; SvKeyValueIterator& operator=( const SvKeyValueIterator& ) = delete; diff --git a/include/svtools/svtabbx.hxx b/include/svtools/svtabbx.hxx index 1f6cadd2a3c6..c07aaa1b2a91 100644 --- a/include/svtools/svtabbx.hxx +++ b/include/svtools/svtabbx.hxx @@ -64,7 +64,7 @@ protected: public: SvTabListBox( vcl::Window* pParent, WinBits = WB_BORDER ); - virtual ~SvTabListBox(); + virtual ~SvTabListBox() override; virtual void dispose() override; void SetTabs(const long* pTabs, MapUnit = MAP_APPFONT); sal_uInt16 TabCount() const { return (sal_uInt16)nTabCount; } @@ -138,7 +138,7 @@ private: public: SvHeaderTabListBox( vcl::Window* pParent, WinBits nBits ); - virtual ~SvHeaderTabListBox(); + virtual ~SvHeaderTabListBox() override; virtual void dispose() override; virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& ) override; diff --git a/include/svtools/tabbar.hxx b/include/svtools/tabbar.hxx index b11a9dbbf37a..e4967ac8982b 100644 --- a/include/svtools/tabbar.hxx +++ b/include/svtools/tabbar.hxx @@ -367,7 +367,7 @@ public: static const sal_uInt16 PAGE_NOT_FOUND; TabBar( vcl::Window* pParent, WinBits nWinStyle = WB_STDTABBAR ); - virtual ~TabBar(); + virtual ~TabBar() override; virtual void dispose() override; virtual void MouseMove( const MouseEvent& rMEvt ) override; diff --git a/include/svtools/toolbarmenu.hxx b/include/svtools/toolbarmenu.hxx index 22f0ddf40f25..11486356bf5d 100644 --- a/include/svtools/toolbarmenu.hxx +++ b/include/svtools/toolbarmenu.hxx @@ -51,7 +51,7 @@ public: vcl::Window* pParentWindow, WinBits nBits ); - virtual ~ToolbarMenu(); + virtual ~ToolbarMenu() override; virtual void dispose() override; virtual void MouseMove( const MouseEvent& rMEvt ) override; diff --git a/include/svtools/toolboxcontroller.hxx b/include/svtools/toolboxcontroller.hxx index 249ed1643951..7f307679005e 100644 --- a/include/svtools/toolboxcontroller.hxx +++ b/include/svtools/toolboxcontroller.hxx @@ -65,7 +65,7 @@ class SVT_DLLPUBLIC ToolboxController : const css::uno::Reference< css::frame::XFrame >& xFrame, const OUString& aCommandURL ); ToolboxController(); - virtual ~ToolboxController(); + virtual ~ToolboxController() override; css::uno::Reference< css::frame::XFrame > getFrameInterface() const; const css::uno::Reference< css::uno::XComponentContext >& getContext() const; diff --git a/include/svtools/toolpanelopt.hxx b/include/svtools/toolpanelopt.hxx index 2480e2e0d8e5..1d2e957972e4 100644 --- a/include/svtools/toolpanelopt.hxx +++ b/include/svtools/toolpanelopt.hxx @@ -37,7 +37,7 @@ class SVT_DLLPUBLIC SvtToolPanelOptions: public utl::detail::Options { public: SvtToolPanelOptions(); - virtual ~SvtToolPanelOptions(); + virtual ~SvtToolPanelOptions() override; bool GetVisibleImpressView() const; void SetVisibleImpressView( bool bVisible ); diff --git a/include/svtools/transfer.hxx b/include/svtools/transfer.hxx index 521f0531ad5d..2eb31595afe1 100644 --- a/include/svtools/transfer.hxx +++ b/include/svtools/transfer.hxx @@ -148,7 +148,7 @@ private: public: TerminateListener( TransferableHelper& rDropTargetHelper ); - virtual ~TerminateListener(); + virtual ~TerminateListener() override; }; friend class TransferableHelper::TerminateListener; @@ -212,7 +212,7 @@ private: protected: - virtual ~TransferableHelper(); + virtual ~TransferableHelper() override; void AddFormat( SotClipboardFormatId nFormat ); void AddFormat( const css::datatransfer::DataFlavor& rFlavor ); @@ -387,7 +387,7 @@ private: public: DragGestureListener( DragSourceHelper& rDragSourceHelper ); - virtual ~DragGestureListener(); + virtual ~DragGestureListener() override; }; friend class DragSourceHelper::DragGestureListener; @@ -438,7 +438,7 @@ private: public: DropTargetListener( DropTargetHelper& rDropTargetHelper ); - virtual ~DropTargetListener(); + virtual ~DropTargetListener() override; }; friend class DropTargetHelper::DropTargetListener; @@ -494,7 +494,7 @@ protected: public: TransferDataContainer(); - virtual ~TransferDataContainer(); + virtual ~TransferDataContainer() override; void CopyINetBookmark( const INetBookmark& rBkmk ); void CopyINetImage( const INetImage& rINtImg ); diff --git a/include/svtools/treelistbox.hxx b/include/svtools/treelistbox.hxx index 166373a9a076..900077932ad1 100644 --- a/include/svtools/treelistbox.hxx +++ b/include/svtools/treelistbox.hxx @@ -343,7 +343,7 @@ public: SvTreeListBox( vcl::Window* pParent, WinBits nWinStyle=0 ); SvTreeListBox( vcl::Window* pParent, const ResId& rResId ); - virtual ~SvTreeListBox(); + virtual ~SvTreeListBox() override; virtual void dispose() override; SvTreeList* GetModel() const diff --git a/include/svtools/unoevent.hxx b/include/svtools/unoevent.hxx index a29b9d217cf1..ef303638f7ae 100644 --- a/include/svtools/unoevent.hxx +++ b/include/svtools/unoevent.hxx @@ -69,7 +69,7 @@ public: SvBaseEventDescriptor(const SvEventDescription* pSupportedMacroItems); - virtual ~SvBaseEventDescriptor(); + virtual ~SvBaseEventDescriptor() override; // XNameReplace @@ -176,7 +176,7 @@ public: SvEventDescriptor(css::uno::XInterface& rParent, const SvEventDescription* pSupportedMacroItems); - virtual ~SvEventDescriptor(); + virtual ~SvEventDescriptor() override; protected: @@ -230,7 +230,7 @@ public: SvDetachedEventDescriptor(const SvEventDescription* pSupportedMacroItems); - virtual ~SvDetachedEventDescriptor(); + virtual ~SvDetachedEventDescriptor() override; //XServiceInfo virtual OUString SAL_CALL getImplementationName() @@ -278,7 +278,7 @@ public: SvMacroTableEventDescriptor(const SvxMacroTableDtor& aFmt, const SvEventDescription* pSupportedMacroItems); - virtual ~SvMacroTableEventDescriptor(); + virtual ~SvMacroTableEventDescriptor() override; void copyMacrosFromTable(const SvxMacroTableDtor& aFmt); void copyMacrosIntoTable(SvxMacroTableDtor& aFmt); diff --git a/include/svtools/valueset.hxx b/include/svtools/valueset.hxx index 432f410d80ca..20fe873784ca 100644 --- a/include/svtools/valueset.hxx +++ b/include/svtools/valueset.hxx @@ -282,7 +282,7 @@ protected: public: ValueSet( vcl::Window* pParent, WinBits nWinStyle ); ValueSet( vcl::Window* pParent, const ResId& rResId ); - virtual ~ValueSet(); + virtual ~ValueSet() override; virtual void dispose() override; virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; diff --git a/include/svtools/wizardmachine.hxx b/include/svtools/wizardmachine.hxx index fd41de1d9412..bc7ce509fbaa 100644 --- a/include/svtools/wizardmachine.hxx +++ b/include/svtools/wizardmachine.hxx @@ -103,7 +103,7 @@ namespace svt must be the OWizardMachine (which is derived from Window) */ OWizardPage(vcl::Window *pParent, const OString& rID, const OUString& rUIXMLDescription); - virtual ~OWizardPage(); + virtual ~OWizardPage() override; // IWizardPageController overridables virtual void initializePage() override; @@ -170,7 +170,7 @@ namespace svt public: OWizardMachine(vcl::Window* _pParent, const WinBits i_nStyle, WizardButtonFlags _nButtonFlags ); OWizardMachine(vcl::Window* _pParent, WizardButtonFlags _nButtonFlags ); - virtual ~OWizardMachine(); + virtual ~OWizardMachine() override; virtual void dispose() override; /// enable (or disable) buttons diff --git a/include/svtools/wizdlg.hxx b/include/svtools/wizdlg.hxx index 9ed4e2bbf949..97564c58ef8f 100644 --- a/include/svtools/wizdlg.hxx +++ b/include/svtools/wizdlg.hxx @@ -231,7 +231,7 @@ private: public: WizardDialog( vcl::Window* pParent, WinBits nStyle = WB_STDTABDIALOG ); WizardDialog( vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription ); - virtual ~WizardDialog(); + virtual ~WizardDialog() override; virtual void dispose() override; virtual void Resize() override; |