diff options
Diffstat (limited to 'accessibility/inc/standard')
6 files changed, 14 insertions, 14 deletions
diff --git a/accessibility/inc/standard/vclxaccessiblebox.hxx b/accessibility/inc/standard/vclxaccessiblebox.hxx index b16a12f7702f..c632e2d99d38 100644 --- a/accessibility/inc/standard/vclxaccessiblebox.hxx +++ b/accessibility/inc/standard/vclxaccessiblebox.hxx @@ -70,7 +70,7 @@ public: actual list. The text field is not provided for non drop down list boxes. */ - sal_Int32 SAL_CALL getAccessibleChildCount() override; + sal_Int32 SAL_CALL getAccessibleChildCount() final override; /** For drop down list boxes the text field is a not editable VCLXAccessibleTextField, for combo boxes it is an editable VLCAccessibleEdit. @@ -87,7 +87,7 @@ public: /** There is one action for drop down boxes and none for others. */ - virtual sal_Int32 SAL_CALL getAccessibleActionCount() override; + virtual sal_Int32 SAL_CALL getAccessibleActionCount() final override; /** The action for drop down boxes lets the user toggle the visibility of the popup menu. */ @@ -153,6 +153,8 @@ protected: virtual void FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) override; + sal_Int32 implGetAccessibleChildCount(); + private: /// Index in parent. This is settable from the outside. sal_Int32 m_nIndexInParent; diff --git a/accessibility/inc/standard/vclxaccessiblemenu.hxx b/accessibility/inc/standard/vclxaccessiblemenu.hxx index 58c0b116f662..b44742c43866 100644 --- a/accessibility/inc/standard/vclxaccessiblemenu.hxx +++ b/accessibility/inc/standard/vclxaccessiblemenu.hxx @@ -38,6 +38,7 @@ class VCLXAccessibleMenu : public VCLXAccessibleMenuItem, protected: virtual bool IsFocused() override; virtual bool IsPopupMenuOpen() override; + sal_Int32 implGetSelectedAccessibleChildCount(); public: VCLXAccessibleMenu( Menu* pParent, sal_uInt16 nItemPos, Menu* pMenu ); diff --git a/accessibility/inc/standard/vclxaccessiblemenuitem.hxx b/accessibility/inc/standard/vclxaccessiblemenuitem.hxx index ee0ccd5589e8..5e54ecb595e3 100644 --- a/accessibility/inc/standard/vclxaccessiblemenuitem.hxx +++ b/accessibility/inc/standard/vclxaccessiblemenuitem.hxx @@ -92,7 +92,7 @@ public: virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override; // XAccessibleAction - virtual sal_Int32 SAL_CALL getAccessibleActionCount( ) override; + virtual sal_Int32 SAL_CALL getAccessibleActionCount( ) final override; virtual sal_Bool SAL_CALL doAccessibleAction ( sal_Int32 nIndex ) override; virtual OUString SAL_CALL getAccessibleActionDescription ( sal_Int32 nIndex ) override; virtual css::uno::Reference< css::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) override; diff --git a/accessibility/inc/standard/vclxaccessiblestatusbar.hxx b/accessibility/inc/standard/vclxaccessiblestatusbar.hxx index 5e0dce31e493..ed64580a201c 100644 --- a/accessibility/inc/standard/vclxaccessiblestatusbar.hxx +++ b/accessibility/inc/standard/vclxaccessiblestatusbar.hxx @@ -31,7 +31,7 @@ class StatusBar; // class VCLXAccessibleStatusBar -class VCLXAccessibleStatusBar : public VCLXAccessibleComponent +class VCLXAccessibleStatusBar final : public VCLXAccessibleComponent { private: typedef std::vector< css::uno::Reference< css::accessibility::XAccessible > > AccessibleChildren; @@ -39,7 +39,6 @@ private: AccessibleChildren m_aAccessibleChildren; VclPtr<StatusBar> m_pStatusBar; -protected: void UpdateShowing( sal_Int32 i, bool bShowing ); void UpdateItemName( sal_Int32 i ); void UpdateItemText( sal_Int32 i ); diff --git a/accessibility/inc/standard/vclxaccessiblestatusbaritem.hxx b/accessibility/inc/standard/vclxaccessiblestatusbaritem.hxx index 47cb8bad700a..5fea0a071169 100644 --- a/accessibility/inc/standard/vclxaccessiblestatusbaritem.hxx +++ b/accessibility/inc/standard/vclxaccessiblestatusbaritem.hxx @@ -42,8 +42,8 @@ typedef ::cppu::ImplHelper2< css::accessibility::XAccessible, css::lang::XServiceInfo > VCLXAccessibleStatusBarItem_BASE; -class VCLXAccessibleStatusBarItem : public AccessibleTextHelper_BASE, - public VCLXAccessibleStatusBarItem_BASE +class VCLXAccessibleStatusBarItem final : public AccessibleTextHelper_BASE, + public VCLXAccessibleStatusBarItem_BASE { friend class VCLXAccessibleStatusBar; @@ -54,7 +54,6 @@ private: OUString m_sItemText; bool m_bShowing; -protected: bool IsShowing(); void SetShowing( bool bShowing ); void SetItemName( const OUString& sItemName ); @@ -96,7 +95,7 @@ public: // XAccessibleContext virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) override; - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild(sal_Int32) override; virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) override; virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) override; virtual sal_Int16 SAL_CALL getAccessibleRole( ) override; diff --git a/accessibility/inc/standard/vclxaccessibletoolboxitem.hxx b/accessibility/inc/standard/vclxaccessibletoolboxitem.hxx index fd455b025507..6a8836f13f94 100644 --- a/accessibility/inc/standard/vclxaccessibletoolboxitem.hxx +++ b/accessibility/inc/standard/vclxaccessibletoolboxitem.hxx @@ -41,8 +41,8 @@ typedef ::cppu::ImplHelper4 < css::accessibility::XAccessible, css::accessibility::XAccessibleValue, css::lang::XServiceInfo > VCLXAccessibleToolBoxItem_BASE; -class VCLXAccessibleToolBoxItem : public AccessibleTextHelper_BASE, - public VCLXAccessibleToolBoxItem_BASE +class VCLXAccessibleToolBoxItem final : public AccessibleTextHelper_BASE, + public VCLXAccessibleToolBoxItem_BASE { private: OUString m_sOldName; @@ -55,12 +55,13 @@ private: bool m_bIndeterminate; css::uno::Reference< css::accessibility::XAccessible > m_xChild; + OUString GetText(); public: sal_Int32 getIndexInParent() const { return m_nIndexInParent; } void setIndexInParent( sal_Int32 _nNewIndex ) { m_nIndexInParent = _nNewIndex; } -protected: +private: virtual ~VCLXAccessibleToolBoxItem() override; virtual void SAL_CALL disposing() override; @@ -73,8 +74,6 @@ protected: virtual css::lang::Locale implGetLocale() override; virtual void implGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex ) override; - OUString GetText(); - public: VCLXAccessibleToolBoxItem( ToolBox* _pToolBox, sal_Int32 _nPos ); |