From a41fe32ba989cad3b6e2e20793b3fff469230eb6 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 14 Jan 2020 10:27:30 +0200 Subject: loplugin:finalclasses in accessibility Change-Id: If9314712090bc2494f86afa8f0c25038f8307278 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86742 Tested-by: Jenkins Reviewed-by: Noel Grandin --- accessibility/inc/extended/AccessibleBrowseBoxCheckBoxCell.hxx | 3 +-- accessibility/inc/extended/AccessibleBrowseBoxHeaderCell.hxx | 4 ++-- accessibility/inc/extended/AccessibleBrowseBoxTableCell.hxx | 3 +-- accessibility/inc/extended/accessibleeditbrowseboxcell.hxx | 8 +++----- accessibility/inc/helper/listboxhelper.hxx | 2 +- accessibility/inc/standard/vclxaccessiblefixedhyperlink.hxx | 3 +-- accessibility/inc/standard/vclxaccessibleheaderbar.hxx | 2 +- accessibility/inc/standard/vclxaccessiblemenuseparator.hxx | 2 +- accessibility/inc/standard/vclxaccessiblepopupmenu.hxx | 3 +-- accessibility/inc/standard/vclxaccessibleradiobutton.hxx | 3 +-- accessibility/inc/standard/vclxaccessiblescrollbar.hxx | 3 +-- accessibility/inc/standard/vclxaccessibletabpagewindow.hxx | 3 +-- accessibility/inc/standard/vclxaccessibletextfield.hxx | 5 ++--- 13 files changed, 17 insertions(+), 27 deletions(-) (limited to 'accessibility/inc') diff --git a/accessibility/inc/extended/AccessibleBrowseBoxCheckBoxCell.hxx b/accessibility/inc/extended/AccessibleBrowseBoxCheckBoxCell.hxx index 800d3957b48a..0ad34ba18ede 100644 --- a/accessibility/inc/extended/AccessibleBrowseBoxCheckBoxCell.hxx +++ b/accessibility/inc/extended/AccessibleBrowseBoxCheckBoxCell.hxx @@ -30,14 +30,13 @@ namespace accessibility css::accessibility::XAccessibleValue > AccessibleCheckBoxCell_BASE; - class AccessibleCheckBoxCell : public AccessibleBrowseBoxCell + class AccessibleCheckBoxCell final : public AccessibleBrowseBoxCell ,public AccessibleCheckBoxCell_BASE { private: TriState m_eState; bool m_bIsTriState; - protected: virtual ~AccessibleCheckBoxCell() override {} virtual ::utl::AccessibleStateSetHelper* implCreateStateSetHelper() override; diff --git a/accessibility/inc/extended/AccessibleBrowseBoxHeaderCell.hxx b/accessibility/inc/extended/AccessibleBrowseBoxHeaderCell.hxx index 0a2d10686598..2987483ff65c 100644 --- a/accessibility/inc/extended/AccessibleBrowseBoxHeaderCell.hxx +++ b/accessibility/inc/extended/AccessibleBrowseBoxHeaderCell.hxx @@ -22,7 +22,7 @@ namespace accessibility { - class AccessibleBrowseBoxHeaderCell : public BrowseBoxAccessibleElement + class AccessibleBrowseBoxHeaderCell final : public BrowseBoxAccessibleElement { sal_Int32 m_nColumnRowId; public: @@ -61,7 +61,7 @@ namespace accessibility */ ::utl::AccessibleStateSetHelper* implCreateStateSetHelper() override; - protected: + private: virtual tools::Rectangle implGetBoundingBox() override; virtual tools::Rectangle implGetBoundingBoxOnScreen() override; diff --git a/accessibility/inc/extended/AccessibleBrowseBoxTableCell.hxx b/accessibility/inc/extended/AccessibleBrowseBoxTableCell.hxx index d6029b54531d..6823fa67eb7a 100644 --- a/accessibility/inc/extended/AccessibleBrowseBoxTableCell.hxx +++ b/accessibility/inc/extended/AccessibleBrowseBoxTableCell.hxx @@ -29,14 +29,13 @@ namespace accessibility > AccessibleTextHelper_BASE; // implementation of a table cell of BrowseBox - class AccessibleBrowseBoxTableCell :public AccessibleBrowseBoxCell + class AccessibleBrowseBoxTableCell final : public AccessibleBrowseBoxCell ,public AccessibleTextHelper_BASE ,public ::comphelper::OCommonAccessibleText { private: sal_Int32 m_nOffset; - protected: // OCommonAccessibleText virtual OUString implGetText() final override; virtual css::lang::Locale implGetLocale() override; diff --git a/accessibility/inc/extended/accessibleeditbrowseboxcell.hxx b/accessibility/inc/extended/accessibleeditbrowseboxcell.hxx index fb3c2036904a..6d827ac13a05 100644 --- a/accessibility/inc/extended/accessibleeditbrowseboxcell.hxx +++ b/accessibility/inc/extended/accessibleeditbrowseboxcell.hxx @@ -28,7 +28,7 @@ namespace accessibility // = EditBrowseBoxTableCell - class EditBrowseBoxTableCell :public AccessibleBrowseBoxCell + class EditBrowseBoxTableCell final : public AccessibleBrowseBoxCell ,public ::comphelper::OAccessibleContextWrapperHelper { public: @@ -42,10 +42,9 @@ namespace accessibility sal_uInt16 _nColPos ); - protected: + private: virtual ~EditBrowseBoxTableCell() override; - protected: // XAccessibleComponent virtual sal_Int32 SAL_CALL getForeground( ) override ; virtual sal_Int32 SAL_CALL getBackground( ) override ; @@ -71,7 +70,7 @@ namespace accessibility virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) override; virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override; - protected: + // OComponentHelper virtual void SAL_CALL disposing() override; @@ -81,7 +80,6 @@ namespace accessibility // OAccessibleContextWrapperHelper(); void notifyTranslatedEvent( const css::accessibility::AccessibleEventObject& _rEvent ) override; - private: EditBrowseBoxTableCell( const EditBrowseBoxTableCell& ) = delete; EditBrowseBoxTableCell& operator=( const EditBrowseBoxTableCell& ) = delete; }; diff --git a/accessibility/inc/helper/listboxhelper.hxx b/accessibility/inc/helper/listboxhelper.hxx index 3d7a76c3c8a8..919cbbdce5b3 100644 --- a/accessibility/inc/helper/listboxhelper.hxx +++ b/accessibility/inc/helper/listboxhelper.hxx @@ -32,7 +32,7 @@ const sal_Int32 DEFAULT_INDEX_IN_PARENT = -1; -template< class T > class VCLListBoxHelper : public ::accessibility::IComboListBoxHelper +template< class T > class VCLListBoxHelper final : public ::accessibility::IComboListBoxHelper { private: T& m_aComboListBox; diff --git a/accessibility/inc/standard/vclxaccessiblefixedhyperlink.hxx b/accessibility/inc/standard/vclxaccessiblefixedhyperlink.hxx index e831db0ff146..b0cc9024fe7b 100644 --- a/accessibility/inc/standard/vclxaccessiblefixedhyperlink.hxx +++ b/accessibility/inc/standard/vclxaccessiblefixedhyperlink.hxx @@ -24,9 +24,8 @@ -class VCLXAccessibleFixedHyperlink : public VCLXAccessibleTextComponent +class VCLXAccessibleFixedHyperlink final : public VCLXAccessibleTextComponent { -protected: virtual ~VCLXAccessibleFixedHyperlink() override = default; public: diff --git a/accessibility/inc/standard/vclxaccessibleheaderbar.hxx b/accessibility/inc/standard/vclxaccessibleheaderbar.hxx index a75107956ca7..3f284d7f0cb2 100644 --- a/accessibility/inc/standard/vclxaccessibleheaderbar.hxx +++ b/accessibility/inc/standard/vclxaccessibleheaderbar.hxx @@ -26,7 +26,7 @@ typedef std::vector< css::uno::WeakReference< css::accessibility::XAccessible > > ListItems; -class VCLXAccessibleHeaderBar : public VCLXAccessibleComponent +class VCLXAccessibleHeaderBar final : public VCLXAccessibleComponent { VclPtr m_pHeadBar; diff --git a/accessibility/inc/standard/vclxaccessiblemenuseparator.hxx b/accessibility/inc/standard/vclxaccessiblemenuseparator.hxx index e16097b18b21..bb14b952e98c 100644 --- a/accessibility/inc/standard/vclxaccessiblemenuseparator.hxx +++ b/accessibility/inc/standard/vclxaccessiblemenuseparator.hxx @@ -24,7 +24,7 @@ -class VCLXAccessibleMenuSeparator : public OAccessibleMenuItemComponent +class VCLXAccessibleMenuSeparator final : public OAccessibleMenuItemComponent { public: VCLXAccessibleMenuSeparator( Menu* pParent, sal_uInt16 nItemPos ); diff --git a/accessibility/inc/standard/vclxaccessiblepopupmenu.hxx b/accessibility/inc/standard/vclxaccessiblepopupmenu.hxx index 3569f03f1846..3374ef450e25 100644 --- a/accessibility/inc/standard/vclxaccessiblepopupmenu.hxx +++ b/accessibility/inc/standard/vclxaccessiblepopupmenu.hxx @@ -24,9 +24,8 @@ -class VCLXAccessiblePopupMenu : public OAccessibleMenuComponent +class VCLXAccessiblePopupMenu final : public OAccessibleMenuComponent { -protected: virtual bool IsFocused() override; public: diff --git a/accessibility/inc/standard/vclxaccessibleradiobutton.hxx b/accessibility/inc/standard/vclxaccessibleradiobutton.hxx index d7debfe59f93..b4773946d31f 100644 --- a/accessibility/inc/standard/vclxaccessibleradiobutton.hxx +++ b/accessibility/inc/standard/vclxaccessibleradiobutton.hxx @@ -33,10 +33,9 @@ typedef ::cppu::ImplHelper2< css::accessibility::XAccessibleAction, css::accessibility::XAccessibleValue > VCLXAccessibleRadioButton_BASE; -class VCLXAccessibleRadioButton : public VCLXAccessibleTextComponent, +class VCLXAccessibleRadioButton final : public VCLXAccessibleTextComponent, public VCLXAccessibleRadioButton_BASE { -protected: virtual ~VCLXAccessibleRadioButton() override = default; virtual void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) override; diff --git a/accessibility/inc/standard/vclxaccessiblescrollbar.hxx b/accessibility/inc/standard/vclxaccessiblescrollbar.hxx index cbb86e489982..8d81c60cc7db 100644 --- a/accessibility/inc/standard/vclxaccessiblescrollbar.hxx +++ b/accessibility/inc/standard/vclxaccessiblescrollbar.hxx @@ -33,10 +33,9 @@ typedef ::cppu::ImplHelper2< css::accessibility::XAccessibleAction, css::accessibility::XAccessibleValue > VCLXAccessibleScrollBar_BASE; -class VCLXAccessibleScrollBar : public VCLXAccessibleComponent, +class VCLXAccessibleScrollBar final : public VCLXAccessibleComponent, public VCLXAccessibleScrollBar_BASE { -protected: virtual ~VCLXAccessibleScrollBar() override = default; virtual void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) override; diff --git a/accessibility/inc/standard/vclxaccessibletabpagewindow.hxx b/accessibility/inc/standard/vclxaccessibletabpagewindow.hxx index b50d4b352569..36254ceeca37 100644 --- a/accessibility/inc/standard/vclxaccessibletabpagewindow.hxx +++ b/accessibility/inc/standard/vclxaccessibletabpagewindow.hxx @@ -27,14 +27,13 @@ -class VCLXAccessibleTabPageWindow : public VCLXAccessibleComponent +class VCLXAccessibleTabPageWindow final : public VCLXAccessibleComponent { private: VclPtr m_pTabControl; VclPtr m_pTabPage; sal_uInt16 m_nPageId; -protected: // OCommonAccessibleComponent virtual css::awt::Rectangle implGetBounds( ) override; diff --git a/accessibility/inc/standard/vclxaccessibletextfield.hxx b/accessibility/inc/standard/vclxaccessibletextfield.hxx index 41747240e857..5d29de76624d 100644 --- a/accessibility/inc/standard/vclxaccessibletextfield.hxx +++ b/accessibility/inc/standard/vclxaccessibletextfield.hxx @@ -32,7 +32,7 @@ typedef ::cppu::ImplHelper1< css::accessibility::XAccessible > VCLXAccessible_BA accessible by this class. When the selected item changes then also the exported text changes. */ -class VCLXAccessibleTextField : +class VCLXAccessibleTextField final : public VCLXAccessibleTextComponent, public VCLXAccessible_BASE { @@ -64,7 +64,7 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; -protected: +private: virtual ~VCLXAccessibleTextField() override = default; /** With this method the text of the currently selected item is made @@ -72,7 +72,6 @@ protected: */ OUString implGetText() override; -private: /** We need to save the accessible parent to return it in getAccessibleParent(), because this method of the base class returns the wrong parent. */ -- cgit v1.2.3