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>

18 files changed, 62 insertions, 59 deletions

diff --git a/svtools/source/config/colorcfg.cxx b/svtools/source/config/colorcfg.cxx
index da09eac04d12..3e28171fe614 100644
--- a/svtools/source/config/colorcfg.cxx
+++ b/svtools/source/config/colorcfg.cxx
@@ -335,7 +335,7 @@ void ColorConfig_Impl::SettingsChanged()
 
 IMPL_LINK( ColorConfig_Impl, DataChangedEventListener, VclSimpleEvent&, rEvent, void )
 {
-    if ( rEvent.GetId() == VCLEVENT_APPLICATION_DATACHANGED )
+    if ( rEvent.GetId() == VclEventId::ApplicationDataChanged )
     {
         DataChangedEvent* pData = static_cast<DataChangedEvent*>(static_cast<VclWindowEvent&>(rEvent).GetData());
         if ( (pData->GetType() == DataChangedEventType::SETTINGS) &&
diff --git a/svtools/source/config/extcolorcfg.cxx b/svtools/source/config/extcolorcfg.cxx
index cdf060cb2def..9c6c9d187140 100644
--- a/svtools/source/config/extcolorcfg.cxx
+++ b/svtools/source/config/extcolorcfg.cxx
@@ -522,7 +522,7 @@ void ExtendedColorConfig_Impl::UnlockBroadcast()
 
 IMPL_LINK( ExtendedColorConfig_Impl, DataChangedEventListener, VclSimpleEvent&, rEvent, void )
 {
-    if ( rEvent.GetId() == VCLEVENT_APPLICATION_DATACHANGED )
+    if ( rEvent.GetId() == VclEventId::ApplicationDataChanged )
     {
         DataChangedEvent* pData = static_cast<DataChangedEvent*>(static_cast<VclWindowEvent&>(rEvent).GetData());
         if ( (pData->GetType() == DataChangedEventType::SETTINGS) &&
diff --git a/svtools/source/contnr/imivctl.hxx b/svtools/source/contnr/imivctl.hxx
index 85ea19ac93bf..d43208cf380c 100644
--- a/svtools/source/contnr/imivctl.hxx
+++ b/svtools/source/contnr/imivctl.hxx
@@ -483,7 +483,7 @@ public:
                         );
     void                DrawHighlightFrame(vcl::RenderContext& rRenderContext, const Rectangle& rBmpRect);
 
-    void                CallEventListeners( sal_uLong nEvent, void* pData );
+    void                CallEventListeners( VclEventId nEvent, void* pData );
 
     ::svt::IAccessibleFactory& GetAccessibleFactory()
     {
diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx
index a07194f177b3..b3068ba23d12 100644
--- a/svtools/source/contnr/imivctl1.cxx
+++ b/svtools/source/contnr/imivctl1.cxx
@@ -414,7 +414,7 @@ void SvxIconChoiceCtrl_Impl::EntrySelected(SvxIconChoiceCtrlEntry* pEntry, bool
     // #i101012# emit vcl event LISTBOX_SELECT only in case that the given entry is selected.
     if (bSelect)
     {
-        CallEventListeners(VCLEVENT_LISTBOX_SELECT, pEntry);
+        CallEventListeners(VclEventId::ListboxSelect, pEntry);
     }
 }
 
@@ -974,7 +974,7 @@ void SvxIconChoiceCtrl_Impl::SetCursor_Impl( SvxIconChoiceCtrlEntry* pOldCursor,
         {
             SelectEntry( pCursor, true, false, bPaintSync );
             aCurSelectionRect = GetEntryBoundRect( pCursor );
-            CallEventListeners( VCLEVENT_LISTBOX_SELECT, pCursor );
+            CallEventListeners( VclEventId::ListboxSelect, pCursor );
         }
     }
 }
@@ -3508,7 +3508,7 @@ void SvxIconChoiceCtrl_Impl::SetOrigin( const Point& rPos )
     pView->SetMapMode( aMapMode );
 }
 
-void SvxIconChoiceCtrl_Impl::CallEventListeners( sal_uLong nEvent, void* pData )
+void SvxIconChoiceCtrl_Impl::CallEventListeners( VclEventId nEvent, void* pData )
 {
     pView->CallImplEventListeners( nEvent, pData );
 }
diff --git a/svtools/source/contnr/ivctrl.cxx b/svtools/source/contnr/ivctrl.cxx
index 7a0969848ad7..41f2296978e6 100644
--- a/svtools/source/contnr/ivctrl.cxx
+++ b/svtools/source/contnr/ivctrl.cxx
@@ -87,7 +87,7 @@ void SvtIconChoiceCtrl::dispose()
 {
     if (_pImpl)
     {
-        _pImpl->CallEventListeners( VCLEVENT_OBJECT_DYING, nullptr );
+        _pImpl->CallEventListeners( VclEventId::ObjectDying, nullptr );
         _pImpl.reset();
     }
     Control::dispose();
@@ -191,7 +191,7 @@ void SvtIconChoiceCtrl::GetFocus()
     Control::GetFocus();
     SvxIconChoiceCtrlEntry* pSelectedEntry = GetSelectedEntry();
     if ( pSelectedEntry )
-        _pImpl->CallEventListeners( VCLEVENT_LISTBOX_SELECT, pSelectedEntry );
+        _pImpl->CallEventListeners( VclEventId::ListboxSelect, pSelectedEntry );
 }
 
 void SvtIconChoiceCtrl::LoseFocus()
@@ -422,7 +422,7 @@ void SvtIconChoiceCtrl::SetNoSelection()
     _pImpl->SetNoSelection();
 }
 
-void SvtIconChoiceCtrl::CallImplEventListeners(sal_uLong nEvent, void* pData)
+void SvtIconChoiceCtrl::CallImplEventListeners(VclEventId nEvent, void* pData)
 {
     CallEventListeners(nEvent, pData);
 }
diff --git a/svtools/source/contnr/svimpbox.cxx b/svtools/source/contnr/svimpbox.cxx
index b5355525ee6d..d3cbdee9bd52 100644
--- a/svtools/source/contnr/svimpbox.cxx
+++ b/svtools/source/contnr/svimpbox.cxx
@@ -291,7 +291,7 @@ void SvImpLBox::Clear()
 
     aContextBmpWidthVector.clear();
 
-    CallEventListeners( VCLEVENT_LISTBOX_ITEMREMOVED );
+    CallEventListeners( VclEventId::ListboxItemRemoved );
 }
 
 // *********************************************************************
@@ -638,7 +638,7 @@ void SvImpLBox::SetCursor( SvTreeListEntry* pEntry, bool bForceNoSelect )
         if(!bForceNoSelect && bSimpleTravel && !(nFlags & LBoxFlags::DeselectAll) && GetUpdateMode())
         {
             pView->Select( pCursor );
-            CallEventListeners( VCLEVENT_LISTBOX_TREEFOCUS, pCursor );
+            CallEventListeners( VclEventId::ListboxTreeFocus, pCursor );
         }
         // multiple selection: select in cursor move if we're not in
         // Add mode (Ctrl-F8)
@@ -648,14 +648,14 @@ void SvImpLBox::SetCursor( SvTreeListEntry* pEntry, bool bForceNoSelect )
                  !bForceNoSelect )
         {
             pView->Select( pCursor );
-            CallEventListeners( VCLEVENT_LISTBOX_TREEFOCUS, pCursor );
+            CallEventListeners( VclEventId::ListboxTreeFocus, pCursor );
         }
         else
         {
             ShowCursor( true );
             if (bForceNoSelect && GetUpdateMode())
             {
-                CallEventListeners( VCLEVENT_LISTBOX_TREEFOCUS, pCursor);
+                CallEventListeners( VclEventId::ListboxTreeFocus, pCursor);
             }
         }
 
@@ -1622,7 +1622,7 @@ void SvImpLBox::EntrySelected( SvTreeListEntry* pEntry, bool bSelect )
 
 void SvImpLBox::RemovingEntry( SvTreeListEntry* pEntry )
 {
-    CallEventListeners( VCLEVENT_LISTBOX_ITEMREMOVED , pEntry );
+    CallEventListeners( VclEventId::ListboxItemRemoved , pEntry );
 
     DestroyAnchor();
 
@@ -2203,7 +2203,7 @@ bool SvImpLBox::KeyInput( const KeyEvent& rKEvt)
                 {
                     ++nCurTabPos;
                     ShowCursor( true );
-                    CallEventListeners( VCLEVENT_LISTBOX_SELECT, pCursor );
+                    CallEventListeners( VclEventId::ListboxSelect, pCursor );
                 }
             }
             else if( nWindowStyle & WB_HSCROLL )
@@ -2234,7 +2234,7 @@ bool SvImpLBox::KeyInput( const KeyEvent& rKEvt)
                 {
                     --nCurTabPos;
                     ShowCursor( true );
-                    CallEventListeners( VCLEVENT_LISTBOX_SELECT, pCursor );
+                    CallEventListeners( VclEventId::ListboxSelect, pCursor );
                 }
             }
             else if ( nWindowStyle & WB_HSCROLL )
