diff options
| author | Noel Grandin <noel@peralex.com> | 2014-11-07 12:30:39 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-11-07 14:53:36 +0200 |
| commit | 31d902d3c00fdc5f088aff433b7ebf308a718339 (patch) | |
| tree | 07b113a7e8d6bc7f6ba89bd5b6af002a594e6120 /avmedia | |
| parent | adaf5229afa37331da6fac2c4711494f53a2e067 (diff) | |
fdo#84938: replace MOUSE_ modifier constants with enum
and make the two categories of constants non-overlapping, we
really don't need to risk confusion in order to save 6 bits in
a data structure like this.
Change-Id: I2251195d8e45ed04e2a89e47ae9c3e52cf0475c0
Diffstat (limited to 'avmedia')
| -rw-r--r-- | avmedia/source/viewer/mediaevent_impl.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/avmedia/source/viewer/mediaevent_impl.cxx b/avmedia/source/viewer/mediaevent_impl.cxx index 2db883172d5e..86e18175101c 100644 --- a/avmedia/source/viewer/mediaevent_impl.cxx +++ b/avmedia/source/viewer/mediaevent_impl.cxx @@ -107,7 +107,7 @@ void SAL_CALL MediaEventListenersImpl::mousePressed( const ::com::sun::star::awt { MouseEvent aVCLMouseEvt( Point( e.X, e.Y ), sal::static_int_cast< sal_uInt16 >(e.ClickCount), - 0, + MouseEventModifiers::NONE, ( ( e.Buttons & 1 ) ? MOUSE_LEFT : 0 ) | ( ( e.Buttons & 2 ) ? MOUSE_RIGHT : 0 ) | ( ( e.Buttons & 4 ) ? MOUSE_MIDDLE : 0 ), @@ -128,7 +128,7 @@ void SAL_CALL MediaEventListenersImpl::mouseReleased( const ::com::sun::star::aw { MouseEvent aVCLMouseEvt( Point( e.X, e.Y ), sal::static_int_cast< sal_uInt16 >(e.ClickCount), - 0, + MouseEventModifiers::NONE, ( ( e.Buttons & 1 ) ? MOUSE_LEFT : 0 ) | ( ( e.Buttons & 2 ) ? MOUSE_RIGHT : 0 ) | ( ( e.Buttons & 4 ) ? MOUSE_MIDDLE : 0 ), @@ -173,7 +173,7 @@ void SAL_CALL MediaEventListenersImpl::mouseDragged( const ::com::sun::star::awt if( mpNotifyWindow ) { - MouseEvent aVCLMouseEvt( Point( e.X, e.Y ), 0, 0, e.Buttons, e.Modifiers ); + MouseEvent aVCLMouseEvt( Point( e.X, e.Y ), 0, MouseEventModifiers::NONE, e.Buttons, e.Modifiers ); Application::PostMouseEvent( VCLEVENT_WINDOW_MOUSEMOVE, reinterpret_cast< vcl::Window* >( mpNotifyWindow ), &aVCLMouseEvt ); } } @@ -188,7 +188,7 @@ void SAL_CALL MediaEventListenersImpl::mouseMoved( const ::com::sun::star::awt:: if( mpNotifyWindow ) { - MouseEvent aVCLMouseEvt( Point( e.X, e.Y ), 0, 0, e.Buttons, e.Modifiers ); + MouseEvent aVCLMouseEvt( Point( e.X, e.Y ), 0, MouseEventModifiers::NONE, e.Buttons, e.Modifiers ); Application::PostMouseEvent( VCLEVENT_WINDOW_MOUSEMOVE, reinterpret_cast< vcl::Window* >( mpNotifyWindow ), &aVCLMouseEvt ); } } |