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 /svx/source/form | |
| 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 'svx/source/form')
| -rw-r--r-- | svx/source/form/filtnav.cxx | 2 | ||||
| -rw-r--r-- | svx/source/form/fmview.cxx | 2 | ||||
| -rw-r--r-- | svx/source/form/navigatortree.cxx | 2 | ||||
| -rw-r--r-- | svx/source/form/tabwin.cxx | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx index 7de8f32a1730..4b1b2dd5b30e 100644 --- a/svx/source/form/filtnav.cxx +++ b/svx/source/form/filtnav.cxx @@ -1766,7 +1766,7 @@ SvTreeListEntry* FmFilterNavigator::getPrevEntry(SvTreeListEntry* _pStartWith) void FmFilterNavigator::KeyInput(const KeyEvent& rKEvt) { - const KeyCode& rKeyCode = rKEvt.GetKeyCode(); + const vcl::KeyCode& rKeyCode = rKEvt.GetKeyCode(); switch ( rKeyCode.GetCode() ) { diff --git a/svx/source/form/fmview.cxx b/svx/source/form/fmview.cxx index 702fd00ef0c1..343c624c6f17 100644 --- a/svx/source/form/fmview.cxx +++ b/svx/source/form/fmview.cxx @@ -486,7 +486,7 @@ void FmFormView::EndCompleteRedraw( SdrPaintWindow& rPaintWindow, bool bPaintFor bool FmFormView::KeyInput(const KeyEvent& rKEvt, Window* pWin) { bool bDone = false; - const KeyCode& rKeyCode = rKEvt.GetKeyCode(); + const vcl::KeyCode& rKeyCode = rKEvt.GetKeyCode(); if ( IsDesignMode() && rKeyCode.GetCode() == KEY_RETURN ) diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx index 80298a70c78f..187a1cb7af17 100644 --- a/svx/source/form/navigatortree.cxx +++ b/svx/source/form/navigatortree.cxx @@ -1273,7 +1273,7 @@ namespace svxform void NavigatorTree::KeyInput(const ::KeyEvent& rKEvt) { - const KeyCode& rCode = rKEvt.GetKeyCode(); + const vcl::KeyCode& rCode = rKEvt.GetKeyCode(); // delete? if (rKEvt.GetKeyCode().GetCode() == KEY_DELETE && !rKEvt.GetKeyCode().GetModifier()) diff --git a/svx/source/form/tabwin.cxx b/svx/source/form/tabwin.cxx index adcda345e5f8..a5c524b985b1 100644 --- a/svx/source/form/tabwin.cxx +++ b/svx/source/form/tabwin.cxx @@ -247,7 +247,7 @@ bool FmFieldWin::PreNotify( NotifyEvent& _rNEvt ) { if ( EVENT_KEYINPUT == _rNEvt.GetType() ) { - const KeyCode& rKeyCode = _rNEvt.GetKeyEvent()->GetKeyCode(); + const vcl::KeyCode& rKeyCode = _rNEvt.GetKeyEvent()->GetKeyCode(); if ( ( 0 == rKeyCode.GetModifier() ) && ( KEY_RETURN == rKeyCode.GetCode() ) ) { if ( createSelectionControls() ) |