@@ -3362,7 +3362,7 @@ const Image& SvImpLBox::GetDefaultCollapsedNodeImage( )
 }
 
 
-void SvImpLBox::CallEventListeners( sal_uLong nEvent, void* pData )
+void SvImpLBox::CallEventListeners( VclEventId nEvent, void* pData )
 {
     if ( pView )
         pView->CallImplEventListeners( nEvent, pData);
diff --git a/svtools/source/contnr/svtabbx.cxx b/svtools/source/contnr/svtabbx.cxx
index 12c6934b1259..e114d651d326 100644
--- a/svtools/source/contnr/svtabbx.cxx
+++ b/svtools/source/contnr/svtabbx.cxx
@@ -323,7 +323,7 @@ void SvTabListBox::SetEntryText(const OUString& rStr, SvTreeListEntry* pEntry, s
     GetModel()->InvalidateEntry( pEntry );
 
     TabListBoxEventData* pData = new TabListBoxEventData( pEntry, nTextColumn, sOldText );
-    CallEventListeners( VCLEVENT_TABLECELL_NAMECHANGED, pData );
+    CallEventListeners( VclEventId::TableCellNameChanged, pData );
     delete pData;
 }
 
diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx
index 5052c0aab34a..0e1c363e3d3f 100644
--- a/svtools/source/contnr/treelistbox.cxx
+++ b/svtools/source/contnr/treelistbox.cxx
@@ -1398,7 +1398,7 @@ void SvTreeListBox::dispose()
 {
     if( pImpl )
     {
-        pImpl->CallEventListeners( VCLEVENT_OBJECT_DYING );
+        pImpl->CallEventListeners( VclEventId::ObjectDying );
         pImpl.reset();
     }
     if( mpImpl )
@@ -1871,7 +1871,7 @@ void SvTreeListBox::CheckButtonHdl()
 {
     aCheckButtonHdl.Call( this );
     if ( pCheckButtonData )
-        pImpl->CallEventListeners( VCLEVENT_CHECKBOX_TOGGLE, static_cast<void*>(pCheckButtonData->GetActEntry()) );
+        pImpl->CallEventListeners( VclEventId::CheckboxToggle, static_cast<void*>(pCheckButtonData->GetActEntry()) );
 }
 
 
@@ -2050,7 +2050,7 @@ void SvTreeListBox::GetFocus()
             pEntry = pImpl->pCursor;
     }
     if ( pEntry )
-        pImpl->CallEventListeners( VCLEVENT_LISTBOX_TREEFOCUS, pEntry );
+        pImpl->CallEventListeners( VclEventId::ListboxTreeFocus, pEntry );
 
 }
 
