From 91dd2db17bd6cb9b357d1d69b187174e31eabef0 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Tue, 13 Sep 2016 13:09:01 +0200 Subject: 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 --- include/toolkit/awt/animatedimagespeer.hxx | 2 +- include/toolkit/awt/scrollabledialog.hxx | 2 +- include/toolkit/awt/vclxaccessiblecomponent.hxx | 2 +- include/toolkit/awt/vclxcontainer.hxx | 2 +- include/toolkit/awt/vclxdevice.hxx | 4 +-- include/toolkit/awt/vclxfont.hxx | 2 +- include/toolkit/awt/vclxgraphics.hxx | 2 +- include/toolkit/awt/vclxmenu.hxx | 2 +- include/toolkit/awt/vclxpointer.hxx | 2 +- include/toolkit/awt/vclxprinter.hxx | 6 ++-- include/toolkit/awt/vclxregion.hxx | 2 +- include/toolkit/awt/vclxspinbutton.hxx | 2 +- include/toolkit/awt/vclxsystemdependentwindow.hxx | 2 +- include/toolkit/awt/vclxtabpagecontainer.hxx | 2 +- include/toolkit/awt/vclxtopwindow.hxx | 2 +- include/toolkit/awt/vclxwindow.hxx | 2 +- include/toolkit/awt/vclxwindows.hxx | 36 +++++++++++----------- .../toolkit/controls/accessiblecontrolcontext.hxx | 2 +- include/toolkit/controls/animatedimages.hxx | 2 +- .../toolkit/controls/controlmodelcontainerbase.hxx | 6 ++-- include/toolkit/controls/dialogcontrol.hxx | 14 ++++----- include/toolkit/controls/formattedcontrol.hxx | 2 +- include/toolkit/controls/geometrycontrolmodel.hxx | 2 +- include/toolkit/controls/stdtabcontroller.hxx | 2 +- include/toolkit/controls/stdtabcontrollermodel.hxx | 2 +- include/toolkit/controls/tabpagemodel.hxx | 2 +- include/toolkit/controls/unocontrol.hxx | 2 +- include/toolkit/controls/unocontrolcontainer.hxx | 2 +- include/toolkit/controls/unocontrols.hxx | 4 +-- include/toolkit/helper/accessiblefactory.hxx | 2 +- 30 files changed, 59 insertions(+), 59 deletions(-) (limited to 'include/toolkit') diff --git a/include/toolkit/awt/animatedimagespeer.hxx b/include/toolkit/awt/animatedimagespeer.hxx index 4acfd46b055d..c2bccd999065 100644 --- a/include/toolkit/awt/animatedimagespeer.hxx +++ b/include/toolkit/awt/animatedimagespeer.hxx @@ -48,7 +48,7 @@ namespace toolkit AnimatedImagesPeer(); protected: - virtual ~AnimatedImagesPeer(); + virtual ~AnimatedImagesPeer() override; public: // XAnimation diff --git a/include/toolkit/awt/scrollabledialog.hxx b/include/toolkit/awt/scrollabledialog.hxx index 2f7269587bb4..1c73a62b4414 100644 --- a/include/toolkit/awt/scrollabledialog.hxx +++ b/include/toolkit/awt/scrollabledialog.hxx @@ -54,7 +54,7 @@ namespace toolkit void lcl_Scroll( long nX, long nY ); public: ScrollableWrapper( vcl::Window* pParent, WinBits nStyle = WB_STDDIALOG, Dialog::InitFlag eFlag = Dialog::InitFlag::Default ); - virtual ~ScrollableWrapper(); + virtual ~ScrollableWrapper() override; virtual void dispose() override; virtual void SetScrollWidth( long nWidth ) override; virtual void SetScrollHeight( long nHeight ) override; diff --git a/include/toolkit/awt/vclxaccessiblecomponent.hxx b/include/toolkit/awt/vclxaccessiblecomponent.hxx index b6a556b6a2e7..1fea9e5c9851 100644 --- a/include/toolkit/awt/vclxaccessiblecomponent.hxx +++ b/include/toolkit/awt/vclxaccessiblecomponent.hxx @@ -78,7 +78,7 @@ protected: public: VCLXAccessibleComponent( VCLXWindow* pVCLXWindow ); - virtual ~VCLXAccessibleComponent(); + virtual ~VCLXAccessibleComponent() override; VCLXWindow* GetVCLXWindow() const; VclPtr GetWindow() const; diff --git a/include/toolkit/awt/vclxcontainer.hxx b/include/toolkit/awt/vclxcontainer.hxx index 732d7d200f05..bcf7bbf4755f 100644 --- a/include/toolkit/awt/vclxcontainer.hxx +++ b/include/toolkit/awt/vclxcontainer.hxx @@ -39,7 +39,7 @@ class TOOLKIT_DLLPUBLIC VCLXContainer : public css::awt::XVclContainer, { public: VCLXContainer(); - virtual ~VCLXContainer(); + virtual ~VCLXContainer() override; // css::uno::XInterface css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; diff --git a/include/toolkit/awt/vclxdevice.hxx b/include/toolkit/awt/vclxdevice.hxx index 5fb5add9f179..2b59cee62f3e 100644 --- a/include/toolkit/awt/vclxdevice.hxx +++ b/include/toolkit/awt/vclxdevice.hxx @@ -56,7 +56,7 @@ public: public: VCLXDevice(); - virtual ~VCLXDevice(); + virtual ~VCLXDevice() override; void SetOutputDevice( const VclPtr &pOutDev ) { mpOutputDevice = pOutDev; } const VclPtr& GetOutputDevice() const { return mpOutputDevice; } @@ -102,7 +102,7 @@ public: class VCLXVirtualDevice : public VCLXDevice { public: - virtual ~VCLXVirtualDevice(); + virtual ~VCLXVirtualDevice() override; void SetVirtualDevice( VirtualDevice* pVDev ) { SetOutputDevice( pVDev ); } }; diff --git a/include/toolkit/awt/vclxfont.hxx b/include/toolkit/awt/vclxfont.hxx index 85b00d1cad4d..d9550e742e82 100644 --- a/include/toolkit/awt/vclxfont.hxx +++ b/include/toolkit/awt/vclxfont.hxx @@ -50,7 +50,7 @@ protected: public: VCLXFont(); - virtual ~VCLXFont(); + virtual ~VCLXFont() override; void Init( css::awt::XDevice& rxDev, const vcl::Font& rFont ); const vcl::Font& GetFont() const { return maFont; } diff --git a/include/toolkit/awt/vclxgraphics.hxx b/include/toolkit/awt/vclxgraphics.hxx index d7111f36a6ad..5f689db070c1 100644 --- a/include/toolkit/awt/vclxgraphics.hxx +++ b/include/toolkit/awt/vclxgraphics.hxx @@ -76,7 +76,7 @@ private: public: VCLXGraphics(); - virtual ~VCLXGraphics(); + virtual ~VCLXGraphics() override; void Init( OutputDevice* pOutDev ); void InitOutputDevice( InitOutDevFlags nFlags ); diff --git a/include/toolkit/awt/vclxmenu.hxx b/include/toolkit/awt/vclxmenu.hxx index e042e014ea14..8ca1ab2bece9 100644 --- a/include/toolkit/awt/vclxmenu.hxx +++ b/include/toolkit/awt/vclxmenu.hxx @@ -74,7 +74,7 @@ protected: public: VCLXMenu(); VCLXMenu( Menu* pMenu ); - virtual ~VCLXMenu(); + virtual ~VCLXMenu() override; Menu* GetMenu() const { return mpMenu; } diff --git a/include/toolkit/awt/vclxpointer.hxx b/include/toolkit/awt/vclxpointer.hxx index 145d3bc7f99f..dff64dae6115 100644 --- a/include/toolkit/awt/vclxpointer.hxx +++ b/include/toolkit/awt/vclxpointer.hxx @@ -45,7 +45,7 @@ protected: public: VCLXPointer(); - virtual ~VCLXPointer(); + virtual ~VCLXPointer() override; const Pointer& GetPointer() const { return maPointer; } diff --git a/include/toolkit/awt/vclxprinter.hxx b/include/toolkit/awt/vclxprinter.hxx index 4fe541f15833..c9a80375c5f7 100644 --- a/include/toolkit/awt/vclxprinter.hxx +++ b/include/toolkit/awt/vclxprinter.hxx @@ -64,7 +64,7 @@ protected: bool mbHorizontal; public: VCLXPrinterPropertySet( const OUString& rPrinterName ); - virtual ~VCLXPrinterPropertySet(); + virtual ~VCLXPrinterPropertySet() override; Printer* GetPrinter() const { return mxPrinter.get(); } css::uno::Reference< css::awt::XDevice > const & GetDevice(); @@ -112,7 +112,7 @@ class VCLXPrinter: public VCLXPrinter_Base JobSetup maInitJobSetup; public: VCLXPrinter( const OUString& rPrinterName ); - virtual ~VCLXPrinter(); + virtual ~VCLXPrinter() override; // css::beans::XPropertySet css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override { return VCLXPrinterPropertySet::getPropertySetInfo(); } @@ -149,7 +149,7 @@ class VCLXInfoPrinter: public VCLXInfoPrinter_Base { public: VCLXInfoPrinter( const OUString& rPrinterName ); - virtual ~VCLXInfoPrinter(); + virtual ~VCLXInfoPrinter() override; // css::beans::XPropertySet css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override { return VCLXPrinterPropertySet::getPropertySetInfo(); } diff --git a/include/toolkit/awt/vclxregion.hxx b/include/toolkit/awt/vclxregion.hxx index 6225b258a18f..81b6ba2256ef 100644 --- a/include/toolkit/awt/vclxregion.hxx +++ b/include/toolkit/awt/vclxregion.hxx @@ -47,7 +47,7 @@ protected: public: VCLXRegion(); - virtual ~VCLXRegion(); + virtual ~VCLXRegion() override; const vcl::Region& GetRegion() const { return maRegion; } diff --git a/include/toolkit/awt/vclxspinbutton.hxx b/include/toolkit/awt/vclxspinbutton.hxx index 6d932925075f..81fe3ae82736 100644 --- a/include/toolkit/awt/vclxspinbutton.hxx +++ b/include/toolkit/awt/vclxspinbutton.hxx @@ -45,7 +45,7 @@ namespace toolkit VCLXSpinButton(); protected: - virtual ~VCLXSpinButton( ); + virtual ~VCLXSpinButton( ) override; // XInterface DECLARE_XINTERFACE() diff --git a/include/toolkit/awt/vclxsystemdependentwindow.hxx b/include/toolkit/awt/vclxsystemdependentwindow.hxx index 684136cf5f5e..3c6d19d75695 100644 --- a/include/toolkit/awt/vclxsystemdependentwindow.hxx +++ b/include/toolkit/awt/vclxsystemdependentwindow.hxx @@ -37,7 +37,7 @@ class TOOLKIT_DLLPUBLIC VCLXSystemDependentWindow : public css::awt::XSystemDepe { public: VCLXSystemDependentWindow(); - virtual ~VCLXSystemDependentWindow(); + virtual ~VCLXSystemDependentWindow() override; // css::uno::XInterface css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; diff --git a/include/toolkit/awt/vclxtabpagecontainer.hxx b/include/toolkit/awt/vclxtabpagecontainer.hxx index d8e90ab8e9af..77f2dab6c1f3 100644 --- a/include/toolkit/awt/vclxtabpagecontainer.hxx +++ b/include/toolkit/awt/vclxtabpagecontainer.hxx @@ -42,7 +42,7 @@ class VCLXTabPageContainer : public VCLXTabPageContainer_Base { public: VCLXTabPageContainer(); - virtual ~VCLXTabPageContainer(); + virtual ~VCLXTabPageContainer() override; // css::awt::XView void SAL_CALL draw( sal_Int32 nX, sal_Int32 nY ) throw(css::uno::RuntimeException, std::exception) override; diff --git a/include/toolkit/awt/vclxtopwindow.hxx b/include/toolkit/awt/vclxtopwindow.hxx index f80734e626d3..ba0ddafdb4fa 100644 --- a/include/toolkit/awt/vclxtopwindow.hxx +++ b/include/toolkit/awt/vclxtopwindow.hxx @@ -90,7 +90,7 @@ protected: public: VCLXTopWindow(bool bWHWND = false); - virtual ~VCLXTopWindow(); + virtual ~VCLXTopWindow() override; // css::uno::XInterface css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; diff --git a/include/toolkit/awt/vclxwindow.hxx b/include/toolkit/awt/vclxwindow.hxx index 775d38e84d06..af10c4f0aa41 100644 --- a/include/toolkit/awt/vclxwindow.hxx +++ b/include/toolkit/awt/vclxwindow.hxx @@ -124,7 +124,7 @@ protected: public: VCLXWindow( bool bWithDefaultProps = false ); - virtual ~VCLXWindow(); + virtual ~VCLXWindow() override; virtual void SetWindow( const VclPtr< vcl::Window > &pWindow ); template< class derived_type > VclPtr< derived_type > GetAs() const { diff --git a/include/toolkit/awt/vclxwindows.hxx b/include/toolkit/awt/vclxwindows.hxx index 84830085c813..62a8bc2afd05 100644 --- a/include/toolkit/awt/vclxwindows.hxx +++ b/include/toolkit/awt/vclxwindows.hxx @@ -161,7 +161,7 @@ protected: public: VCLXButton(); - virtual ~VCLXButton(); + virtual ~VCLXButton() override; // css::lang::XComponent void SAL_CALL dispose( ) throw(css::uno::RuntimeException, std::exception) override; @@ -197,7 +197,7 @@ class VCLXImageControl : public VCLXGraphicControl { public: VCLXImageControl(); - virtual ~VCLXImageControl(); + virtual ~VCLXImageControl() override; // css::awt::XLayoutConstrains css::awt::Size SAL_CALL getMinimumSize( ) throw(css::uno::RuntimeException, std::exception) override; @@ -339,7 +339,7 @@ class VCLXMessageBox : public css::awt::XMessageBox, { public: VCLXMessageBox(); - virtual ~VCLXMessageBox(); + virtual ~VCLXMessageBox() override; // css::uno::XInterface css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; @@ -375,7 +375,7 @@ protected: public: VCLXFrame(); - virtual ~VCLXFrame(); + virtual ~VCLXFrame() override; // css::uno::XInterface css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; @@ -407,7 +407,7 @@ class TOOLKIT_DLLPUBLIC VCLXDialog : public css::awt::XDialog2, { public: VCLXDialog(); - virtual ~VCLXDialog(); + virtual ~VCLXDialog() override; // css::uno::XInterface css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; @@ -449,7 +449,7 @@ class VCLXTabPage : public VCLXContainer { public: VCLXTabPage(); - virtual ~VCLXTabPage(); + virtual ~VCLXTabPage() override; // css::uno::XInterface css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; @@ -482,7 +482,7 @@ protected: void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) override; public: VCLXMultiPage(); - virtual ~VCLXMultiPage(); + virtual ~VCLXMultiPage() override; // css::uno::XInterface css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; @@ -542,7 +542,7 @@ protected: public: VCLXFixedHyperlink(); - virtual ~VCLXFixedHyperlink(); + virtual ~VCLXFixedHyperlink() override; // css::uno::XInterface css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; @@ -590,7 +590,7 @@ protected: public: VCLXFixedText(); - virtual ~VCLXFixedText(); + virtual ~VCLXFixedText() override; // css::uno::XInterface css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; @@ -841,7 +841,7 @@ protected: public: VCLXComboBox(); - virtual ~VCLXComboBox(); + virtual ~VCLXComboBox() override; // css::lang::XComponent void SAL_CALL dispose( ) throw(css::uno::RuntimeException, std::exception) override; @@ -937,7 +937,7 @@ protected: public: VCLXFormattedSpinField(); - virtual ~VCLXFormattedSpinField(); + virtual ~VCLXFormattedSpinField() override; void SetFormatter( FormatterBase* pFormatter ) { mpFormatter = pFormatter; } @@ -962,7 +962,7 @@ protected: virtual css::uno::Reference< css::accessibility::XAccessibleContext > CreateAccessibleContext() override; public: VCLXDateField(); - virtual ~VCLXDateField(); + virtual ~VCLXDateField() override; // css::uno::XInterface css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; @@ -1010,7 +1010,7 @@ protected: virtual css::uno::Reference< css::accessibility::XAccessibleContext > CreateAccessibleContext() override; public: VCLXTimeField(); - virtual ~VCLXTimeField(); + virtual ~VCLXTimeField() override; // css::uno::XInterface css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; @@ -1053,7 +1053,7 @@ class VCLXNumericField : public css::awt::XNumericField, { public: VCLXNumericField(); - virtual ~VCLXNumericField(); + virtual ~VCLXNumericField() override; // css::uno::XInterface css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; @@ -1103,7 +1103,7 @@ class VCLXMetricField : public css::awt::XMetricField, void CallListeners(); public: VCLXMetricField(); - virtual ~VCLXMetricField(); + virtual ~VCLXMetricField() override; // css::uno::XInterface css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; @@ -1150,7 +1150,7 @@ class VCLXCurrencyField : public css::awt::XCurrencyField, { public: VCLXCurrencyField(); - virtual ~VCLXCurrencyField(); + virtual ~VCLXCurrencyField() override; // css::uno::XInterface css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; @@ -1196,7 +1196,7 @@ class VCLXPatternField : public css::awt::XPatternField, { public: VCLXPatternField(); - virtual ~VCLXPatternField(); + virtual ~VCLXPatternField() override; // css::uno::XInterface css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; @@ -1237,7 +1237,7 @@ protected: public: VCLXToolBox(); - virtual ~VCLXToolBox(); + virtual ~VCLXToolBox() override; }; #endif // INCLUDED_TOOLKIT_AWT_VCLXWINDOWS_HXX diff --git a/include/toolkit/controls/accessiblecontrolcontext.hxx b/include/toolkit/controls/accessiblecontrolcontext.hxx index e7ab21bc16fd..4c977db4f336 100644 --- a/include/toolkit/controls/accessiblecontrolcontext.hxx +++ b/include/toolkit/controls/accessiblecontrolcontext.hxx @@ -61,7 +61,7 @@ namespace toolkit protected: /// ctor. @see Init OAccessibleControlContext(); - virtual ~OAccessibleControlContext(); + virtual ~OAccessibleControlContext() override; /** late ctor */ diff --git a/include/toolkit/controls/animatedimages.hxx b/include/toolkit/controls/animatedimages.hxx index 6deaaebc6bab..6b165b788dd6 100644 --- a/include/toolkit/controls/animatedimages.hxx +++ b/include/toolkit/controls/animatedimages.hxx @@ -72,7 +72,7 @@ namespace toolkit virtual void SAL_CALL removeContainerListener( const css::uno::Reference< css::container::XContainerListener >& i_listener ) throw (css::uno::RuntimeException, std::exception) override; protected: - virtual ~AnimatedImagesControlModel(); + virtual ~AnimatedImagesControlModel() override; css::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const override; ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; diff --git a/include/toolkit/controls/controlmodelcontainerbase.hxx b/include/toolkit/controls/controlmodelcontainerbase.hxx index 17e524c9d5b6..5b90a02251a7 100644 --- a/include/toolkit/controls/controlmodelcontainerbase.hxx +++ b/include/toolkit/controls/controlmodelcontainerbase.hxx @@ -102,7 +102,7 @@ protected: public: ControlModelContainerBase( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); ControlModelContainerBase( const ControlModelContainerBase& rModel ); - virtual ~ControlModelContainerBase(); + virtual ~ControlModelContainerBase() override; UnoControlModel* Clone() const override; @@ -187,7 +187,7 @@ class ResourceListener :public css::util::XModifyListener, { public: ResourceListener( const css::uno::Reference< css::util::XModifyListener >& xListener ); - virtual ~ResourceListener(); + virtual ~ResourceListener() override; void startListening( const css::uno::Reference< css::resource::XStringResourceResolver >& rResource ); void stopListening(); @@ -237,7 +237,7 @@ protected: public: ControlContainerBase( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); - virtual ~ControlContainerBase(); + virtual ~ControlContainerBase() override; DECLIMPL_SERVICEINFO_DERIVED( ControlContainerBase, UnoControlBase, "toolkit.ControlContainerBase" ) diff --git a/include/toolkit/controls/dialogcontrol.hxx b/include/toolkit/controls/dialogcontrol.hxx index 62325ac20788..aad4e977b9ab 100644 --- a/include/toolkit/controls/dialogcontrol.hxx +++ b/include/toolkit/controls/dialogcontrol.hxx @@ -49,7 +49,7 @@ private: public: UnoDialogControl( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); - virtual ~UnoDialogControl(); + virtual ~UnoDialogControl() override; OUString GetComponentServiceName() override; void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& Toolkit, const css::uno::Reference< css::awt::XWindowPeer >& Parent ) throw(css::uno::RuntimeException, std::exception) override; @@ -172,7 +172,7 @@ class UnoMultiPageModel : public ControlModelContainerBase { public: UnoMultiPageModel( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); - virtual ~UnoMultiPageModel(); + virtual ~UnoMultiPageModel() override; UnoMultiPageModel( const UnoMultiPageModel& rModel ); UnoControlModel* Clone() const override; @@ -200,7 +200,7 @@ class UnoMultiPageControl : public ControlContainerBase void bindPage( const css::uno::Reference< css::awt::XControl >& _rxControl ); public: UnoMultiPageControl( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); - virtual ~UnoMultiPageControl(); + virtual ~UnoMultiPageControl() override; OUString GetComponentServiceName() override; // css::lang::XServiceInfo @@ -247,7 +247,7 @@ class UnoPageModel : public ControlModelContainerBase { public: UnoPageModel( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); - virtual ~UnoPageModel(); + virtual ~UnoPageModel() override; UnoPageModel( const UnoPageModel& rModel ); UnoControlModel* Clone() const override; @@ -269,7 +269,7 @@ class UnoPageControl : public ControlContainerBase { public: UnoPageControl( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); - virtual ~UnoPageControl(); + virtual ~UnoPageControl() override; OUString GetComponentServiceName() override; @@ -281,7 +281,7 @@ class UnoFrameModel : public ControlModelContainerBase { public: UnoFrameModel( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); - virtual ~UnoFrameModel(); + virtual ~UnoFrameModel() override; UnoFrameModel( const UnoFrameModel& rModel ); UnoControlModel* Clone() const override; @@ -302,7 +302,7 @@ protected: virtual void ImplSetPosSize( css::uno::Reference< css::awt::XControl >& rxCtrl ) override; public: UnoFrameControl( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); - virtual ~UnoFrameControl(); + virtual ~UnoFrameControl() override; OUString GetComponentServiceName() override; // css::lang::XServiceInfo diff --git a/include/toolkit/controls/formattedcontrol.hxx b/include/toolkit/controls/formattedcontrol.hxx index f6ef3585ea45..ed993d1911c2 100644 --- a/include/toolkit/controls/formattedcontrol.hxx +++ b/include/toolkit/controls/formattedcontrol.hxx @@ -83,7 +83,7 @@ namespace toolkit throw (css::uno::RuntimeException, std::exception) override; protected: - virtual ~UnoControlFormattedFieldModel(); + virtual ~UnoControlFormattedFieldModel() override; // XComponent void SAL_CALL dispose( ) throw(css::uno::RuntimeException, std::exception) override; diff --git a/include/toolkit/controls/geometrycontrolmodel.hxx b/include/toolkit/controls/geometrycontrolmodel.hxx index 549e7e12cbdc..49d21e24e158 100644 --- a/include/toolkit/controls/geometrycontrolmodel.hxx +++ b/include/toolkit/controls/geometrycontrolmodel.hxx @@ -107,7 +107,7 @@ namespace com { namespace sun { namespace star { void releaseAggregation(); protected: - virtual ~OGeometryControlModel_Base(); + virtual ~OGeometryControlModel_Base() override; // XAggregation css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _aType ) throw(css::uno::RuntimeException, std::exception) override; diff --git a/include/toolkit/controls/stdtabcontroller.hxx b/include/toolkit/controls/stdtabcontroller.hxx index d915fc723941..7472b5d74deb 100644 --- a/include/toolkit/controls/stdtabcontroller.hxx +++ b/include/toolkit/controls/stdtabcontroller.hxx @@ -50,7 +50,7 @@ protected: public: StdTabController(); - virtual ~StdTabController(); + virtual ~StdTabController() override; static css::uno::Reference< css::awt::XControl > FindControl( css::uno::Sequence< css::uno::Reference< css::awt::XControl > >& rCtrls, const css::uno::Reference< css::awt::XControlModel > & rxCtrlModel ); diff --git a/include/toolkit/controls/stdtabcontrollermodel.hxx b/include/toolkit/controls/stdtabcontrollermodel.hxx index 92d54dbc4386..e1a5b7446eaf 100644 --- a/include/toolkit/controls/stdtabcontrollermodel.hxx +++ b/include/toolkit/controls/stdtabcontrollermodel.hxx @@ -99,7 +99,7 @@ protected: public: StdTabControllerModel(); - virtual ~StdTabControllerModel(); + virtual ~StdTabControllerModel() override; // css::uno::XInterface css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override { return OWeakAggObject::queryInterface(rType); } diff --git a/include/toolkit/controls/tabpagemodel.hxx b/include/toolkit/controls/tabpagemodel.hxx index 4020c35963ef..b60371c92959 100644 --- a/include/toolkit/controls/tabpagemodel.hxx +++ b/include/toolkit/controls/tabpagemodel.hxx @@ -69,7 +69,7 @@ private: public: UnoControlTabPage( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); - virtual ~UnoControlTabPage(); + virtual ~UnoControlTabPage() override; OUString GetComponentServiceName() override; void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& Toolkit, const css::uno::Reference< css::awt::XWindowPeer >& Parent ) throw(css::uno::RuntimeException, std::exception) override; diff --git a/include/toolkit/controls/unocontrol.hxx b/include/toolkit/controls/unocontrol.hxx index fd5fa0a0f618..72d81b6bd8d7 100644 --- a/include/toolkit/controls/unocontrol.hxx +++ b/include/toolkit/controls/unocontrol.hxx @@ -137,7 +137,7 @@ protected: public: UnoControl(); - virtual ~UnoControl(); + virtual ~UnoControl() override; UnoControlComponentInfos& GetComponentInfos() { return maComponentInfos; } diff --git a/include/toolkit/controls/unocontrolcontainer.hxx b/include/toolkit/controls/unocontrolcontainer.hxx index 86e10ae26692..37fd46db86f2 100644 --- a/include/toolkit/controls/unocontrolcontainer.hxx +++ b/include/toolkit/controls/unocontrolcontainer.hxx @@ -58,7 +58,7 @@ protected: public: UnoControlContainer(); UnoControlContainer( const css::uno::Reference< css::awt::XWindowPeer >& xPeer ); - virtual ~UnoControlContainer(); + virtual ~UnoControlContainer() override; // css::lang::XComponent diff --git a/include/toolkit/controls/unocontrols.hxx b/include/toolkit/controls/unocontrols.hxx index c81ba5268627..373e59c80ee2 100644 --- a/include/toolkit/controls/unocontrols.hxx +++ b/include/toolkit/controls/unocontrols.hxx @@ -543,7 +543,7 @@ private: public: UnoCheckBoxControl(); - virtual ~UnoCheckBoxControl(){;} + virtual ~UnoCheckBoxControl() override {;} OUString GetComponentServiceName() override; void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& Toolkit, const css::uno::Reference< css::awt::XWindowPeer >& Parent ) throw(css::uno::RuntimeException, std::exception) override; @@ -798,7 +798,7 @@ public: ConstructorMode const i_mode = ConstructDefault ); UnoControlListBoxModel( const UnoControlListBoxModel& i_rSource ); - virtual ~UnoControlListBoxModel(); + virtual ~UnoControlListBoxModel() override; UnoControlModel* Clone() const override { return new UnoControlListBoxModel( *this ); } diff --git a/include/toolkit/helper/accessiblefactory.hxx b/include/toolkit/helper/accessiblefactory.hxx index 95255e7a5db8..1dfd3d7d7e35 100644 --- a/include/toolkit/helper/accessiblefactory.hxx +++ b/include/toolkit/helper/accessiblefactory.hxx @@ -122,7 +122,7 @@ namespace toolkit createAccessible( Menu* _pMenu, bool _bIsMenuBar ) = 0; protected: - virtual ~IAccessibleFactory() {} + virtual ~IAccessibleFactory() override {} }; -- cgit libreoffice-5-2-6 LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff
path: root/vcl/unx/gtk3_kde5/a11y/gtk3_kde5_atkutil.cxx
AgeCommit message (Expand)Author
2018-01-23Introduce gtk3_kde5 vcl pluginMilian Wolff