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 <m.weghorn@posteo.de>

1 files changed, 102 insertions, 103 deletions

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;
                 }