@@ -2237,7 +2237,7 @@ bool SvTreeListBox::Expand( SvTreeListEntry* pParent )
     // #i92103#
     if ( bExpanded )
     {
-        pImpl->CallEventListeners( VCLEVENT_ITEM_EXPANDED, pParent );
+        pImpl->CallEventListeners( VclEventId::ItemExpanded, pParent );
     }
 
     return bExpanded;
@@ -2263,7 +2263,7 @@ bool SvTreeListBox::Collapse( SvTreeListEntry* pParent )
     // #i92103#
     if ( bCollapsed )
     {
-        pImpl->CallEventListeners( VCLEVENT_ITEM_COLLAPSED, pParent );
+        pImpl->CallEventListeners( VclEventId::ItemCollapsed, pParent );
     }
 
     return bCollapsed;
@@ -2281,7 +2281,7 @@ bool SvTreeListBox::Select( SvTreeListEntry* pEntry, bool bSelect )
         if( bSelect )
         {
             SelectHdl();
-            CallEventListeners( VCLEVENT_LISTBOX_TREESELECT, pEntry);
+            CallEventListeners( VclEventId::ListboxTreeSelect, pEntry);
         }
         else
             DeselectHdl();
@@ -3730,7 +3730,7 @@ void SvTreeListBox::EnableCellFocus()
     pImpl->EnableCellFocus();
 }
 
