convert VCLEVENT constants to scoped enum

Change-Id: Ic8ccb0a9715ec05182dacddab2c015b0de6a0fba
Reviewed-on: https://gerrit.libreoffice.org/31675
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

23 files changed, 172 insertions, 169 deletions

diff --git a/accessibility/inc/extended/listboxaccessible.hxx b/accessibility/inc/extended/listboxaccessible.hxx
index e93fa0225ad1..013644a5e064 100644
--- a/accessibility/inc/extended/listboxaccessible.hxx
+++ b/accessibility/inc/extended/listboxaccessible.hxx
@@ -53,7 +53,7 @@ namespace accessibility
     protected:
         virtual ~ListBoxAccessibleBase( );
 
-        /** will be called when our window broadcasts the VCLEVENT_OBJECT_DYING event
+        /** will be called when our window broadcasts the VclEventId::ObjectDying event
 
             <p>Usually, you derive your class from both ListBoxAccessibleBase and XComponent,
             and call XComponent::dispose here.</p>
diff --git a/accessibility/source/extended/accessibleiconchoicectrl.cxx b/accessibility/source/extended/accessibleiconchoicectrl.cxx
index 194e52a870c0..21c4a4a7889d 100644
--- a/accessibility/source/extended/accessibleiconchoicectrl.cxx
+++ b/accessibility/source/extended/accessibleiconchoicectrl.cxx
@@ -63,7 +63,7 @@ namespace accessibility
         {
             switch ( rVclWindowEvent.GetId() )
             {
-                case VCLEVENT_LISTBOX_SELECT :
+                case VclEventId::ListboxSelect :
                 {
                     // First send an event that tells the listeners of a
                     // modified selection.  The active descendant event is
@@ -88,7 +88,7 @@ namespace accessibility
                     }
                     break;
                 }
-                case VCLEVENT_WINDOW_GETFOCUS :
+                case VclEventId::WindowGetFocus :
                 {
                     VclPtr<SvtIconChoiceCtrl> pCtrl = getCtrl();
                     if ( pCtrl && pCtrl->HasFocus() )
diff --git a/accessibility/source/extended/accessiblelistbox.cxx b/accessibility/source/extended/accessiblelistbox.cxx
index 367e92a689c2..2cb64e3814bb 100644
--- a/accessibility/source/extended/accessiblelistbox.cxx
+++ b/accessibility/source/extended/accessiblelistbox.cxx
@@ -73,7 +73,7 @@ namespace accessibility
         {
             switch ( rVclWindowEvent.GetId() )
             {
-            case  VCLEVENT_CHECKBOX_TOGGLE :
+            case  VclEventId::CheckboxToggle :
                 {
                     if ( !getListBox() || !getListBox()->HasFocus() )
                     {
@@ -98,13 +98,13 @@ namespace accessibility
                     break;
                 }
 
-            case VCLEVENT_LISTBOX_SELECT :
+            case VclEventId::ListboxSelect :
                 {
-                    OSL_FAIL("Debug: Treelist shouldn't use VCLEVENT_LISTBOX_SELECT");
+                    OSL_FAIL("Debug: Treelist shouldn't use VclEventId::ListboxSelect");
                     break;
                 }
 
-            case VCLEVENT_LISTBOX_TREESELECT:
+            case VclEventId::ListboxTreeSelect:
                 {
                     if ( getListBox() && getListBox()->HasFocus() )
                     {
@@ -116,7 +116,7 @@ namespace accessibility
                     }
                 }
                 break;
-            case VCLEVENT_LISTBOX_TREEFOCUS:
+            case VclEventId::ListboxTreeFocus:
                 {
                     VclPtr<SvTreeListBox> pBox = getListBox();
                     bool bNeedFocus = false;
@@ -176,7 +176,7 @@ namespace accessibility
                     }
                 }
                 break;
-            case VCLEVENT_LISTBOX_ITEMREMOVED:
+            case VclEventId::ListboxItemRemoved:
                 {
                     SvTreeListEntry* pEntry = static_cast< SvTreeListEntry* >( rVclWindowEvent.GetData() );
                     if ( pEntry )
@@ -200,8 +200,8 @@ namespace accessibility
                 break;
 
                 // #i92103#
-            case VCLEVENT_ITEM_EXPANDED :
-            case VCLEVENT_ITEM_COLLAPSED :
+            case VclEventId::ItemExpanded :
+            case VclEventId::ItemCollapsed :
                 {
                     SvTreeListEntry* pEntry = static_cast< SvTreeListEntry* >( rVclWindowEvent.GetData() );
                     if ( pEntry )
@@ -210,7 +210,7 @@ namespace accessibility
                             new AccessibleListBoxEntry( *getListBox(), pEntry, this );
                         Reference< XAccessible > xChild = pAccListBoxEntry;
                         const short nAccEvent =
-                                ( rVclWindowEvent.GetId() == VCLEVENT_ITEM_EXPANDED )
+                                ( rVclWindowEvent.GetId() == VclEventId::ItemExpanded )
                                 ? AccessibleEventId::LISTBOX_ENTRY_EXPANDED
                                 : AccessibleEventId::LISTBOX_ENTRY_COLLAPSED;
                         uno::Any aListBoxEntry;
@@ -290,8 +290,8 @@ namespace accessibility
     {
         switch ( rVclWindowEvent.GetId() )
         {
-            case VCLEVENT_WINDOW_SHOW:
-            case VCLEVENT_WINDOW_HIDE:
+            case VclEventId::WindowShow:
+            case VclEventId::WindowHide:
             {
             }
             break;
diff --git a/accessibility/source/extended/accessibletabbar.cxx b/accessibility/source/extended/accessibletabbar.cxx
index 26ac2e7a7c14..431dbd05f786 100644
--- a/accessibility/source/extended/accessibletabbar.cxx
+++ b/accessibility/source/extended/accessibletabbar.cxx
@@ -67,7 +67,7 @@ namespace accessibility
 
         switch ( rVclWindowEvent.GetId() )
         {
-            case VCLEVENT_WINDOW_ENABLED:
+            case VclEventId::WindowEnabled:
             {
                 aNewValue <<= AccessibleStateType::SENSITIVE;
                 NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue );
@@ -75,7 +75,7 @@ namespace accessibility
                 NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue );
             }
             break;
-            case VCLEVENT_WINDOW_DISABLED:
+            case VclEventId::WindowDisabled:
             {
                 aOldValue <<= AccessibleStateType::ENABLED;
                 NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue );
@@ -83,25 +83,25 @@ namespace accessibility
                 NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue );
             }
             break;
-            case VCLEVENT_WINDOW_GETFOCUS:
+            case VclEventId::WindowGetFocus:
             {
                 aNewValue <<= AccessibleStateType::FOCUSED;
                 NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue );
             }
             break;
-            case VCLEVENT_WINDOW_LOSEFOCUS:
+            case VclEventId::WindowLoseFocus:
             {
                 aOldValue <<= AccessibleStateType::FOCUSED;
                 NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue );
             }
             break;
-            case VCLEVENT_WINDOW_SHOW:
+            case VclEventId::WindowShow:
             {
                 aNewValue <<= AccessibleStateType::SHOWING;
                 NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue );
             }
             break;
-            case VCLEVENT_WINDOW_HIDE:
+            case VclEventId::WindowHide:
             {
                 aOldValue <<= AccessibleStateType::SHOWING;
                 NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue );
diff --git a/accessibility/source/extended/accessibletabbarbase.cxx b/accessibility/source/extended/accessibletabbarbase.cxx
index f75d4572a789..2e3a0a974a91 100644
--- a/accessibility/source/extended/accessibletabbarbase.cxx
+++ b/accessibility/source/extended/accessibletabbarbase.cxx
@@ -48,20 +48,20 @@ IMPL_LINK( AccessibleTabBarBase, WindowEventListener, VclWindowEvent&, rEvent, v
     vcl::Window* pEventWindow = rEvent.GetWindow();
     OSL_ENSURE( pEventWindow, "AccessibleTabBarBase::WindowEventListener: no window!" );
 
-    if( ( rEvent.GetId() == VCLEVENT_TABBAR_PAGEREMOVED ) &&
+    if( ( rEvent.GetId() == VclEventId::TabbarPageRemoved ) &&
         ( (sal_uInt16)reinterpret_cast<sal_IntPtr>(rEvent.GetData()) == TabBar::PAGE_NOT_FOUND ) &&
         ( dynamic_cast< AccessibleTabBarPageList *> (this) != nullptr ) )
     {
         return;
     }
 
-    if ( !pEventWindow->IsAccessibilityEventsSuppressed() || (rEvent.GetId() == VCLEVENT_OBJECT_DYING) )
+    if ( !pEventWindow->IsAccessibilityEventsSuppressed() || (rEvent.GetId() == VclEventId::ObjectDying) )
         ProcessWindowEvent( rEvent );
 }
 
 void AccessibleTabBarBase::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
 {
-    if( rVclWindowEvent.GetId() == VCLEVENT_OBJECT_DYING )
+    if( rVclWindowEvent.GetId() == VclEventId::ObjectDying )
         ClearTabBarPointer();
 }
 
diff --git a/accessibility/source/extended/accessibletabbarpagelist.cxx b/accessibility/source/extended/accessibletabbarpagelist.cxx
index 9e80a3f7af9f..05848a598b66 100644
--- a/accessibility/source/extended/accessibletabbarpagelist.cxx
+++ b/accessibility/source/extended/accessibletabbarpagelist.cxx
@@ -178,7 +178,7 @@ namespace accessibility
     {
          switch ( rVclWindowEvent.GetId() )
          {
-            case VCLEVENT_WINDOW_ENABLED:
+            case VclEventId::WindowEnabled:
             {
                Any aNewValue;
                 aNewValue <<= AccessibleStateType::SENSITIVE;
@@ -187,7 +187,7 @@ namespace accessibility
                 NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, Any(), aNewValue );
             }
             break;
-            case VCLEVENT_WINDOW_DISABLED:
+            case VclEventId::WindowDisabled:
             {
                Any aOldValue;
                 aOldValue <<= AccessibleStateType::ENABLED;
@@ -196,7 +196,7 @@ namespace accessibility
                 NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, Any() );
             }
             break;
-            case VCLEVENT_WINDOW_SHOW:
+            case VclEventId::WindowShow:
             {
                 Any aOldValue, aNewValue;
                 aNewValue <<= AccessibleStateType::SHOWING;
@@ -204,7 +204,7 @@ namespace accessibility
                 UpdateShowing( true );
             }
             break;
-            case VCLEVENT_WINDOW_HIDE:
+            case VclEventId::WindowHide:
             {
                 Any aOldValue, aNewValue;
                 aOldValue <<= AccessibleStateType::SHOWING;
@@ -212,12 +212,12 @@ namespace accessibility
                 UpdateShowing( false );
             }
             break;
-            case VCLEVENT_TABBAR_PAGESELECTED:
+            case VclEventId::TabbarPageSelected:
             {
                 // do nothing
             }
             break;
-            case VCLEVENT_TABBAR_PAGEACTIVATED:
+            case VclEventId::TabbarPageActivated:
             {
                 if ( m_pTabBar )
                 {
@@ -227,7 +227,7 @@ namespace accessibility
                 }
             }
             break;
-            case VCLEVENT_TABBAR_PAGEDEACTIVATED:
+            case VclEventId::TabbarPageDeactivated:
             {
                 if ( m_pTabBar )
                 {
@@ -237,7 +237,7 @@ namespace accessibility
                 }
             }
             break;
-            case VCLEVENT_TABBAR_PAGEINSERTED:
+            case VclEventId::TabbarPageInserted:
             {
                 if ( m_pTabBar )
                 {
@@ -247,7 +247,7 @@ namespace accessibility
                 }
             }
             break;
-            case VCLEVENT_TABBAR_PAGEREMOVED:
+            case VclEventId::TabbarPageRemoved:
             {
                 if ( m_pTabBar )
                 {
@@ -277,14 +277,14 @@ namespace accessibility
                 }
             }
             break;
-            case VCLEVENT_TABBAR_PAGEMOVED:
+            case VclEventId::TabbarPageMoved:
             {
                 Pair* pPair = static_cast<Pair*>(rVclWindowEvent.GetData());
                 if ( pPair )
                     MoveChild( pPair->A(), pPair->B() );
             }
             break;
-            case VCLEVENT_TABBAR_PAGETEXTCHANGED:
+            case VclEventId::TabbarPageTextChanged:
             {
                 sal_uInt16 nPageId = (sal_uInt16)reinterpret_cast<sal_IntPtr>(rVclWindowEvent.GetData());
                 sal_uInt16 nPagePos = m_pTabBar->GetPagePos( nPageId );
diff --git a/accessibility/source/extended/accessibletablistboxtable.cxx b/accessibility/source/extended/accessibletablistboxtable.cxx
index 529892445008..6b73a4a09b47 100644
--- a/accessibility/source/extended/accessibletablistboxtable.cxx
+++ b/accessibility/source/extended/accessibletablistboxtable.cxx
@@ -65,21 +65,21 @@ namespace accessibility
     {
         if ( isAlive() )
         {
-            sal_uLong nEventId = rVclWindowEvent.GetId();
+            VclEventId nEventId = rVclWindowEvent.GetId();
             switch ( nEventId )
             {
-                case  VCLEVENT_OBJECT_DYING :
+                case  VclEventId::ObjectDying :
                 {
                     m_pTabListBox->RemoveEventListener( LINK( this, AccessibleTabListBoxTable, WindowEventListener ) );
                     m_pTabListBox = nullptr;
                     break;
                 }
 
-                case VCLEVENT_CONTROL_GETFOCUS :
-                case VCLEVENT_CONTROL_LOSEFOCUS :
+                case VclEventId::ControlGetFocus :
+                case VclEventId::ControlLoseFocus :
                 {
                     uno::Any aOldValue, aNewValue;
-                    if ( VCLEVENT_CONTROL_GETFOCUS == nEventId )
+                    if ( VclEventId::ControlGetFocus == nEventId )
                         aNewValue <<= AccessibleStateType::FOCUSED;
                     else
                         aOldValue <<= AccessibleStateType::FOCUSED;
@@ -87,7 +87,7 @@ namespace accessibility
                     break;
                 }
 
-                case VCLEVENT_LISTBOX_SELECT :
+                case VclEventId::ListboxSelect :
                 {
                     // First send an event that tells the listeners of a
                     // modified selection.  The active descendant event is
@@ -131,7 +131,7 @@ namespace accessibility
                     }
                     break;
                 }
-                case VCLEVENT_WINDOW_GETFOCUS :
+                case VclEventId::WindowGetFocus :
                 {
                     uno::Any aOldValue, aNewValue;
                     aNewValue <<= AccessibleStateType::FOCUSED;
@@ -139,14 +139,14 @@ namespace accessibility
                     break;
 
                 }
-                case VCLEVENT_WINDOW_LOSEFOCUS :
+                case VclEventId::WindowLoseFocus :
                 {
                     uno::Any aOldValue, aNewValue;
                     aOldValue <<= AccessibleStateType::FOCUSED;
                     commitEvent( AccessibleEventId::STATE_CHANGED, aNewValue, aOldValue );
                     break;
                 }
-                case VCLEVENT_LISTBOX_TREESELECT:
+                case VclEventId::ListboxTreeSelect:
                     {
                         SvTreeListEntry* pEntry = static_cast< SvTreeListEntry* >( rVclWindowEvent.GetData() );
                         if (pEntry)
@@ -167,7 +167,7 @@ namespace accessibility
                         }
                     }
                     break;
-                case VCLEVENT_LISTBOX_TREEFOCUS:
+                case VclEventId::ListboxTreeFocus:
                     {
                         if ( m_pTabListBox && m_pTabListBox->HasFocus() )
                         {
@@ -189,7 +189,7 @@ namespace accessibility
                     }
                     break;
 
-                case VCLEVENT_CHECKBOX_TOGGLE :
+                case VclEventId::CheckboxToggle :
                 {
                     if ( m_pTabListBox && m_pTabListBox->HasFocus() )
                     {
@@ -212,7 +212,7 @@ namespace accessibility
                     break;
                 }
 
-                case VCLEVENT_TABLECELL_NAMECHANGED :
+                case VclEventId::TableCellNameChanged :
                 {
                     if ( m_pTabListBox->IsTransientChildrenDisabled() )
                     {
@@ -247,6 +247,7 @@ namespace accessibility
                     }
                     break;
                 }
+                default: break;
             }
         }
     }
diff --git a/accessibility/source/extended/listboxaccessible.cxx b/accessibility/source/extended/listboxaccessible.cxx
index 63cb02db16f7..781412078835 100644
--- a/accessibility/source/extended/listboxaccessible.cxx
+++ b/accessibility/source/extended/listboxaccessible.cxx
@@ -50,7 +50,7 @@ namespace accessibility
         {
             switch ( rEvent.GetId() )
             {
-                case  VCLEVENT_OBJECT_DYING :
+                case  VclEventId::ObjectDying :
                 {
                     if ( m_pWindow )
                         m_pWindow->RemoveEventListener( LINK( this, ListBoxAccessibleBase, WindowEventListener ) );
@@ -58,6 +58,7 @@ namespace accessibility
                     dispose();
                     break;
                 }
+                default: break;
             }
         }
     }
diff --git a/accessibility/source/extended/textwindowaccessibility.cxx b/accessibility/source/extended/textwindowaccessibility.cxx
index 07a67088aa73..6964ea409d65 100644
--- a/accessibility/source/extended/textwindowaccessibility.cxx
+++ b/accessibility/source/extended/textwindowaccessibility.cxx
@@ -1629,7 +1629,7 @@ IMPL_LINK(Document, WindowEventHandler, ::VclWindowEvent&, rEvent, void)
 {
     switch (rEvent.GetId())
     {
-    case VCLEVENT_WINDOW_RESIZE:
+    case VclEventId::WindowResize:
         {
             ::osl::MutexGuard aInternalGuard(GetMutex());
             if (!isAlive())
@@ -1652,7 +1652,7 @@ IMPL_LINK(Document, WindowEventHandler, ::VclWindowEvent&, rEvent, void)
             }
             break;
         }
-    case VCLEVENT_WINDOW_GETFOCUS:
+    case VclEventId::WindowGetFocus:
         {
             ::osl::MutexGuard aInternalGuard(GetMutex());
             if (!isAlive())
@@ -1689,7 +1689,7 @@ IMPL_LINK(Document, WindowEventHandler, ::VclWindowEvent&, rEvent, void)
             */
             break;
         }
