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 /sd/source/ui/view | |
| 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 'sd/source/ui/view')
| -rw-r--r-- | sd/source/ui/view/drviewse.cxx | 6 | ||||
| -rw-r--r-- | sd/source/ui/view/outlnvsh.cxx | 4 | ||||
| -rw-r--r-- | sd/source/ui/view/viewshel.cxx | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx index f9340b08ea56..77ebf9616f89 100644 --- a/sd/source/ui/view/drviewse.cxx +++ b/sd/source/ui/view/drviewse.cxx @@ -125,7 +125,7 @@ void ImpAddPrintableCharactersToTextEdit(SfxRequest& rReq, ::sd::View* pView) for(sal_Int32 a(0); a < aInputString.getLength(); a++) { sal_Char aChar = (sal_Char)aInputString[a]; - KeyCode aKeyCode; + vcl::KeyCode aKeyCode; KeyEvent aKeyEvent(aChar, aKeyCode); // add actual character @@ -866,7 +866,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) if (pOLV) { - KeyCode aKCode(KEY_DELETE); + vcl::KeyCode aKCode(KEY_DELETE); KeyEvent aKEvt( 0, aKCode); pOLV->PostKeyEvent(aKEvt); } @@ -878,7 +878,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) } else { - KeyCode aKCode(KEY_DELETE); + vcl::KeyCode aKCode(KEY_DELETE); KeyEvent aKEvt( 0, aKCode); bool bConsumed = mpDrawView && mpDrawView->getSmartTags().KeyInput( aKEvt ); diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx index e3b4aa7a7522..8e8b35ee978a 100644 --- a/sd/source/ui/view/outlnvsh.cxx +++ b/sd/source/ui/view/outlnvsh.cxx @@ -541,7 +541,7 @@ void OutlineViewShell::FuSupport(SfxRequest &rReq) { OutlineViewPageChangesGuard aGuard2(pOlView); - KeyCode aKCode(KEY_DELETE); + vcl::KeyCode aKCode(KEY_DELETE); KeyEvent aKEvt( 0, aKCode ); pOutlView->PostKeyEvent(aKEvt); @@ -1445,7 +1445,7 @@ bool OutlineViewShell::KeyInput(const KeyEvent& rKEvt, ::sd::Window* pWin) Invalidate(SID_STYLE_FAMILY5); // check and distinguish cursor movements- or input-keys - KeyCode aKeyGroup( rKEvt.GetKeyCode().GetGroup() ); + vcl::KeyCode aKeyGroup( rKEvt.GetKeyCode().GetGroup() ); if( (aKeyGroup != KEYGROUP_CURSOR && aKeyGroup != KEYGROUP_FKEYS) || (GetActualPage() != pLastPage) ) { diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx index 440eaf748b77..23de40151bbf 100644 --- a/sd/source/ui/view/viewshel.cxx +++ b/sd/source/ui/view/viewshel.cxx @@ -450,7 +450,7 @@ bool ViewShell::KeyInput(const KeyEvent& rKEvt, ::sd::Window* pWin) if(!bReturn && GetActiveWindow()) { - KeyCode aKeyCode = rKEvt.GetKeyCode(); + vcl::KeyCode aKeyCode = rKEvt.GetKeyCode(); if (aKeyCode.IsMod1() && aKeyCode.IsShift() && aKeyCode.GetCode() == KEY_R) |