1 files changed, 1 insertions, 1 deletions
diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx
index 2dc2e33fb91c..1971c9b9f022 100644
--- a/xmloff/source/draw/ximpshap.cxx
+++ b/xmloff/source/draw/ximpshap.cxx
@@ -60,7 +60,7 @@
 
 #include <sax/tools/converter.hxx>
 #include <comphelper/sequence.hxx>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 
 #include <xmloff/families.hxx>
 #include<xmloff/xmlnamespace.hxx>
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: */
diff --git a/winaccessibility/source/service/AccComponentEventListener.cxx b/winaccessibility/source/service/AccComponentEventListener.cxx
index 7f7acfe1e1e1..21de787addee 100644
--- a/winaccessibility/source/service/AccComponentEventListener.cxx
+++ b/winaccessibility/source/service/AccComponentEventListener.cxx
@@ -93,7 +93,7 @@ void  AccComponentEventListener::notifyEvent( const css::accessibility::Accessib
 void AccComponentEventListener::HandleValueChangedEvent(Any, Any)
 {
     pAgent->UpdateValue(m_xAccessible.get());
-    pAgent->NotifyAccEvent(UM_EVENT_OBJECT_VALUECHANGE, m_xAccessible.get());
+    pAgent->NotifyAccEvent(UnoMSAAEvent::OBJECT_VALUECHANGE, m_xAccessible.get());
 }
 
 /**
@@ -102,7 +102,7 @@ void AccComponentEventListener::HandleValueChangedEvent(Any, Any)
 void AccComponentEventListener::HandleActionChangedEvent()
 {
     pAgent->UpdateAction(m_xAccessible.get());
-    pAgent->NotifyAccEvent(UM_EVENT_OBJECT_DEFACTIONCHANGE, m_xAccessible.get());
+    pAgent->NotifyAccEvent(UnoMSAAEvent::OBJECT_DEFACTIONCHANGE, m_xAccessible.get());
 }
 
 /**
@@ -114,7 +114,7 @@ void AccComponentEventListener::HandleActionChangedEvent()
 void AccComponentEventListener::HandleTextChangedEvent(Any, Any newValue)
 {
     pAgent->UpdateValue(m_xAccessible.get(), newValue);
-    pAgent->NotifyAccEvent(UM_EVENT_OBJECT_VALUECHANGE, m_xAccessible.get());
+    pAgent->NotifyAccEvent(UnoMSAAEvent::OBJECT_VALUECHANGE, m_xAccessible.get());
 }
 
 /**
@@ -125,7 +125,7 @@ void AccComponentEventListener::HandleTextChangedEvent(Any, Any newValue)
  */
 void AccComponentEventListener::HandleCaretChangedEvent(Any, Any)
 {
-    pAgent->NotifyAccEvent(UM_EVENT_OBJECT_CARETCHANGE, m_xAccessible.get());
+    pAgent->NotifyAccEvent(UnoMSAAEvent::OBJECT_CARETCHANGE, m_xAccessible.get());
 }
 
 /**
@@ -218,19 +218,19 @@ void AccComponentEventListener::FireStatePropertyChange(short state, bool set)
 
             if(!pAgent->IsSpecialToolboItem(m_xAccessible.get()))
             {
-                pAgent->NotifyAccEvent(UM_EVENT_STATE_CHECKED, m_xAccessible.get());
+                pAgent->NotifyAccEvent(UnoMSAAEvent::STATE_CHECKED, m_xAccessible.get());
             }
             break;
         case AccessibleStateType::PRESSED:
             pAgent->IncreaseState(m_xAccessible.get(), state);
-            pAgent->NotifyAccEvent(UM_EVENT_STATE_PRESSED, m_xAccessible.get());
+            pAgent->NotifyAccEvent(UnoMSAAEvent::STATE_PRESSED, m_xAccessible.get());
             break;
         case AccessibleStateType::SELECTED:
             pAgent->IncreaseState(m_xAccessible.get(), state);
             break;
         case AccessibleStateType::ARMED:
             pAgent->IncreaseState(m_xAccessible.get(), state);
-            pAgent->NotifyAccEvent(UM_EVENT_STATE_ARMED, m_xAccessible.get());
+            pAgent->NotifyAccEvent(UnoMSAAEvent::STATE_ARMED, m_xAccessible.get());
             break;
         case AccessibleStateType::SHOWING:
             pAgent->DecreaseState(m_xAccessible.get(), AccessibleStateType::DEFUNC);
@@ -257,23 +257,23 @@ void AccComponentEventListener::FireStatePropertyChange(short state, bool set)
 
             if(!pAgent->IsSpecialToolboItem(m_xAccessible.get()))
             {
-                pAgent->NotifyAccEvent(UM_EVENT_STATE_CHECKED, m_xAccessible.get());
+                pAgent->NotifyAccEvent(UnoMSAAEvent::STATE_CHECKED, m_xAccessible.get());
             }
             break;
         case AccessibleStateType::PRESSED:
             pAgent->DecreaseState(m_xAccessible.get(), state);
-            pAgent->NotifyAccEvent(UM_EVENT_STATE_PRESSED, m_xAccessible.get());
+            pAgent->NotifyAccEvent(UnoMSAAEvent::STATE_PRESSED, m_xAccessible.get());
             break;
         case AccessibleStateType::SELECTED:
             pAgent->DecreaseState(m_xAccessible.get(), state);
             //if the state is unset, no need to send MSAA SELECTION event
-            //pAgent->NotifyAccEvent(UM_EVENT_STATE_SELECTED, m_xAccessible.get());
+            //pAgent->NotifyAccEvent(UnoMSAAEvent::STATE_SELECTED, m_xAccessible.get());
             break;
         case AccessibleStateType::ARMED:
             {
                 pAgent->DecreaseState(m_xAccessible.get(), state);
                 //if the state is unset, no need to send MSAA MENU event
-                //pAgent->NotifyAccEvent(UM_EVENT_STATE_ARMED, m_xAccessible.get());
+                //pAgent->NotifyAccEvent(UnoMSAAEvent::STATE_ARMED, m_xAccessible.get());
             }
             break;
         case AccessibleStateType::SHOWING:
@@ -302,7 +302,7 @@ void AccComponentEventListener::FireStateFocusedChange(bool enable)
     if(enable)
     {
         if (GetParentRole() != AccessibleRole::COMBO_BOX)
-            pAgent->NotifyAccEvent(UM_EVENT_STATE_FOCUSED, m_xAccessible.get());
+            pAgent->NotifyAccEvent(UnoMSAAEvent::STATE_FOCUSED, m_xAccessible.get());
     }
     else
     {
@@ -313,13 +313,13 @@ void AccComponentEventListener::FireStateFocusedChange(bool enable)
 
 void AccComponentEventListener::HandleSelectionChangedEventNoArgs()
 {
-    pAgent->NotifyAccEvent(UM_EVENT_SELECTION_CHANGED, m_xAccessible.get());
+    pAgent->NotifyAccEvent(UnoMSAAEvent::SELECTION_CHANGED, m_xAccessible.get());
 }
 
 //add TEXT_SELECTION_CHANGED event
 void AccComponentEventListener::HandleTextSelectionChangedEvent()
 {
-    pAgent->NotifyAccEvent(UM_EVENT_TEXT_SELECTION_CHANGED, m_xAccessible.get());
+    pAgent->NotifyAccEvent(UnoMSAAEvent::TEXT_SELECTION_CHANGED, m_xAccessible.get());
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/winaccessibility/source/service/AccContainerEventListener.cxx b/winaccessibility/source/service/AccContainerEventListener.cxx
index ae4cccba9e0e..aa7a016e2384 100644
--- a/winaccessibility/source/service/AccContainerEventListener.cxx
+++ b/winaccessibility/source/service/AccContainerEventListener.cxx
@@ -134,7 +134,7 @@ void AccContainerEventListener::HandleChildChangedEvent(Any oldValue, Any newVal
             {
                 //add all oldValue's existing children
                 pAgent->InsertChildrenAccObj(pAcc);
-                pAgent->NotifyAccEvent(UM_EVENT_CHILD_ADDED, pAcc);
+                pAgent->NotifyAccEvent(UnoMSAAEvent::CHILD_ADDED, pAcc);
             }
         }
     }
@@ -144,7 +144,7 @@ void AccContainerEventListener::HandleChildChangedEvent(Any oldValue, Any newVal
         if(xChild.is())
         {
             XAccessible* pAcc = xChild.get();
-            pAgent->NotifyAccEvent(UM_EVENT_CHILD_REMOVED, pAcc);
+            pAgent->NotifyAccEvent(UnoMSAAEvent::CHILD_REMOVED, pAcc);
             //delete all oldValue's existing children
             pAgent->DeleteChildrenAccObj( pAcc );
             //delete this child
@@ -162,14 +162,14 @@ void AccContainerEventListener::HandleChildChangedEvent(Any oldValue, Any newVal
  */
 void AccContainerEventListener::HandleSelectionChangedEvent(const Any& /*oldValue*/, const Any& newValue)
 {
-    if(NotifyChildEvent(UM_EVENT_SELECTION_CHANGED,newValue))
+    if (NotifyChildEvent(UnoMSAAEvent::SELECTION_CHANGED, newValue))
     {
         return ;
     }
 
     //menu bar does not process selection change event,just same as word behavior
     if (GetRole()!=AccessibleRole::MENU_BAR)
-        pAgent->NotifyAccEvent(UM_EVENT_SELECTION_CHANGED, m_xAccessible.get());
+        pAgent->NotifyAccEvent(UnoMSAAEvent::SELECTION_CHANGED, m_xAccessible.get());
 }
 
 /**
@@ -184,7 +184,7 @@ void AccContainerEventListener::HandleAllChildrenChangedEvent()
         pAgent->DeleteChildrenAccObj(m_xAccessible.get());
         //add all oldValue's existing children
         pAgent->InsertChildrenAccObj(m_xAccessible.get());
-        pAgent->NotifyAccEvent(UM_EVENT_OBJECT_REORDER , m_xAccessible.get());
+        pAgent->NotifyAccEvent(UnoMSAAEvent::OBJECT_REORDER, m_xAccessible.get());
     }
 }
 
@@ -194,7 +194,7 @@ void AccContainerEventListener::HandleAllChildrenChangedEvent()
 void AccContainerEventListener::HandleTextChangedEvent(Any, Any newValue)
 {
     pAgent->UpdateValue(m_xAccessible.get(), newValue);
-    pAgent->NotifyAccEvent(UM_EVENT_OBJECT_TEXTCHANGE, m_xAccessible.get());
+    pAgent->NotifyAccEvent(UnoMSAAEvent::OBJECT_TEXTCHANGE, m_xAccessible.get());
 }
 
 /**
@@ -261,7 +261,7 @@ void AccContainerEventListener::SetComponentState(short state, bool enable )
     case AccessibleStateType::CHECKED:
         {
             pAgent->UpdateState(m_xAccessible.get());
-            pAgent->NotifyAccEvent(UM_EVENT_STATE_BUSY, m_xAccessible.get());
+            pAgent->NotifyAccEvent(UnoMSAAEvent::STATE_BUSY, m_xAccessible.get());
             break;
         }
 
@@ -290,7 +290,7 @@ void AccContainerEventListener::FireStatePropertyChange(short state, bool set)
         case AccessibleStateType::FOCUSABLE:
         case AccessibleStateType::OFFSCREEN:
             pAgent->IncreaseState(m_xAccessible.get(), state);
-            pAgent->NotifyAccEvent(UM_EVENT_STATE_BUSY, m_xAccessible.get());
+            pAgent->NotifyAccEvent(UnoMSAAEvent::STATE_BUSY, m_xAccessible.get());
             break;
         case AccessibleStateType::SHOWING:
             // UNO !SHOWING == MSAA OFFSCREEN
@@ -317,7 +317,7 @@ void AccContainerEventListener::FireStatePropertyChange(short state, bool set)
         case AccessibleStateType::FOCUSABLE:
         case AccessibleStateType::OFFSCREEN:
             pAgent->DecreaseState(m_xAccessible.get(), state);
-            pAgent->NotifyAccEvent(UM_EVENT_STATE_BUSY, m_xAccessible.get());
+            pAgent->NotifyAccEvent(UnoMSAAEvent::STATE_BUSY, m_xAccessible.get());
             break;
         case AccessibleStateType::SHOWING:
             // UNO !SHOWING == MSAA OFFSCREEN
@@ -342,15 +342,15 @@ void AccContainerEventListener::FireStateFocusedChange(bool enable)
     if(enable)
     {
         pAgent->IncreaseState(m_xAccessible.get(), AccessibleStateType::FOCUSED);
-        //if the acc role is MENU_BAR, MSAA UM_EVENT_MENU_START event should be sent
-        //if the acc role is POPUP_MENU, MSAA UM_EVENT_MENUPOPUPSTART event should be sent
+        // if the acc role is MENU_BAR, UnoMSAAEvent::MENU_START event should be sent
+        // if the acc role is POPUP_MENU, UnoMSAAEvent::MENUPOPUPSTART event should be sent
         short role = GetRole();
         if(role == AccessibleRole::MENU_BAR)
         {
-            pAgent->NotifyAccEvent(UM_EVENT_MENU_START, m_xAccessible.get());
+            pAgent->NotifyAccEvent(UnoMSAAEvent::MENU_START, m_xAccessible.get());
         }
         else if (role == AccessibleRole::POPUP_MENU)
-            pAgent->NotifyAccEvent(UM_EVENT_MENUPOPUPSTART, m_xAccessible.get());
+            pAgent->NotifyAccEvent(UnoMSAAEvent::MENUPOPUPSTART, m_xAccessible.get());
         //Disable the focused event on option_pane and Panel.
         //only disable option_pane for toolbar has panel to get focus
         else if (role == AccessibleRole::PANEL || role == AccessibleRole::OPTION_PANE )
@@ -360,7 +360,7 @@ void AccContainerEventListener::FireStateFocusedChange(bool enable)
             if (parentRole == AccessibleRole::TOOL_BAR
                 || parentRole == AccessibleRole::SCROLL_PANE // sidebar
                 || parentRole == AccessibleRole::PANEL) // sidebar
-                pAgent->NotifyAccEvent(UM_EVENT_STATE_FOCUSED, m_xAccessible.get());
+                pAgent->NotifyAccEvent(UnoMSAAEvent::STATE_FOCUSED, m_xAccessible.get());
         }
         else if (role == AccessibleRole::COMBO_BOX )
         {
@@ -381,30 +381,30 @@ void AccContainerEventListener::FireStateFocusedChange(bool enable)
                         {
                             pAgent->DecreaseState(m_xAccessible.get(), AccessibleStateType::FOCUSED);
                             pAgent->IncreaseState( mxChild.get(), AccessibleStateType::FOCUSED);
-                            pAgent->NotifyAccEvent(UM_EVENT_STATE_FOCUSED, mxChild.get());
+                            pAgent->NotifyAccEvent(UnoMSAAEvent::STATE_FOCUSED, mxChild.get());
                             bSendFocusOnCombobox = false;
                         }
                     }
                 }
             }
             if (bSendFocusOnCombobox)
-                pAgent->NotifyAccEvent(UM_EVENT_STATE_FOCUSED, m_xAccessible.get());
+                pAgent->NotifyAccEvent(UnoMSAAEvent::STATE_FOCUSED, m_xAccessible.get());
         }
         else
-            pAgent->NotifyAccEvent(UM_EVENT_STATE_FOCUSED, m_xAccessible.get());
+            pAgent->NotifyAccEvent(UnoMSAAEvent::STATE_FOCUSED, m_xAccessible.get());
     }
     else
     {
         pAgent->DecreaseState(m_xAccessible.get(), AccessibleStateType::FOCUSED);
-        //if the acc role is MENU_BAR, MSAA UM_EVENT_MENU_END event should be sent
-        //if the acc role is POPUP_MENU, MSAA UM_EVENT_MENUPOPUPEND event should be sent
+        // if the acc role is MENU_BAR, UnoMSAAEvent::MENU_END event should be sent
+        // if the acc role is POPUP_MENU, UnoMSAAEvent::MENUPOPUPEND event should be sent
         if (GetRole() == AccessibleRole::MENU_BAR)
         {
-            pAgent->NotifyAccEvent(UM_EVENT_MENU_END, m_xAccessible.get());
+            pAgent->NotifyAccEvent(UnoMSAAEvent::MENU_END, m_xAccessible.get());
         }
         else if (GetRole() == AccessibleRole::POPUP_MENU)
         {
-            pAgent->NotifyAccEvent(UM_EVENT_MENUPOPUPEND, m_xAccessible.get());
+            pAgent->NotifyAccEvent(UnoMSAAEvent::MENUPOPUPEND, m_xAccessible.get());
         }
     }
 }
@@ -418,7 +418,7 @@ void AccContainerEventListener::FireStateFocusedChange(bool enable)
 void AccContainerEventListener::HandleValueChangedEvent(Any, Any)
 {
     pAgent->UpdateValue(m_xAccessible.get());
-    pAgent->NotifyAccEvent(UM_EVENT_OBJECT_VALUECHANGE, m_xAccessible.get());
+    pAgent->NotifyAccEvent(UnoMSAAEvent::OBJECT_VALUECHANGE, m_xAccessible.get());
 }
 
 bool AccContainerEventListener::IsEditable(Reference<XAccessibleContext> const & xContext)
@@ -437,7 +437,7 @@ bool AccContainerEventListener::IsEditable(Reference<XAccessibleContext> const &
     return false;
 }
 
-bool AccContainerEventListener::NotifyChildEvent(short nWinEvent,const Any &Value)
+bool AccContainerEventListener::NotifyChildEvent(UnoMSAAEvent eWinEvent, const Any& Value)
 {
     Reference< XAccessible > xChild;
     if(Value >>= xChild )
@@ -445,7 +445,7 @@ bool AccContainerEventListener::NotifyChildEvent(short nWinEvent,const Any &Valu
         if(xChild.is())
         {
             XAccessible* pAcc = xChild.get();
-            pAgent->NotifyAccEvent(nWinEvent, pAcc);
+            pAgent->NotifyAccEvent(eWinEvent, pAcc);
             return true;
         }
     }
@@ -454,29 +454,29 @@ bool AccContainerEventListener::NotifyChildEvent(short nWinEvent,const Any &Valu
 
 void AccContainerEventListener::HandleSelectionChangedAddEvent(const Any& /*oldValue*/, const Any& newValue)
 {
-    if(NotifyChildEvent(UM_EVENT_SELECTION_CHANGED_ADD,newValue))
+    if (NotifyChildEvent(UnoMSAAEvent::SELECTION_CHANGED_ADD, newValue))
     {
         return ;
     }
-    pAgent->NotifyAccEvent(UM_EVENT_SELECTION_CHANGED_ADD, m_xAccessible.get());
+    pAgent->NotifyAccEvent(UnoMSAAEvent::SELECTION_CHANGED_ADD, m_xAccessible.get());
 }
 
 void AccContainerEventListener::HandleSelectionChangedRemoveEvent(const Any& /*oldValue*/, const Any& newValue)
 {
-    if(NotifyChildEvent(UM_EVENT_SELECTION_CHANGED_REMOVE,newValue))
+    if (NotifyChildEvent(UnoMSAAEvent::SELECTION_CHANGED_REMOVE, newValue))
     {
         return ;
     }
-    pAgent->NotifyAccEvent(UM_EVENT_SELECTION_CHANGED_REMOVE, m_xAccessible.get());
+    pAgent->NotifyAccEvent(UnoMSAAEvent::SELECTION_CHANGED_REMOVE, m_xAccessible.get());
 }
 
 void AccContainerEventListener::HandleSelectionChangedWithinEvent(const Any& /*oldValue*/, const Any& newValue)
 {
-    if(NotifyChildEvent(UM_EVENT_SELECTION_CHANGED_WITHIN,newValue))
+    if (NotifyChildEvent(UnoMSAAEvent::SELECTION_CHANGED_WITHIN, newValue))
     {
         return ;
     }
-    pAgent->NotifyAccEvent(UM_EVENT_SELECTION_CHANGED_WITHIN, m_xAccessible.get());
+    pAgent->NotifyAccEvent(UnoMSAAEvent::SELECTION_CHANGED_WITHIN, m_xAccessible.get());
 }
 
 void AccContainerEventListener::UpdateAllChildrenState(XAccessible* pXAccessible)
