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 /sc/source/ui/navipi | |
| 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 'sc/source/ui/navipi')
| -rw-r--r-- | sc/source/ui/navipi/content.cxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/navipi/navipi.cxx | 4 | ||||
| -rw-r--r-- | sc/source/ui/navipi/scenwnd.cxx | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx index ee6d14a1cb1a..029eca29e968 100644 --- a/sc/source/ui/navipi/content.cxx +++ b/sc/source/ui/navipi/content.cxx @@ -425,7 +425,7 @@ void ScContentTree::KeyInput( const KeyEvent& rKEvt ) { bool bUsed = false; - const KeyCode aCode = rKEvt.GetKeyCode(); + const vcl::KeyCode aCode = rKEvt.GetKeyCode(); if (aCode.GetCode() == KEY_RETURN) { switch (aCode.GetModifier()) diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx index 70624af0cfb5..a2191840d5ae 100644 --- a/sc/source/ui/navipi/navipi.cxx +++ b/sc/source/ui/navipi/navipi.cxx @@ -99,7 +99,7 @@ bool ColumnEdit::Notify( NotifyEvent& rNEvt ) if ( nType == EVENT_KEYINPUT ) { const KeyEvent* pKEvt = rNEvt.GetKeyEvent(); - KeyCode aCode = pKEvt->GetKeyCode(); + vcl::KeyCode aCode = pKEvt->GetKeyCode(); if ( !aCode.IsMod1() && !aCode.IsMod2() ) { @@ -270,7 +270,7 @@ bool RowEdit::Notify( NotifyEvent& rNEvt ) if ( rNEvt.GetType() == EVENT_KEYINPUT ) { const KeyEvent* pKEvt = rNEvt.GetKeyEvent(); - KeyCode aCode = pKEvt->GetKeyCode(); + vcl::KeyCode aCode = pKEvt->GetKeyCode(); if ( aCode.GetCode() == KEY_RETURN && !aCode.IsMod1() && !aCode.IsMod2() ) { ScNavigatorDlg::ReleaseFocus(); diff --git a/sc/source/ui/navipi/scenwnd.cxx b/sc/source/ui/navipi/scenwnd.cxx index e415d09d48ec..d17c24be4f73 100644 --- a/sc/source/ui/navipi/scenwnd.cxx +++ b/sc/source/ui/navipi/scenwnd.cxx @@ -113,7 +113,7 @@ bool ScScenarioListBox::Notify( NotifyEvent& rNEvt ) if( rNEvt.GetType() == EVENT_KEYINPUT ) { - KeyCode aCode = rNEvt.GetKeyEvent()->GetKeyCode(); + vcl::KeyCode aCode = rNEvt.GetKeyEvent()->GetKeyCode(); switch( aCode.GetCode() ) { case KEY_RETURN: |