wina11y: Convert unomsaaevent.hxx constants to enum class UnoMSAAEvent

Also drop the previous comments for the constants that add
little value and are partially outdated.
See the actual implementation to see how values are mapped
to send out actual MSAA events, e.g. the previous comment

// CARET_CHANGED --> EVENT_OBJECT_LOCATIONCHANGED

was no longer correct by now, since that is by now mapped to
`IA2_EVENT_TEXT_CARET_MOVED` in `AccObjectWinManager::NotifyAccEvent`.

Change-Id: I38111ccb60c06f73ce53b18a6ca32e13dbd629b8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130697
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>

5 files changed, 54 insertions, 88 deletions

diff --git a/winaccessibility/inc/AccContainerEventListener.hxx b/winaccessibility/inc/AccContainerEventListener.hxx
index f0b87c3d4042..c880374fbb3d 100644
--- a/winaccessibility/inc/AccContainerEventListener.hxx
+++ b/winaccessibility/inc/AccContainerEventListener.hxx
@@ -19,6 +19,8 @@
 
 #pragma once
 
+enum class UnoMSAAEvent;
+
 #include <stdio.h>
 #include "AccEventListener.hxx"
 #include <com/sun/star/accessibility/XAccessibleEventListener.hpp>
@@ -73,7 +75,7 @@ public:
     // update all children's state
     void UpdateAllChildrenState( css::accessibility::XAccessible* pXAccessible);
 
-    bool NotifyChildEvent(short nWinEvent, const css::uno::Any &Value);
+    bool NotifyChildEvent(UnoMSAAEvent eWinEvent, const css::uno::Any& Value);
 
     virtual void HandleSelectionChangedAddEvent(
             const css::uno::Any &oldValue, const css::uno::Any &newValue);
diff --git a/winaccessibility/inc/AccDescendantManagerEventListener.hxx b/winaccessibility/inc/AccDescendantManagerEventListener.hxx
index 73cda0f4eb46..669143a036f6 100644
--- a/winaccessibility/inc/AccDescendantManagerEventListener.hxx
+++ b/winaccessibility/inc/AccDescendantManagerEventListener.hxx
@@ -19,6 +19,8 @@
 
 #pragma once
 
+enum class UnoMSAAEvent;
+
 #include <stdio.h>
 #include <vector>
 #include "AccComponentEventListener.hxx"
@@ -54,7 +56,7 @@ public:
     virtual void HandleChildChangedNoFocusEvent(
             css::uno::Any oldValue, css::uno::Any newValue);
 
-    bool NotifyChildEvent(short nWinEvent,const css::uno::Any &Value);
+    bool NotifyChildEvent(UnoMSAAEvent eWinEvent, const css::uno::Any& Value);
 
     virtual void HandleSelectionChangedAddEvent(
             const css::uno::Any &oldValue, const css::uno::Any &newValue);
diff --git a/winaccessibility/inc/AccObjectManagerAgent.hxx b/winaccessibility/inc/AccObjectManagerAgent.hxx
index a0f3daec579b..f0f0ca06a66a 100644
--- a/winaccessibility/inc/AccObjectManagerAgent.hxx
+++ b/winaccessibility/inc/AccObjectManagerAgent.hxx
@@ -30,6 +30,7 @@
 struct IMAccessible;
 struct IAccessible;
 class AccObjectWinManager;