@@ -514,17 +514,17 @@ void AccContainerEventListener::UpdateAllChildrenState(XAccessible* pXAccessible
 
 void AccContainerEventListener::HandlePageChangedEvent(const Any& /*oldValue*/, const Any& /*newValue*/)
 {
-    pAgent->NotifyAccEvent(UM_EVENT_OBJECT_PAGECHANGED, m_xAccessible.get());
+    pAgent->NotifyAccEvent(UnoMSAAEvent::OBJECT_PAGECHANGED, m_xAccessible.get());
 }
 
 void AccContainerEventListener::HandleSectionChangedEvent(const Any& /*oldValue*/, const Any& /*newValue*/ )
 {
-    pAgent->NotifyAccEvent(UM_EVENT_SECTION_CHANGED, m_xAccessible.get());
+    pAgent->NotifyAccEvent(UnoMSAAEvent::SECTION_CHANGED, m_xAccessible.get());
 }
 
 void AccContainerEventListener::HandleColumnChangedEvent(const Any& /*oldValue*/, const Any& /*newValue*/)
 {
-    pAgent->NotifyAccEvent(UM_EVENT_COLUMN_CHANGED, m_xAccessible.get());
+    pAgent->NotifyAccEvent(UnoMSAAEvent::COLUMN_CHANGED, m_xAccessible.get());
 }
 
 void  AccContainerEventListener::HandleNameChangedEvent( Any name )
diff --git a/winaccessibility/source/service/AccDescendantManagerEventListener.cxx b/winaccessibility/source/service/AccDescendantManagerEventListener.cxx
index e3236fe6cabe..c38f19e32cd8 100644
--- a/winaccessibility/source/service/AccDescendantManagerEventListener.cxx
+++ b/winaccessibility/source/service/AccDescendantManagerEventListener.cxx
@@ -93,7 +93,7 @@ void AccDescendantManagerEventListener::HandleChildChangedEvent(Any oldValue, An
             pAgent->InsertAccObj(pAcc, m_xAccessible.get());
             pAgent->InsertChildrenAccObj(pAcc);
 
-            pAgent->NotifyAccEvent(UM_EVENT_CHILD_ADDED, pAcc);
+            pAgent->NotifyAccEvent(UnoMSAAEvent::CHILD_ADDED, pAcc);
 
         }
     }
