winaccessibility/source/service/AccObject.cxx | 36 ++++++++++----------------
1 file changed, 15 insertions(+), 21 deletions(-)
New commits:
commit 552eb49c60562b67d2e8bc4b3813464b5d13be87
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Mon Nov 13 13:28:49 2023 +0000
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Tue Nov 14 08:08:37 2023 +0100
wina11y: Drop extra local var for role
Just use the `m_accRole` member directly.
Change-Id: I6a4eae9bc00422683e600fa1be300264d45fec46
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159380
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/winaccessibility/source/service/AccObject.cxx
b/winaccessibility/source/service/AccObject.cxx
index aeb220134843..51d04ec18dea 100644
--- a/winaccessibility/source/service/AccObject.cxx
+++ b/winaccessibility/source/service/AccObject.cxx
@@ -719,14 +719,11 @@ void AccObject::DecreaseState( sal_Int64 xState )
if( xState == FOCUSABLE)
{
- short Role = m_accRole ;
- if(Role == MENU_ITEM
- || Role == RADIO_MENU_ITEM
- || Role == CHECK_MENU_ITEM)
+ if (m_accRole == MENU_ITEM || m_accRole == RADIO_MENU_ITEM ||
m_accRole == CHECK_MENU_ITEM)
return;
else
{
- if (Role == TOGGLE_BUTTON || Role == PUSH_BUTTON ||
BUTTON_DROPDOWN == Role)
+ if (m_accRole == TOGGLE_BUTTON || m_accRole == PUSH_BUTTON ||
m_accRole == BUTTON_DROPDOWN)
{
if( ( m_pParentObj !=nullptr ) && (TOOL_BAR ==
m_pParentObj->m_accRole ) )
return;
@@ -906,8 +903,6 @@ void AccObject::UpdateState()
m_pIMAcc->IncreaseState( STATE_SYSTEM_INVISIBLE );
}
- short Role = m_accRole;
-
switch(m_accRole)
{
case LABEL:
@@ -949,19 +944,19 @@ void AccObject::UpdateState()
if( isEnable )
{
- if(!(Role == FILLER || Role == END_NOTE || Role == FOOTER || Role ==
FOOTNOTE || Role == GROUP_BOX || Role == RULER
- || Role == HEADER || Role == ICON || Role == INTERNAL_FRAME ||
Role == LABEL || Role == LAYERED_PANE
- || Role == SCROLL_BAR || Role == SCROLL_PANE || Role ==
SPLIT_PANE || Role == STATIC || Role == STATUS_BAR
- || Role == TOOL_TIP || Role == NOTIFICATION))
+ if (!(m_accRole == FILLER || m_accRole == END_NOTE || m_accRole ==
FOOTER || m_accRole == FOOTNOTE || m_accRole == GROUP_BOX || m_accRole == RULER
+ || m_accRole == HEADER || m_accRole == ICON || m_accRole ==
INTERNAL_FRAME || m_accRole == LABEL || m_accRole == LAYERED_PANE
+ || m_accRole == SCROLL_BAR || m_accRole == SCROLL_PANE ||
m_accRole == SPLIT_PANE || m_accRole == STATIC || m_accRole == STATUS_BAR
+ || m_accRole == TOOL_TIP || m_accRole == NOTIFICATION))
{
- if( SEPARATOR == Role )
+ if (m_accRole == SEPARATOR)
{
if( ( m_pParentObj != nullptr ) && ( MENU ==
m_pParentObj->m_accRole || POPUP_MENU == m_pParentObj->m_accRole ))
IncreaseState( FOCUSABLE );
}
- else if (TABLE_CELL == Role || TABLE == Role || PANEL == Role ||
OPTION_PANE == Role ||
- COLUMN_HEADER == Role)
+ else if (m_accRole == TABLE_CELL || m_accRole == TABLE ||
m_accRole == PANEL || m_accRole == OPTION_PANE ||
+ m_accRole == COLUMN_HEADER)
{
if (isFocusable)
IncreaseState( FOCUSABLE );
@@ -985,11 +980,11 @@ void AccObject::UpdateState()
else
{
m_pIMAcc->IncreaseState( STATE_SYSTEM_UNAVAILABLE );
- if( !((Role == MENU_ITEM) ||
- (Role == RADIO_MENU_ITEM) ||
- (Role == CHECK_MENU_ITEM)) )
+ if( !((m_accRole == MENU_ITEM) ||
+ (m_accRole == RADIO_MENU_ITEM) ||
+ (m_accRole == CHECK_MENU_ITEM)) )
{
- if ( Role == TOGGLE_BUTTON || Role == PUSH_BUTTON ||
BUTTON_DROPDOWN == Role)
+ if (m_accRole == TOGGLE_BUTTON || m_accRole == PUSH_BUTTON ||
m_accRole == BUTTON_DROPDOWN)
{
if(( m_pParentObj != nullptr )&& (TOOL_BAR ==
m_pParentObj->m_accRole ) )
IncreaseState( FOCUSABLE );
commit 9356c479a62e83f1e89be0dd455c60601c35ef86
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Mon Nov 13 13:10:39 2023 +0000
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Tue Nov 14 08:08:23 2023 +0100
wina11y: Drop unnecessary local var 'Role'
Just use `m_accRole` directly, as already
happens elsewhere in this method.
Change-Id: Ibd3358e9f85621ba7d9c99d5ed0812b6c692d473
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159379
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/winaccessibility/source/service/AccObject.cxx
b/winaccessibility/source/service/AccObject.cxx
index 7c5a4243af84..aeb220134843 100644
--- a/winaccessibility/source/service/AccObject.cxx
+++ b/winaccessibility/source/service/AccObject.cxx
@@ -600,7 +600,6 @@ DWORD AccObject::GetMSAAStateFromUNO(sal_Int64 nState)
assert(false);
return IState;
}
- short Role = m_accRole;
switch( nState )
{
@@ -608,7 +607,7 @@ DWORD AccObject::GetMSAAStateFromUNO(sal_Int64 nState)
IState = STATE_SYSTEM_BUSY;
break;
case CHECKED:
- if( Role == PUSH_BUTTON || Role == TOGGLE_BUTTON )
+ if (m_accRole == PUSH_BUTTON || m_accRole == TOGGLE_BUTTON)
{
IState = STATE_SYSTEM_PRESSED;
}
@@ -666,7 +665,7 @@ DWORD AccObject::GetMSAAStateFromUNO(sal_Int64 nState)
{
sal_Bool isExpanded = true;
sal_Bool isExpandable = true;
- if( Role == PUSH_BUTTON || Role == TOGGLE_BUTTON ||
BUTTON_DROPDOWN == Role )
+ if (m_accRole == PUSH_BUTTON || m_accRole == TOGGLE_BUTTON ||
m_accRole == BUTTON_DROPDOWN)
{
IState = STATE_SYSTEM_HASPOPUP;
}