+enum class UnoMSAAEvent;
 
 /****************************************************************
 AccObjectManagerAgent is used for managing AccObjects, which encapsulates
@@ -56,7 +57,7 @@ public:
     virtual void DeleteAccObj( css::accessibility::XAccessible* pXAcc );
     virtual IMAccessible*  GetIMAccByXAcc(css::accessibility::XAccessible* pXAcc);
 
-    bool NotifyAccEvent(short pEvent = 0, css::accessibility::XAccessible* pXAcc = nullptr);
+    bool NotifyAccEvent(UnoMSAAEvent eEvent, css::accessibility::XAccessible* pXAcc = nullptr);
 
     bool InsertChildrenAccObj(css::accessibility::XAccessible* pXAcc,
                               HWND  hWnd = nullptr);
diff --git a/winaccessibility/inc/AccObjectWinManager.hxx b/winaccessibility/inc/AccObjectWinManager.hxx
index 813c1d8541fa..6ab6d61322da 100644
--- a/winaccessibility/inc/AccObjectWinManager.hxx
+++ b/winaccessibility/inc/AccObjectWinManager.hxx
@@ -43,6 +43,7 @@ class ResIDGenerator;
 class AccObjectManagerAgent;
 class AccEventListener;
 class AccObject;
+enum class UnoMSAAEvent;
 
 /*******************************************************************
 AccObjectWinManager complete the functions:
@@ -106,7 +107,7 @@ public:
     void DeleteAccObj( css::accessibility::XAccessible* pXAcc );
     void DeleteChildrenAccObj(css::accessibility::XAccessible* pAccObj);
 
-    bool NotifyAccEvent( css::accessibility::XAccessible* pXAcc,short state = 0 );
+    bool NotifyAccEvent(css::accessibility::XAccessible* pXAcc, UnoMSAAEvent eEvent);
 
     LRESULT Get_ToATInterface(HWND hWnd, long lParam, WPARAM wParam);
 
diff --git a/winaccessibility/inc/unomsaaevent.hxx b/winaccessibility/inc/unomsaaevent.hxx
index 7b45c86867ed..e8d77d7cdcf0 100644
--- a/winaccessibility/inc/unomsaaevent.hxx
+++ b/winaccessibility/inc/unomsaaevent.hxx
@@ -19,89 +19,49 @@
 
 #pragma once
 
-//STATE_CHANGED with get FOCUSED -> EVENT_OBJECT_FOCUS
-const short UM_EVENT_STATE_FOCUSED = 0;
-
-//STATE_CHANGED --> EVENT_OBJECT_STATECHANGE
-const short UM_EVENT_STATE_CHECKED = 1;
-const short UM_EVENT_STATE_ARMED = 2;
-const short UM_EVENT_STATE_PRESSED = 3;
-const short UM_EVENT_STATE_SELECTED = 4;
-const short UM_EVENT_STATE_SHOWING = 5;
-
-//if acc role is MENU_BAR, STATE_CHANGED with get FOCUSED -> EVENT_SYSTEM_MENUSTART
-const short UM_EVENT_MENU_START = 6;
-
-//if acc role is MENU_BAR, STATE_CHANGED with lose FOCUSED -> EVENT_SYSTEM_MENUEND
-const short UM_EVENT_MENU_END = 7;
-
-//if acc role is POPUP_MENU, STATE_CHANGED with get FOCUSED -> EVENT_SYSTEM_MENUPOPUPSTART
-const short UM_EVENT_MENUPOPUPSTART = 8;
-
-//if acc role is POPUP_MENU, STATE_CHANGED with lose FOCUSED -> EVENT_SYSTEM_MENUPOPUPEND
-const short UM_EVENT_MENUPOPUPEND = 9;
-
-//SELECTION_CHANGED -> EVENT_OBJECT_SELECTION
-const short UM_EVENT_SELECTION_CHANGED = 10;
-
-//INVALIDATE_ALL_CHILDREN --> EVENT_OBJECT_SHOW
-const short UM_EVENT_INVALIDATE_ALL_CHILDREN = 11;
-
-//VALUE_CHANGED --> EVENT_OBJECT_VALUECHANGE
-const short UM_EVENT_OBJECT_VALUECHANGE = 12;
-
-//NAME_CHANGED --> EVENT_OBJECT_NAMECHANGE
-const short UM_EVENT_OBJECT_NAMECHANGE = 13;
-
-//DESCRIPTION_CHANGED --> EVENT_OBJECT_DESCRIPTIONCHANGE
-const short UM_EVENT_OBJECT_DESCRIPTIONCHANGE = 14;
-
-//ACTION_CHANGED --> EVENT_OBJECT_DEFACTIONCHANGE
-const short UM_EVENT_OBJECT_DEFACTIONCHANGE = 15;
-
-//CARET_CHANGED --> EVENT_OBJECT_LOCATIONCHANGED
-const short UM_EVENT_OBJECT_CARETCHANGE = 16;
-
-//TEXT_CHANGED --> EVENT_OBJECT_VALUECHANGE
-const short UM_EVENT_OBJECT_TEXTCHANGE = 17;
-
-//ACTIVE_DESCENDANT_CHANGED --> EVENT_OBJECT_FOCUS
-const short UM_EVENT_ACTIVE_DESCENDANT_CHANGED = 18;
-
-//BOUNDRECT_CHANGED --> EVENT_OBJECT_LOCATIONCHANGE
-const short UM_EVENT_BOUNDRECT_CHANGED = 19;
-
-//VISIBLE_DATA_CHANGED --> EVENT_OBJECT_VALUECHANGE
-const short UM_EVENT_VISIBLE_DATA_CHANGED = 20;
-
-//to enable SHOW on dialogs, windows, frames
-const short UM_EVENT_SHOW = 21;
-
-const short UM_EVENT_STATE_BUSY = 22;
-
-const short UM_EVENT_TABLE_CAPTION_CHANGED = 24;
-const short UM_EVENT_TABLE_COLUMN_DESCRIPTION_CHANGED = 25;
-const short UM_EVENT_TABLE_COLUMN_HEADER_CHANGED = 26;
-const short UM_EVENT_TABLE_MODEL_CHANGED = 27;
-const short UM_EVENT_TABLE_ROW_HEADER_CHANGED = 28;
-const short UM_EVENT_TABLE_SUMMARY_CHANGED = 29;
-const short UM_EVENT_OBJECT_REORDER = 30;
-const short UM_EVENT_PAGE_CHANGED = 31;
-const short UM_EVENT_CHILD_ADDED = 32;
-const short UM_EVENT_CHILD_REMOVED = 33;
-const short UM_EVENT_TABLE_ROW_DESCRIPTION_CHANGED = 34;
-const short UM_EVENT_SELECTION_CHANGED_ADD = 35;
-const short UM_EVENT_SELECTION_CHANGED_REMOVE = 36;
-const short UM_EVENT_SELECTION_CHANGED_WITHIN = 37;
-
-//support for PAGE_CHANGED event
-const short UM_EVENT_OBJECT_PAGECHANGED = 38;
-
-//to add TEXT_SELECTION_CHANGED event
-const short UM_EVENT_TEXT_SELECTION_CHANGED = 39;
-
-//for section change and column change event
-const short UM_EVENT_SECTION_CHANGED = 40;
-const short UM_EVENT_COLUMN_CHANGED = 41;
+enum class UnoMSAAEvent
+{
+    STATE_FOCUSED,
+    STATE_CHECKED,
+    STATE_ARMED,
+    STATE_PRESSED,
+    STATE_SELECTED,
+    STATE_SHOWING,
+    MENU_START,
+    MENU_END,
+    MENUPOPUPSTART,
+    MENUPOPUPEND,
+    SELECTION_CHANGED,
+    INVALIDATE_ALL_CHILDREN,
+    OBJECT_VALUECHANGE,
+    OBJECT_NAMECHANGE,
+    OBJECT_DESCRIPTIONCHANGE,
+    OBJECT_DEFACTIONCHANGE,
+    OBJECT_CARETCHANGE,
+    OBJECT_TEXTCHANGE,
+    ACTIVE_DESCENDANT_CHANGED,
+    BOUNDRECT_CHANGED,
+    VISIBLE_DATA_CHANGED,
+    SHOW,
+    STATE_BUSY,
+    TABLE_CAPTION_CHANGED,
+    TABLE_COLUMN_DESCRIPTION_CHANGED,
+    TABLE_COLUMN_HEADER_CHANGED,
+    TABLE_MODEL_CHANGED,
+    TABLE_ROW_HEADER_CHANGED,
+    TABLE_SUMMARY_CHANGED,
+    OBJECT_REORDER,
+    PAGE_CHANGED,
+    CHILD_ADDED,
+    CHILD_REMOVED,
+    TABLE_ROW_DESCRIPTION_CHANGED,
+    SELECTION_CHANGED_ADD,
+    SELECTION_CHANGED_REMOVE,
+    SELECTION_CHANGED_WITHIN,
+    OBJECT_PAGECHANGED,
+    TEXT_SELECTION_CHANGED,
+    SECTION_CHANGED,
+    COLUMN_CHANGED
+};
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */