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 | |
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')
-rw-r--r-- | svx/source/dialog/_bmpmask.cxx | 2 | ||||
-rw-r--r-- | svx/source/dialog/charmap.cxx | 2 | ||||
-rw-r--r-- | svx/source/dialog/checklbx.cxx | 2 | ||||
-rw-r--r-- | svx/source/dialog/dialcontrol.cxx | 2 | ||||
-rw-r--r-- | svx/source/dialog/dlgctl3d.cxx | 2 | ||||
-rw-r--r-- | svx/source/dialog/dlgctrl.cxx | 2 | ||||
-rw-r--r-- | svx/source/dialog/frmsel.cxx | 2 | ||||
-rw-r--r-- | svx/source/dialog/graphctl.cxx | 2 | ||||
-rw-r--r-- | svx/source/dialog/rubydialog.cxx | 2 | ||||
-rw-r--r-- | svx/source/fmcomp/fmgridcl.cxx | 2 | ||||
-rw-r--r-- | svx/source/fmcomp/gridctrl.cxx | 2 | ||||
-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 | ||||
-rw-r--r-- | svx/source/svdraw/svdview.cxx | 2 | ||||
-rw-r--r-- | svx/source/tbxctrls/itemwin.cxx | 2 |
17 files changed, 17 insertions, 17 deletions
diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx index c39bfbbda0cc..aca2ea65e989 100644 --- a/svx/source/dialog/_bmpmask.cxx +++ b/svx/source/dialog/_bmpmask.cxx @@ -124,7 +124,7 @@ void MaskSet::GetFocus() void MaskSet::KeyInput( const KeyEvent& rKEvt ) { - KeyCode aCode = rKEvt.GetKeyCode(); + vcl::KeyCode aCode = rKEvt.GetKeyCode(); // if the key has a modifier we don't care if( aCode.GetModifier() ) diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx index 0903a3259115..81c42a16454c 100644 --- a/svx/source/dialog/charmap.cxx +++ b/svx/source/dialog/charmap.cxx @@ -251,7 +251,7 @@ int SvxShowCharSet::PixelToMapIndex( const Point& point) const void SvxShowCharSet::KeyInput( const KeyEvent& rKEvt ) { - KeyCode aCode = rKEvt.GetKeyCode(); + vcl::KeyCode aCode = rKEvt.GetKeyCode(); if( aCode.GetModifier() ) { diff --git a/svx/source/dialog/checklbx.cxx b/svx/source/dialog/checklbx.cxx index 0180643b9af5..a3738c97ae13 100644 --- a/svx/source/dialog/checklbx.cxx +++ b/svx/source/dialog/checklbx.cxx @@ -221,7 +221,7 @@ void SvxCheckListBox::MouseButtonDown( const MouseEvent& rMEvt ) void SvxCheckListBox::KeyInput( const KeyEvent& rKEvt ) { - const KeyCode& rKey = rKEvt.GetKeyCode(); + const vcl::KeyCode& rKey = rKEvt.GetKeyCode(); if ( rKey.GetCode() == KEY_RETURN || rKey.GetCode() == KEY_SPACE ) { diff --git a/svx/source/dialog/dialcontrol.cxx b/svx/source/dialog/dialcontrol.cxx index d8da2985b566..5b270e680b51 100644 --- a/svx/source/dialog/dialcontrol.cxx +++ b/svx/source/dialog/dialcontrol.cxx @@ -353,7 +353,7 @@ void DialControl::MouseButtonUp( const MouseEvent& rMEvt ) void DialControl::KeyInput( const KeyEvent& rKEvt ) { - const KeyCode& rKCode = rKEvt.GetKeyCode(); + const vcl::KeyCode& rKCode = rKEvt.GetKeyCode(); if( !rKCode.GetModifier() && (rKCode.GetCode() == KEY_ESCAPE) ) HandleEscapeEvent(); else diff --git a/svx/source/dialog/dlgctl3d.cxx b/svx/source/dialog/dlgctl3d.cxx index d0bfeb33d2a6..a7a2d3121af7 100644 --- a/svx/source/dialog/dlgctl3d.cxx +++ b/svx/source/dialog/dlgctl3d.cxx @@ -1108,7 +1108,7 @@ void SvxLightCtl3D::move( double fDeltaHor, double fDeltaVer ) void SvxLightCtl3D::KeyInput( const KeyEvent& rKEvt ) { - const KeyCode aCode(rKEvt.GetKeyCode()); + const vcl::KeyCode aCode(rKEvt.GetKeyCode()); if( aCode.GetModifier() ) { diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx index 79c2176acd66..b8b677c12e6b 100644 --- a/svx/source/dialog/dlgctrl.cxx +++ b/svx/source/dialog/dlgctrl.cxx @@ -953,7 +953,7 @@ Rectangle SvxPixelCtl::implCalFocusRect( const Point& aPosition ) //Solution:Keyboard function void SvxPixelCtl::KeyInput( const KeyEvent& rKEvt ) { - KeyCode aKeyCode = rKEvt.GetKeyCode(); + vcl::KeyCode aKeyCode = rKEvt.GetKeyCode(); sal_uInt16 nCode = aKeyCode.GetCode(); bool bIsMod = aKeyCode.IsShift() || aKeyCode.IsMod1() || aKeyCode.IsMod2(); diff --git a/svx/source/dialog/frmsel.cxx b/svx/source/dialog/frmsel.cxx index 3a8b0e32a7ed..e72575baa366 100644 --- a/svx/source/dialog/frmsel.cxx +++ b/svx/source/dialog/frmsel.cxx @@ -1136,7 +1136,7 @@ void FrameSelector::MouseButtonDown( const MouseEvent& rMEvt ) void FrameSelector::KeyInput( const KeyEvent& rKEvt ) { bool bHandled = false; - KeyCode aKeyCode = rKEvt.GetKeyCode(); + vcl::KeyCode aKeyCode = rKEvt.GetKeyCode(); if( !aKeyCode.GetModifier() ) { sal_uInt16 nCode = aKeyCode.GetCode(); diff --git a/svx/source/dialog/graphctl.cxx b/svx/source/dialog/graphctl.cxx index 8e6316c37df5..f11e6892db23 100644 --- a/svx/source/dialog/graphctl.cxx +++ b/svx/source/dialog/graphctl.cxx @@ -305,7 +305,7 @@ void GraphCtrl::MarkListHasChanged() void GraphCtrl::KeyInput( const KeyEvent& rKEvt ) { - KeyCode aCode( rKEvt.GetKeyCode() ); + vcl::KeyCode aCode( rKEvt.GetKeyCode() ); bool bProc = false; Dialog* pDialog = GetParentDialog(); diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx index cb6898a77225..5e71d5015d90 100644 --- a/svx/source/dialog/rubydialog.cxx +++ b/svx/source/dialog/rubydialog.cxx @@ -893,7 +893,7 @@ bool RubyEdit::PreNotify( NotifyEvent& rNEvt ) if ( rNEvt.GetType() == EVENT_KEYINPUT ) { const KeyEvent* pKEvt = rNEvt.GetKeyEvent(); - const KeyCode& rKeyCode = pKEvt->GetKeyCode(); + const vcl::KeyCode& rKeyCode = pKEvt->GetKeyCode(); sal_uInt16 nMod = rKeyCode.GetModifier(); sal_uInt16 nCode = rKeyCode.GetCode(); if( nCode == KEY_TAB && (!nMod || KEY_SHIFT == nMod)) diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx index 2a585d50136b..8d4fee971643 100644 --- a/svx/source/fmcomp/fmgridcl.cxx +++ b/svx/source/fmcomp/fmgridcl.cxx @@ -2008,7 +2008,7 @@ void FmGridControl::Select() void FmGridControl::KeyInput( const KeyEvent& rKEvt ) { bool bDone = false; - const KeyCode& rKeyCode = rKEvt.GetKeyCode(); + const vcl::KeyCode& rKeyCode = rKEvt.GetKeyCode(); if ( IsDesignMode() && !rKeyCode.IsShift() && !rKeyCode.IsMod1() diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx index f991024fb783..bbe947224c58 100644 --- a/svx/source/fmcomp/gridctrl.cxx +++ b/svx/source/fmcomp/gridctrl.cxx @@ -3205,7 +3205,7 @@ bool DbGridControl::PreNotify(NotifyEvent& rEvt) // Ctrl-Tab is used to step out of the control, without traveling to the // remaining cells first // -> build a new key event without the Ctrl-key, and let the very base class handle it - KeyCode aNewCode( KEY_TAB, bShift, false, false, false ); + vcl::KeyCode aNewCode( KEY_TAB, bShift, false, false, false ); KeyEvent aNewEvent( pKeyEvent->GetCharCode(), aNewCode ); // call the Control - our direct base class will interpret this in a way we do not want (and do 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() ) diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx index dbaee9279103..b981adfc882d 100644 --- a/svx/source/svdraw/svdview.cxx +++ b/svx/source/svdraw/svdview.cxx @@ -1386,7 +1386,7 @@ void SdrView::DeleteMarked() { if (IsTextEdit()) { - SdrObjEditView::KeyInput(KeyEvent(0,KeyCode(KEYFUNC_DELETE)),pTextEditWin); + SdrObjEditView::KeyInput(KeyEvent(0,vcl::KeyCode(KEYFUNC_DELETE)),pTextEditWin); } else { diff --git a/svx/source/tbxctrls/itemwin.cxx b/svx/source/tbxctrls/itemwin.cxx index acf76892d0bc..f40bf9a53aa5 100644 --- a/svx/source/tbxctrls/itemwin.cxx +++ b/svx/source/tbxctrls/itemwin.cxx @@ -371,7 +371,7 @@ bool SvxMetricField::Notify( NotifyEvent& rNEvt ) if ( rNEvt.GetType() == EVENT_KEYINPUT ) { const KeyEvent* pKEvt = rNEvt.GetKeyEvent(); - const KeyCode& rKey = pKEvt->GetKeyCode(); + const vcl::KeyCode& rKey = pKEvt->GetKeyCode(); SfxViewShell* pSh = SfxViewShell::Current(); if ( rKey.GetModifier() && rKey.GetGroup() != KEYGROUP_CURSOR && pSh ) |