-void SvTreeListBox::CallImplEventListeners(sal_uLong nEvent, void* pData)
+void SvTreeListBox::CallImplEventListeners(VclEventId nEvent, void* pData)
 {
     CallEventListeners(nEvent, pData);
 }
diff --git a/svtools/source/control/roadmap.cxx b/svtools/source/control/roadmap.cxx
index db44584ab150..2d5fcbf7bdd0 100644
--- a/svtools/source/control/roadmap.cxx
+++ b/svtools/source/control/roadmap.cxx
@@ -515,7 +515,7 @@ Link<LinkParamNone*,void> ORoadmap::GetItemSelectHdl() const
 void ORoadmap::Select()
 {
     GetItemSelectHdl().Call( nullptr );
-    CallEventListeners( VCLEVENT_ROADMAP_ITEMSELECTED );
+    CallEventListeners( VclEventId::RoadmapItemSelected );
 }
 
 void ORoadmap::GetFocus()
diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx
index 26cd89620ed8..357c70d3a017 100644
--- a/svtools/source/control/tabbar.cxx
+++ b/svtools/source/control/tabbar.cxx
@@ -1497,7 +1497,7 @@ void TabBar::DataChanged(const DataChangedEvent& rDCEvt)
 void TabBar::ImplSelect()
 {
     Select();
-    CallEventListeners(VCLEVENT_TABBAR_PAGESELECTED, reinterpret_cast<void*>(sal::static_int_cast<sal_IntPtr>(mnCurPageId)));
+    CallEventListeners(VclEventId::TabbarPageSelected, reinterpret_cast<void*>(sal::static_int_cast<sal_IntPtr>(mnCurPageId)));
 }
 
 void TabBar::Select()
@@ -1518,7 +1518,7 @@ void TabBar::ImplActivatePage()
 {
     ActivatePage();
 
-    CallEventListeners(VCLEVENT_TABBAR_PAGEACTIVATED, reinterpret_cast<void*>(sal::static_int_cast<sal_IntPtr>(mnCurPageId)));
+    CallEventListeners(VclEventId::TabbarPageActivated, reinterpret_cast<void*>(sal::static_int_cast<sal_IntPtr>(mnCurPageId)));
 }
 
 void TabBar::ActivatePage()
@@ -1528,7 +1528,7 @@ bool TabBar::ImplDeactivatePage()
 {
     bool bRet = DeactivatePage();
 
-    CallEventListeners(VCLEVENT_TABBAR_PAGEDEACTIVATED, reinterpret_cast<void*>(sal::static_int_cast<sal_IntPtr>(mnCurPageId)));
+    CallEventListeners(VclEventId::TabbarPageDeactivated, reinterpret_cast<void*>(sal::static_int_cast<sal_IntPtr>(mnCurPageId)));
 
     return bRet;
 }
@@ -1649,7 +1649,7 @@ void TabBar::InsertPage(sal_uInt16 nPageId, const OUString& rText,
     if (IsReallyVisible() && IsUpdateMode())
         Invalidate();
 
-    CallEventListeners(VCLEVENT_TABBAR_PAGEINSERTED, reinterpret_cast<void*>(sal::static_int_cast<sal_IntPtr>(nPageId)));
+    CallEventListeners(VclEventId::TabbarPageInserted, reinterpret_cast<void*>(sal::static_int_cast<sal_IntPtr>(nPageId)));
 }
 
 Color TabBar::GetTabBgColor(sal_uInt16 nPageId) const
@@ -1708,7 +1708,7 @@ void TabBar::RemovePage(sal_uInt16 nPageId)
         if (IsReallyVisible() && IsUpdateMode())
             Invalidate();
 
-        CallEventListeners(VCLEVENT_TABBAR_PAGEREMOVED, reinterpret_cast<void*>(sal::static_int_cast<sal_IntPtr>(nPageId)));
+        CallEventListeners(VclEventId::TabbarPageRemoved, reinterpret_cast<void*>(sal::static_int_cast<sal_IntPtr>(nPageId)));
     }
 }
 
@@ -1746,7 +1746,7 @@ void TabBar::MovePage(sal_uInt16 nPageId, sal_uInt16 nNewPos)
         if (IsReallyVisible() && IsUpdateMode())
             Invalidate();
 
