[Libreoffice-commits] core.git: accessibility/inc accessibility/source
Arnaud Versini
Arnaud.Versini at libreoffice.org
Fri Sep 15 09:28:51 UTC 2017
accessibility/inc/extended/accessibletabbarpage.hxx | 5 +---
accessibility/inc/standard/vclxaccessiblebox.hxx | 6 +++--
accessibility/inc/standard/vclxaccessiblemenu.hxx | 1
accessibility/inc/standard/vclxaccessiblemenuitem.hxx | 2 -
accessibility/inc/standard/vclxaccessiblestatusbar.hxx | 3 --
accessibility/inc/standard/vclxaccessiblestatusbaritem.hxx | 7 ++----
accessibility/inc/standard/vclxaccessibletoolboxitem.hxx | 9 +++-----
accessibility/source/extended/accessibletabbar.cxx | 2 -
accessibility/source/extended/accessibletabbarpage.cxx | 7 +-----
accessibility/source/standard/vclxaccessiblebox.cxx | 11 +++++++---
accessibility/source/standard/vclxaccessiblebutton.cxx | 6 ++---
accessibility/source/standard/vclxaccessiblecheckbox.cxx | 6 ++---
accessibility/source/standard/vclxaccessiblemenu.cxx | 6 ++++-
accessibility/source/standard/vclxaccessiblemenuitem.cxx | 6 ++---
accessibility/source/standard/vclxaccessibleradiobutton.cxx | 6 ++---
accessibility/source/standard/vclxaccessiblescrollbar.cxx | 9 ++++----
accessibility/source/standard/vclxaccessiblestatusbar.cxx | 2 -
accessibility/source/standard/vclxaccessiblestatusbaritem.cxx | 9 +-------
accessibility/source/standard/vclxaccessibletoolbox.cxx | 2 -
accessibility/source/standard/vclxaccessibletoolboxitem.cxx | 10 ++++-----
20 files changed, 58 insertions(+), 57 deletions(-)
New commits:
commit 5d060fd07a16c80bd94d27b08fefe1d0aaf418f7
Author: Arnaud Versini <Arnaud.Versini at libreoffice.org>
Date: Sun Jul 23 16:25:20 2017 +0200
accessibility: remove useless calls to virtual methods.
This also removes a lot of useless recursive locks.
Change-Id: Ifee7dbf2095bf0431eb27e8022e7f5299c46388f
Reviewed-on: https://gerrit.libreoffice.org/42122
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/accessibility/inc/extended/accessibletabbarpage.hxx b/accessibility/inc/extended/accessibletabbarpage.hxx
index d9ee581dd372..a89914aea111 100644
--- a/accessibility/inc/extended/accessibletabbarpage.hxx
+++ b/accessibility/inc/extended/accessibletabbarpage.hxx
@@ -43,8 +43,8 @@ namespace accessibility
css::accessibility::XAccessible,
css::lang::XServiceInfo > AccessibleTabBarPage_BASE;
- class AccessibleTabBarPage : public AccessibleTabBarBase,
- public AccessibleTabBarPage_BASE
+ class AccessibleTabBarPage final : public AccessibleTabBarBase,
+ public AccessibleTabBarPage_BASE
{
friend class AccessibleTabBarPageList;
@@ -56,7 +56,6 @@ namespace accessibility
css::uno::Reference< css::accessibility::XAccessible > m_xParent;
- protected:
bool IsEnabled();
bool IsShowing();
bool IsSelected();
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 );
diff --git a/accessibility/source/extended/accessibletabbar.cxx b/accessibility/source/extended/accessibletabbar.cxx
index 66ffc402a915..662e1b745338 100644
--- a/accessibility/source/extended/accessibletabbar.cxx
+++ b/accessibility/source/extended/accessibletabbar.cxx
@@ -233,7 +233,7 @@ namespace accessibility
{
OExternalLockGuard aGuard( this );
- if ( i < 0 || i >= getAccessibleChildCount() )
+ if ( i < 0 || i >= static_cast<sal_Int32>(m_aAccessibleChildren.size()) )
throw IndexOutOfBoundsException();
Reference< XAccessible > xChild = m_aAccessibleChildren[i];
diff --git a/accessibility/source/extended/accessibletabbarpage.cxx b/accessibility/source/extended/accessibletabbarpage.cxx
index 272d357cb440..a69d434ada75 100644
--- a/accessibility/source/extended/accessibletabbarpage.cxx
+++ b/accessibility/source/extended/accessibletabbarpage.cxx
@@ -254,14 +254,11 @@ namespace accessibility
}
- Reference< XAccessible > AccessibleTabBarPage::getAccessibleChild( sal_Int32 i )
+ Reference< XAccessible > AccessibleTabBarPage::getAccessibleChild( sal_Int32 )
{
OExternalLockGuard aGuard( this );
- if ( i < 0 || i >= getAccessibleChildCount() )
- throw IndexOutOfBoundsException();
-
- return Reference< XAccessible >();
+ throw IndexOutOfBoundsException();
}
diff --git a/accessibility/source/standard/vclxaccessiblebox.cxx b/accessibility/source/standard/vclxaccessiblebox.cxx
index c1df7719f323..f4586da3c1c2 100644
--- a/accessibility/source/standard/vclxaccessiblebox.cxx
+++ b/accessibility/source/standard/vclxaccessiblebox.cxx
@@ -274,6 +274,11 @@ sal_Int32 SAL_CALL VCLXAccessibleBox::getAccessibleChildCount()
SolarMutexGuard aSolarGuard;
::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
+ return implGetAccessibleChildCount();
+}
+
+sal_Int32 VCLXAccessibleBox::implGetAccessibleChildCount()
+{
// Usually a box has a text field and a list of items as its children.
// Non drop down list boxes have no text field. Additionally check
// whether the object is valid.
@@ -297,7 +302,7 @@ Reference<XAccessible> SAL_CALL VCLXAccessibleBox::getAccessibleChild (sal_Int32
SolarMutexGuard aSolarGuard;
::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
- if (i<0 || i>=getAccessibleChildCount())
+ if (i<0 || i>=implGetAccessibleChildCount())
throw IndexOutOfBoundsException();
Reference< XAccessible > xChild;
@@ -382,7 +387,7 @@ sal_Bool SAL_CALL VCLXAccessibleBox::doAccessibleAction (sal_Int32 nIndex)
SolarMutexGuard aSolarGuard;
::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
- if (nIndex<0 || nIndex>=getAccessibleActionCount())
+ if (nIndex!=0 || !m_bIsDropDownBox)
throw css::lang::IndexOutOfBoundsException(
("VCLXAccessibleBox::doAccessibleAction: index "
+ OUString::number(nIndex) + " not among 0.."
@@ -418,7 +423,7 @@ sal_Bool SAL_CALL VCLXAccessibleBox::doAccessibleAction (sal_Int32 nIndex)
OUString SAL_CALL VCLXAccessibleBox::getAccessibleActionDescription (sal_Int32 nIndex)
{
::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
- if (nIndex<0 || nIndex>=getAccessibleActionCount())
+ if (nIndex!=0 || !m_bIsDropDownBox)
throw css::lang::IndexOutOfBoundsException();
if (m_bIsDropDownBox)
diff --git a/accessibility/source/standard/vclxaccessiblebutton.cxx b/accessibility/source/standard/vclxaccessiblebutton.cxx
index c95004327f86..df67584bdccc 100644
--- a/accessibility/source/standard/vclxaccessiblebutton.cxx
+++ b/accessibility/source/standard/vclxaccessiblebutton.cxx
@@ -187,7 +187,7 @@ sal_Bool VCLXAccessibleButton::doAccessibleAction ( sal_Int32 nIndex )
{
OExternalLockGuard aGuard( this );
- if ( nIndex < 0 || nIndex >= getAccessibleActionCount() )
+ if ( nIndex != 0 )
throw IndexOutOfBoundsException();
VclPtr< PushButton > pButton = GetAs< PushButton >();
@@ -202,7 +202,7 @@ OUString VCLXAccessibleButton::getAccessibleActionDescription ( sal_Int32 nIndex
{
OExternalLockGuard aGuard( this );
- if ( nIndex < 0 || nIndex >= getAccessibleActionCount() )
+ if ( nIndex != 0 )
throw IndexOutOfBoundsException();
return OUString(RID_STR_ACC_ACTION_CLICK);
@@ -213,7 +213,7 @@ Reference< XAccessibleKeyBinding > VCLXAccessibleButton::getAccessibleActionKeyB
{
OExternalLockGuard aGuard( this );
- if ( nIndex < 0 || nIndex >= getAccessibleActionCount() )
+ if ( nIndex != 0 )
throw IndexOutOfBoundsException();
OAccessibleKeyBindingHelper* pKeyBindingHelper = new OAccessibleKeyBindingHelper();
diff --git a/accessibility/source/standard/vclxaccessiblecheckbox.cxx b/accessibility/source/standard/vclxaccessiblecheckbox.cxx
index f8243bfc7254..d411c8ca54a2 100644
--- a/accessibility/source/standard/vclxaccessiblecheckbox.cxx
+++ b/accessibility/source/standard/vclxaccessiblecheckbox.cxx
@@ -184,7 +184,7 @@ sal_Bool VCLXAccessibleCheckBox::doAccessibleAction ( sal_Int32 nIndex )
{
OExternalLockGuard aGuard( this );
- if ( nIndex < 0 || nIndex >= getAccessibleActionCount() )
+ if ( nIndex != 0 )
throw IndexOutOfBoundsException();
VclPtr< CheckBox > pCheckBox = GetAs< CheckBox >();
@@ -214,7 +214,7 @@ OUString VCLXAccessibleCheckBox::getAccessibleActionDescription ( sal_Int32 nInd
{
OExternalLockGuard aGuard( this );
- if ( nIndex < 0 || nIndex >= getAccessibleActionCount() )
+ if ( nIndex != 0 )
throw IndexOutOfBoundsException();
if(IsChecked())
@@ -228,7 +228,7 @@ Reference< XAccessibleKeyBinding > VCLXAccessibleCheckBox::getAccessibleActionKe
{
OExternalLockGuard aGuard( this );
- if ( nIndex < 0 || nIndex >= getAccessibleActionCount() )
+ if ( nIndex != 0 )
throw IndexOutOfBoundsException();
OAccessibleKeyBindingHelper* pKeyBindingHelper = new OAccessibleKeyBindingHelper();
diff --git a/accessibility/source/standard/vclxaccessiblemenu.cxx b/accessibility/source/standard/vclxaccessiblemenu.cxx
index fd709766618c..99edb949eb4c 100644
--- a/accessibility/source/standard/vclxaccessiblemenu.cxx
+++ b/accessibility/source/standard/vclxaccessiblemenu.cxx
@@ -182,6 +182,11 @@ sal_Int32 VCLXAccessibleMenu::getSelectedAccessibleChildCount( )
{
OExternalLockGuard aGuard( this );
+ return implGetSelectedAccessibleChildCount();
+}
+
+sal_Int32 VCLXAccessibleMenu::implGetSelectedAccessibleChildCount( )
+{
sal_Int32 nRet = 0;
for ( sal_Int32 i = 0, nCount = GetChildCount(); i < nCount; i++ )
@@ -193,7 +198,6 @@ sal_Int32 VCLXAccessibleMenu::getSelectedAccessibleChildCount( )
return nRet;
}
-
Reference< XAccessible > VCLXAccessibleMenu::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex )
{
OExternalLockGuard aGuard( this );
diff --git a/accessibility/source/standard/vclxaccessiblemenuitem.cxx b/accessibility/source/standard/vclxaccessiblemenuitem.cxx
index 60de73778696..259501bfe4dd 100644
--- a/accessibility/source/standard/vclxaccessiblemenuitem.cxx
+++ b/accessibility/source/standard/vclxaccessiblemenuitem.cxx
@@ -405,7 +405,7 @@ sal_Bool VCLXAccessibleMenuItem::doAccessibleAction ( sal_Int32 nIndex )
{
OExternalLockGuard aGuard( this );
- if ( nIndex < 0 || nIndex >= getAccessibleActionCount() )
+ if ( nIndex != 0 )
throw IndexOutOfBoundsException();
Click();
@@ -418,7 +418,7 @@ OUString VCLXAccessibleMenuItem::getAccessibleActionDescription ( sal_Int32 nInd
{
OExternalLockGuard aGuard( this );
- if ( nIndex < 0 || nIndex >= getAccessibleActionCount() )
+ if ( nIndex != 0 )
throw IndexOutOfBoundsException();
return OUString(RID_STR_ACC_ACTION_SELECT);
@@ -429,7 +429,7 @@ Reference< XAccessibleKeyBinding > VCLXAccessibleMenuItem::getAccessibleActionKe
{
OExternalLockGuard aGuard( this );
- if ( nIndex < 0 || nIndex >= getAccessibleActionCount() )
+ if ( nIndex != 0 )
throw IndexOutOfBoundsException();
OAccessibleKeyBindingHelper* pKeyBindingHelper = new OAccessibleKeyBindingHelper();
diff --git a/accessibility/source/standard/vclxaccessibleradiobutton.cxx b/accessibility/source/standard/vclxaccessibleradiobutton.cxx
index 9606092e92f4..bff33c10647c 100644
--- a/accessibility/source/standard/vclxaccessibleradiobutton.cxx
+++ b/accessibility/source/standard/vclxaccessibleradiobutton.cxx
@@ -162,7 +162,7 @@ sal_Bool VCLXAccessibleRadioButton::doAccessibleAction ( sal_Int32 nIndex )
{
OExternalLockGuard aGuard( this );
- if ( nIndex < 0 || nIndex >= getAccessibleActionCount() )
+ if ( nIndex != 0 )
throw IndexOutOfBoundsException();
VCLXRadioButton* pVCLXRadioButton = static_cast< VCLXRadioButton* >( GetVCLXWindow() );
@@ -176,7 +176,7 @@ OUString VCLXAccessibleRadioButton::getAccessibleActionDescription ( sal_Int32 n
{
OExternalLockGuard aGuard( this );
- if ( nIndex < 0 || nIndex >= getAccessibleActionCount() )
+ if ( nIndex != 0 )
throw IndexOutOfBoundsException();
return OUString(RID_STR_ACC_ACTION_SELECT);
@@ -186,7 +186,7 @@ Reference< XAccessibleKeyBinding > VCLXAccessibleRadioButton::getAccessibleActio
{
OExternalLockGuard aGuard( this );
- if ( nIndex < 0 || nIndex >= getAccessibleActionCount() )
+ if ( nIndex != 0 )
throw IndexOutOfBoundsException();
OAccessibleKeyBindingHelper* pKeyBindingHelper = new OAccessibleKeyBindingHelper();
diff --git a/accessibility/source/standard/vclxaccessiblescrollbar.cxx b/accessibility/source/standard/vclxaccessiblescrollbar.cxx
index bb83d7ac832d..242f09f69a27 100644
--- a/accessibility/source/standard/vclxaccessiblescrollbar.cxx
+++ b/accessibility/source/standard/vclxaccessiblescrollbar.cxx
@@ -117,12 +117,13 @@ Sequence< OUString > VCLXAccessibleScrollBar::getSupportedServiceNames()
// XAccessibleAction
+static constexpr sal_Int32 ACCESSIBLE_ACTION_COUNT=4;
sal_Int32 VCLXAccessibleScrollBar::getAccessibleActionCount( )
{
OExternalLockGuard aGuard( this );
- return 4;
+ return ACCESSIBLE_ACTION_COUNT;
}
@@ -130,7 +131,7 @@ sal_Bool VCLXAccessibleScrollBar::doAccessibleAction ( sal_Int32 nIndex )
{
OExternalLockGuard aGuard( this );
- if ( nIndex < 0 || nIndex >= getAccessibleActionCount() )
+ if ( nIndex < 0 || nIndex >= ACCESSIBLE_ACTION_COUNT )
throw IndexOutOfBoundsException();
bool bReturn = false;
@@ -158,7 +159,7 @@ OUString VCLXAccessibleScrollBar::getAccessibleActionDescription ( sal_Int32 nIn
{
OExternalLockGuard aGuard( this );
- if ( nIndex < 0 || nIndex >= getAccessibleActionCount() )
+ if ( nIndex < 0 || nIndex >= ACCESSIBLE_ACTION_COUNT )
throw IndexOutOfBoundsException();
OUString sDescription;
@@ -180,7 +181,7 @@ Reference< XAccessibleKeyBinding > VCLXAccessibleScrollBar::getAccessibleActionK
{
OExternalLockGuard aGuard( this );
- if ( nIndex < 0 || nIndex >= getAccessibleActionCount() )
+ if ( nIndex < 0 || nIndex >= ACCESSIBLE_ACTION_COUNT )
throw IndexOutOfBoundsException();
return Reference< XAccessibleKeyBinding >();
diff --git a/accessibility/source/standard/vclxaccessiblestatusbar.cxx b/accessibility/source/standard/vclxaccessiblestatusbar.cxx
index 9f7bcee9b19c..05281f20189a 100644
--- a/accessibility/source/standard/vclxaccessiblestatusbar.cxx
+++ b/accessibility/source/standard/vclxaccessiblestatusbar.cxx
@@ -295,7 +295,7 @@ Reference< XAccessible > VCLXAccessibleStatusBar::getAccessibleChild( sal_Int32
{
OExternalLockGuard aGuard( this );
- if ( i < 0 || i >= getAccessibleChildCount() )
+ if ( i < 0 || i >= static_cast<sal_Int32> (m_aAccessibleChildren.size()) )
throw IndexOutOfBoundsException();
Reference< XAccessible > xChild = m_aAccessibleChildren[i];
diff --git a/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx b/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx
index 6bd311c8a960..7b0ce47daa84 100644
--- a/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx
+++ b/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx
@@ -254,14 +254,9 @@ sal_Int32 VCLXAccessibleStatusBarItem::getAccessibleChildCount()
}
-Reference< XAccessible > VCLXAccessibleStatusBarItem::getAccessibleChild( sal_Int32 i )
+Reference< XAccessible > VCLXAccessibleStatusBarItem::getAccessibleChild( sal_Int32 )
{
- OExternalLockGuard aGuard( this );
-
- if ( i < 0 || i >= getAccessibleChildCount() )
- throw IndexOutOfBoundsException();
-
- return Reference< XAccessible >();
+ throw IndexOutOfBoundsException();
}
diff --git a/accessibility/source/standard/vclxaccessibletoolbox.cxx b/accessibility/source/standard/vclxaccessibletoolbox.cxx
index 0dd0134a54d5..83828e6b0b65 100644
--- a/accessibility/source/standard/vclxaccessibletoolbox.cxx
+++ b/accessibility/source/standard/vclxaccessibletoolbox.cxx
@@ -44,7 +44,7 @@ namespace
/** XAccessibleContext implementation for a toolbox item which is represented by a VCL Window
*/
- class OToolBoxWindowItemContext : public OAccessibleContextWrapper
+ class OToolBoxWindowItemContext final : public OAccessibleContextWrapper
{
sal_Int32 m_nIndexInParent;
public:
diff --git a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
index 5dbc3b4d1050..4713e382f1e4 100644
--- a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
+++ b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
@@ -357,7 +357,7 @@ OUString SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleDescription( )
{
OExternalLockGuard aGuard( this );
- if (m_nRole == AccessibleRole::PANEL && getAccessibleChildCount() > 0)
+ if (m_nRole == AccessibleRole::PANEL && m_xChild.is())
{
return AccResId( RID_STR_ACC_PANEL_DESCRIPTION );
}
@@ -512,7 +512,7 @@ sal_Bool SAL_CALL VCLXAccessibleToolBoxItem::copyText( sal_Int32 nStartIndex, sa
Reference< datatransfer::clipboard::XClipboard > xClipboard = m_pToolBox->GetClipboard();
if ( xClipboard.is() )
{
- OUString sText( getTextRange( nStartIndex, nEndIndex ) );
+ OUString sText( OCommonAccessibleText::getTextRange( nStartIndex, nEndIndex ) );
vcl::unohelper::TextDataObject* pDataObj = new vcl::unohelper::TextDataObject( sText );
@@ -621,7 +621,7 @@ sal_Bool VCLXAccessibleToolBoxItem::doAccessibleAction ( sal_Int32 nIndex )
{
OExternalLockGuard aGuard( this );
- if ( nIndex < 0 || nIndex >= getAccessibleActionCount() )
+ if ( nIndex != 0 )
throw IndexOutOfBoundsException();
if ( m_pToolBox )
@@ -634,7 +634,7 @@ OUString VCLXAccessibleToolBoxItem::getAccessibleActionDescription ( sal_Int32 n
{
OExternalLockGuard aGuard( this );
- if ( nIndex < 0 || nIndex >= getAccessibleActionCount() )
+ if ( nIndex != 0 )
throw IndexOutOfBoundsException();
return OUString(RID_STR_ACC_ACTION_CLICK);
@@ -644,7 +644,7 @@ Reference< XAccessibleKeyBinding > VCLXAccessibleToolBoxItem::getAccessibleActio
{
OContextEntryGuard aGuard( this );
- if ( nIndex < 0 || nIndex >= getAccessibleActionCount() )
+ if ( nIndex != 0 )
throw IndexOutOfBoundsException();
return Reference< XAccessibleKeyBinding >();
More information about the Libreoffice-commits
mailing list