diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-12-06 13:26:09 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-12-07 07:10:39 +0000 |
| commit | 2d48f5fc0a4f7b5b8c9d3a4f4cc85d5f3a7e5053 (patch) | |
| tree | c2e18df7dd44255e98c91f242194fd9bb66f3f3e /sc | |
| parent | ed80d28d9f019a1afa2edd66e115eae26ea19963 (diff) | |
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>
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/ui/Accessibility/AccessibleDocument.cxx | 5 | ||||
| -rw-r--r-- | sc/source/ui/app/inputhdl.cxx | 4 | ||||
| -rw-r--r-- | sc/source/ui/cctrl/checklistmenu.cxx | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx index f919af438e80..6b57a08b27db 100644 --- a/sc/source/ui/Accessibility/AccessibleDocument.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx @@ -1480,7 +1480,7 @@ IMPL_LINK( ScAccessibleDocument, WindowChildEventListener, VclWindowEvent&, rEve OSL_ENSURE( rEvent.GetWindow(), "Window???" ); switch ( rEvent.GetId() ) { - case VCLEVENT_WINDOW_SHOW: // send create on show for direct accessible children + case VclEventId::WindowShow: // send create on show for direct accessible children { vcl::Window* pChildWin = static_cast < vcl::Window * >( rEvent.GetData() ); if( pChildWin && AccessibleRole::EMBEDDED_OBJECT == pChildWin->GetAccessibleRole() ) @@ -1489,7 +1489,7 @@ IMPL_LINK( ScAccessibleDocument, WindowChildEventListener, VclWindowEvent&, rEve } } break; - case VCLEVENT_WINDOW_HIDE: // send destroy on hide for direct accessible children + case VclEventId::WindowHide: // send destroy on hide for direct accessible children { vcl::Window* pChildWin = static_cast < vcl::Window * >( rEvent.GetData() ); if( pChildWin && AccessibleRole::EMBEDDED_OBJECT == pChildWin->GetAccessibleRole() ) @@ -1498,6 +1498,7 @@ IMPL_LINK( ScAccessibleDocument, WindowChildEventListener, VclWindowEvent&, rEve } } break; + default: break; } } diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx index 5d1fa7602453..33ec65641b00 100644 --- a/sc/source/ui/app/inputhdl.cxx +++ b/sc/source/ui/app/inputhdl.cxx @@ -857,13 +857,13 @@ void ScInputHandler::GetFormulaData() IMPL_LINK( ScInputHandler, ShowHideTipVisibleParentListener, VclWindowEvent&, rEvent, void ) { - if( rEvent.GetId() == VCLEVENT_OBJECT_DYING || rEvent.GetId() == VCLEVENT_WINDOW_HIDE ) + if( rEvent.GetId() == VclEventId::ObjectDying || rEvent.GetId() == VclEventId::WindowHide ) HideTip(); } IMPL_LINK( ScInputHandler, ShowHideTipVisibleSecParentListener, VclWindowEvent&, rEvent, void ) { - if( rEvent.GetId() == VCLEVENT_OBJECT_DYING || rEvent.GetId() == VCLEVENT_WINDOW_HIDE ) + if( rEvent.GetId() == VclEventId::ObjectDying || rEvent.GetId() == VclEventId::WindowHide ) HideTipBelow(); } diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx index bdf2b706e7df..d32ac8b55b3a 100644 --- a/sc/source/ui/cctrl/checklistmenu.cxx +++ b/sc/source/ui/cctrl/checklistmenu.cxx @@ -777,7 +777,7 @@ void ScMenuFloatingWindow::fireMenuHighlightedEvent() if (!xAccMenu.is()) return; - VclAccessibleEvent aEvent(VCLEVENT_MENU_HIGHLIGHT, xAccMenu); + VclAccessibleEvent aEvent(VclEventId::MenuHighlight, xAccMenu); FireVclEvent(aEvent); } |