From 82d68f9cbce4073a727c43b4a8e81d39871b71eb Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 7 May 2015 15:25:20 +0200 Subject: convert COMMAND_ constants to scoped enum Change-Id: I88e67f89dbbab0646e8f106dfeb32c6ee1bb0b95 Reviewed-on: https://gerrit.libreoffice.org/15671 Tested-by: Jenkins Reviewed-by: Noel Grandin --- svtools/source/control/calendar.cxx | 4 ++-- svtools/source/control/fmtfield.cxx | 2 +- svtools/source/control/headbar.cxx | 2 +- svtools/source/control/scrwin.cxx | 6 +++--- svtools/source/control/tabbar.cxx | 7 +++---- svtools/source/control/toolbarmenu.cxx | 2 +- svtools/source/control/valueset.cxx | 8 ++++---- 7 files changed, 15 insertions(+), 16 deletions(-) (limited to 'svtools/source/control') diff --git a/svtools/source/control/calendar.cxx b/svtools/source/control/calendar.cxx index 647bd118d2ea..e88fc0ebd5e9 100644 --- a/svtools/source/control/calendar.cxx +++ b/svtools/source/control/calendar.cxx @@ -1638,7 +1638,7 @@ void Calendar::RequestHelp( const HelpEvent& rHEvt ) void Calendar::Command( const CommandEvent& rCEvt ) { - if ( rCEvt.GetCommand() == COMMAND_CONTEXTMENU ) + if ( rCEvt.GetCommand() == CommandEventId::ContextMenu ) { if ( !mbSelection && rCEvt.IsMouseEvent() ) { @@ -1651,7 +1651,7 @@ void Calendar::Command( const CommandEvent& rCEvt ) } } } - else if ( rCEvt.GetCommand() == COMMAND_WHEEL ) + else if ( rCEvt.GetCommand() == CommandEventId::Wheel ) { const CommandWheelData* pData = rCEvt.GetWheelData(); if ( pData->GetMode() == CommandWheelMode::SCROLL ) diff --git a/svtools/source/control/fmtfield.cxx b/svtools/source/control/fmtfield.cxx index 3ba6477517be..0b09fb3ebce6 100644 --- a/svtools/source/control/fmtfield.cxx +++ b/svtools/source/control/fmtfield.cxx @@ -777,7 +777,7 @@ bool FormattedField::Notify(NotifyEvent& rNEvt) if ((rNEvt.GetType() == MouseNotifyEvent::COMMAND) && !IsReadOnly()) { const CommandEvent* pCommand = rNEvt.GetCommandEvent(); - if (pCommand->GetCommand() == COMMAND_WHEEL) + if (pCommand->GetCommand() == CommandEventId::Wheel) { const CommandWheelData* pData = rNEvt.GetCommandEvent()->GetWheelData(); if ((pData->GetMode() == CommandWheelMode::SCROLL) && ImplGetFormatter()->IsTextFormat(m_nFormatKey)) diff --git a/svtools/source/control/headbar.cxx b/svtools/source/control/headbar.cxx index 90f07816ed8e..6d4be8b36188 100644 --- a/svtools/source/control/headbar.cxx +++ b/svtools/source/control/headbar.cxx @@ -1018,7 +1018,7 @@ void HeaderBar::Resize() void HeaderBar::Command( const CommandEvent& rCEvt ) { - if ( rCEvt.IsMouseEvent() && (rCEvt.GetCommand() == COMMAND_STARTDRAG) && !mbDrag ) + if ( rCEvt.IsMouseEvent() && (rCEvt.GetCommand() == CommandEventId::StartDrag) && !mbDrag ) { ImplStartDrag( rCEvt.GetMousePosPixel(), true ); return; diff --git a/svtools/source/control/scrwin.cxx b/svtools/source/control/scrwin.cxx index 9bac31091e9a..3f716b00ca46 100644 --- a/svtools/source/control/scrwin.cxx +++ b/svtools/source/control/scrwin.cxx @@ -67,9 +67,9 @@ void ScrollableWindow::dispose() void ScrollableWindow::Command( const CommandEvent& rCEvt ) { - if ( (rCEvt.GetCommand() == COMMAND_WHEEL) || - (rCEvt.GetCommand() == COMMAND_STARTAUTOSCROLL) || - (rCEvt.GetCommand() == COMMAND_AUTOSCROLL) ) + if ( (rCEvt.GetCommand() == CommandEventId::Wheel) || + (rCEvt.GetCommand() == CommandEventId::StartAutoScroll) || + (rCEvt.GetCommand() == CommandEventId::AutoScroll) ) { ScrollBar* pHScrBar; ScrollBar* pVScrBar; diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx index ae62dc1a6b27..f65b7257e0f9 100644 --- a/svtools/source/control/tabbar.cxx +++ b/svtools/source/control/tabbar.cxx @@ -303,8 +303,7 @@ void ImplTabButton::MouseButtonUp(const MouseEvent& rMouseEvent) void ImplTabButton::Command(const CommandEvent& rCommandEvent) { - sal_uInt16 nCommand = rCommandEvent.GetCommand(); - if (nCommand == COMMAND_CONTEXTMENU) + if (rCommandEvent.GetCommand() == CommandEventId::ContextMenu) { TabBar* pParent = GetParent(); pParent->maScrollAreaContextHdl.Call((void*)&rCommandEvent); @@ -1417,7 +1416,7 @@ bool TabBar::PreNotify( NotifyEvent& rNEvt ) { if (rNEvt.GetType() == MouseNotifyEvent::COMMAND) { - if (rNEvt.GetCommandEvent()->GetCommand() == COMMAND_WHEEL) + if (rNEvt.GetCommandEvent()->GetCommand() == CommandEventId::Wheel) { const CommandWheelData* pData = rNEvt.GetCommandEvent()->GetWheelData(); sal_uInt16 nNewPos = mnFirstPos; @@ -2344,7 +2343,7 @@ OString TabBar::GetHelpId( sal_uInt16 nPageId ) const bool TabBar::StartDrag( const CommandEvent& rCEvt, vcl::Region& rRegion ) { - if ( !(mnWinStyle & WB_DRAG) || (rCEvt.GetCommand() != COMMAND_STARTDRAG) ) + if ( !(mnWinStyle & WB_DRAG) || (rCEvt.GetCommand() != CommandEventId::StartDrag) ) return false; // Check if the clicked page was selected. If this is not the case diff --git a/svtools/source/control/toolbarmenu.cxx b/svtools/source/control/toolbarmenu.cxx index 4e20373fc9df..adc60bbf2ac6 100644 --- a/svtools/source/control/toolbarmenu.cxx +++ b/svtools/source/control/toolbarmenu.cxx @@ -1535,7 +1535,7 @@ void ToolbarMenu::DataChanged( const DataChangedEvent& rDCEvt ) void ToolbarMenu::Command( const CommandEvent& rCEvt ) { - if ( rCEvt.GetCommand() == COMMAND_WHEEL ) + if ( rCEvt.GetCommand() == CommandEventId::Wheel ) { const CommandWheelData* pData = rCEvt.GetWheelData(); if( !pData->GetModifier() && ( pData->GetMode() == CommandWheelMode::SCROLL ) ) diff --git a/svtools/source/control/valueset.cxx b/svtools/source/control/valueset.cxx index 8d36028c636d..28bee3593a83 100644 --- a/svtools/source/control/valueset.cxx +++ b/svtools/source/control/valueset.cxx @@ -1410,9 +1410,9 @@ void ValueSet::KeyInput( const KeyEvent& rKeyEvent ) void ValueSet::Command( const CommandEvent& rCommandEvent ) { - if ( rCommandEvent.GetCommand() == COMMAND_WHEEL || - rCommandEvent.GetCommand() == COMMAND_STARTAUTOSCROLL || - rCommandEvent.GetCommand() == COMMAND_AUTOSCROLL ) + if ( rCommandEvent.GetCommand() == CommandEventId::Wheel || + rCommandEvent.GetCommand() == CommandEventId::StartAutoScroll || + rCommandEvent.GetCommand() == CommandEventId::AutoScroll ) { if ( HandleScrollCommand( rCommandEvent, NULL, mxScrollBar.get() ) ) return; @@ -2119,7 +2119,7 @@ void ValueSet::SetFormat(bool bFormat) bool ValueSet::StartDrag( const CommandEvent& rEvent, vcl::Region& rRegion ) { - if ( rEvent.GetCommand() != COMMAND_STARTDRAG ) + if ( rEvent.GetCommand() != CommandEventId::StartDrag ) return false; // if necessary abort an existing action -- cgit v1.2.3