diff options
author | Noel Grandin <noel@peralex.com> | 2015-05-07 15:25:20 +0200 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2015-05-11 12:17:42 +0000 |
commit | 82d68f9cbce4073a727c43b4a8e81d39871b71eb (patch) | |
tree | 64b3a9e1092586afee46899adfd00070821613b8 /svtools/source | |
parent | 19ea033f380aa196c9c868a3cdb43e967eb42abe (diff) |
convert COMMAND_ constants to scoped enum
Change-Id: I88e67f89dbbab0646e8f106dfeb32c6ee1bb0b95
Reviewed-on: https://gerrit.libreoffice.org/15671
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'svtools/source')
-rw-r--r-- | svtools/source/brwbox/brwbox2.cxx | 2 | ||||
-rw-r--r-- | svtools/source/brwbox/brwhead.cxx | 4 | ||||
-rw-r--r-- | svtools/source/brwbox/datwin.cxx | 10 | ||||
-rw-r--r-- | svtools/source/contnr/imivctl1.cxx | 14 | ||||
-rw-r--r-- | svtools/source/contnr/svimpbox.cxx | 8 | ||||
-rw-r--r-- | svtools/source/control/calendar.cxx | 4 | ||||
-rw-r--r-- | svtools/source/control/fmtfield.cxx | 2 | ||||
-rw-r--r-- | svtools/source/control/headbar.cxx | 2 | ||||
-rw-r--r-- | svtools/source/control/scrwin.cxx | 6 | ||||
-rw-r--r-- | svtools/source/control/tabbar.cxx | 7 | ||||
-rw-r--r-- | svtools/source/control/toolbarmenu.cxx | 2 | ||||
-rw-r--r-- | svtools/source/control/valueset.cxx | 8 | ||||
-rw-r--r-- | svtools/source/table/tabledatawindow.cxx | 2 |
13 files changed, 36 insertions, 35 deletions
diff --git a/svtools/source/brwbox/brwbox2.cxx b/svtools/source/brwbox/brwbox2.cxx index e115d7bc475c..dc1e92145369 100644 --- a/svtools/source/brwbox/brwbox2.cxx +++ b/svtools/source/brwbox/brwbox2.cxx @@ -1443,7 +1443,7 @@ void BrowseBox::MouseButtonDown( const MouseEvent& rEvt ) // event occurred out of data area if ( rEvt.IsRight() ) pDataWin->Command( - CommandEvent( Point( 1, LONG_MAX ), COMMAND_CONTEXTMENU, true ) ); + CommandEvent( Point( 1, LONG_MAX ), CommandEventId::ContextMenu, true ) ); else SetNoSelection(); } diff --git a/svtools/source/brwbox/brwhead.cxx b/svtools/source/brwbox/brwhead.cxx index 0c723a31e32a..c0b99ef473ad 100644 --- a/svtools/source/brwbox/brwhead.cxx +++ b/svtools/source/brwbox/brwhead.cxx @@ -51,14 +51,14 @@ void BrowserHeader::dispose() void BrowserHeader::Command( const CommandEvent& rCEvt ) { - if ( !GetCurItemId() && COMMAND_CONTEXTMENU == rCEvt.GetCommand() ) + if ( !GetCurItemId() && CommandEventId::ContextMenu == rCEvt.GetCommand() ) { Point aPos( rCEvt.GetMousePosPixel() ); if ( _pBrowseBox->IsFrozen(0) ) aPos.X() += _pBrowseBox->GetColumnWidth(0); _pBrowseBox->GetDataWindow().Command( CommandEvent( Point( aPos.X(), aPos.Y() - GetSizePixel().Height() ), - COMMAND_CONTEXTMENU, rCEvt.IsMouseEvent() ) ); + CommandEventId::ContextMenu, rCEvt.IsMouseEvent() ) ); } } diff --git a/svtools/source/brwbox/datwin.cxx b/svtools/source/brwbox/datwin.cxx index 6dd64ed0389a..e3dfa380cd21 100644 --- a/svtools/source/brwbox/datwin.cxx +++ b/svtools/source/brwbox/datwin.cxx @@ -416,16 +416,16 @@ void BrowserDataWin::Command( const CommandEvent& rEvt ) { // scroll mouse event? BrowseBox *pBox = GetParent(); - if ( ( (rEvt.GetCommand() == COMMAND_WHEEL) || - (rEvt.GetCommand() == COMMAND_STARTAUTOSCROLL) || - (rEvt.GetCommand() == COMMAND_AUTOSCROLL) ) && + if ( ( (rEvt.GetCommand() == CommandEventId::Wheel) || + (rEvt.GetCommand() == CommandEventId::StartAutoScroll) || + (rEvt.GetCommand() == CommandEventId::AutoScroll) ) && ( HandleScrollCommand( rEvt, pBox->aHScroll.get(), pBox->pVScroll ) ) ) return; Point aEventPos( rEvt.GetMousePosPixel() ); long nRow = pBox->GetRowAtYPosPixel( aEventPos.Y(), false); MouseEvent aMouseEvt( aEventPos, 1, MouseEventModifiers::SELECT, MOUSE_LEFT ); - if ( COMMAND_CONTEXTMENU == rEvt.GetCommand() && rEvt.IsMouseEvent() && + if ( CommandEventId::ContextMenu == rEvt.GetCommand() && rEvt.IsMouseEvent() && nRow < pBox->GetRowCount() && !pBox->IsRowSelected(nRow) ) { bInCommand = true; @@ -447,7 +447,7 @@ void BrowserDataWin::Command( const CommandEvent& rEvt ) return; bInCommand = false; - if ( COMMAND_STARTDRAG == rEvt.GetCommand() ) + if ( CommandEventId::StartDrag == rEvt.GetCommand() ) MouseButtonUp( aMouseEvt ); Control::Command( rEvt ); diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx index b5d9ca55bb96..d28af606e7f1 100644 --- a/svtools/source/contnr/imivctl1.cxx +++ b/svtools/source/contnr/imivctl1.cxx @@ -2149,7 +2149,7 @@ bool SvxIconChoiceCtrl_Impl::HandleScrollCommand( const CommandEvent& rCmd ) switch( rCmd.GetCommand() ) { - case COMMAND_STARTAUTOSCROLL: + case CommandEventId::StartAutoScroll: { pView->EndTracking(); sal_uInt16 nScrollFlags = 0; @@ -2165,7 +2165,7 @@ bool SvxIconChoiceCtrl_Impl::HandleScrollCommand( const CommandEvent& rCmd ) } break; - case COMMAND_WHEEL: + case CommandEventId::Wheel: { const CommandWheelData* pData = rCmd.GetWheelData(); if( pData && (CommandWheelMode::SCROLL == pData->GetMode()) && !pData->IsHorz() ) @@ -2186,7 +2186,7 @@ bool SvxIconChoiceCtrl_Impl::HandleScrollCommand( const CommandEvent& rCmd ) } break; - case COMMAND_AUTOSCROLL: + case CommandEventId::AutoScroll: { const CommandScrollData* pData = rCmd.GetAutoScrollData(); if( pData ) @@ -2196,6 +2196,8 @@ bool SvxIconChoiceCtrl_Impl::HandleScrollCommand( const CommandEvent& rCmd ) } } break; + + default: break; } if( nScrollDX || nScrollDY ) @@ -2214,9 +2216,9 @@ bool SvxIconChoiceCtrl_Impl::HandleScrollCommand( const CommandEvent& rCmd ) void SvxIconChoiceCtrl_Impl::Command( const CommandEvent& rCEvt ) { // scroll mouse event? - 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) ) { if( HandleScrollCommand( rCEvt ) ) return; diff --git a/svtools/source/contnr/svimpbox.cxx b/svtools/source/contnr/svimpbox.cxx index 78ec65c1734b..b50efab898e7 100644 --- a/svtools/source/contnr/svimpbox.cxx +++ b/svtools/source/contnr/svimpbox.cxx @@ -2965,17 +2965,17 @@ static void lcl_DeleteSubPopups(PopupMenu* pPopup) void SvImpLBox::Command( const CommandEvent& rCEvt ) { - sal_uInt16 nCommand = rCEvt.GetCommand(); + CommandEventId nCommand = rCEvt.GetCommand(); - if( nCommand == COMMAND_CONTEXTMENU ) + if( nCommand == CommandEventId::ContextMenu ) aEditIdle.Stop(); // scroll mouse event? - if( ( ( nCommand == COMMAND_WHEEL ) || ( nCommand == COMMAND_STARTAUTOSCROLL ) || ( nCommand == COMMAND_AUTOSCROLL ) ) + if( ( ( nCommand == CommandEventId::Wheel ) || ( nCommand == CommandEventId::StartAutoScroll ) || ( nCommand == CommandEventId::AutoScroll ) ) && pView->HandleScrollCommand( rCEvt, aHorSBar.get(), aVerSBar.get() ) ) return; - if( bContextMenuHandling && nCommand == COMMAND_CONTEXTMENU ) + if( bContextMenuHandling && nCommand == CommandEventId::ContextMenu ) { Point aPopupPos; bool bClickedIsFreePlace = false; 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 diff --git a/svtools/source/table/tabledatawindow.cxx b/svtools/source/table/tabledatawindow.cxx index 8691b326a0ca..51709935ea7d 100644 --- a/svtools/source/table/tabledatawindow.cxx +++ b/svtools/source/table/tabledatawindow.cxx @@ -201,7 +201,7 @@ namespace svt { namespace table if ( rNEvt.GetType() == MouseNotifyEvent::COMMAND ) { const CommandEvent& rCEvt = *rNEvt.GetCommandEvent(); - if ( rCEvt.GetCommand() == COMMAND_WHEEL ) + if ( rCEvt.GetCommand() == CommandEventId::Wheel ) { const CommandWheelData* pData = rCEvt.GetWheelData(); if( !pData->GetModifier() && ( pData->GetMode() == CommandWheelMode::SCROLL ) ) |