summaryrefslogtreecommitdiff
path: root/dbaccess/source/ui/browser
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2014-08-23 22:22:32 +0300
committerTor Lillqvist <tml@collabora.com>2014-08-23 22:33:30 +0300
commit30ae83c268125383866d47a7ee3e4a5dfcf59f71 (patch)
treeab52f8ecd7ed9517d70e13b22843b7948f20c9e9 /dbaccess/source/ui/browser
parent02f6c270e79879188b2be670c6db4feb56bb064e (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 'dbaccess/source/ui/browser')
-rw-r--r--dbaccess/source/ui/browser/brwview.cxx6
-rw-r--r--dbaccess/source/ui/browser/dataview.cxx2
2 files changed, 4 insertions, 4 deletions
diff --git a/dbaccess/source/ui/browser/brwview.cxx b/dbaccess/source/ui/browser/brwview.cxx
index f348dc678810..6be18a14ae17 100644
--- a/dbaccess/source/ui/browser/brwview.cxx
+++ b/dbaccess/source/ui/browser/brwview.cxx
@@ -311,9 +311,9 @@ bool UnoDataBrowserView::PreNotify( NotifyEvent& rNEvt )
if ( bGrabAllowed )
{
const KeyEvent* pKeyEvt = rNEvt.GetKeyEvent();
- const KeyCode& rKeyCode = pKeyEvt->GetKeyCode();
- if ( ( rKeyCode == KeyCode( KEY_E, true, true, false, false ) )
- || ( rKeyCode == KeyCode( KEY_TAB, true, false, false, false ) )
+ const vcl::KeyCode& rKeyCode = pKeyEvt->GetKeyCode();
+ if ( ( rKeyCode == vcl::KeyCode( KEY_E, true, true, false, false ) )
+ || ( rKeyCode == vcl::KeyCode( KEY_TAB, true, false, false, false ) )
)
{
if ( m_pTreeView && m_pVclControl && m_pTreeView->HasChildPathFocus() )
diff --git a/dbaccess/source/ui/browser/dataview.cxx b/dbaccess/source/ui/browser/dataview.cxx
index edd48b43a31d..ec220d3b562a 100644
--- a/dbaccess/source/ui/browser/dataview.cxx
+++ b/dbaccess/source/ui/browser/dataview.cxx
@@ -125,7 +125,7 @@ namespace dbaui
case EVENT_KEYINPUT:
{
const KeyEvent* pKeyEvent = _rNEvt.GetKeyEvent();
- const KeyCode& aKeyCode = pKeyEvent->GetKeyCode();
+ const vcl::KeyCode& aKeyCode = pKeyEvent->GetKeyCode();
if ( m_pAccel.get() && m_pAccel->execute( aKeyCode ) )
// the accelerator consumed the event
return true;