-    case VCLEVENT_WINDOW_LOSEFOCUS:
+    case VclEventId::WindowLoseFocus:
         {
             ::osl::MutexGuard aInternalGuard(GetMutex());
             if (!isAlive())
@@ -1728,6 +1728,7 @@ IMPL_LINK(Document, WindowEventHandler, ::VclWindowEvent&, rEvent, void)
             */
             break;
         }
+    default: break;
     }
 }
 
diff --git a/accessibility/source/standard/accessiblemenubasecomponent.cxx b/accessibility/source/standard/accessiblemenubasecomponent.cxx
index 957e82490558..0d8fb8d8b03a 100644
--- a/accessibility/source/standard/accessiblemenubasecomponent.cxx
+++ b/accessibility/source/standard/accessiblemenubasecomponent.cxx
@@ -542,82 +542,82 @@ void OAccessibleMenuBaseComponent::ProcessMenuEvent( const VclMenuEvent& rVclMen
 
     switch ( rVclMenuEvent.GetId() )
     {
-        case VCLEVENT_MENU_SHOW:
-        case VCLEVENT_MENU_HIDE:
+        case VclEventId::MenuShow:
+        case VclEventId::MenuHide:
         {
             UpdateVisible();
         }
         break;
-        case VCLEVENT_MENU_HIGHLIGHT:
+        case VclEventId::MenuHighlight:
         {
             SetFocused( false );
             UpdateFocused( nItemPos, true );
             UpdateSelected( nItemPos, true );
         }
         break;
-        case VCLEVENT_MENU_DEHIGHLIGHT:
+        case VclEventId::MenuDehighlight:
         {
             UpdateFocused( nItemPos, false );
             UpdateSelected( nItemPos, false );
         }
         break;
-        case VCLEVENT_MENU_SUBMENUACTIVATE:
+        case VclEventId::MenuSubmenuActivate:
         {
         }
         break;
-        case VCLEVENT_MENU_SUBMENUDEACTIVATE:
+        case VclEventId::MenuSubmenuDeactivate:
         {
             UpdateFocused( nItemPos, true );
         }
         break;
-        case VCLEVENT_MENU_ENABLE:
+        case VclEventId::MenuEnable:
         {
             UpdateEnabled( nItemPos, true );
         }
         break;
-        case VCLEVENT_MENU_DISABLE:
+        case VclEventId::MenuDisable:
         {
             UpdateEnabled( nItemPos, false );
         }
         break;
-        case VCLEVENT_MENU_SUBMENUCHANGED:
+        case VclEventId::MenuSubmenuChanged:
         {
             RemoveChild( nItemPos );
             InsertChild( nItemPos );
         }
         break;
-        case VCLEVENT_MENU_INSERTITEM:
+        case VclEventId::MenuInsertItem:
         {
             InsertChild( nItemPos );
         }
         break;
-        case VCLEVENT_MENU_REMOVEITEM:
+        case VclEventId::MenuRemoveItem:
         {
             RemoveChild( nItemPos );
         }
         break;
-        case VCLEVENT_MENU_ACCESSIBLENAMECHANGED:
+        case VclEventId::MenuAccessibleNameChanged:
         {
             UpdateAccessibleName( nItemPos );
         }
         break;
-        case VCLEVENT_MENU_ITEMTEXTCHANGED:
+        case VclEventId::MenuItemTextChanged:
         {
             UpdateAccessibleName( nItemPos );
             UpdateItemText( nItemPos );
         }
         break;
-        case VCLEVENT_MENU_ITEMCHECKED:
+        case VclEventId::MenuItemChecked:
         {
             UpdateChecked( nItemPos, true );
         }
         break;
-        case VCLEVENT_MENU_ITEMUNCHECKED:
+        case VclEventId::MenuItemUnchecked:
         {
             UpdateChecked( nItemPos, false );
         }
         break;
-        case VCLEVENT_OBJECT_DYING:
+        case VclEventId::ObjectDying:
         {
             if ( m_pMenu )
             {
diff --git a/accessibility/source/standard/vclxaccessiblebox.cxx b/accessibility/source/standard/vclxaccessiblebox.cxx
index 4a28c71152c8..2c043439a6d9 100644
--- a/accessibility/source/standard/vclxaccessiblebox.cxx
+++ b/accessibility/source/standard/vclxaccessiblebox.cxx
@@ -66,8 +66,8 @@ void VCLXAccessibleBox::ProcessWindowChildEvent( const VclWindowEvent& rVclWindo
 
     switch ( rVclWindowEvent.GetId() )
     {
-        case VCLEVENT_WINDOW_SHOW:
-        case VCLEVENT_WINDOW_HIDE:
+        case VclEventId::WindowShow:
+        case VclEventId::WindowHide:
         {
             vcl::Window* pChildWindow = static_cast<vcl::Window *>(rVclWindowEvent.GetData());
             // Just compare to the combo box text field.  All other children
@@ -79,7 +79,7 @@ void VCLXAccessibleBox::ProcessWindowChildEvent( const VclWindowEvent& rVclWindo
                 if ( ( pComboBox != nullptr ) && ( pChildWindow != nullptr ) )
                     if (pChildWindow == pComboBox->GetSubEdit())
                     {
-                        if (rVclWindowEvent.GetId() == VCLEVENT_WINDOW_SHOW)
+                        if (rVclWindowEvent.GetId() == VclEventId::WindowShow)
                         {
                             // Instantiate text field.
                             getAccessibleChild (0);
@@ -110,9 +110,9 @@ void VCLXAccessibleBox::ProcessWindowEvent (const VclWindowEvent& rVclWindowEven
 {
     switch ( rVclWindowEvent.GetId() )
     {
-        case VCLEVENT_DROPDOWN_SELECT:
-        case VCLEVENT_LISTBOX_SELECT:
-        case VCLEVENT_LISTBOX_FOCUSITEMCHANGED:
+        case VclEventId::DropdownSelect:
+        case VclEventId::ListboxSelect:
+        case VclEventId::ListboxFocusItemChanged:
         {
             // Forward the call to the list child.
             VCLXAccessibleList* pList = static_cast<VCLXAccessibleList*>(m_xList.get());
@@ -133,7 +133,7 @@ void VCLXAccessibleBox::ProcessWindowEvent (const VclWindowEvent& rVclWindowEven
             }
             break;
         }
-        case VCLEVENT_DROPDOWN_OPEN:
+        case VclEventId::DropdownOpen:
         {
             VCLXAccessibleList* pList = static_cast<VCLXAccessibleList*>(m_xList.get());
             if ( pList == nullptr )
@@ -148,7 +148,7 @@ void VCLXAccessibleBox::ProcessWindowEvent (const VclWindowEvent& rVclWindowEven
             }
             break;
         }
-        case VCLEVENT_DROPDOWN_CLOSE:
+        case VclEventId::DropdownClose:
         {
             VCLXAccessibleList* pList = static_cast<VCLXAccessibleList*>(m_xList.get());
             if ( pList == nullptr )
@@ -169,7 +169,7 @@ void VCLXAccessibleBox::ProcessWindowEvent (const VclWindowEvent& rVclWindowEven
             }
             break;
         }
-        case VCLEVENT_COMBOBOX_SELECT:
+        case VclEventId::ComboboxSelect:
         {
             VCLXAccessibleList* pList = static_cast<VCLXAccessibleList*>(m_xList.get());
             if (pList != nullptr && m_xText.is())
@@ -189,16 +189,16 @@ void VCLXAccessibleBox::ProcessWindowEvent (const VclWindowEvent& rVclWindowEven
             }
             break;
         }
-        //case VCLEVENT_DROPDOWN_OPEN:
-        //case VCLEVENT_DROPDOWN_CLOSE:
-        case VCLEVENT_LISTBOX_DOUBLECLICK:
-        case VCLEVENT_LISTBOX_SCROLLED:
-        //case VCLEVENT_LISTBOX_SELECT:
-        case VCLEVENT_LISTBOX_ITEMADDED:
-        case VCLEVENT_LISTBOX_ITEMREMOVED:
-        case VCLEVENT_COMBOBOX_ITEMADDED:
-        case VCLEVENT_COMBOBOX_ITEMREMOVED:
-        case VCLEVENT_COMBOBOX_SCROLLED:
+        //case VclEventId::DropdownOpen:
+        //case VclEventId::DropdownClose:
+        case VclEventId::ListboxDoubleClick:
+        case VclEventId::ListboxScrolled:
+        //case VclEventId::ListboxSelect:
+        case VclEventId::ListboxItemAdded:
+        case VclEventId::ListboxItemRemoved:
+        case VclEventId::ComboboxItemAdded:
+        case VclEventId::ComboboxItemRemoved:
+        case VclEventId::ComboboxScrolled:
         {
             // Forward the call to the list child.
             VCLXAccessibleList* pList = static_cast<VCLXAccessibleList*>(m_xList.get());
@@ -212,8 +212,8 @@ void VCLXAccessibleBox::ProcessWindowEvent (const VclWindowEvent& rVclWindowEven
             break;
         }
 
-        //case VCLEVENT_COMBOBOX_SELECT:
-        case VCLEVENT_COMBOBOX_DESELECT:
+        //case VclEventId::ComboboxSelect:
+        case VclEventId::ComboboxDeselect:
         {
             // Selection is handled by VCLXAccessibleList which operates on
             // the same VCL object as this box does.  In case of the
@@ -234,9 +234,9 @@ void VCLXAccessibleBox::ProcessWindowEvent (const VclWindowEvent& rVclWindowEven
             break;
         }
 
-        case VCLEVENT_EDIT_MODIFY:
-        case VCLEVENT_EDIT_SELECTIONCHANGED:
-        case VCLEVENT_EDIT_CARETCHANGED:
+        case VclEventId::EditModify:
+        case VclEventId::EditSelectionChanged:
+        case VclEventId::EditCaretChanged:
             // Modify/Selection events are handled by the combo box instead of
             // directly by the edit field (Why?).  Therefore, delegate this
             // call to the edit field.
diff --git a/accessibility/source/standard/vclxaccessiblebutton.cxx b/accessibility/source/standard/vclxaccessiblebutton.cxx
index b7feea96c46a..cd12ca8c8796 100644
--- a/accessibility/source/standard/vclxaccessiblebutton.cxx
+++ b/accessibility/source/standard/vclxaccessiblebutton.cxx
@@ -57,7 +57,7 @@ void VCLXAccessibleButton::ProcessWindowEvent( const VclWindowEvent& rVclWindowE
 {
     switch ( rVclWindowEvent.GetId() )
     {
-        case VCLEVENT_PUSHBUTTON_TOGGLE:
+        case VclEventId::PushbuttonToggle:
         {
             Any aOldValue;
             Any aNewValue;
diff --git a/accessibility/source/standard/vclxaccessiblecheckbox.cxx b/accessibility/source/standard/vclxaccessiblecheckbox.cxx
index 9221c10dfa09..8c71bb48ec59 100644
--- a/accessibility/source/standard/vclxaccessiblecheckbox.cxx
+++ b/accessibility/source/standard/vclxaccessiblecheckbox.cxx
@@ -115,7 +115,7 @@ void VCLXAccessibleCheckBox::ProcessWindowEvent( const VclWindowEvent& rVclWindo
 {
     switch ( rVclWindowEvent.GetId() )
     {
-        case VCLEVENT_CHECKBOX_TOGGLE:
+        case VclEventId::CheckboxToggle:
         {
             SetChecked( IsChecked() );
             SetIndeterminate( IsIndeterminate() );
diff --git a/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx b/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx
index 408e2be10a16..55b4506e05d3 100644
--- a/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx
+++ b/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx
@@ -64,8 +64,8 @@ void VCLXAccessibleDropDownComboBox::ProcessWindowEvent (const VclWindowEvent& r
 {
     switch ( rVclWindowEvent.GetId() )
     {
-        case VCLEVENT_DROPDOWN_OPEN:
-        case VCLEVENT_DROPDOWN_CLOSE:
+        case VclEventId::DropdownOpen:
+        case VclEventId::DropdownClose:
         {
             break;
         }
diff --git a/accessibility/source/standard/vclxaccessibleedit.cxx b/accessibility/source/standard/vclxaccessibleedit.cxx
index 432315a35aea..fa3d0bc6f3a2 100644
--- a/accessibility/source/standard/vclxaccessibleedit.cxx
+++ b/accessibility/source/standard/vclxaccessibleedit.cxx
@@ -69,12 +69,12 @@ void VCLXAccessibleEdit::ProcessWindowEvent( const VclWindowEvent& rVclWindowEve
 {
     switch ( rVclWindowEvent.GetId() )
     {
-        case VCLEVENT_EDIT_MODIFY:
+        case VclEventId::EditModify:
         {
             SetText( implGetText() );
         }
         break;
-        case VCLEVENT_EDIT_CARETCHANGED:
+        case VclEventId::EditCaretChanged:
         {
             sal_Int32 nOldCaretPosition = m_nCaretPosition;
             m_nCaretPosition = getCaretPosition();
@@ -92,7 +92,7 @@ void VCLXAccessibleEdit::ProcessWindowEvent( const VclWindowEvent& rVclWindowEve
             }
         }
         break;
-        case VCLEVENT_EDIT_SELECTIONCHANGED:
+        case VclEventId::EditSelectionChanged:
         {
             VclPtr<vcl::Window> pWindow = GetWindow();
             if (pWindow && pWindow->HasChildPathFocus())
diff --git a/accessibility/source/standard/vclxaccessiblelist.cxx b/accessibility/source/standard/vclxaccessiblelist.cxx
index 38f6c39e282c..e369ea329aa0 100644
--- a/accessibility/source/standard/vclxaccessiblelist.cxx
+++ b/accessibility/source/standard/vclxaccessiblelist.cxx
@@ -337,18 +337,18 @@ void VCLXAccessibleList::ProcessWindowEvent (const VclWindowEvent& rVclWindowEve
 {
     switch ( rVclWindowEvent.GetId() )
       {
-        case VCLEVENT_DROPDOWN_SELECT:
-        case VCLEVENT_LISTBOX_SELECT:
+        case VclEventId::DropdownSelect:
+        case VclEventId::ListboxSelect:
             if ( !m_bDisableProcessEvent )
                 UpdateSelection_Impl_Acc(b_IsDropDownList);
             break;
-        case VCLEVENT_LISTBOX_FOCUSITEMCHANGED:
+        case VclEventId::ListboxFocusItemChanged:
             if ( !m_bDisableProcessEvent )
                 UpdateFocus_Impl_Acc((sal_uInt16)reinterpret_cast<sal_uIntPtr>(rVclWindowEvent.GetData()),b_IsDropDownList);
             break;
-        case VCLEVENT_WINDOW_GETFOCUS:
+        case VclEventId::WindowGetFocus:
             break;
-        case VCLEVENT_CONTROL_GETFOCUS:
+        case VclEventId::ControlGetFocus:
             {
                 VCLXAccessibleComponent::ProcessWindowEvent (rVclWindowEvent);
                 if (m_aBoxType == COMBOBOX && b_IsDropDownList)
@@ -386,28 +386,28 @@ void VCLXAccessibleList::ProcessWindowEvent (const VclWindowEvent& rVclWindowEve
 void VCLXAccessibleList::ProcessWindowEvent (const VclWindowEvent& rVclWindowEvent)
 {
     // Create a reference to this object to prevent an early release of the
-    // listbox (VCLEVENT_OBJECT_DYING).
+    // listbox (VclEventId::ObjectDying).
     Reference< XAccessible > xTemp = this;
 
     switch ( rVclWindowEvent.GetId() )
     {
-        case VCLEVENT_DROPDOWN_OPEN:
+        case VclEventId::DropdownOpen:
             notifyVisibleStates(true);
             break;
-        case VCLEVENT_DROPDOWN_CLOSE:
+        case VclEventId::DropdownClose:
             notifyVisibleStates(false);
             break;
-        case VCLEVENT_LISTBOX_SCROLLED:
-        case VCLEVENT_COMBOBOX_SCROLLED:
+        case VclEventId::ListboxScrolled:
+        case VclEventId::ComboboxScrolled:
             UpdateEntryRange_Impl();
             break;
 
-        // The selection events VCLEVENT_COMBOBOX_SELECT and
-        // VCLEVENT_COMBOBOX_DESELECT are not handled here because here we
+        // The selection events VclEventId::ComboboxSelect and
+        // VclEventId::ComboboxDeselect are not handled here because here we
         // have no access to the edit field.  Its text is necessary to
         // identify the currently selected item.
 
-        case VCLEVENT_OBJECT_DYING:
+        case VclEventId::ObjectDying:
         {
             dispose();
 
@@ -415,18 +415,18 @@ void VCLXAccessibleList::ProcessWindowEvent (const VclWindowEvent& rVclWindowEve
             break;
         }
 
-        case VCLEVENT_LISTBOX_ITEMREMOVED:
-        case VCLEVENT_COMBOBOX_ITEMREMOVED:
+        case VclEventId::ListboxItemRemoved:
+        case VclEventId::ComboboxItemRemoved:
             HandleChangedItemList (false, reinterpret_cast<sal_IntPtr>(
                 rVclWindowEvent.GetData()));
             break;
 
-        case VCLEVENT_LISTBOX_ITEMADDED:
-        case VCLEVENT_COMBOBOX_ITEMADDED:
+        case VclEventId::ListboxItemAdded:
+        case VclEventId::ComboboxItemAdded:
             HandleChangedItemList (true, reinterpret_cast<sal_IntPtr>(
                 rVclWindowEvent.GetData()));
             break;
-        case VCLEVENT_CONTROL_GETFOCUS:
+        case VclEventId::ControlGetFocus:
             {
                 VCLXAccessibleComponent::ProcessWindowEvent (rVclWindowEvent);
                 // Added by IBM Symphony Acc team to handle the list item focus when List control get focus
diff --git a/accessibility/source/standard/vclxaccessiblemenubar.cxx b/accessibility/source/standard/vclxaccessiblemenubar.cxx
index ca917152d313..f1855c59c3a4 100644
--- a/accessibility/source/standard/vclxaccessiblemenubar.cxx
+++ b/accessibility/source/standard/vclxaccessiblemenubar.cxx
@@ -72,7 +72,7 @@ bool VCLXAccessibleMenuBar::IsFocused()
 IMPL_LINK( VCLXAccessibleMenuBar, WindowEventListener, VclWindowEvent&, rEvent, void )
 {
     OSL_ENSURE( rEvent.GetWindow(), "VCLXAccessibleMenuBar::WindowEventListener: no window!" );
-    if ( !rEvent.GetWindow()->IsAccessibilityEventsSuppressed() || ( rEvent.GetId() == VCLEVENT_OBJECT_DYING ) )
+    if ( !rEvent.GetWindow()->IsAccessibilityEventsSuppressed() || ( rEvent.GetId() == VclEventId::ObjectDying ) )
     {
         ProcessWindowEvent( rEvent );
     }
@@ -83,13 +83,13 @@ void VCLXAccessibleMenuBar::ProcessWindowEvent( const VclWindowEvent& rVclWindow
 {
     switch ( rVclWindowEvent.GetId() )
     {
-        case VCLEVENT_WINDOW_GETFOCUS:
-        case VCLEVENT_WINDOW_LOSEFOCUS:
+        case VclEventId::WindowGetFocus:
+        case VclEventId::WindowLoseFocus:
         {
-            SetFocused( rVclWindowEvent.GetId() == VCLEVENT_WINDOW_GETFOCUS );
+            SetFocused( rVclWindowEvent.GetId() == VclEventId::WindowGetFocus );
         }
         break;
-        case VCLEVENT_OBJECT_DYING:
+        case VclEventId::ObjectDying:
         {
             if ( m_pWindow )
             {
diff --git a/accessibility/source/standard/vclxaccessibleradiobutton.cxx b/accessibility/source/standard/vclxaccessibleradiobutton.cxx
index 23cae200edc4..ab567e27609f 100644
--- a/accessibility/source/standard/vclxaccessibleradiobutton.cxx
+++ b/accessibility/source/standard/vclxaccessibleradiobutton.cxx
@@ -62,7 +62,7 @@ void VCLXAccessibleRadioButton::ProcessWindowEvent( const VclWindowEvent& rVclWi
 {
     switch ( rVclWindowEvent.GetId() )
     {
-        case VCLEVENT_RADIOBUTTON_TOGGLE:
+        case VclEventId::RadiobuttonToggle:
         {
             Any aOldValue;
             Any aNewValue;
diff --git a/accessibility/source/standard/vclxaccessiblescrollbar.cxx b/accessibility/source/standard/vclxaccessiblescrollbar.cxx
index 6fdf4166a1d3..74e89b53d36e 100644
--- a/accessibility/source/standard/vclxaccessiblescrollbar.cxx
+++ b/accessibility/source/standard/vclxaccessiblescrollbar.cxx
@@ -58,7 +58,7 @@ void VCLXAccessibleScrollBar::ProcessWindowEvent( const VclWindowEvent& rVclWind
 {
     switch ( rVclWindowEvent.GetId() )
     {
-        case VCLEVENT_SCROLLBAR_SCROLL:
+        case VclEventId::ScrollbarScroll:
         {
             NotifyAccessibleEvent( AccessibleEventId::VALUE_CHANGED, Any(), Any() );
         }
diff --git a/accessibility/source/standard/vclxaccessiblestatusbar.cxx b/accessibility/source/standard/vclxaccessiblestatusbar.cxx
index 3f4c0aeb6e1e..22b4e22713ee 100644
--- a/accessibility/source/standard/vclxaccessiblestatusbar.cxx
+++ b/accessibility/source/standard/vclxaccessiblestatusbar.cxx
@@ -148,7 +148,7 @@ void VCLXAccessibleStatusBar::ProcessWindowEvent( const VclWindowEvent& rVclWind
 {
     switch ( rVclWindowEvent.GetId() )
     {
-        case VCLEVENT_STATUSBAR_ITEMADDED:
+        case VclEventId::StatusbarItemAdded:
         {
             if ( m_pStatusBar )
             {
@@ -158,7 +158,7 @@ void VCLXAccessibleStatusBar::ProcessWindowEvent( const VclWindowEvent& rVclWind
             }
         }
         break;
-        case VCLEVENT_STATUSBAR_ITEMREMOVED:
+        case VclEventId::StatusbarItemRemoved:
         {
             if ( m_pStatusBar )
             {
@@ -179,30 +179,30 @@ void VCLXAccessibleStatusBar::ProcessWindowEvent( const VclWindowEvent& rVclWind
             }
         }
         break;
-        case VCLEVENT_STATUSBAR_ALLITEMSREMOVED:
+        case VclEventId::StatusbarAllItemsRemoved:
         {
             for ( sal_Int32 i = m_aAccessibleChildren.size() - 1; i >= 0; --i )
                 RemoveChild( i );
         }
         break;
-        case VCLEVENT_STATUSBAR_SHOWITEM:
-        case VCLEVENT_STATUSBAR_HIDEITEM:
+        case VclEventId::StatusbarShowItem:
+        case VclEventId::StatusbarHideItem:
         {
             if ( m_pStatusBar )
             {
                 sal_uInt16 nItemId = (sal_uInt16)reinterpret_cast<sal_IntPtr>(rVclWindowEvent.GetData());
                 sal_uInt16 nItemPos = m_pStatusBar->GetItemPos( nItemId );
-                UpdateShowing( nItemPos, rVclWindowEvent.GetId() == VCLEVENT_STATUSBAR_SHOWITEM );
+                UpdateShowing( nItemPos, rVclWindowEvent.GetId() == VclEventId::StatusbarShowItem );
             }
         }
         break;
-        case VCLEVENT_STATUSBAR_SHOWALLITEMS:
+        case VclEventId::StatusbarShowAllItems:
         {
             for ( size_t i = 0; i < m_aAccessibleChildren.size(); ++i )
-                UpdateShowing( i, rVclWindowEvent.GetId() == VCLEVENT_STATUSBAR_SHOWALLITEMS );
+                UpdateShowing( i, rVclWindowEvent.GetId() == VclEventId::StatusbarShowAllItems );
         }
         break;
-        case VCLEVENT_STATUSBAR_NAMECHANGED:
+        case VclEventId::StatusbarNameChanged:
         {
             if ( m_pStatusBar )
             {
@@ -212,7 +212,7 @@ void VCLXAccessibleStatusBar::ProcessWindowEvent( const VclWindowEvent& rVclWind
             }
         }
         break;
-        case VCLEVENT_STATUSBAR_DRAWITEM:
+        case VclEventId::StatusbarDrawItem:
         {
             if ( m_pStatusBar )
             {
@@ -222,7 +222,7 @@ void VCLXAccessibleStatusBar::ProcessWindowEvent( const VclWindowEvent& rVclWind
             }
         }
         break;
-        case VCLEVENT_OBJECT_DYING:
+        case VclEventId::ObjectDying:
         {
             if ( m_pStatusBar )
             {
diff --git a/accessibility/source/standard/vclxaccessibletabcontrol.cxx b/accessibility/source/standard/vclxaccessibletabcontrol.cxx
index 12837d670918..637e0b656e97 100644
--- a/accessibility/source/standard/vclxaccessibletabcontrol.cxx
+++ b/accessibility/source/standard/vclxaccessibletabcontrol.cxx
@@ -161,19 +161,19 @@ void VCLXAccessibleTabControl::ProcessWindowEvent( const VclWindowEvent& rVclWin
 {
     switch ( rVclWindowEvent.GetId() )
     {
-        case VCLEVENT_TABPAGE_ACTIVATE:
-        case VCLEVENT_TABPAGE_DEACTIVATE:
+        case VclEventId::TabpageActivate:
+        case VclEventId::TabpageDeactivate:
         {
             if ( m_pTabControl )
             {
                 sal_uInt16 nPageId = (sal_uInt16)reinterpret_cast<sal_IntPtr>(rVclWindowEvent.GetData());
                 sal_uInt16 nPagePos = m_pTabControl->GetPagePos( nPageId );
                 UpdateFocused();
-                UpdateSelected( nPagePos, rVclWindowEvent.GetId() == VCLEVENT_TABPAGE_ACTIVATE );
+                UpdateSelected( nPagePos, rVclWindowEvent.GetId() == VclEventId::TabpageActivate );
             }
         }
         break;
-        case VCLEVENT_TABPAGE_PAGETEXTCHANGED:
+        case VclEventId::TabpagePageTextChanged:
         {
             if ( m_pTabControl )
             {
@@ -183,7 +183,7 @@ void VCLXAccessibleTabControl::ProcessWindowEvent( const VclWindowEvent& rVclWin
             }
         }
         break;
-        case VCLEVENT_TABPAGE_INSERTED:
+        case VclEventId::TabpageInserted:
         {
             if ( m_pTabControl )
             {
@@ -193,7 +193,7 @@ void VCLXAccessibleTabControl::ProcessWindowEvent( const VclWindowEvent& rVclWin
             }
         }
         break;
-        case VCLEVENT_TABPAGE_REMOVED:
+        case VclEventId::TabpageRemoved:
         {
             if ( m_pTabControl )
             {
@@ -214,19 +214,19 @@ void VCLXAccessibleTabControl::ProcessWindowEvent( const VclWindowEvent& rVclWin
             }
         }
         break;
-        case VCLEVENT_TABPAGE_REMOVEDALL:
+        case VclEventId::TabpageRemovedAll:
         {
             for ( sal_Int32 i = m_aAccessibleChildren.size() - 1; i >= 0; --i )
                 RemoveChild( i );
         }
         break;
-        case VCLEVENT_WINDOW_GETFOCUS:
-        case VCLEVENT_WINDOW_LOSEFOCUS:
+        case VclEventId::WindowGetFocus:
+        case VclEventId::WindowLoseFocus:
         {
             UpdateFocused();
         }
         break;
-        case VCLEVENT_OBJECT_DYING:
+        case VclEventId::ObjectDying:
         {
             if ( m_pTabControl )
             {
@@ -255,8 +255,8 @@ void VCLXAccessibleTabControl::ProcessWindowChildEvent( const VclWindowEvent& rV
 {
     switch ( rVclWindowEvent.GetId() )
     {
-        case VCLEVENT_WINDOW_SHOW:
-        case VCLEVENT_WINDOW_HIDE:
+        case VclEventId::WindowShow:
+        case VclEventId::WindowHide:
         {
             if ( m_pTabControl )
             {
@@ -268,7 +268,7 @@ void VCLXAccessibleTabControl::ProcessWindowChildEvent( const VclWindowEvent& rV
                         sal_uInt16 nPageId = m_pTabControl->GetPageId( (sal_uInt16)i );
                         TabPage* pTabPage = m_pTabControl->GetTabPage( nPageId );
                         if ( pTabPage == static_cast<TabPage*>(pChild) )
-                            UpdateTabPage( i, rVclWindowEvent.GetId() == VCLEVENT_WINDOW_SHOW );
+                            UpdateTabPage( i, rVclWindowEvent.GetId() == VclEventId::WindowShow );
                     }
                 }
             }
diff --git a/accessibility/source/standard/vclxaccessibletextcomponent.cxx b/accessibility/source/standard/vclxaccessibletextcomponent.cxx
index 8a0543f676e0..3fa741fa4a13 100644
--- a/accessibility/source/standard/vclxaccessibletextcomponent.cxx
+++ b/accessibility/source/standard/vclxaccessibletextcomponent.cxx
@@ -74,7 +74,7 @@ void VCLXAccessibleTextComponent::ProcessWindowEvent( const VclWindowEvent& rVcl
 {
     switch ( rVclWindowEvent.GetId() )
     {
-        case VCLEVENT_WINDOW_FRAMETITLECHANGED:
+        case VclEventId::WindowFrameTitleChanged:
         {
             VCLXAccessibleComponent::ProcessWindowEvent( rVclWindowEvent );
             SetText( implGetText() );
diff --git a/accessibility/source/standard/vclxaccessibletoolbox.cxx b/accessibility/source/standard/vclxaccessibletoolbox.cxx
index 126e4c1758d3..ab3ff8185dff 100644
--- a/accessibility/source/standard/vclxaccessibletoolbox.cxx
+++ b/accessibility/source/standard/vclxaccessibletoolbox.cxx
@@ -507,13 +507,13 @@ void VCLXAccessibleToolBox::FillAccessibleStateSet( utl::AccessibleStateSetHelpe
 
 void VCLXAccessibleToolBox::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
 {
-    // to prevent an early release of the toolbox (VCLEVENT_OBJECT_DYING)
+    // to prevent an early release of the toolbox (VclEventId::ObjectDying)
     Reference< XAccessibleContext > xTemp = this;
 
     switch ( rVclWindowEvent.GetId() )
     {
-        case VCLEVENT_TOOLBOX_CLICK:
-        case VCLEVENT_TOOLBOX_SELECT:
+        case VclEventId::ToolboxClick:
+        case VclEventId::ToolboxSelect:
         {
             VclPtr< ToolBox > pToolBox = GetAs< ToolBox >();
             if ( rVclWindowEvent.GetData() )
@@ -528,13 +528,13 @@ void VCLXAccessibleToolBox::ProcessWindowEvent( const VclWindowEvent& rVclWindow
             }
             break;
         }
-        case VCLEVENT_TOOLBOX_DOUBLECLICK:
-        case VCLEVENT_TOOLBOX_ACTIVATE:
-        case VCLEVENT_TOOLBOX_DEACTIVATE:
-        //case VCLEVENT_TOOLBOX_SELECT:
+        case VclEventId::ToolboxDoubleClick:
+        case VclEventId::ToolboxActivate:
+        case VclEventId::ToolboxDeactivate:
+        //case VclEventId::ToolboxSelect:
             break;
 
-        case VCLEVENT_TOOLBOX_ITEMUPDATED:
+        case VclEventId::ToolboxItemUpdated:
         {
             if ( rVclWindowEvent.GetData() )
             {
@@ -544,26 +544,26 @@ void VCLXAccessibleToolBox::ProcessWindowEvent( const VclWindowEvent& rVclWindow
         break;
         }
 
-        case VCLEVENT_TOOLBOX_HIGHLIGHT:
+        case VclEventId::ToolboxHighlight:
             UpdateFocus_Impl();
             break;
 
-        case VCLEVENT_TOOLBOX_HIGHLIGHTOFF:
+        case VclEventId::ToolboxHighlightOff:
             ReleaseFocus_Impl( (sal_Int32)reinterpret_cast<sal_IntPtr>(rVclWindowEvent.GetData()) );
             break;
 
-        case VCLEVENT_TOOLBOX_ITEMADDED :
+        case VclEventId::ToolboxItemAdded :
             UpdateItem_Impl( (sal_Int32)reinterpret_cast<sal_IntPtr>(rVclWindowEvent.GetData()) );
             break;
 
-        case VCLEVENT_TOOLBOX_ITEMREMOVED :
-        case VCLEVENT_TOOLBOX_ALLITEMSCHANGED :
+        case VclEventId::ToolboxItemRemoved :
+        case VclEventId::ToolboxAllItemsChanged :
         {
             UpdateAllItems_Impl();
             break;
         }
 
-        case VCLEVENT_TOOLBOX_ITEMWINDOWCHANGED:
+        case VclEventId::ToolboxItemWindowChanged:
         {
             sal_Int32 nPos = (sal_Int32)reinterpret_cast<sal_IntPtr>(rVclWindowEvent.GetData());
             ToolBoxItemsMap::iterator aAccessiblePos( m_aAccessibleChildren.find( nPos ) );
@@ -578,25 +578,25 @@ void VCLXAccessibleToolBox::ProcessWindowEvent( const VclWindowEvent& rVclWindow
             NotifyAccessibleEvent( AccessibleEventId::CHILD, Any(), aNewValue );
             break;
         }
-        case VCLEVENT_TOOLBOX_ITEMTEXTCHANGED :
+        case VclEventId::ToolboxItemTextChanged :
             UpdateItemName_Impl( (sal_Int32)reinterpret_cast<sal_IntPtr>(rVclWindowEvent.GetData()) );
             break;
 
-        case VCLEVENT_TOOLBOX_ITEMENABLED :
-        case VCLEVENT_TOOLBOX_ITEMDISABLED :
+        case VclEventId::ToolboxItemEnabled :
+        case VclEventId::ToolboxItemDisabled :
         {
             UpdateItemEnabled_Impl( (sal_Int32)reinterpret_cast<sal_IntPtr>(rVclWindowEvent.GetData()) );
             break;
         }
 
-        case VCLEVENT_DROPDOWN_OPEN:
-        case VCLEVENT_DROPDOWN_CLOSE:
+        case VclEventId::DropdownOpen:
+        case VclEventId::DropdownClose:
         {
-            UpdateCustomPopupItemp_Impl( static_cast< vcl::Window* >( rVclWindowEvent.GetData() ), rVclWindowEvent.GetId() == VCLEVENT_DROPDOWN_OPEN );
+            UpdateCustomPopupItemp_Impl( static_cast< vcl::Window* >( rVclWindowEvent.GetData() ), rVclWindowEvent.GetId() == VclEventId::DropdownOpen );
             break;
         }
 
-        case VCLEVENT_OBJECT_DYING :
+        case VclEventId::ObjectDying :
         {
             // if this toolbox is a subtoolbox, we have to release it from its parent
             VclPtr< vcl::Window > pWin = GetAs< vcl::Window >();
@@ -629,7 +629,7 @@ void VCLXAccessibleToolBox::ProcessWindowChildEvent( const VclWindowEvent& rVclW
 {
     switch ( rVclWindowEvent.GetId() )
     {
-        case VCLEVENT_WINDOW_SHOW:  // send create on show for direct accessible children
+        case VclEventId::WindowShow:  // send create on show for direct accessible children
         {
             Reference< XAccessible > xReturn = GetItemWindowAccessible(rVclWindowEvent);
             if ( xReturn.is() )