-        CallEventListeners( VCLEVENT_TABBAR_PAGEMOVED, static_cast<void*>(&aPair) );
+        CallEventListeners( VclEventId::TabbarPageMoved, static_cast<void*>(&aPair) );
     }
 }
 
@@ -1769,7 +1769,7 @@ void TabBar::Clear()
     if (IsReallyVisible() && IsUpdateMode())
         Invalidate();
 
-    CallEventListeners(VCLEVENT_TABBAR_PAGEREMOVED, reinterpret_cast<void*>(sal::static_int_cast<sal_IntPtr>(PAGE_NOT_FOUND)));
+    CallEventListeners(VclEventId::TabbarPageRemoved, reinterpret_cast<void*>(sal::static_int_cast<sal_IntPtr>(PAGE_NOT_FOUND)));
 }
 
 bool TabBar::IsPageEnabled(sal_uInt16 nPageId) const
@@ -2219,7 +2219,7 @@ void TabBar::SetPageText(sal_uInt16 nPageId, const OUString& rText)
         if (IsReallyVisible() && IsUpdateMode())
             Invalidate();
 
-        CallEventListeners(VCLEVENT_TABBAR_PAGETEXTCHANGED, reinterpret_cast<void*>(sal::static_int_cast<sal_IntPtr>(nPageId)));
+        CallEventListeners(VclEventId::TabbarPageTextChanged, reinterpret_cast<void*>(sal::static_int_cast<sal_IntPtr>(nPageId)));
     }
 }
 
