winaccessibility/source/service/AccObject.cxx | 173 ++++++++++---------------- 1 file changed, 68 insertions(+), 105 deletions(-)
New commits: commit 557b161bd6925299ccc0983feff30237697317eb Author: Michael Weghorn <[email protected]> AuthorDate: Mon Sep 30 12:28:04 2024 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Mon Sep 30 21:39:47 2024 +0200 wina11y: Simplify AccObject::GetMSAAStateFromUNO with early return Change-Id: Ieeb152ac6e6ba99758fad0d202cc74614871401a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174271 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/winaccessibility/source/service/AccObject.cxx b/winaccessibility/source/service/AccObject.cxx index 6404ca173742..822c5c58db08 100644 --- a/winaccessibility/source/service/AccObject.cxx +++ b/winaccessibility/source/service/AccObject.cxx @@ -493,102 +493,68 @@ DWORD AccObject::GetMSAAStateFromUNO(sal_Int64 nState) switch( nState ) { case AccessibleStateType::BUSY: - IState = STATE_SYSTEM_BUSY; - break; + return STATE_SYSTEM_BUSY; case AccessibleStateType::CHECKED: if (m_accRole == PUSH_BUTTON || m_accRole == TOGGLE_BUTTON) - { - IState = STATE_SYSTEM_PRESSED; - } - else - IState = STATE_SYSTEM_CHECKED; - break; + return STATE_SYSTEM_PRESSED; + return STATE_SYSTEM_CHECKED; case AccessibleStateType::DEFUNC: - IState = STATE_SYSTEM_UNAVAILABLE; - break; + return STATE_SYSTEM_UNAVAILABLE; case AccessibleStateType::EXPANDED: - IState = STATE_SYSTEM_EXPANDED; - break; + return STATE_SYSTEM_EXPANDED; case AccessibleStateType::FOCUSABLE: - IState = STATE_SYSTEM_FOCUSABLE; - break; + return STATE_SYSTEM_FOCUSABLE; case AccessibleStateType::FOCUSED: - IState = STATE_SYSTEM_FOCUSED; - break; + return STATE_SYSTEM_FOCUSED; case AccessibleStateType::INDETERMINATE: - IState = STATE_SYSTEM_MIXED; - break; + return STATE_SYSTEM_MIXED; case AccessibleStateType::MULTI_SELECTABLE: - IState = STATE_SYSTEM_MULTISELECTABLE; - break; + return STATE_SYSTEM_MULTISELECTABLE; case AccessibleStateType::PRESSED: - IState = STATE_SYSTEM_PRESSED; - break; + return STATE_SYSTEM_PRESSED; case AccessibleStateType::RESIZABLE: - IState = STATE_SYSTEM_SIZEABLE; - break; + return STATE_SYSTEM_SIZEABLE; case AccessibleStateType::SELECTABLE: - if( m_accRole == MENU || m_accRole == MENU_ITEM) - { - IState = UNO_MSAA_UNMAPPING; - } - else - { - IState = STATE_SYSTEM_SELECTABLE; - } - break; + if (m_accRole == MENU || m_accRole == MENU_ITEM) + return UNO_MSAA_UNMAPPING; + return STATE_SYSTEM_SELECTABLE; case AccessibleStateType::SELECTED: - if( m_accRole == MENU || m_accRole == MENU_ITEM ) - { - IState = UNO_MSAA_UNMAPPING; - } - else - { - IState = STATE_SYSTEM_SELECTED; - } - break; + if (m_accRole == MENU || m_accRole == MENU_ITEM) + return UNO_MSAA_UNMAPPING; + return STATE_SYSTEM_SELECTED; case AccessibleStateType::ARMED: - IState = STATE_SYSTEM_FOCUSED; - break; + return STATE_SYSTEM_FOCUSED; case AccessibleStateType::EXPANDABLE: { sal_Bool isExpanded = true; sal_Bool isExpandable = true; if (m_accRole == PUSH_BUTTON || m_accRole == TOGGLE_BUTTON || m_accRole == BUTTON_DROPDOWN) - { - IState = STATE_SYSTEM_HASPOPUP; - } - else - { - GetExpandedState(&isExpandable,&isExpanded); - if(!isExpanded) - IState = STATE_SYSTEM_COLLAPSED; - } + return STATE_SYSTEM_HASPOPUP; + + GetExpandedState(&isExpandable,&isExpanded); + if(!isExpanded) + return STATE_SYSTEM_COLLAPSED; + + return UNO_MSAA_UNMAPPING; } - break; //Remove the SENSITIVE state mapping. There is no corresponding MSAA state. //case SENSITIVE: // IState = STATE_SYSTEM_PROTECTED; case AccessibleStateType::EDITABLE: m_pIMAcc->DecreaseState(STATE_SYSTEM_READONLY); - break; + return UNO_MSAA_UNMAPPING; case AccessibleStateType::OFFSCREEN: - IState = STATE_SYSTEM_OFFSCREEN; - break; + return STATE_SYSTEM_OFFSCREEN; case AccessibleStateType::MOVEABLE: - IState = STATE_SYSTEM_MOVEABLE; - break; + return STATE_SYSTEM_MOVEABLE; case AccessibleStateType::COLLAPSE: - IState = STATE_SYSTEM_COLLAPSED; + return STATE_SYSTEM_COLLAPSED; break; case AccessibleStateType::DEFAULT: - IState = STATE_SYSTEM_DEFAULT; - break; + return STATE_SYSTEM_DEFAULT; default: - break; + return UNO_MSAA_UNMAPPING; } - - return IState; } /** commit 59abbdea415598a2944325b525382146879a8d78 Author: Michael Weghorn <[email protected]> AuthorDate: Mon Sep 30 12:07:44 2024 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Mon Sep 30 21:39:35 2024 +0200 wina11y: Drop "using namespace css::accessibility::AccessibleStateType" Explicitly specifying the `AccessibleStateType` namespace makes the distinction between the UNO and the IAccessible2 states clearer. Change-Id: If8dba19fa716753b1b838377546c5c810e588e5a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174270 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/winaccessibility/source/service/AccObject.cxx b/winaccessibility/source/service/AccObject.cxx index aa8bdc8ba873..6404ca173742 100644 --- a/winaccessibility/source/service/AccObject.cxx +++ b/winaccessibility/source/service/AccObject.cxx @@ -50,7 +50,6 @@ using namespace com::sun::star::uno; using namespace com::sun::star::accessibility; using namespace com::sun::star::accessibility::AccessibleRole; -using namespace com::sun::star::accessibility::AccessibleStateType; namespace { @@ -493,10 +492,10 @@ DWORD AccObject::GetMSAAStateFromUNO(sal_Int64 nState) switch( nState ) { - case BUSY: + case AccessibleStateType::BUSY: IState = STATE_SYSTEM_BUSY; break; - case CHECKED: + case AccessibleStateType::CHECKED: if (m_accRole == PUSH_BUTTON || m_accRole == TOGGLE_BUTTON) { IState = STATE_SYSTEM_PRESSED; @@ -504,31 +503,31 @@ DWORD AccObject::GetMSAAStateFromUNO(sal_Int64 nState) else IState = STATE_SYSTEM_CHECKED; break; - case DEFUNC: + case AccessibleStateType::DEFUNC: IState = STATE_SYSTEM_UNAVAILABLE; break; - case EXPANDED: + case AccessibleStateType::EXPANDED: IState = STATE_SYSTEM_EXPANDED; break; - case FOCUSABLE: + case AccessibleStateType::FOCUSABLE: IState = STATE_SYSTEM_FOCUSABLE; break; - case FOCUSED: + case AccessibleStateType::FOCUSED: IState = STATE_SYSTEM_FOCUSED; break; - case INDETERMINATE: + case AccessibleStateType::INDETERMINATE: IState = STATE_SYSTEM_MIXED; break; - case MULTI_SELECTABLE: + case AccessibleStateType::MULTI_SELECTABLE: IState = STATE_SYSTEM_MULTISELECTABLE; break; - case PRESSED: + case AccessibleStateType::PRESSED: IState = STATE_SYSTEM_PRESSED; break; - case RESIZABLE: + case AccessibleStateType::RESIZABLE: IState = STATE_SYSTEM_SIZEABLE; break; - case SELECTABLE: + case AccessibleStateType::SELECTABLE: if( m_accRole == MENU || m_accRole == MENU_ITEM) { IState = UNO_MSAA_UNMAPPING; @@ -538,7 +537,7 @@ DWORD AccObject::GetMSAAStateFromUNO(sal_Int64 nState) IState = STATE_SYSTEM_SELECTABLE; } break; - case SELECTED: + case AccessibleStateType::SELECTED: if( m_accRole == MENU || m_accRole == MENU_ITEM ) { IState = UNO_MSAA_UNMAPPING; @@ -548,10 +547,10 @@ DWORD AccObject::GetMSAAStateFromUNO(sal_Int64 nState) IState = STATE_SYSTEM_SELECTED; } break; - case ARMED: + case AccessibleStateType::ARMED: IState = STATE_SYSTEM_FOCUSED; break; - case EXPANDABLE: + case AccessibleStateType::EXPANDABLE: { sal_Bool isExpanded = true; sal_Bool isExpandable = true; @@ -570,19 +569,19 @@ DWORD AccObject::GetMSAAStateFromUNO(sal_Int64 nState) //Remove the SENSITIVE state mapping. There is no corresponding MSAA state. //case SENSITIVE: // IState = STATE_SYSTEM_PROTECTED; - case EDITABLE: + case AccessibleStateType::EDITABLE: m_pIMAcc->DecreaseState(STATE_SYSTEM_READONLY); break; - case OFFSCREEN: + case AccessibleStateType::OFFSCREEN: IState = STATE_SYSTEM_OFFSCREEN; break; - case MOVEABLE: + case AccessibleStateType::MOVEABLE: IState = STATE_SYSTEM_MOVEABLE; break; - case COLLAPSE: + case AccessibleStateType::COLLAPSE: IState = STATE_SYSTEM_COLLAPSED; break; - case DEFAULT: + case AccessibleStateType::DEFAULT: IState = STATE_SYSTEM_DEFAULT; break; default: @@ -599,7 +598,7 @@ DWORD AccObject::GetMSAAStateFromUNO(sal_Int64 nState) */ void AccObject::DecreaseState( sal_Int64 xState ) { - if( xState == FOCUSABLE) + if (xState == AccessibleStateType::FOCUSABLE) { if (m_accRole == MENU_ITEM || m_accRole == RADIO_MENU_ITEM || m_accRole == CHECK_MENU_ITEM) return; @@ -702,15 +701,15 @@ void AccObject::UpdateState() sal_Int64 nState = sal_Int64(1) << i; if (!(nState & nRState)) continue; - if (nState == ENABLED) + if (nState == AccessibleStateType::ENABLED) isEnable = true; - else if (nState == SHOWING) + else if (nState == AccessibleStateType::SHOWING) isShowing = true; - else if (nState == VISIBLE) + else if (nState == AccessibleStateType::VISIBLE) isVisible = true; - else if (nState == EDITABLE) + else if (nState == AccessibleStateType::EDITABLE) isEditable = true; - else if (nState == FOCUSABLE) + else if (nState == AccessibleStateType::FOCUSABLE) isFocusable = true; IncreaseState(nState); } @@ -780,27 +779,25 @@ void AccObject::UpdateState() if (m_accRole == SEPARATOR) { if( ( m_pParentObj != nullptr ) && ( MENU == m_pParentObj->m_accRole || POPUP_MENU == m_pParentObj->m_accRole )) - IncreaseState( FOCUSABLE ); + IncreaseState(AccessibleStateType::FOCUSABLE); } else if (m_accRole == TABLE_CELL || m_accRole == TABLE || m_accRole == PANEL || m_accRole == OPTION_PANE || m_accRole == COLUMN_HEADER) { if (isFocusable) - IncreaseState( FOCUSABLE ); + IncreaseState(AccessibleStateType::FOCUSABLE); } else { if(bIsMenuItem) { if ( isShowing && isVisible) - { - IncreaseState( FOCUSABLE ); - } + IncreaseState(AccessibleStateType::FOCUSABLE); } else { - IncreaseState( FOCUSABLE ); + IncreaseState(AccessibleStateType::FOCUSABLE); } } } @@ -815,16 +812,16 @@ void AccObject::UpdateState() 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 ); + IncreaseState(AccessibleStateType::FOCUSABLE); else - DecreaseState( FOCUSABLE ); + DecreaseState(AccessibleStateType::FOCUSABLE); } else - DecreaseState( FOCUSABLE ); + DecreaseState(AccessibleStateType::FOCUSABLE); } else if( isShowing || isVisible ) { - IncreaseState( FOCUSABLE ); + IncreaseState(AccessibleStateType::FOCUSABLE); } } @@ -873,7 +870,7 @@ bool AccObject::UpdateAccessibleInfoFromUnoToMSAA() */ void AccObject::setFocus() { - IncreaseState(FOCUSED); + IncreaseState(AccessibleStateType::FOCUSED); m_pIMAcc->Put_XAccFocus(CHILDID_SELF); UpdateRole(); @@ -886,7 +883,7 @@ void AccObject::setFocus() */ void AccObject::unsetFocus() { - DecreaseState(FOCUSED); + DecreaseState(AccessibleStateType::FOCUSED); m_pIMAcc->Put_XAccFocus(UACC_NO_FOCUS); } @@ -901,9 +898,9 @@ void AccObject::GetExpandedState( sal_Bool* isExpandable, sal_Bool* isExpanded) } sal_Int64 nRState = m_xAccContextRef->getAccessibleStateSet(); - if (nRState & EXPANDED) + if (nRState & AccessibleStateType::EXPANDED) *isExpanded = true; - if (nRState & EXPANDABLE) + if (nRState & AccessibleStateType::EXPANDABLE) *isExpandable = true; }
