winaccessibility/inc/AccObjectManagerAgent.hxx | 2 winaccessibility/inc/AccObjectWinManager.hxx | 2 winaccessibility/source/service/AccComponentEventListener.cxx | 4 winaccessibility/source/service/AccObjectManagerAgent.cxx | 4 winaccessibility/source/service/AccObjectWinManager.cxx | 207 ++++------ 5 files changed, 109 insertions(+), 110 deletions(-)
New commits: commit 3cde1fe16965d2b976c6c1210e81f17ae352b79f Author: Michael Weghorn <[email protected]> AuthorDate: Mon Feb 28 11:43:13 2022 +0000 Commit: Michael Weghorn <[email protected]> CommitDate: Mon Feb 28 17:43:19 2022 +0100 wina11y: Unify how AccessibleRole is referred to here Using using namespace com::sun::star::accessibility::AccessibleRole; and then case /*AccessibleRole::*/DIALOG looks a bit odd. Drop the `using` directive and consistently use `AccessibleRole::<ROLE>` across this source file when referring to `AccessibleRole`s. Change-Id: If4b295548468067c65afcd1a216d29cad9e0c213 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130699 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/winaccessibility/source/service/AccObjectWinManager.cxx b/winaccessibility/source/service/AccObjectWinManager.cxx index d24154769b05..13b6bd640bf2 100644 --- a/winaccessibility/source/service/AccObjectWinManager.cxx +++ b/winaccessibility/source/service/AccObjectWinManager.cxx @@ -46,7 +46,6 @@ using namespace com::sun::star::accessibility; -using namespace com::sun::star::accessibility::AccessibleRole; using namespace com::sun::star::accessibility::AccessibleStateType; using namespace com::sun::star::uno; @@ -530,10 +529,10 @@ void AccObjectWinManager::DeleteAccObj( XAccessible* pXAcc ) assert(i != 0); (void) i; DeleteFromHwndXAcc(pXAcc); - if( accObj.GetRole() == DOCUMENT || - accObj.GetRole() == DOCUMENT_PRESENTATION || - accObj.GetRole() == DOCUMENT_SPREADSHEET || - accObj.GetRole() == DOCUMENT_TEXT ) + if (accObj.GetRole() == AccessibleRole::DOCUMENT || + accObj.GetRole() == AccessibleRole::DOCUMENT_PRESENTATION || + accObj.GetRole() == AccessibleRole::DOCUMENT_SPREADSHEET || + accObj.GetRole() == AccessibleRole::DOCUMENT_TEXT) { XHWNDDocList.erase(accObj.GetParentHWND()); } @@ -695,10 +694,10 @@ bool AccObjectWinManager::InsertAccObj( XAccessible* pXAcc,XAccessible* pParentX pObj.SetParentHWND( pWnd ); //for file name support - if( pObj.GetRole() == DOCUMENT || - pObj.GetRole() == DOCUMENT_PRESENTATION || - pObj.GetRole() == DOCUMENT_SPREADSHEET || - pObj.GetRole() == DOCUMENT_TEXT ) + if (pObj.GetRole() == AccessibleRole::DOCUMENT || + pObj.GetRole() == AccessibleRole::DOCUMENT_PRESENTATION || + pObj.GetRole() == AccessibleRole::DOCUMENT_SPREADSHEET || + pObj.GetRole() == AccessibleRole::DOCUMENT_TEXT) { XHWNDToDocumentHash::iterator aIter = XHWNDDocList.find(pWnd); if ( aIter != XHWNDDocList.end() ) @@ -765,94 +764,94 @@ AccObjectWinManager::CreateAccEventListener(XAccessible* pXAcc) { switch( xContext->getAccessibleRole() ) { - case /*AccessibleRole::*/DIALOG: + case AccessibleRole::DIALOG: pRet = new AccDialogEventListener(pXAcc,pAgent); break; - case /*AccessibleRole::*/FRAME: + case AccessibleRole::FRAME: pRet = new AccFrameEventListener(pXAcc,pAgent); break; - case /*AccessibleRole::*/WINDOW: + case AccessibleRole::WINDOW: pRet = new AccWindowEventListener(pXAcc,pAgent); break; - case /*AccessibleRole::*/ROOT_PANE: + case AccessibleRole::ROOT_PANE: pRet = new AccFrameEventListener(pXAcc,pAgent); break; //Container - case /*AccessibleRole::*/CANVAS: - case /*AccessibleRole::*/COMBO_BOX: - case /*AccessibleRole::*/DOCUMENT: - case /*AccessibleRole::*/DOCUMENT_PRESENTATION: - case /*AccessibleRole::*/DOCUMENT_SPREADSHEET: - case /*AccessibleRole::*/DOCUMENT_TEXT: - case /*AccessibleRole::*/END_NOTE: - case /*AccessibleRole::*/FILLER: - case /*AccessibleRole::*/FOOTNOTE: - case /*AccessibleRole::*/FOOTER: - case /*AccessibleRole::*/HEADER: - case /*AccessibleRole::*/LAYERED_PANE: - case /*AccessibleRole::*/MENU_BAR: - case /*AccessibleRole::*/POPUP_MENU: - case /*AccessibleRole::*/OPTION_PANE: - case /*AccessibleRole::*/PAGE_TAB: - case /*AccessibleRole::*/PAGE_TAB_LIST: - case /*AccessibleRole::*/PANEL: - case /*AccessibleRole::*/SCROLL_PANE: - case /*AccessibleRole::*/SPLIT_PANE: - case /*AccessibleRole::*/STATUS_BAR: - case /*AccessibleRole::*/TABLE_CELL: - case /*AccessibleRole::*/TOOL_BAR: - case /*AccessibleRole::*/VIEW_PORT: + case AccessibleRole::CANVAS: + case AccessibleRole::COMBO_BOX: + case AccessibleRole::DOCUMENT: + case AccessibleRole::DOCUMENT_PRESENTATION: + case AccessibleRole::DOCUMENT_SPREADSHEET: + case AccessibleRole::DOCUMENT_TEXT: + case AccessibleRole::END_NOTE: + case AccessibleRole::FILLER: + case AccessibleRole::FOOTNOTE: + case AccessibleRole::FOOTER: + case AccessibleRole::HEADER: + case AccessibleRole::LAYERED_PANE: + case AccessibleRole::MENU_BAR: + case AccessibleRole::POPUP_MENU: + case AccessibleRole::OPTION_PANE: + case AccessibleRole::PAGE_TAB: + case AccessibleRole::PAGE_TAB_LIST: + case AccessibleRole::PANEL: + case AccessibleRole::SCROLL_PANE: + case AccessibleRole::SPLIT_PANE: + case AccessibleRole::STATUS_BAR: + case AccessibleRole::TABLE_CELL: + case AccessibleRole::TOOL_BAR: + case AccessibleRole::VIEW_PORT: pRet = new AccContainerEventListener(pXAcc,pAgent); break; - case /*AccessibleRole::*/PARAGRAPH: - case /*AccessibleRole::*/HEADING: + case AccessibleRole::PARAGRAPH: + case AccessibleRole::HEADING: pRet = new AccParagraphEventListener(pXAcc,pAgent); break; //Component - case /*AccessibleRole::*/CHECK_BOX: - case /*AccessibleRole::*/ICON: - case /*AccessibleRole::*/LABEL: - case /*AccessibleRole::*/STATIC: - case /*AccessibleRole::*/MENU_ITEM: - case /*AccessibleRole::*/CHECK_MENU_ITEM: - case /*AccessibleRole::*/RADIO_MENU_ITEM: - case /*AccessibleRole::*/PUSH_BUTTON: - case /*AccessibleRole::*/RADIO_BUTTON: - case /*AccessibleRole::*/SCROLL_BAR: - case /*AccessibleRole::*/SEPARATOR: - case /*AccessibleRole::*/TOGGLE_BUTTON: - case /*AccessibleRole::*/BUTTON_DROPDOWN: - case /*AccessibleRole::*/TOOL_TIP: - case /*AccessibleRole::*/SPIN_BOX: - case DATE_EDITOR: + case AccessibleRole::CHECK_BOX: + case AccessibleRole::ICON: + case AccessibleRole::LABEL: + case AccessibleRole::STATIC: + case AccessibleRole::MENU_ITEM: + case AccessibleRole::CHECK_MENU_ITEM: + case AccessibleRole::RADIO_MENU_ITEM: + case AccessibleRole::PUSH_BUTTON: + case AccessibleRole::RADIO_BUTTON: + case AccessibleRole::SCROLL_BAR: + case AccessibleRole::SEPARATOR: + case AccessibleRole::TOGGLE_BUTTON: + case AccessibleRole::BUTTON_DROPDOWN: + case AccessibleRole::TOOL_TIP: + case AccessibleRole::SPIN_BOX: + case AccessibleRole::DATE_EDITOR: pRet = new AccComponentEventListener(pXAcc,pAgent); break; //text component - case /*AccessibleRole::*/TEXT: + case AccessibleRole::TEXT: pRet = new AccTextComponentEventListener(pXAcc,pAgent); break; //menu - case /*AccessibleRole::*/MENU: + case AccessibleRole::MENU: pRet = new AccMenuEventListener(pXAcc,pAgent); break; //object container - case /*AccessibleRole::*/SHAPE: + case AccessibleRole::SHAPE: - case /*AccessibleRole::*/EMBEDDED_OBJECT: - case /*AccessibleRole::*/GRAPHIC: - case /*AccessibleRole::*/TEXT_FRAME: + case AccessibleRole::EMBEDDED_OBJECT: + case AccessibleRole::GRAPHIC: + case AccessibleRole::TEXT_FRAME: pRet = new AccObjectContainerEventListener(pXAcc,pAgent); break; //descendmanager - case /*AccessibleRole::*/LIST: + case AccessibleRole::LIST: pRet = new AccListEventListener(pXAcc,pAgent); break; - case /*AccessibleRole::*/TREE: + case AccessibleRole::TREE: pRet = new AccTreeEventListener(pXAcc,pAgent); break; //special - case /*AccessibleRole::*/COLUMN_HEADER: - case /*AccessibleRole::*/TABLE: + case AccessibleRole::COLUMN_HEADER: + case AccessibleRole::TABLE: pRet = new AccTableEventListener(pXAcc,pAgent); break; default: @@ -989,46 +988,46 @@ bool AccObjectWinManager::IsContainer(XAccessible* pAccessible) { switch( xContext->getAccessibleRole() ) { - case /*AccessibleRole::*/DIALOG: - case /*AccessibleRole::*/FRAME: - case /*AccessibleRole::*/WINDOW: - case /*AccessibleRole::*/ROOT_PANE: - case /*AccessibleRole::*/CANVAS: - case /*AccessibleRole::*/COMBO_BOX: - case /*AccessibleRole::*/DOCUMENT: - case /*AccessibleRole::*/DOCUMENT_PRESENTATION: - case /*AccessibleRole::*/DOCUMENT_SPREADSHEET: - case /*AccessibleRole::*/DOCUMENT_TEXT: - case /*AccessibleRole::*/EMBEDDED_OBJECT: - case /*AccessibleRole::*/END_NOTE: - case /*AccessibleRole::*/FILLER: - case /*AccessibleRole::*/FOOTNOTE: - case /*AccessibleRole::*/FOOTER: - case /*AccessibleRole::*/GRAPHIC: - case /*AccessibleRole::*/GROUP_BOX: - case /*AccessibleRole::*/HEADER: - case /*AccessibleRole::*/LAYERED_PANE: - case /*AccessibleRole::*/MENU_BAR: - case /*AccessibleRole::*/POPUP_MENU: - case /*AccessibleRole::*/OPTION_PANE: - case /*AccessibleRole::*/PAGE_TAB: - case /*AccessibleRole::*/PAGE_TAB_LIST: - case /*AccessibleRole::*/PANEL: - case /*AccessibleRole::*/SCROLL_PANE: - case /*AccessibleRole::*/SPLIT_PANE: - case /*AccessibleRole::*/STATUS_BAR: - case /*AccessibleRole::*/TABLE_CELL: - case /*AccessibleRole::*/TEXT_FRAME: - case /*AccessibleRole::*/TOOL_BAR: - case /*AccessibleRole::*/VIEW_PORT: - case /*AccessibleRole::*/SHAPE: + case AccessibleRole::DIALOG: + case AccessibleRole::FRAME: + case AccessibleRole::WINDOW: + case AccessibleRole::ROOT_PANE: + case AccessibleRole::CANVAS: + case AccessibleRole::COMBO_BOX: + case AccessibleRole::DOCUMENT: + case AccessibleRole::DOCUMENT_PRESENTATION: + case AccessibleRole::DOCUMENT_SPREADSHEET: + case AccessibleRole::DOCUMENT_TEXT: + case AccessibleRole::EMBEDDED_OBJECT: + case AccessibleRole::END_NOTE: + case AccessibleRole::FILLER: + case AccessibleRole::FOOTNOTE: + case AccessibleRole::FOOTER: + case AccessibleRole::GRAPHIC: + case AccessibleRole::GROUP_BOX: + case AccessibleRole::HEADER: + case AccessibleRole::LAYERED_PANE: + case AccessibleRole::MENU_BAR: + case AccessibleRole::POPUP_MENU: + case AccessibleRole::OPTION_PANE: + case AccessibleRole::PAGE_TAB: + case AccessibleRole::PAGE_TAB_LIST: + case AccessibleRole::PANEL: + case AccessibleRole::SCROLL_PANE: + case AccessibleRole::SPLIT_PANE: + case AccessibleRole::STATUS_BAR: + case AccessibleRole::TABLE_CELL: + case AccessibleRole::TEXT_FRAME: + case AccessibleRole::TOOL_BAR: + case AccessibleRole::VIEW_PORT: + case AccessibleRole::SHAPE: return true; - case /*AccessibleRole::*/COLUMN_HEADER: - case /*AccessibleRole::*/TABLE: + case AccessibleRole::COLUMN_HEADER: + case AccessibleRole::TABLE: if(!IsStateManageDescendant(pAccessible)) return true; break; - case /*AccessibleRole::*/MENU: + case AccessibleRole::MENU: return true; default: return false; @@ -1148,12 +1147,12 @@ bool AccObjectWinManager::IsSpecialToolbarItem(css::accessibility::XAccessible* { if (pXAcc && oldFocus != pXAcc) { - if(GetParentRole(pXAcc) == TOOL_BAR) + if (GetParentRole(pXAcc) == AccessibleRole::TOOL_BAR) { Reference< XAccessibleContext > pRContext(pXAcc->getAccessibleContext()); if (pRContext.is()) { - if(pRContext->getAccessibleRole() == TOGGLE_BUTTON) + if (pRContext->getAccessibleRole() == AccessibleRole::TOGGLE_BUTTON) { return true; } commit 95e2e5190cf69c5b931639d2b9279e0adbbdaf3b Author: Michael Weghorn <[email protected]> AuthorDate: Mon Feb 28 11:31:49 2022 +0000 Commit: Michael Weghorn <[email protected]> CommitDate: Mon Feb 28 17:43:04 2022 +0100 wina11y: Rename IsSpecialToolboItem -> IsSpecialToolbarItem Change-Id: I972a65783fcb481e91db68e6e58124d46f78ee66 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130698 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/winaccessibility/inc/AccObjectManagerAgent.hxx b/winaccessibility/inc/AccObjectManagerAgent.hxx index f0f0ca06a66a..d91f33ef1818 100644 --- a/winaccessibility/inc/AccObjectManagerAgent.hxx +++ b/winaccessibility/inc/AccObjectManagerAgent.hxx @@ -87,7 +87,7 @@ public: void UpdateChildState(css::accessibility::XAccessible* pXAcc); - bool IsSpecialToolboItem(css::accessibility::XAccessible* pXAcc); + bool IsSpecialToolbarItem(css::accessibility::XAccessible* pXAcc); short GetRole(css::accessibility::XAccessible* pXAcc); diff --git a/winaccessibility/inc/AccObjectWinManager.hxx b/winaccessibility/inc/AccObjectWinManager.hxx index 6ab6d61322da..342d2278d42d 100644 --- a/winaccessibility/inc/AccObjectWinManager.hxx +++ b/winaccessibility/inc/AccObjectWinManager.hxx @@ -139,7 +139,7 @@ public: void UpdateChildState(css::accessibility::XAccessible* pXAcc); - bool IsSpecialToolboItem(css::accessibility::XAccessible* pXAcc); + bool IsSpecialToolbarItem(css::accessibility::XAccessible* pXAcc); static short GetRole(css::accessibility::XAccessible* pXAcc); diff --git a/winaccessibility/source/service/AccComponentEventListener.cxx b/winaccessibility/source/service/AccComponentEventListener.cxx index 21de787addee..f2a649a05272 100644 --- a/winaccessibility/source/service/AccComponentEventListener.cxx +++ b/winaccessibility/source/service/AccComponentEventListener.cxx @@ -216,7 +216,7 @@ void AccComponentEventListener::FireStatePropertyChange(short state, bool set) pAgent->IncreaseState(m_xAccessible.get(), state); pAgent->UpdateAction(m_xAccessible.get()); - if(!pAgent->IsSpecialToolboItem(m_xAccessible.get())) + if (!pAgent->IsSpecialToolbarItem(m_xAccessible.get())) { pAgent->NotifyAccEvent(UnoMSAAEvent::STATE_CHECKED, m_xAccessible.get()); } @@ -255,7 +255,7 @@ void AccComponentEventListener::FireStatePropertyChange(short state, bool set) pAgent->DecreaseState(m_xAccessible.get(), state); pAgent->UpdateAction(m_xAccessible.get()); - if(!pAgent->IsSpecialToolboItem(m_xAccessible.get())) + if (!pAgent->IsSpecialToolbarItem(m_xAccessible.get())) { pAgent->NotifyAccEvent(UnoMSAAEvent::STATE_CHECKED, m_xAccessible.get()); } diff --git a/winaccessibility/source/service/AccObjectManagerAgent.cxx b/winaccessibility/source/service/AccObjectManagerAgent.cxx index ee2690a71797..b67a2294eac7 100644 --- a/winaccessibility/source/service/AccObjectManagerAgent.cxx +++ b/winaccessibility/source/service/AccObjectManagerAgent.cxx @@ -328,10 +328,10 @@ void AccObjectManagerAgent::UpdateChildState(XAccessible* pXAcc) } -bool AccObjectManagerAgent::IsSpecialToolboItem(XAccessible* pXAcc) +bool AccObjectManagerAgent::IsSpecialToolbarItem(XAccessible* pXAcc) { if(pWinManager) - return pWinManager->IsSpecialToolboItem( pXAcc ); + return pWinManager->IsSpecialToolbarItem(pXAcc); return false; } diff --git a/winaccessibility/source/service/AccObjectWinManager.cxx b/winaccessibility/source/service/AccObjectWinManager.cxx index 24dce8fc8249..d24154769b05 100644 --- a/winaccessibility/source/service/AccObjectWinManager.cxx +++ b/winaccessibility/source/service/AccObjectWinManager.cxx @@ -1144,7 +1144,7 @@ void AccObjectWinManager::UpdateChildState(css::accessibility::XAccessible* pAcc } -bool AccObjectWinManager::IsSpecialToolboItem(css::accessibility::XAccessible* pXAcc) +bool AccObjectWinManager::IsSpecialToolbarItem(css::accessibility::XAccessible* pXAcc) { if (pXAcc && oldFocus != pXAcc) {
