From 7ef698355ad59c6fa263daa4ded124cf512e8926 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Sun, 26 Oct 2014 13:01:46 +0200 Subject: fdo#84938: replace KEYTYPE_ constants with enum Change-Id: I563cf96f8ca815d6c8ad9f5fe365fc7ce7a2a328 Reviewed-on: https://gerrit.libreoffice.org/12104 Reviewed-by: Noel Grandin Tested-by: Noel Grandin --- sc/source/ui/app/inputhdl.cxx | 2 +- sc/source/ui/view/tabvwsh4.cxx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'sc/source') diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx index 4717da786bfd..eff6c2902049 100644 --- a/sc/source/ui/app/inputhdl.cxx +++ b/sc/source/ui/app/inputhdl.cxx @@ -3183,7 +3183,7 @@ bool ScInputHandler::KeyInput( const KeyEvent& rKEvt, bool bStartEdit /* = false KeyFuncType eFunc = rKEvt.GetKeyCode().GetFunction(); if ( nChar && nChar != 8 && nChar != 127 && // no 'backspace', no 'delete' - KEYFUNC_CUT != eFunc) // and no 'CTRL-X' + KeyFuncType::CUT != eFunc) // and no 'CTRL-X' { if (bFormulaMode) UseFormulaData(); diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx index 6123f565bd39..5440daf9e0ea 100644 --- a/sc/source/ui/view/tabvwsh4.cxx +++ b/sc/source/ui/view/tabvwsh4.cxx @@ -1271,7 +1271,7 @@ bool ScTabViewShell::TabKeyInput(const KeyEvent& rKEvt) // Spezialfall: Copy/Cut bei Mehrfachselektion -> Fehlermeldung // (Slot ist disabled, SfxViewShell::KeyInput wuerde also kommentarlos verschluckt) KeyFuncType eFunc = aCode.GetFunction(); - if ( eFunc == KEYFUNC_CUT ) + if ( eFunc == KeyFuncType::CUT ) { ScRange aDummy; ScMarkType eMarkType = GetViewData().GetSimpleArea( aDummy ); @@ -1288,7 +1288,7 @@ bool ScTabViewShell::TabKeyInput(const KeyEvent& rKEvt) // container app and are executed during Window::KeyInput. // -> don't pass keys to input handler that would be used there // but should call slots instead. - bool bParent = ( GetViewFrame()->GetFrame().IsInPlace() && eFunc != KEYFUNC_DONTKNOW ); + bool bParent = ( GetViewFrame()->GetFrame().IsInPlace() && eFunc != KeyFuncType::DONTKNOW ); if( !bUsed && !bDraw && nCode != KEY_RETURN && !bParent ) bUsed = pScMod->InputKeyEvent( rKEvt, true ); // Eingabe -- cgit