diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2006-04-06 12:27:08 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2006-04-06 12:27:08 +0000 |
| commit | e00b283a76829138dc3f97417969f053d9516707 (patch) | |
| tree | aa2326b74fd63dacb2e889e802aea829444e0c50 /sd | |
| parent | 3ef15788c64b0ed368d04a016db37051684a8ec6 (diff) | |
INTEGRATION: CWS slideshowkeys01 (1.6.144); FILE MERGED
2006/03/21 15:25:45 cl 1.6.144.1: #i54381# changed slide show controlling
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/slideshow/slideshow.cxx | 27 |
1 files changed, 24 insertions, 3 deletions
diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx index f59fe121e23d..0c5b75cc2fc3 100644 --- a/sd/source/ui/slideshow/slideshow.cxx +++ b/sd/source/ui/slideshow/slideshow.cxx @@ -4,9 +4,9 @@ * * $RCSfile: slideshow.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: obo $ $Date: 2005-10-11 08:17:41 $ + * last change: $Author: vg $ $Date: 2006-04-06 13:27:08 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -185,8 +185,29 @@ void Slideshow::mouseButtonUp(const MouseEvent& rMEvt) mpImpl->mouseButtonUp( rMEvt ); } -void Slideshow::command(const CommandEvent& rCEvt) +void Slideshow::command(const CommandEvent& rEvent) { + switch (rEvent.GetCommand()) + { + case COMMAND_WHEEL: + { + // We ignore zooming with control+mouse wheel. + const CommandWheelData* pData = rEvent.GetWheelData(); + if( pData && !pData->GetModifier() && ( pData->GetMode() == COMMAND_WHEEL_SCROLL ) && !pData->IsHorz() ) + { + long nDelta = pData->GetDelta(); + if( nDelta > 0 ) + { + mpImpl->gotoPreviousSlide(); + } + else if( nDelta < 0 ) + { + mpImpl->gotoNextEffect(); + } + }; + } + break; + } } bool Slideshow::isAlwaysOnTop() |