@@ -104,7 +104,7 @@ void AccDescendantManagerEventListener::HandleChildChangedEvent(Any oldValue, An
         {
             XAccessible* pAcc = xChild.get();
 
-            pAgent->NotifyAccEvent(UM_EVENT_CHILD_REMOVED, pAcc);
+            pAgent->NotifyAccEvent(UnoMSAAEvent::CHILD_REMOVED, pAcc);
             pAgent->DeleteChildrenAccObj( pAcc );
             pAgent->DeleteAccObj( pAcc );
         }
@@ -130,7 +130,7 @@ void AccDescendantManagerEventListener::HandleSelectionChangedEvent(Any oldValue
                 pAgent->IncreaseState( pAcc, AccessibleStateType::SELECTED);
             }
 
-            pAgent->NotifyAccEvent(UM_EVENT_SELECTION_CHANGED, pAcc);
+            pAgent->NotifyAccEvent(UnoMSAAEvent::SELECTION_CHANGED, pAcc);
             bSend=true;
         }
     }
@@ -144,7 +144,7 @@ void AccDescendantManagerEventListener::HandleSelectionChangedEvent(Any oldValue
     }
     if (!bSend)
     {
-        pAgent->NotifyAccEvent(UM_EVENT_SELECTION_CHANGED, m_xAccessible.get());
+        pAgent->NotifyAccEvent(UnoMSAAEvent::SELECTION_CHANGED, m_xAccessible.get());
     }
 }
 
