diff options
| author | Arnaud Versini <arnaud.versini@gmail.com> | 2018-04-08 10:21:54 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-04-23 13:16:01 +0200 |
| commit | 0c2beb9ecde1600d4879d2240b6af45ac8477e36 (patch) | |
| tree | 26460bb4d32bc52681044d4b23235c531647c3cb /accessibility/inc | |
| parent | c0af8057188c0e95831f9e6d1ef96a424da6f9b2 (diff) | |
accessibility : remove useless guards and simplify.
Change-Id: I9e0d5967f71b2bd822c64690f8e02a0c95c8b88f
Reviewed-on: https://gerrit.libreoffice.org/52581
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'accessibility/inc')
6 files changed, 14 insertions, 1 deletions
diff --git a/accessibility/inc/standard/vclxaccessiblecheckbox.hxx b/accessibility/inc/standard/vclxaccessiblecheckbox.hxx index e57ef74eb503..5c4e21e18898 100644 --- a/accessibility/inc/standard/vclxaccessiblecheckbox.hxx +++ b/accessibility/inc/standard/vclxaccessiblecheckbox.hxx @@ -44,6 +44,8 @@ private: virtual ~VCLXAccessibleCheckBox() override = default; + sal_Int32 implGetMaximumValue(); + bool IsChecked(); bool IsIndeterminate(); diff --git a/accessibility/inc/standard/vclxaccessibleedit.hxx b/accessibility/inc/standard/vclxaccessibleedit.hxx index f41479c0ceef..a6207c202c42 100644 --- a/accessibility/inc/standard/vclxaccessibleedit.hxx +++ b/accessibility/inc/standard/vclxaccessibleedit.hxx @@ -46,6 +46,7 @@ private: virtual void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) override; virtual void FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) override; + sal_Int16 implGetAccessibleRole(); // OCommonAccessibleText virtual OUString implGetText() override; diff --git a/accessibility/inc/standard/vclxaccessiblelist.hxx b/accessibility/inc/standard/vclxaccessiblelist.hxx index f4301ee13950..71c4b0ff4892 100644 --- a/accessibility/inc/standard/vclxaccessiblelist.hxx +++ b/accessibility/inc/standard/vclxaccessiblelist.hxx @@ -92,7 +92,7 @@ public: getAccessibleContext() override; // XAccessibleContext - virtual sal_Int32 SAL_CALL getAccessibleChildCount() override; + virtual sal_Int32 SAL_CALL getAccessibleChildCount() override final; css::uno::Reference< css::accessibility::XAccessible> SAL_CALL getAccessibleChild (sal_Int32 i) override; virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL @@ -144,6 +144,8 @@ private: virtual ~VCLXAccessibleList() override = default; + sal_Int32 implGetAccessibleChildCount(); + /** 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/vclxaccessibletabcontrol.hxx b/accessibility/inc/standard/vclxaccessibletabcontrol.hxx index 9e0960d67ea7..8f248466bce9 100644 --- a/accessibility/inc/standard/vclxaccessibletabcontrol.hxx +++ b/accessibility/inc/standard/vclxaccessibletabcontrol.hxx @@ -44,6 +44,10 @@ private: AccessibleChildren m_aAccessibleChildren; VclPtr<TabControl> m_pTabControl; + css::uno::Reference< css::accessibility::XAccessible > implGetAccessibleChild( sal_Int32 i ); + bool implIsAccessibleChildSelected( sal_Int32 nChildIndex ); + + void UpdateFocused(); void UpdateSelected( sal_Int32 i, bool bSelected ); void UpdatePageText( sal_Int32 i ); diff --git a/accessibility/inc/standard/vclxaccessibletabpage.hxx b/accessibility/inc/standard/vclxaccessibletabpage.hxx index 495f4a36412a..9d64e665827a 100644 --- a/accessibility/inc/standard/vclxaccessibletabpage.hxx +++ b/accessibility/inc/standard/vclxaccessibletabpage.hxx @@ -55,6 +55,8 @@ private: bool m_bSelected; OUString m_sPageText; + sal_Int32 implGetAccessibleChildCount(); + bool IsFocused(); bool IsSelected(); diff --git a/accessibility/inc/standard/vclxaccessibletoolbox.hxx b/accessibility/inc/standard/vclxaccessibletoolbox.hxx index add703137fb2..192445291065 100644 --- a/accessibility/inc/standard/vclxaccessibletoolbox.hxx +++ b/accessibility/inc/standard/vclxaccessibletoolbox.hxx @@ -53,6 +53,8 @@ private: void UpdateCustomPopupItemp_Impl( vcl::Window* pWindow, bool bOpen ); void HandleSubToolBarEvent( const VclWindowEvent& rVclWindowEvent ); void ReleaseSubToolBox( ToolBox* _pSubToolBox ); + sal_Int32 implGetAccessibleChildCount(); + sal_Int32 implGetSelectedAccessibleChildCount(); virtual ~VCLXAccessibleToolBox() override; |