diff options
| author | Tor Lillqvist <tml@collabora.com> | 2014-08-23 22:22:32 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2014-08-23 22:33:30 +0300 |
| commit | 30ae83c268125383866d47a7ee3e4a5dfcf59f71 (patch) | |
| tree | ab52f8ecd7ed9517d70e13b22843b7948f20c9e9 /avmedia | |
| parent | 02f6c270e79879188b2be670c6db4feb56bb064e (diff) | |
fdo#82577: Handle KeyCode
Put the VCL KeyCode class in the vcl namespace. Avoids clash with the X11
KeyCode typedef.
Change-Id: I624c9d937f7c5f5986d313b6c5f060bd8bb7e028
Diffstat (limited to 'avmedia')
| -rw-r--r-- | avmedia/source/viewer/mediaevent_impl.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/avmedia/source/viewer/mediaevent_impl.cxx b/avmedia/source/viewer/mediaevent_impl.cxx index 3c411b9b4b08..b994bd3ecdf1 100644 --- a/avmedia/source/viewer/mediaevent_impl.cxx +++ b/avmedia/source/viewer/mediaevent_impl.cxx @@ -66,10 +66,10 @@ void SAL_CALL MediaEventListenersImpl::keyPressed( const ::com::sun::star::awt:: if( mpNotifyWindow ) { - KeyCode aVCLKeyCode( e.KeyCode, - ( ( e.Modifiers & 1 ) ? KEY_SHIFT : 0 ) | - ( ( e.Modifiers & 2 ) ? KEY_MOD1 : 0 ) | - ( ( e.Modifiers & 4 ) ? KEY_MOD2 : 0 ) ); + vcl::KeyCode aVCLKeyCode( e.KeyCode, + ( ( e.Modifiers & 1 ) ? KEY_SHIFT : 0 ) | + ( ( e.Modifiers & 2 ) ? KEY_MOD1 : 0 ) | + ( ( e.Modifiers & 4 ) ? KEY_MOD2 : 0 ) ); KeyEvent aVCLKeyEvt( e.KeyChar, aVCLKeyCode ); Application::PostKeyEvent( VCLEVENT_WINDOW_KEYINPUT, reinterpret_cast< ::Window* >( mpNotifyWindow ), &aVCLKeyEvt ); @@ -86,10 +86,10 @@ void SAL_CALL MediaEventListenersImpl::keyReleased( const ::com::sun::star::awt: if( mpNotifyWindow ) { - KeyCode aVCLKeyCode( e.KeyCode, - ( ( e.Modifiers & 1 ) ? KEY_SHIFT : 0 ) | - ( ( e.Modifiers & 2 ) ? KEY_MOD1 : 0 ) | - ( ( e.Modifiers & 4 ) ? KEY_MOD2 : 0 ) ); + vcl::KeyCode aVCLKeyCode( e.KeyCode, + ( ( e.Modifiers & 1 ) ? KEY_SHIFT : 0 ) | + ( ( e.Modifiers & 2 ) ? KEY_MOD1 : 0 ) | + ( ( e.Modifiers & 4 ) ? KEY_MOD2 : 0 ) ); KeyEvent aVCLKeyEvt( e.KeyChar, aVCLKeyCode ); Application::PostKeyEvent( VCLEVENT_WINDOW_KEYUP, reinterpret_cast< ::Window* >( mpNotifyWindow ), &aVCLKeyEvt ); } |