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 /sfx2 | |
| 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 'sfx2')
| -rw-r--r-- | sfx2/source/appl/newhelp.cxx | 4 | ||||
| -rw-r--r-- | sfx2/source/control/thumbnailview.cxx | 6 | ||||
| -rw-r--r-- | sfx2/source/sidebar/Deck.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/statbar/stbitem.cxx | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index 7adaaf1a3173..3b261724f1d4 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -1278,7 +1278,7 @@ bool BookmarksBox_Impl::Notify( NotifyEvent& rNEvt ) else if ( MouseNotifyEvent::COMMAND == nType ) { const CommandEvent* pCEvt = rNEvt.GetCommandEvent(); - if ( pCEvt->GetCommand() == COMMAND_CONTEXTMENU ) + if ( pCEvt->GetCommand() == CommandEventId::ContextMenu ) { PopupMenu aMenu( SfxResId( MENU_HELP_BOOKMARKS ) ); sal_uInt16 nId = aMenu.Execute( this, pCEvt->GetMousePosPixel() ); @@ -2394,7 +2394,7 @@ bool SfxHelpTextWindow_Impl::PreNotify( NotifyEvent& rNEvt ) const CommandEvent* pCmdEvt = rNEvt.GetCommandEvent(); vcl::Window* pCmdWin = rNEvt.GetWindow(); - if ( pCmdEvt->GetCommand() == COMMAND_CONTEXTMENU && pCmdWin != this && pCmdWin != aToolBox.get() ) + if ( pCmdEvt->GetCommand() == CommandEventId::ContextMenu && pCmdWin != this && pCmdWin != aToolBox.get() ) { Point aPos; if ( pCmdEvt->IsMouseEvent() ) diff --git a/sfx2/source/control/thumbnailview.cxx b/sfx2/source/control/thumbnailview.cxx index 25f63c48c79a..6fbd97d75eaa 100644 --- a/sfx2/source/control/thumbnailview.cxx +++ b/sfx2/source/control/thumbnailview.cxx @@ -847,9 +847,9 @@ void ThumbnailView::MouseButtonUp( const MouseEvent& rMEvt ) void ThumbnailView::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) ) { if ( HandleScrollCommand( rCEvt, NULL, mpScrBar ) ) return; diff --git a/sfx2/source/sidebar/Deck.cxx b/sfx2/source/sidebar/Deck.cxx index ae6ba6da825f..4b2893e823d2 100644 --- a/sfx2/source/sidebar/Deck.cxx +++ b/sfx2/source/sidebar/Deck.cxx @@ -168,7 +168,7 @@ bool Deck::Notify (NotifyEvent& rEvent) if (pCommandEvent != NULL) switch (pCommandEvent->GetCommand()) { - case COMMAND_WHEEL: + case CommandEventId::Wheel: return ProcessWheelEvent(pCommandEvent); default: diff --git a/sfx2/source/statbar/stbitem.cxx b/sfx2/source/statbar/stbitem.cxx index 3ebd81948203..c0ded64c7da3 100644 --- a/sfx2/source/statbar/stbitem.cxx +++ b/sfx2/source/statbar/stbitem.cxx @@ -377,7 +377,7 @@ throw (::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ::Point aPos( rPos.X, rPos.Y ); - CommandEvent aCmdEvent( aPos, (sal_uInt16)nCommand, true, NULL ); + CommandEvent aCmdEvent( aPos, static_cast<CommandEventId>(nCommand), true, NULL ); Command( aCmdEvent ); } |