@@ -173,7 +173,7 @@ void AccDescendantManagerEventListener::HandleChildChangedNoFocusEvent(Any oldVa
     }
 }
 
-bool AccDescendantManagerEventListener::NotifyChildEvent(short nWinEvent,const Any &Value)
+bool AccDescendantManagerEventListener::NotifyChildEvent(UnoMSAAEvent eWinEvent, const Any& Value)
 {
     Reference< XAccessible > xChild;
     if(Value >>= xChild )
@@ -181,11 +181,11 @@ bool AccDescendantManagerEventListener::NotifyChildEvent(short nWinEvent,const A
         if(xChild.is())
         {
             XAccessible* pAcc = xChild.get();
-            pAgent->NotifyAccEvent(nWinEvent, pAcc);
+            pAgent->NotifyAccEvent(eWinEvent, pAcc);
 
             if (pAgent->IsStateManageDescendant(m_xAccessible.get()))
             {
-                if (nWinEvent == UM_EVENT_SELECTION_CHANGED_REMOVE)
+                if (eWinEvent == UnoMSAAEvent::SELECTION_CHANGED_REMOVE)
                 {
                     // The object has just been sent in a SELECTION_CHANGED_REMOVE event
                     // and accessibility tools may query for the object and call methods on
@@ -209,29 +209,29 @@ bool AccDescendantManagerEventListener::NotifyChildEvent(short nWinEvent,const A
 }
 void AccDescendantManagerEventListener::HandleSelectionChangedAddEvent(const Any& /*oldValue*/, const Any &newValue)
 {
-    if(NotifyChildEvent(UM_EVENT_SELECTION_CHANGED_ADD,newValue))
+    if (NotifyChildEvent(UnoMSAAEvent::SELECTION_CHANGED_ADD, newValue))
     {
         return ;
     }
-    pAgent->NotifyAccEvent(UM_EVENT_SELECTION_CHANGED_ADD, m_xAccessible.get());
+    pAgent->NotifyAccEvent(UnoMSAAEvent::SELECTION_CHANGED_ADD, m_xAccessible.get());
 }
 
 void AccDescendantManagerEventListener::HandleSelectionChangedRemoveEvent(const Any& /*oldValue*/, const Any &newValue)
 {
-    if(NotifyChildEvent(UM_EVENT_SELECTION_CHANGED_REMOVE,newValue))
+    if (NotifyChildEvent(UnoMSAAEvent::SELECTION_CHANGED_REMOVE, newValue))
     {
         return ;
     }
-    pAgent->NotifyAccEvent(UM_EVENT_SELECTION_CHANGED_REMOVE, m_xAccessible.get());
+    pAgent->NotifyAccEvent(UnoMSAAEvent::SELECTION_CHANGED_REMOVE, m_xAccessible.get());
 }
 
 void AccDescendantManagerEventListener::HandleSelectionChangedWithinEvent(const Any& /*oldValue*/, const Any &newValue)
 {
-    if(NotifyChildEvent(UM_EVENT_SELECTION_CHANGED_WITHIN,newValue))
+    if (NotifyChildEvent(UnoMSAAEvent::SELECTION_CHANGED_WITHIN, newValue))
     {
         return ;
     }
-    pAgent->NotifyAccEvent(UM_EVENT_SELECTION_CHANGED_WITHIN, m_xAccessible.get());
+    pAgent->NotifyAccEvent(UnoMSAAEvent::SELECTION_CHANGED_WITHIN, m_xAccessible.get());
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/winaccessibility/source/service/AccDialogEventListener.cxx b/winaccessibility/source/service/AccDialogEventListener.cxx
index 1b9ce3cb7b5a..865a039a7926 100644
--- a/winaccessibility/source/service/AccDialogEventListener.cxx
+++ b/winaccessibility/source/service/AccDialogEventListener.cxx
@@ -82,7 +82,7 @@ void AccDialogEventListener::HandleChildChangedEvent(Any oldValue, Any newValue)
             pAgent->InsertAccObj(pAcc, m_xAccessible.get());
             //add all oldValue's existing children
             pAgent->InsertChildrenAccObj(pAcc);
-            pAgent->NotifyAccEvent(UM_EVENT_CHILD_ADDED, pAcc);
+            pAgent->NotifyAccEvent(UnoMSAAEvent::CHILD_ADDED, pAcc);
         }
     }
     else if (oldValue >>= xChild)
@@ -91,7 +91,7 @@ void AccDialogEventListener::HandleChildChangedEvent(Any oldValue, Any newValue)
         if(xChild.is())
         {
             XAccessible* pAcc = xChild.get();
-            pAgent->NotifyAccEvent(UM_EVENT_CHILD_REMOVED, pAcc);
+            pAgent->NotifyAccEvent(UnoMSAAEvent::CHILD_REMOVED, pAcc);
             //delete all oldValue's existing children
             pAgent->DeleteChildrenAccObj( pAcc );
             //delete this child
diff --git a/winaccessibility/source/service/AccEventListener.cxx b/winaccessibility/source/service/AccEventListener.cxx
index 6736edf382f4..fd8636099033 100644
--- a/winaccessibility/source/service/AccEventListener.cxx
+++ b/winaccessibility/source/service/AccEventListener.cxx
@@ -85,12 +85,12 @@ void AccEventListener::HandleNameChangedEvent(Any name)
         if (pAccDoc)
         {
             pAgent->UpdateAccName(pAccDoc);
-            pAgent->NotifyAccEvent(UM_EVENT_OBJECT_NAMECHANGE, pAccDoc);
+            pAgent->NotifyAccEvent(UnoMSAAEvent::OBJECT_NAMECHANGE, pAccDoc);
         }
     }
 
     pAgent->UpdateAccName(m_xAccessible.get(), name);
-    pAgent->NotifyAccEvent(UM_EVENT_OBJECT_NAMECHANGE, m_xAccessible.get());
+    pAgent->NotifyAccEvent(UnoMSAAEvent::OBJECT_NAMECHANGE, m_xAccessible.get());
 }
 
 /**
@@ -98,7 +98,7 @@ void AccEventListener::HandleNameChangedEvent(Any name)
  */
 void AccEventListener::HandleDescriptionChangedEvent()
 {
-    pAgent->NotifyAccEvent(UM_EVENT_OBJECT_DESCRIPTIONCHANGE, m_xAccessible.get());
+    pAgent->NotifyAccEvent(UnoMSAAEvent::OBJECT_DESCRIPTIONCHANGE, m_xAccessible.get());
 }
 
 /**
@@ -107,7 +107,7 @@ void AccEventListener::HandleDescriptionChangedEvent()
 void AccEventListener::HandleBoundrectChangedEvent()
 {
     AccObjectManagerAgent::UpdateLocation(m_xAccessible.get());
-    pAgent->NotifyAccEvent(UM_EVENT_BOUNDRECT_CHANGED, m_xAccessible.get());
+    pAgent->NotifyAccEvent(UnoMSAAEvent::BOUNDRECT_CHANGED, m_xAccessible.get());
 }
 
 /**
@@ -116,7 +116,7 @@ void AccEventListener::HandleBoundrectChangedEvent()
 void AccEventListener::HandleVisibleDataChangedEvent()
 {
     pAgent->UpdateValue(m_xAccessible.get());
-    pAgent->NotifyAccEvent(UM_EVENT_VISIBLE_DATA_CHANGED, m_xAccessible.get());
+    pAgent->NotifyAccEvent(UnoMSAAEvent::VISIBLE_DATA_CHANGED, m_xAccessible.get());
 }
 
 /**
@@ -164,7 +164,7 @@ void AccEventListener::FireStateFocusedChange(bool enable)
     if (enable)
     {
         pAgent->IncreaseState(m_xAccessible.get(), AccessibleStateType::FOCUSED);
-        pAgent->NotifyAccEvent(UM_EVENT_STATE_FOCUSED, m_xAccessible.get());
+        pAgent->NotifyAccEvent(UnoMSAAEvent::STATE_FOCUSED, m_xAccessible.get());
     }
     else
     {
diff --git a/winaccessibility/source/service/AccFrameEventListener.cxx b/winaccessibility/source/service/AccFrameEventListener.cxx
index 4ddaf3d8789b..bae97a1cab6a 100644
--- a/winaccessibility/source/service/AccFrameEventListener.cxx
+++ b/winaccessibility/source/service/AccFrameEventListener.cxx
@@ -94,7 +94,7 @@ void AccFrameEventListener::HandleChildChangedEvent(Any oldValue, Any newValue)
             pAgent->InsertAccObj(pAcc, m_xAccessible.get(), systemdata->hWnd);
             //add all oldValue's existing children
             pAgent->InsertChildrenAccObj(pAcc);
-            pAgent->NotifyAccEvent(UM_EVENT_CHILD_ADDED, pAcc);
+            pAgent->NotifyAccEvent(UnoMSAAEvent::CHILD_ADDED, pAcc);
         }
     }
     else if (oldValue >>= xChild)
@@ -103,7 +103,7 @@ void AccFrameEventListener::HandleChildChangedEvent(Any oldValue, Any newValue)
         if(xChild.is())
         {
             XAccessible* pAcc = xChild.get();
-            pAgent->NotifyAccEvent(UM_EVENT_CHILD_REMOVED, pAcc);
+            pAgent->NotifyAccEvent(UnoMSAAEvent::CHILD_REMOVED, pAcc);
             //delete all oldValue's existing children
             pAgent->DeleteChildrenAccObj( pAcc );
             //delete this child
diff --git a/winaccessibility/source/service/AccListEventListener.cxx b/winaccessibility/source/service/AccListEventListener.cxx
index 9852fe810538..b4ecb9f77862 100644
--- a/winaccessibility/source/service/AccListEventListener.cxx
+++ b/winaccessibility/source/service/AccListEventListener.cxx
@@ -92,7 +92,7 @@ void AccListEventListener::HandleActiveDescendantChangedEvent(Any oldValue, Any
 
             pAgent->IncreaseState( pAcc, AccessibleStateType::FOCUSED);
 
-            pAgent->NotifyAccEvent(UM_EVENT_ACTIVE_DESCENDANT_CHANGED, pAcc);
+            pAgent->NotifyAccEvent(UnoMSAAEvent::ACTIVE_DESCENDANT_CHANGED, pAcc);
         }
     }
     if (oldValue >>= xChild)
@@ -119,7 +119,7 @@ void AccListEventListener::HandleValueChangedEvent(Any, Any)
         XAccessible* pParentAcc =
             pAgent->GetParentXAccessible(m_xAccessible.get());
         pAgent->UpdateValue(pParentAcc);
-        pAgent->NotifyAccEvent(UM_EVENT_OBJECT_VALUECHANGE, pParentAcc);
+        pAgent->NotifyAccEvent(UnoMSAAEvent::OBJECT_VALUECHANGE, pParentAcc);
     }
 }
 
diff --git a/winaccessibility/source/service/AccMenuEventListener.cxx b/winaccessibility/source/service/AccMenuEventListener.cxx
index 623997177e9f..05d78b9b0a4f 100644
--- a/winaccessibility/source/service/AccMenuEventListener.cxx
+++ b/winaccessibility/source/service/AccMenuEventListener.cxx
@@ -81,7 +81,7 @@ void AccMenuEventListener::HandleChildChangedEvent(Any oldValue, Any newValue)
             pAgent->InsertAccObj(pAcc, m_xAccessible.get());
             //add all oldValue's existing children
             pAgent->InsertChildrenAccObj(pAcc);
-            pAgent->NotifyAccEvent(UM_EVENT_CHILD_ADDED, pAcc);
+            pAgent->NotifyAccEvent(UnoMSAAEvent::CHILD_ADDED, pAcc);
         }
     }
     else if (oldValue >>= xChild)
@@ -90,7 +90,7 @@ void AccMenuEventListener::HandleChildChangedEvent(Any oldValue, Any newValue)
         if(xChild.is())
         {
             XAccessible* pAcc = xChild.get();
-            pAgent->NotifyAccEvent(UM_EVENT_CHILD_REMOVED, pAcc);
+            pAgent->NotifyAccEvent(UnoMSAAEvent::CHILD_REMOVED, pAcc);
             //delete all oldValue's existing children
             pAgent->DeleteChildrenAccObj( pAcc );
             //delete this child
@@ -105,7 +105,7 @@ void AccMenuEventListener::HandleChildChangedEvent(Any oldValue, Any newValue)
  */
 void AccMenuEventListener::HandleSelectionChangedEventNoArgs()
 {
-    pAgent->NotifyAccEvent(UM_EVENT_SELECTION_CHANGED, m_xAccessible.get());
+    pAgent->NotifyAccEvent(UnoMSAAEvent::SELECTION_CHANGED, m_xAccessible.get());
 }
 
 /**
diff --git a/winaccessibility/source/service/AccObjectManagerAgent.cxx b/winaccessibility/source/service/AccObjectManagerAgent.cxx