diff options
| author | Noel Grandin <noel@peralex.com> | 2015-05-06 15:42:16 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-05-08 11:41:53 +0000 |
| commit | 32186f005088fbace08b791df5cf5557f6e5fd24 (patch) | |
| tree | 2a4493648f40f9abb42e9f15a6798562a0f6dc49 /sd | |
| parent | 303f08fe4292341cda40f70da3d0f82d69f697aa (diff) | |
convert MEDIA_COMMAND constants to scoped enum
Change-Id: Id3731144fab89cdab9a6f66d78a1ebe1ebd4f61c
Reviewed-on: https://gerrit.libreoffice.org/15652
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/app/sdmod1.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/slideshow/slideshowimpl.cxx | 22 |
2 files changed, 12 insertions, 12 deletions
diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx index c7bebb074c29..2b9a522e03e4 100644 --- a/sd/source/ui/app/sdmod1.cxx +++ b/sd/source/ui/app/sdmod1.cxx @@ -428,7 +428,7 @@ IMPL_LINK( SdModule, EventListenerHdl, VclSimpleEvent*, pEvent ) pMediaData->SetPassThroughToOS(false); switch (pMediaData->GetMediaId()) { - case MEDIA_COMMAND_PLAY: + case MediaCommand::Play: { ::sd::DrawDocShell* pDocShell = PTR_CAST(::sd::DrawDocShell, SfxObjectShell::Current()); if( pDocShell ) // Impress or Draw ? diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx index f03a0e34fe32..4018cb143b3b 100644 --- a/sd/source/ui/slideshow/slideshowimpl.cxx +++ b/sd/source/ui/slideshow/slideshowimpl.cxx @@ -2020,7 +2020,7 @@ IMPL_LINK( SlideshowImpl, EventListenerHdl, VclSimpleEvent*, pEvent ) switch (pMediaData->GetMediaId()) { #if defined( MACOSX ) - case MEDIA_COMMAND_MENU: + case MediaCommand::Menu: if( !mnContextMenuEvent ) { if( mpShowWindow ) @@ -2028,42 +2028,42 @@ IMPL_LINK( SlideshowImpl, EventListenerHdl, VclSimpleEvent*, pEvent ) mnContextMenuEvent = Application::PostUserEvent( LINK( this, SlideshowImpl, ContextMenuHdl ) ); } break; - case MEDIA_COMMAND_VOLUME_DOWN: + case MediaCommand::VolumeDown: gotoPreviousSlide(); break; - case MEDIA_COMMAND_VOLUME_UP: + case MediaCommand::VolumeUp: gotoNextEffect(); break; #endif - case MEDIA_COMMAND_NEXTTRACK: + case MediaCommand::NextTrack: gotoNextEffect(); break; - case MEDIA_COMMAND_PAUSE: + case MediaCommand::Pause: if( !mbIsPaused ) blankScreen(0); break; - case MEDIA_COMMAND_PLAY: + case MediaCommand::Play: if( mbIsPaused ) resume(); break; - case MEDIA_COMMAND_PLAY_PAUSE: + case MediaCommand::PlayPause: if( mbIsPaused ) resume(); else blankScreen(0); break; - case MEDIA_COMMAND_PREVIOUSTRACK: + case MediaCommand::PreviousTrack: gotoPreviousSlide(); break; - case MEDIA_COMMAND_NEXTTRACK_HOLD: + case MediaCommand::NextTrackHold: gotoLastSlide(); break; - case MEDIA_COMMAND_REWIND: + case MediaCommand::Rewind: gotoFirstSlide(); break; - case MEDIA_COMMAND_STOP: + case MediaCommand::Stop: // in case the user cancels the presentation, switch to current slide // in edit mode if( mpSlideController.get() && (ANIMATIONMODE_SHOW == meAnimationMode) ) |