strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

a11y: Use vcl CheckBox directly in VCLXAccessibleCheckBox

Browse source 
... instead of using the toolkit/UNO wrapper class
VCLXCheckBox.

Change-Id: I271535f3e2e46202e2ca3d2e3f9a1d05ac380c41
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177815
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
Tested-by: Jenkins
This commit is contained in:
Michael Weghorn 2024-12-04 16:39:30 +01:00
parent 1d2f37a93c
commit e3c9a06b70
1 changed files with 14 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
accessibility/source/standard/vclxaccessiblecheckbox.cxx
View file

@ -19,7 +19,6 @@
#include <standard/vclxaccessiblecheckbox.hxx>
#include <toolkit/awt/vclxwindows.hxx>
#include <helper/accresmgr.hxx>
#include <strings.hrc>
@ -54,25 +53,15 @@ VCLXAccessibleCheckBox::VCLXAccessibleCheckBox( VCLXWindow* pVCLWindow )
bool VCLXAccessibleCheckBox::IsChecked() const
{
bool bChecked = false;
VCLXCheckBox* pVCLXCheckBox = static_cast< VCLXCheckBox* >( GetVCLXWindow() );
if ( pVCLXCheckBox && pVCLXCheckBox->getState() == sal_Int16(1) )
bChecked = true;
return bChecked;
VclPtr<CheckBox> pCheckBox = GetAs<CheckBox>();
return pCheckBox && pCheckBox->IsChecked();
}
bool VCLXAccessibleCheckBox::IsIndeterminate() const
{
bool bIndeterminate = false;
VCLXCheckBox* pVCLXCheckBox = static_cast< VCLXCheckBox* >( GetVCLXWindow() );
if ( pVCLXCheckBox && pVCLXCheckBox->getState() == sal_Int16(2) )
bIndeterminate = true;
return bIndeterminate;
VclPtr<CheckBox> pCheckBox = GetAs<CheckBox>();
return pCheckBox && pCheckBox->GetState() == TRISTATE_INDET;
}
@ -177,22 +166,21 @@ sal_Bool VCLXAccessibleCheckBox::doAccessibleAction ( sal_Int32 nIndex )
throw IndexOutOfBoundsException();
VclPtr<CheckBox> pCheckBox = GetAs<CheckBox>();
VCLXCheckBox* pVCLXCheckBox = static_cast< VCLXCheckBox* >( GetVCLXWindow() );
if ( pCheckBox && pVCLXCheckBox )
if (pCheckBox)
{
sal_Int32 nValueMax = sal_Int32(1);
if ( pCheckBox->IsTriStateEnabled() )
nValueMax = sal_Int32(2);
sal_Int32 nValue = static_cast<sal_Int32>(pVCLXCheckBox->getState());
sal_Int32 nValue = static_cast<sal_Int32>(pCheckBox->GetState());
++nValue;
if ( nValue > nValueMax )
nValue = 0;
pVCLXCheckBox->setState( static_cast<sal_Int16>(nValue) );
pCheckBox->SetState(static_cast<TriState>(nValue));
}
return true;
@ -259,9 +247,9 @@ Any VCLXAccessibleCheckBox::getCurrentValue( )
Any aValue;
VCLXCheckBox* pVCLXCheckBox = static_cast< VCLXCheckBox* >( GetVCLXWindow() );
if ( pVCLXCheckBox )
aValue <<= static_cast<sal_Int32>(pVCLXCheckBox->getState());
VclPtr<CheckBox> pCheckBox = GetAs<CheckBox>();
if (pCheckBox)
aValue <<= static_cast<sal_Int32>(pCheckBox->GetState());
return aValue;
}
@ -273,8 +261,8 @@ sal_Bool VCLXAccessibleCheckBox::setCurrentValue( const Any& aNumber )
bool bReturn = false;
VCLXCheckBox* pVCLXCheckBox = static_cast< VCLXCheckBox* >( GetVCLXWindow() );
if ( pVCLXCheckBox )
VclPtr<CheckBox> pCheckBox = GetAs<CheckBox>();
if (pCheckBox)
{
sal_Int32 nValue = 0, nValueMin = 0, nValueMax = 0;
OSL_VERIFY( aNumber >>= nValue );
@ -285,7 +273,7 @@ sal_Bool VCLXAccessibleCheckBox::setCurrentValue( const Any& aNumber )
else if ( nValue > nValueMax )
nValue = nValueMax;
pVCLXCheckBox->setState( static_cast<sal_Int16>(nValue) );
pCheckBox->SetState(static_cast<TriState>(nValue));
bReturn = true;
}