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 /cui/source/options | |
| 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 'cui/source/options')
| -rw-r--r-- | cui/source/options/optaboutconfig.cxx | 2 | ||||
| -rw-r--r-- | cui/source/options/optdict.cxx | 2 | ||||
| -rw-r--r-- | cui/source/options/optinet2.cxx | 2 | ||||
| -rw-r--r-- | cui/source/options/treeopt.cxx | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/cui/source/options/optaboutconfig.cxx b/cui/source/options/optaboutconfig.cxx index e918c8a6b702..2baf4f9e6a7d 100644 --- a/cui/source/options/optaboutconfig.cxx +++ b/cui/source/options/optaboutconfig.cxx @@ -68,7 +68,7 @@ void CuiCustomMultilineEdit::KeyInput( const KeyEvent& rKeyEvent ) bool bNonSpace = rKeyEvent.GetKeyCode().GetCode() != KEY_SPACE; if( bNumericOnly && bNonSpace ) { - const KeyCode& rKeyCode = rKeyEvent.GetKeyCode(); + const vcl::KeyCode& rKeyCode = rKeyEvent.GetKeyCode(); sal_uInt16 nGroup = rKeyCode.GetGroup(); sal_uInt16 nKey = rKeyCode.GetCode(); diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx index 23c7d2355e55..f7ca6510f43f 100644 --- a/cui/source/options/optdict.cxx +++ b/cui/source/options/optdict.cxx @@ -779,7 +779,7 @@ IMPL_LINK(SvxEditDictionaryDialog, ModifyHdl, Edit*, pEdt) void SvxDictEdit::KeyInput( const KeyEvent& rKEvt ) { - const KeyCode aKeyCode = rKEvt.GetKeyCode(); + const vcl::KeyCode aKeyCode = rKEvt.GetKeyCode(); const sal_uInt16 nModifier = aKeyCode.GetModifier(); if( aKeyCode.GetCode() == KEY_RETURN ) { diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx index 45f2a5423ba3..4909b894ebe6 100644 --- a/cui/source/options/optinet2.cxx +++ b/cui/source/options/optinet2.cxx @@ -106,7 +106,7 @@ void SvxNoSpaceEdit::KeyInput( const KeyEvent& rKEvent ) bool bValid = rKEvent.GetKeyCode().GetCode() != KEY_SPACE; if (bValid && bOnlyNumeric) { - const KeyCode& rKeyCode = rKEvent.GetKeyCode(); + const vcl::KeyCode& rKeyCode = rKEvent.GetKeyCode(); sal_uInt16 nGroup = rKeyCode.GetGroup(); sal_uInt16 nKey = rKeyCode.GetCode(); bValid = ( KEYGROUP_NUM == nGroup || KEYGROUP_CURSOR == nGroup || diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index f6a48c5b3236..d7293b8bb1b5 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -888,7 +888,7 @@ bool OfaTreeOptionsDialog::Notify( NotifyEvent& rNEvt ) if ( rNEvt.GetType() == EVENT_KEYINPUT ) { const KeyEvent* pKEvt = rNEvt.GetKeyEvent(); - const KeyCode aKeyCode = pKEvt->GetKeyCode(); + const vcl::KeyCode aKeyCode = pKEvt->GetKeyCode(); if( aKeyCode.GetCode() == KEY_PAGEUP || aKeyCode.GetCode() == KEY_PAGEDOWN) |