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 /sw | |
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 'sw')
-rw-r--r-- | sw/source/core/access/accdoc.cxx | 7 | ||||
-rw-r--r-- | sw/source/ui/dialog/uiregionsw.cxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/docvw/SidebarTxtControlAcc.cxx | 11 | ||||
-rw-r--r-- | sw/source/uibase/docvw/SidebarWin.cxx | 4 | ||||
-rw-r--r-- | sw/source/uibase/uiview/viewmdi.cxx | 5 |
5 files changed, 16 insertions, 13 deletions
diff --git a/sw/source/core/access/accdoc.cxx b/sw/source/core/access/accdoc.cxx index 93c17f08150d..b64c39a9bb52 100644 --- a/sw/source/core/access/accdoc.cxx +++ b/sw/source/core/access/accdoc.cxx @@ -389,7 +389,7 @@ IMPL_LINK( SwAccessibleDocument, 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() ) @@ -398,7 +398,7 @@ IMPL_LINK( SwAccessibleDocument, 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() ) @@ -407,7 +407,7 @@ IMPL_LINK( SwAccessibleDocument, WindowChildEventListener, VclWindowEvent&, rEve } } break; - case VCLEVENT_OBJECT_DYING: // send destroy on hide for direct accessible children + case VclEventId::ObjectDying: // send destroy on hide for direct accessible children { vcl::Window* pChildWin = rEvent.GetWindow(); if( pChildWin && AccessibleRole::EMBEDDED_OBJECT == pChildWin->GetAccessibleRole() ) @@ -416,6 +416,7 @@ IMPL_LINK( SwAccessibleDocument, WindowChildEventListener, VclWindowEvent&, rEve } } break; + default: break; } } diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx index 722ec47ca64c..15ee51f64e8b 100644 --- a/sw/source/ui/dialog/uiregionsw.cxx +++ b/sw/source/ui/dialog/uiregionsw.cxx @@ -1342,7 +1342,7 @@ IMPL_LINK( SwEditRegionDlg, DlgClosedHdl, sfx2::FileDialogHelper *, _pFileDlg, v IMPL_LINK( SwEditRegionDlg, SubRegionEventHdl, VclWindowEvent&, rEvent, void ) { - if( !m_bSubRegionsFilled && rEvent.GetId() == VCLEVENT_DROPDOWN_PRE_OPEN ) + if( !m_bSubRegionsFilled && rEvent.GetId() == VclEventId::DropdownPreOpen ) { //if necessary fill the names bookmarks/sections/tables now diff --git a/sw/source/uibase/docvw/SidebarTxtControlAcc.cxx b/sw/source/uibase/docvw/SidebarTxtControlAcc.cxx index ffc62edf5049..5fe11aacab67 100644 --- a/sw/source/uibase/docvw/SidebarTxtControlAcc.cxx +++ b/sw/source/uibase/docvw/SidebarTxtControlAcc.cxx @@ -239,23 +239,24 @@ void SidebarTextControlAccessibleContext::ProcessWindowEvent( const VclWindowEve { switch ( rVclWindowEvent.GetId() ) { - case VCLEVENT_OBJECT_DYING: + case VclEventId::ObjectDying: { defunc(); } break; - case VCLEVENT_WINDOW_GETFOCUS: - case VCLEVENT_CONTROL_GETFOCUS: + case VclEventId::WindowGetFocus: + case VclEventId::ControlGetFocus: { mpAccessibleTextHelper->SetFocus(); } break; - case VCLEVENT_WINDOW_LOSEFOCUS: - case VCLEVENT_CONTROL_LOSEFOCUS: + case VclEventId::WindowLoseFocus: + case VclEventId::ControlLoseFocus: { mpAccessibleTextHelper->SetFocus( false ); } break; + default: break; } } diff --git a/sw/source/uibase/docvw/SidebarWin.cxx b/sw/source/uibase/docvw/SidebarWin.cxx index a1a8224c8342..6f739ccd4157 100644 --- a/sw/source/uibase/docvw/SidebarWin.cxx +++ b/sw/source/uibase/docvw/SidebarWin.cxx @@ -1359,7 +1359,7 @@ void SwSidebarWin::SwitchToPostIt(sal_uInt16 aDirection) IMPL_LINK( SwSidebarWin, WindowEventListener, VclWindowEvent&, rEvent, void ) { - if ( rEvent.GetId() == VCLEVENT_WINDOW_MOUSEMOVE ) + if ( rEvent.GetId() == VclEventId::WindowMouseMove ) { MouseEvent* pMouseEvt = static_cast<MouseEvent*>(rEvent.GetData()); if ( pMouseEvt->IsEnterWindow() ) @@ -1384,7 +1384,7 @@ IMPL_LINK( SwSidebarWin, WindowEventListener, VclWindowEvent&, rEvent, void ) } } } - else if ( rEvent.GetId() == VCLEVENT_WINDOW_ACTIVATE && + else if ( rEvent.GetId() == VclEventId::WindowActivate && rEvent.GetWindow() == mpSidebarTextControl ) { const bool bLockView = mrView.GetWrtShell().IsViewLocked(); diff --git a/sw/source/uibase/uiview/viewmdi.cxx b/sw/source/uibase/uiview/viewmdi.cxx index 27985eb84a94..eef998e77d0b 100644 --- a/sw/source/uibase/uiview/viewmdi.cxx +++ b/sw/source/uibase/uiview/viewmdi.cxx @@ -265,18 +265,19 @@ IMPL_LINK( SwView, WindowChildEventListener, VclWindowEvent&, rEvent, void ) switch ( rEvent.GetId() ) { - case VCLEVENT_WINDOW_HIDE: + case VclEventId::WindowHide: if( pChildWin == m_pHScrollbar ) ShowHScrollbar( false ); else if( pChildWin == m_pVScrollbar ) ShowVScrollbar( false ); break; - case VCLEVENT_WINDOW_SHOW: + case VclEventId::WindowShow: if( pChildWin == m_pHScrollbar ) ShowHScrollbar( true ); else if( pChildWin == m_pVScrollbar ) ShowVScrollbar( true ); break; + default: break; } } |