From d176877bc0ccb8432e55eda2e7d620a246bccdde Mon Sep 17 00:00:00 2001 From: Arnaud Versini Date: Sun, 25 Feb 2018 14:45:15 +0100 Subject: accessibility: cleanup constructors and destructors Change-Id: Id9d420e633691cf87706088d7415aeb8ed1bdb8d Reviewed-on: https://gerrit.libreoffice.org/50307 Reviewed-by: Noel Grandin Tested-by: Noel Grandin --- accessibility/inc/extended/AccessibleBrowseBoxTableBase.hxx | 2 +- accessibility/inc/extended/AccessibleGridControl.hxx | 2 +- accessibility/inc/extended/AccessibleGridControlTable.hxx | 2 +- accessibility/inc/standard/accessiblemenucomponent.hxx | 3 ++- accessibility/inc/standard/vclxaccessiblebutton.hxx | 5 ++--- accessibility/inc/standard/vclxaccessiblecheckbox.hxx | 2 +- accessibility/inc/standard/vclxaccessiblecombobox.hxx | 6 +++--- accessibility/inc/standard/vclxaccessibledropdowncombobox.hxx | 6 +++--- accessibility/inc/standard/vclxaccessibledropdownlistbox.hxx | 6 +++--- accessibility/inc/standard/vclxaccessiblefixedhyperlink.hxx | 2 +- accessibility/inc/standard/vclxaccessiblefixedtext.hxx | 5 ++--- accessibility/inc/standard/vclxaccessiblelist.hxx | 2 +- accessibility/inc/standard/vclxaccessiblelistbox.hxx | 4 ++-- accessibility/inc/standard/vclxaccessiblelistitem.hxx | 2 +- accessibility/inc/standard/vclxaccessiblescrollbar.hxx | 4 ++-- accessibility/inc/standard/vclxaccessiblestatusbar.hxx | 1 - accessibility/inc/standard/vclxaccessiblestatusbaritem.hxx | 1 - accessibility/inc/standard/vclxaccessibletabcontrol.hxx | 1 - accessibility/inc/standard/vclxaccessibletabpagewindow.hxx | 1 - accessibility/inc/standard/vclxaccessibletextcomponent.hxx | 1 - accessibility/inc/standard/vclxaccessibletextfield.hxx | 2 +- 21 files changed, 27 insertions(+), 33 deletions(-) (limited to 'accessibility/inc') diff --git a/accessibility/inc/extended/AccessibleBrowseBoxTableBase.hxx b/accessibility/inc/extended/AccessibleBrowseBoxTableBase.hxx index 32d0fb75d491..ac98a503b9c0 100644 --- a/accessibility/inc/extended/AccessibleBrowseBoxTableBase.hxx +++ b/accessibility/inc/extended/AccessibleBrowseBoxTableBase.hxx @@ -54,7 +54,7 @@ public: ::svt::AccessibleBrowseBoxObjType eObjType ); protected: - virtual ~AccessibleBrowseBoxTableBase() override; + virtual ~AccessibleBrowseBoxTableBase() override = default; public: // XAccessibleContext diff --git a/accessibility/inc/extended/AccessibleGridControl.hxx b/accessibility/inc/extended/AccessibleGridControl.hxx index 3cd2a4d102fc..3968c3e07e33 100644 --- a/accessibility/inc/extended/AccessibleGridControl.hxx +++ b/accessibility/inc/extended/AccessibleGridControl.hxx @@ -43,7 +43,7 @@ class AccessibleGridControl final : public AccessibleGridControlBase ::svt::table::IAccessibleTable& _rTable ); - virtual ~AccessibleGridControl() override; + virtual ~AccessibleGridControl() override = default; /** Cleans up members. */ using AccessibleGridControlBase::disposing; diff --git a/accessibility/inc/extended/AccessibleGridControlTable.hxx b/accessibility/inc/extended/AccessibleGridControlTable.hxx index dc6493dc870c..18627c22e021 100644 --- a/accessibility/inc/extended/AccessibleGridControlTable.hxx +++ b/accessibility/inc/extended/AccessibleGridControlTable.hxx @@ -43,7 +43,7 @@ public: ::svt::table::IAccessibleTable& rTable); private: - virtual ~AccessibleGridControlTable() override; + virtual ~AccessibleGridControlTable() override = default; std::vector< AccessibleGridControlTableCell* > m_pCellVector; std::vector< css::uno::Reference< css::accessibility::XAccessible> > m_pAccessCellVector; public: diff --git a/accessibility/inc/standard/accessiblemenucomponent.hxx b/accessibility/inc/standard/accessiblemenucomponent.hxx index bd2953bf77dd..7c741f66aa17 100644 --- a/accessibility/inc/standard/accessiblemenucomponent.hxx +++ b/accessibility/inc/standard/accessiblemenucomponent.hxx @@ -42,8 +42,9 @@ protected: // OCommonAccessibleComponent virtual css::awt::Rectangle implGetBounds( ) override; + using OAccessibleMenuBaseComponent::OAccessibleMenuBaseComponent; + public: - OAccessibleMenuComponent( Menu* pMenu ); // XInterface DECLARE_XINTERFACE() diff --git a/accessibility/inc/standard/vclxaccessiblebutton.hxx b/accessibility/inc/standard/vclxaccessiblebutton.hxx index 9fb63b3b5088..566dc62866b4 100644 --- a/accessibility/inc/standard/vclxaccessiblebutton.hxx +++ b/accessibility/inc/standard/vclxaccessiblebutton.hxx @@ -35,17 +35,16 @@ typedef ::cppu::ImplHelper2< css::accessibility::XAccessibleAction, css::accessibility::XAccessibleValue > VCLXAccessibleButton_BASE; -class VCLXAccessibleButton : public VCLXAccessibleTextComponent, +class VCLXAccessibleButton final : public VCLXAccessibleTextComponent, public VCLXAccessibleButton_BASE { -protected: virtual ~VCLXAccessibleButton() override = default; virtual void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) override; virtual void FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) override; public: - VCLXAccessibleButton( VCLXWindow* pVCLXindow ); + using VCLXAccessibleTextComponent::VCLXAccessibleTextComponent; // XInterface DECLARE_XINTERFACE() diff --git a/accessibility/inc/standard/vclxaccessiblecheckbox.hxx b/accessibility/inc/standard/vclxaccessiblecheckbox.hxx index 48b3aaa379b7..e57ef74eb503 100644 --- a/accessibility/inc/standard/vclxaccessiblecheckbox.hxx +++ b/accessibility/inc/standard/vclxaccessiblecheckbox.hxx @@ -42,7 +42,7 @@ private: bool m_bChecked; bool m_bIndeterminate; - virtual ~VCLXAccessibleCheckBox() override; + virtual ~VCLXAccessibleCheckBox() override = default; bool IsChecked(); bool IsIndeterminate(); diff --git a/accessibility/inc/standard/vclxaccessiblecombobox.hxx b/accessibility/inc/standard/vclxaccessiblecombobox.hxx index dcd36fcfb60b..1186ffecc432 100644 --- a/accessibility/inc/standard/vclxaccessiblecombobox.hxx +++ b/accessibility/inc/standard/vclxaccessiblecombobox.hxx @@ -31,7 +31,7 @@ object of the VCLXAccessibleList class which does not support selection at the moment. */ -class VCLXAccessibleComboBox +class VCLXAccessibleComboBox final : public VCLXAccessibleBox { public: @@ -43,8 +43,8 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; -protected: - virtual ~VCLXAccessibleComboBox() override; +private: + virtual ~VCLXAccessibleComboBox() override = default; virtual bool IsValid() const override; }; diff --git a/accessibility/inc/standard/vclxaccessibledropdowncombobox.hxx b/accessibility/inc/standard/vclxaccessibledropdowncombobox.hxx index 72559afe66dd..f1701e7cbcba 100644 --- a/accessibility/inc/standard/vclxaccessibledropdowncombobox.hxx +++ b/accessibility/inc/standard/vclxaccessibledropdowncombobox.hxx @@ -31,7 +31,7 @@ VCLXAccessibleList class which does not support selection at the moment. */ -class VCLXAccessibleDropDownComboBox : public VCLXAccessibleBox +class VCLXAccessibleDropDownComboBox final : public VCLXAccessibleBox { public: VCLXAccessibleDropDownComboBox (VCLXWindow* pVCLXindow); @@ -42,8 +42,8 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; -protected: - virtual ~VCLXAccessibleDropDownComboBox() override; +private: + virtual ~VCLXAccessibleDropDownComboBox() override = default; virtual bool IsValid() const override; virtual void ProcessWindowEvent (const VclWindowEvent& rVclWindowEvent) override; diff --git a/accessibility/inc/standard/vclxaccessibledropdownlistbox.hxx b/accessibility/inc/standard/vclxaccessibledropdownlistbox.hxx index 5c00b33b6bb6..476af6986dda 100644 --- a/accessibility/inc/standard/vclxaccessibledropdownlistbox.hxx +++ b/accessibility/inc/standard/vclxaccessibledropdownlistbox.hxx @@ -30,7 +30,7 @@ of the VCLXAccessibleListBoxList class which does support selection. */ -class VCLXAccessibleDropDownListBox : public VCLXAccessibleBox +class VCLXAccessibleDropDownListBox final : public VCLXAccessibleBox { public: VCLXAccessibleDropDownListBox (VCLXWindow* pVCLXindow); @@ -41,8 +41,8 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; -protected: - virtual ~VCLXAccessibleDropDownListBox() override; +private: + virtual ~VCLXAccessibleDropDownListBox() override = default; virtual bool IsValid() const override; diff --git a/accessibility/inc/standard/vclxaccessiblefixedhyperlink.hxx b/accessibility/inc/standard/vclxaccessiblefixedhyperlink.hxx index e0becd208b1d..5ce41b7dfbf8 100644 --- a/accessibility/inc/standard/vclxaccessiblefixedhyperlink.hxx +++ b/accessibility/inc/standard/vclxaccessiblefixedhyperlink.hxx @@ -32,7 +32,7 @@ protected: virtual ~VCLXAccessibleFixedHyperlink() override = default; public: - VCLXAccessibleFixedHyperlink( VCLXWindow* pVCLXindow ); + using VCLXAccessibleTextComponent::VCLXAccessibleTextComponent; // XServiceInfo virtual OUString SAL_CALL getImplementationName() override; diff --git a/accessibility/inc/standard/vclxaccessiblefixedtext.hxx b/accessibility/inc/standard/vclxaccessiblefixedtext.hxx index 79f2c9940622..44875b419c90 100644 --- a/accessibility/inc/standard/vclxaccessiblefixedtext.hxx +++ b/accessibility/inc/standard/vclxaccessiblefixedtext.hxx @@ -26,15 +26,14 @@ // class VCLXAccessibleFixedText -class VCLXAccessibleFixedText : public VCLXAccessibleTextComponent +class VCLXAccessibleFixedText final : public VCLXAccessibleTextComponent { -protected: virtual ~VCLXAccessibleFixedText() override = default; virtual void FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) override; public: - VCLXAccessibleFixedText( VCLXWindow* pVCLXindow ); + using VCLXAccessibleTextComponent::VCLXAccessibleTextComponent; // XServiceInfo virtual OUString SAL_CALL getImplementationName() override; diff --git a/accessibility/inc/standard/vclxaccessiblelist.hxx b/accessibility/inc/standard/vclxaccessiblelist.hxx index a9ee46c6ca8b..f4301ee13950 100644 --- a/accessibility/inc/standard/vclxaccessiblelist.hxx +++ b/accessibility/inc/standard/vclxaccessiblelist.hxx @@ -142,7 +142,7 @@ private: sal_Int32 m_nCurSelectedPos; - virtual ~VCLXAccessibleList() override; + virtual ~VCLXAccessibleList() override = default; /** This function is called from the implementation helper during a XComponent::dispose call. Free the list of items and the items themselves. diff --git a/accessibility/inc/standard/vclxaccessiblelistbox.hxx b/accessibility/inc/standard/vclxaccessiblelistbox.hxx index af0b7af3d153..6806bf732c7d 100644 --- a/accessibility/inc/standard/vclxaccessiblelistbox.hxx +++ b/accessibility/inc/standard/vclxaccessiblelistbox.hxx @@ -31,7 +31,7 @@ VCLXAccessibleListBoxList class which does support selection. */ -class VCLXAccessibleListBox : public VCLXAccessibleBox +class VCLXAccessibleListBox final : public VCLXAccessibleBox { public: VCLXAccessibleListBox (VCLXWindow* pVCLXindow); @@ -42,7 +42,7 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; -protected: +private: virtual ~VCLXAccessibleListBox() override = default; virtual bool IsValid() const override; diff --git a/accessibility/inc/standard/vclxaccessiblelistitem.hxx b/accessibility/inc/standard/vclxaccessiblelistitem.hxx index 3c8ef2e0e589..289162a1bbf9 100644 --- a/accessibility/inc/standard/vclxaccessiblelistitem.hxx +++ b/accessibility/inc/standard/vclxaccessiblelistitem.hxx @@ -68,7 +68,7 @@ private: rtl::Reference< VCLXAccessibleList > m_xParent; css::uno::Reference< css::accessibility::XAccessibleContext > m_xParentContext; - virtual ~VCLXAccessibleListItem() override; + virtual ~VCLXAccessibleListItem() override = default; /** this function is called upon disposing the component */ virtual void SAL_CALL disposing() override; diff --git a/accessibility/inc/standard/vclxaccessiblescrollbar.hxx b/accessibility/inc/standard/vclxaccessiblescrollbar.hxx index 19537d7739a9..a8826487d664 100644 --- a/accessibility/inc/standard/vclxaccessiblescrollbar.hxx +++ b/accessibility/inc/standard/vclxaccessiblescrollbar.hxx @@ -39,13 +39,13 @@ class VCLXAccessibleScrollBar : public VCLXAccessibleComponent, public VCLXAccessibleScrollBar_BASE { protected: - virtual ~VCLXAccessibleScrollBar() override; + virtual ~VCLXAccessibleScrollBar() override = default; virtual void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) override; virtual void FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) override; public: - VCLXAccessibleScrollBar( VCLXWindow* pVCLXindow ); + using VCLXAccessibleComponent::VCLXAccessibleComponent; // XInterface DECLARE_XINTERFACE() diff --git a/accessibility/inc/standard/vclxaccessiblestatusbar.hxx b/accessibility/inc/standard/vclxaccessiblestatusbar.hxx index ed64580a201c..b7564b4f3b98 100644 --- a/accessibility/inc/standard/vclxaccessiblestatusbar.hxx +++ b/accessibility/inc/standard/vclxaccessiblestatusbar.hxx @@ -53,7 +53,6 @@ private: public: VCLXAccessibleStatusBar( VCLXWindow* pVCLXWindow ); - virtual ~VCLXAccessibleStatusBar() override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() override; diff --git a/accessibility/inc/standard/vclxaccessiblestatusbaritem.hxx b/accessibility/inc/standard/vclxaccessiblestatusbaritem.hxx index db008f98897d..05a9cfac215d 100644 --- a/accessibility/inc/standard/vclxaccessiblestatusbaritem.hxx +++ b/accessibility/inc/standard/vclxaccessiblestatusbaritem.hxx @@ -77,7 +77,6 @@ private: public: VCLXAccessibleStatusBarItem( StatusBar* pStatusBar, sal_uInt16 nItemId ); - virtual ~VCLXAccessibleStatusBarItem() override; // XInterface DECLARE_XINTERFACE() diff --git a/accessibility/inc/standard/vclxaccessibletabcontrol.hxx b/accessibility/inc/standard/vclxaccessibletabcontrol.hxx index 7b0892076cd2..9e0960d67ea7 100644 --- a/accessibility/inc/standard/vclxaccessibletabcontrol.hxx +++ b/accessibility/inc/standard/vclxaccessibletabcontrol.hxx @@ -61,7 +61,6 @@ private: public: VCLXAccessibleTabControl( VCLXWindow* pVCLXWindow ); - virtual ~VCLXAccessibleTabControl() override; // XInterface DECLARE_XINTERFACE() diff --git a/accessibility/inc/standard/vclxaccessibletabpagewindow.hxx b/accessibility/inc/standard/vclxaccessibletabpagewindow.hxx index aeaf923e0f12..db9163039489 100644 --- a/accessibility/inc/standard/vclxaccessibletabpagewindow.hxx +++ b/accessibility/inc/standard/vclxaccessibletabpagewindow.hxx @@ -47,7 +47,6 @@ protected: public: VCLXAccessibleTabPageWindow( VCLXWindow* pVCLXWindow ); - virtual ~VCLXAccessibleTabPageWindow() override; // XAccessibleContext virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) override; diff --git a/accessibility/inc/standard/vclxaccessibletextcomponent.hxx b/accessibility/inc/standard/vclxaccessibletextcomponent.hxx index b5ae9e510be1..312bdf0b2309 100644 --- a/accessibility/inc/standard/vclxaccessibletextcomponent.hxx +++ b/accessibility/inc/standard/vclxaccessibletextcomponent.hxx @@ -51,7 +51,6 @@ protected: public: VCLXAccessibleTextComponent( VCLXWindow* pVCLXWindow ); - virtual ~VCLXAccessibleTextComponent() override; // XInterface DECLARE_XINTERFACE() diff --git a/accessibility/inc/standard/vclxaccessibletextfield.hxx b/accessibility/inc/standard/vclxaccessibletextfield.hxx index f1bb4fec8aa1..8dbede5690f0 100644 --- a/accessibility/inc/standard/vclxaccessibletextfield.hxx +++ b/accessibility/inc/standard/vclxaccessibletextfield.hxx @@ -66,7 +66,7 @@ public: getSupportedServiceNames() override; protected: - virtual ~VCLXAccessibleTextField() override; + virtual ~VCLXAccessibleTextField() override = default; /** With this method the text of the currently selected item is made available to the VCLXAccessibleTextComponent base class. -- cgit