diff options
author | Oliver Bolte <obo@openoffice.org> | 2006-10-12 10:26:06 +0000 |
---|---|---|
committer | Oliver Bolte <obo@openoffice.org> | 2006-10-12 10:26:06 +0000 |
commit | 3a6f505c8e42c9ce551176d96601a27451473ee5 (patch) | |
tree | 8a377ac7bc60a71fa4931447744cee1e78bdeaa7 /avmedia/source/viewer | |
parent | a89be27bc2c60b96657af2281bacb1edef71fbe3 (diff) |
INTEGRATION: CWS sb59 (1.3.8); FILE MERGED
2006/08/16 16:02:26 sb 1.3.8.1: #i67487# Made code warning-free (wntmsci10).
Diffstat (limited to 'avmedia/source/viewer')
-rw-r--r-- | avmedia/source/viewer/mediaevent_impl.cxx | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/avmedia/source/viewer/mediaevent_impl.cxx b/avmedia/source/viewer/mediaevent_impl.cxx index 59fc3eb2a2ce..45af4244dd91 100644 --- a/avmedia/source/viewer/mediaevent_impl.cxx +++ b/avmedia/source/viewer/mediaevent_impl.cxx @@ -4,9 +4,9 @@ * * $RCSfile: mediaevent_impl.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: hr $ $Date: 2006-06-19 13:58:43 $ + * last change: $Author: obo $ $Date: 2006-10-12 11:26:06 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -124,7 +124,9 @@ void SAL_CALL MediaEventListenersImpl::mousePressed( const ::com::sun::star::awt if( mpNotifyWindow ) { - MouseEvent aVCLMouseEvt( Point( e.X, e.Y ), e.ClickCount, 0, + MouseEvent aVCLMouseEvt( Point( e.X, e.Y ), + sal::static_int_cast< USHORT >(e.ClickCount), + 0, ( ( e.Buttons & 1 ) ? MOUSE_LEFT : 0 ) | ( ( e.Buttons & 2 ) ? MOUSE_RIGHT : 0 ) | ( ( e.Buttons & 4 ) ? MOUSE_MIDDLE : 0 ), @@ -143,7 +145,9 @@ void SAL_CALL MediaEventListenersImpl::mouseReleased( const ::com::sun::star::aw if( mpNotifyWindow ) { - MouseEvent aVCLMouseEvt( Point( e.X, e.Y ), e.ClickCount, 0, + MouseEvent aVCLMouseEvt( Point( e.X, e.Y ), + sal::static_int_cast< USHORT >(e.ClickCount), + 0, ( ( e.Buttons & 1 ) ? MOUSE_LEFT : 0 ) | ( ( e.Buttons & 2 ) ? MOUSE_RIGHT : 0 ) | ( ( e.Buttons & 4 ) ? MOUSE_MIDDLE : 0 ), |