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 /basctl | |
| 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 'basctl')
| -rw-r--r-- | basctl/source/basicide/baside2b.cxx | 4 | ||||
| -rw-r--r-- | basctl/source/basicide/bastypes.cxx | 2 | ||||
| -rw-r--r-- | basctl/source/dlged/dlgedfunc.cxx | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx index e97d1cc0d148..9d53af5e587d 100644 --- a/basctl/source/basicide/baside2b.cxx +++ b/basctl/source/basicide/baside2b.cxx @@ -1597,8 +1597,8 @@ WatchWindow::WatchWindow (Layout* pParent) : long nTextLen = GetTextWidth( aWatchStr ) + DWBORDER + 3; aXEdit.SetPosPixel( Point( nTextLen, 3 ) ); aXEdit.SetAccHdl( LINK( this, WatchWindow, EditAccHdl ) ); - aXEdit.GetAccelerator().InsertItem( 1, KeyCode( KEY_RETURN ) ); - aXEdit.GetAccelerator().InsertItem( 2, KeyCode( KEY_ESCAPE ) ); + aXEdit.GetAccelerator().InsertItem( 1, vcl::KeyCode( KEY_RETURN ) ); + aXEdit.GetAccelerator().InsertItem( 2, vcl::KeyCode( KEY_ESCAPE ) ); aXEdit.Show(); aRemoveWatchButton.Disable(); diff --git a/basctl/source/basicide/bastypes.cxx b/basctl/source/basicide/bastypes.cxx index 718b6e3ba908..5fbdd63c2004 100644 --- a/basctl/source/basicide/bastypes.cxx +++ b/basctl/source/basicide/bastypes.cxx @@ -115,7 +115,7 @@ bool BaseWindow::Notify( NotifyEvent& rNEvt ) if ( rNEvt.GetType() == EVENT_KEYINPUT ) { KeyEvent aKEvt = *rNEvt.GetKeyEvent(); - KeyCode aCode = aKEvt.GetKeyCode(); + vcl::KeyCode aCode = aKEvt.GetKeyCode(); sal_uInt16 nCode = aCode.GetCode(); switch ( nCode ) diff --git a/basctl/source/dlged/dlgedfunc.cxx b/basctl/source/dlged/dlgedfunc.cxx index f5f2c4137b99..76c43de874b4 100644 --- a/basctl/source/dlged/dlgedfunc.cxx +++ b/basctl/source/dlged/dlgedfunc.cxx @@ -113,7 +113,7 @@ bool DlgEdFunc::KeyInput( const KeyEvent& rKEvt ) SdrView& rView = rParent.GetView(); Window& rWindow = rParent.GetWindow(); - KeyCode aCode = rKEvt.GetKeyCode(); + vcl::KeyCode aCode = rKEvt.GetKeyCode(); sal_uInt16 nCode = aCode.GetCode(); switch ( nCode ) |