diff options
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/app/sdmod1.cxx | 8 | ||||
| -rw-r--r-- | sd/source/ui/slideshow/slideshowimpl.cxx | 7 |
2 files changed, 11 insertions, 4 deletions
diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx index 672ccdd17879..cba122f4c784 100644 --- a/sd/source/ui/app/sdmod1.cxx +++ b/sd/source/ui/app/sdmod1.cxx @@ -428,7 +428,9 @@ IMPL_LINK( SdModule, EventListenerHdl, VclSimpleEvent*, pEvent ) if( rEvent.GetCommand() == COMMAND_MEDIA ) { - switch( rEvent.GetMediaCommand() ) + CommandMediaData* pMediaData = rEvent.GetMediaData(); + pMediaData->SetPassThroughToOS(false); + switch (pMediaData->GetMediaId()) { case MEDIA_COMMAND_PLAY: { @@ -441,10 +443,10 @@ IMPL_LINK( SdModule, EventListenerHdl, VclSimpleEvent*, pEvent ) if( pViewShell && (pDocShell->GetDocumentType() == DOCUMENT_TYPE_IMPRESS) ) pViewShell->GetViewFrame()->GetDispatcher()->Execute( SID_PRESENTATION ); } - } break; - + } default: + pMediaData->SetPassThroughToOS(true); break; } } diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx index 38a0351771f7..861d783b9e9b 100644 --- a/sd/source/ui/slideshow/slideshowimpl.cxx +++ b/sd/source/ui/slideshow/slideshowimpl.cxx @@ -2001,7 +2001,9 @@ IMPL_LINK( SlideshowImpl, EventListenerHdl, VclSimpleEvent*, pEvent ) if( rEvent.GetCommand() == COMMAND_MEDIA ) { - switch( rEvent.GetMediaCommand() ) + CommandMediaData* pMediaData = rEvent.GetMediaData(); + pMediaData->SetPassThroughToOS(false); + switch (pMediaData->GetMediaId()) { #if defined( MACOSX ) case MEDIA_COMMAND_MENU: @@ -2057,6 +2059,9 @@ IMPL_LINK( SlideshowImpl, EventListenerHdl, VclSimpleEvent*, pEvent ) } endPresentation(); break; + default: + pMediaData->SetPassThroughToOS(true); + break; } } } |