diff --git a/svtools/source/control/toolbarmenuacc.cxx b/svtools/source/control/toolbarmenuacc.cxx
index 2fda0afe2e7d..2a3e2759b82c 100644
--- a/svtools/source/control/toolbarmenuacc.cxx
+++ b/svtools/source/control/toolbarmenuacc.cxx
@@ -58,26 +58,26 @@ ToolbarMenuAcc::~ToolbarMenuAcc()
 
 IMPL_LINK( ToolbarMenuAcc, WindowEventListener, VclWindowEvent&, rEvent, void )
 {
-    /* Ignore VCLEVENT_WINDOW_ENDPOPUPMODE, because the UNO accessibility wrapper
+    /* Ignore VclEventId::WindowEndPopupMode, because the UNO accessibility wrapper
      * might have been destroyed by the previous VCLEventListener (if no AT tool
      * is running), e.g. sub-toolbars in impress.
      */
-    if ( !mpParent || (rEvent.GetId() == VCLEVENT_WINDOW_ENDPOPUPMODE) )
+    if ( !mpParent || (rEvent.GetId() == VclEventId::WindowEndPopupMode) )
         return;
     DBG_ASSERT( rEvent.GetWindow(), "Window???" );
-    if( rEvent.GetWindow()->IsAccessibilityEventsSuppressed() && ( rEvent.GetId() != VCLEVENT_OBJECT_DYING ) )
+    if( rEvent.GetWindow()->IsAccessibilityEventsSuppressed() && ( rEvent.GetId() != VclEventId::ObjectDying ) )
         return;
 
     switch ( rEvent.GetId() )
     {
-        case VCLEVENT_OBJECT_DYING:
+        case VclEventId::ObjectDying:
         {
             mpParent->mrMenu.RemoveEventListener( LINK( this, ToolbarMenuAcc, WindowEventListener ) );
             mpParent = nullptr;
         }
         break;
 
-        case VCLEVENT_WINDOW_GETFOCUS:
+        case VclEventId::WindowGetFocus:
         {
             if( !mbIsFocused )
             {
@@ -86,7 +86,7 @@ IMPL_LINK( ToolbarMenuAcc, WindowEventListener, VclWindowEvent&, rEvent, void )
             }
         }
         break;
-        case VCLEVENT_WINDOW_LOSEFOCUS:
+        case VclEventId::WindowLoseFocus:
         {
             if( mbIsFocused )
             {
diff --git a/svtools/source/inc/svimpbox.hxx b/svtools/source/inc/svimpbox.hxx
index 4a892cf87c1a..f2ed5bb4880b 100644
--- a/svtools/source/inc/svimpbox.hxx
+++ b/svtools/source/inc/svimpbox.hxx
@@ -329,7 +329,7 @@ public:
     Rectangle           GetClipRegionRect() const;
     bool HasHorScrollBar() const { return aHorSBar->IsVisible(); }
     void                ShowFocusRect( const SvTreeListEntry* pEntry );
-    void                CallEventListeners( sal_uLong nEvent, void* pData = nullptr );
+    void                CallEventListeners( VclEventId nEvent, void* pData = nullptr );
 
     /** Enables, that one cell of a tablistbox entry can be focused */
     bool IsCellFocusEnabled() const { return bIsCellFocusEnabled; }
diff --git a/svtools/source/misc/dialogcontrolling.cxx b/svtools/source/misc/dialogcontrolling.cxx
index 11e6d50bfac6..8e1c15016da4 100644
--- a/svtools/source/misc/dialogcontrolling.cxx
+++ b/svtools/source/misc/dialogcontrolling.cxx
@@ -97,7 +97,7 @@ namespace svt
     {
         m_pImpl->aConcernedWindows.push_back( &_rWindow );
 
-        VclWindowEvent aEvent( &_rWindow, 0, nullptr );
+        VclWindowEvent aEvent( &_rWindow, VclEventId::NONE, nullptr );
         impl_update( aEvent, _rWindow );
     }
 
diff --git a/svtools/source/table/tablecontrol.cxx b/svtools/source/table/tablecontrol.cxx
index 5627b0ddd91c..a9604b058464 100644
--- a/svtools/source/table/tablecontrol.cxx
+++ b/svtools/source/table/tablecontrol.cxx
@@ -69,7 +69,7 @@ namespace svt { namespace table
 
     void TableControl::dispose()
     {
-        CallEventListeners( VCLEVENT_OBJECT_DYING );
+        CallEventListeners( VclEventId::ObjectDying );
 
         m_pImpl->setModel( PTableModel() );
         m_pImpl->disposeAccessible();
@@ -648,7 +648,7 @@ namespace svt { namespace table
 
     void TableControl::Select()
     {
-        ImplCallEventListenersAndHandler( VCLEVENT_TABLEROW_SELECT, nullptr );
+        ImplCallEventListenersAndHandler( VclEventId::TableRowSelect, nullptr );
 
         if ( m_pImpl->isAccessibleAlive() )
         {
diff --git a/svtools/source/uno/genericunodialog.cxx b/svtools/source/uno/genericunodialog.cxx
index 1a6fab51fd62..b7543b202a46 100644
--- a/svtools/source/uno/genericunodialog.cxx
+++ b/svtools/source/uno/genericunodialog.cxx
@@ -312,7 +312,7 @@ void OGenericUnoDialog::destroyDialog()
 IMPL_LINK( OGenericUnoDialog, OnDialogDying, VclWindowEvent&, _rEvent, void )
 {
     OSL_ENSURE( _rEvent.GetWindow() == m_pDialog, "OGenericUnoDialog::OnDialogDying: where does this come from?" );
-    if ( _rEvent.GetId() == VCLEVENT_OBJECT_DYING )
+    if ( _rEvent.GetId() == VclEventId::ObjectDying )
         m_pDialog = nullptr;
 }
 
diff --git a/svtools/source/uno/popupwindowcontroller.cxx b/svtools/source/uno/popupwindowcontroller.cxx
index bffb118e9e22..9229f09bf040 100644
--- a/svtools/source/uno/popupwindowcontroller.cxx
+++ b/svtools/source/uno/popupwindowcontroller.cxx
@@ -89,7 +89,7 @@ IMPL_LINK( PopupWindowControllerImpl, WindowEventListener, VclWindowEvent&, rWin
 {
     switch( rWindowEvent.GetId() )
     {
-    case VCLEVENT_WINDOW_ENDPOPUPMODE:
+    case VclEventId::WindowEndPopupMode:
     {
         EndPopupModeData* pData = static_cast< EndPopupModeData* >( rWindowEvent.GetData() );
         if( pData && pData->mbTearoff )
@@ -106,7 +106,7 @@ IMPL_LINK( PopupWindowControllerImpl, WindowEventListener, VclWindowEvent&, rWin
         SetPopupWindow(nullptr,nullptr);
         break;
     }
-    case VCLEVENT_WINDOW_PREPARETOGGLEFLOATING:
+    case VclEventId::WindowPrepareToggleFloating:
     {
         if ( mpFloatingWindow && rWindowEvent.GetWindow() == mpFloatingWindow.get() )
         {
@@ -115,33 +115,34 @@ IMPL_LINK( PopupWindowControllerImpl, WindowEventListener, VclWindowEvent&, rWin
         }
         break;
     }
-    case VCLEVENT_WINDOW_CLOSE:
+    case VclEventId::WindowClose:
     {
         SetPopupWindow(nullptr,nullptr);
         SetFloatingWindow();
         break;
     }
-    case VCLEVENT_WINDOW_SHOW:
+    case VclEventId::WindowShow:
     {
         if( mpPopupWindow )
         {
             if( mpToolBox )
-                mpToolBox->CallEventListeners( VCLEVENT_DROPDOWN_OPEN, static_cast<void*>(mpPopupWindow) );
-            mpPopupWindow->CallEventListeners( VCLEVENT_WINDOW_GETFOCUS );
+                mpToolBox->CallEventListeners( VclEventId::DropdownOpen, static_cast<void*>(mpPopupWindow) );
+            mpPopupWindow->CallEventListeners( VclEventId::WindowGetFocus );
             break;
         }
         break;
     }
-    case VCLEVENT_WINDOW_HIDE:
+    case VclEventId::WindowHide:
     {
         if( mpPopupWindow )
         {
-            mpPopupWindow->CallEventListeners( VCLEVENT_WINDOW_LOSEFOCUS );
+            mpPopupWindow->CallEventListeners( VclEventId::WindowLoseFocus );
             if( mpToolBox )
-                mpToolBox->CallEventListeners( VCLEVENT_DROPDOWN_CLOSE, static_cast<void*>(mpPopupWindow) );
+                mpToolBox->CallEventListeners( VclEventId::DropdownClose, static_cast<void*>(mpPopupWindow) );
         }
         break;
     }
+    default: break;
     }
 }
 
diff --git a/svtools/source/uno/svtxgridcontrol.cxx b/svtools/source/uno/svtxgridcontrol.cxx
index 79dee627d540..07a840655704 100644
--- a/svtools/source/uno/svtxgridcontrol.cxx
+++ b/svtools/source/uno/svtxgridcontrol.cxx
@@ -783,7 +783,7 @@ void SVTXGridControl::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent
     bool handled = false;
     switch ( rVclWindowEvent.GetId() )
     {
-        case VCLEVENT_TABLEROW_SELECT:
+        case VclEventId::TableRowSelect:
         {
             if ( m_aSelectionListeners.getLength() )
                 ImplCallItemListeners();
@@ -791,7 +791,7 @@ void SVTXGridControl::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent
         }
         break;
 
-        case VCLEVENT_CONTROL_GETFOCUS:
+        case VclEventId::ControlGetFocus:
         {
             // TODO: this doesn't belong here. It belongs into the TableControl/_Impl, so A11Y also
             // works when the control is used outside the UNO context
@@ -819,7 +819,7 @@ void SVTXGridControl::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent
         }
         break;
 
-        case VCLEVENT_CONTROL_LOSEFOCUS:
+        case VclEventId::ControlLoseFocus:
         {
             // TODO: this doesn't belong here. It belongs into the TableControl/_Impl, so A11Y also
             // works when the control is used outside the UNO context
@@ -841,6 +841,8 @@ void SVTXGridControl::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent
             }
         }
         break;
+
+        default: break;
     }
 
     if ( !handled )
diff --git a/svtools/source/uno/unoiface.cxx b/svtools/source/uno/unoiface.cxx
index ea8324c081fc..e3a362070ee2 100644
--- a/svtools/source/uno/unoiface.cxx
+++ b/svtools/source/uno/unoiface.cxx
@@ -391,7 +391,7 @@ void VCLXMultiLineEdit::ProcessWindowEvent( const VclWindowEvent& rVclWindowEven
 {
     switch ( rVclWindowEvent.GetId() )
     {
-        case VCLEVENT_EDIT_MODIFY:
+        case VclEventId::EditModify:
         {
             if ( maTextListeners.getLength() )
             {
@@ -1399,7 +1399,7 @@ void SVTXRoadmap::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
 {
     switch ( rVclWindowEvent.GetId() )
     {
-        case VCLEVENT_ROADMAP_ITEMSELECTED:
+        case VclEventId::RoadmapItemSelected:
         {
             SolarMutexGuard aGuard;
             VclPtr<::svt::ORoadmap> pField = GetAs< svt::ORoadmap >();