diff options
author | Noel Grandin <noel@peralex.com> | 2014-10-26 13:01:46 +0200 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2014-10-27 08:09:35 +0000 |
commit | 7ef698355ad59c6fa263daa4ded124cf512e8926 (patch) | |
tree | c929c4d25b985116192045f213b6beacf43989c2 /svx | |
parent | 608396721edcdfce8a325026844fd2fab72bbb73 (diff) |
fdo#84938: replace KEYTYPE_ constants with enum
Change-Id: I563cf96f8ca815d6c8ad9f5fe365fc7ce7a2a328
Reviewed-on: https://gerrit.libreoffice.org/12104
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'svx')
-rw-r--r-- | svx/source/fmcomp/gridctrl.cxx | 2 | ||||
-rw-r--r-- | svx/source/form/navigatortree.cxx | 6 | ||||
-rw-r--r-- | svx/source/svdraw/svdview.cxx | 16 |
3 files changed, 12 insertions, 12 deletions
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx index 3c1a9e3bad41..f42ef319b9bc 100644 --- a/svx/source/fmcomp/gridctrl.cxx +++ b/svx/source/fmcomp/gridctrl.cxx @@ -3259,7 +3259,7 @@ bool DbGridControl::IsTabAllowed(bool bRight) const void DbGridControl::KeyInput( const KeyEvent& rEvt ) { - if (rEvt.GetKeyCode().GetFunction() == KEYFUNC_COPY) + if (rEvt.GetKeyCode().GetFunction() == KeyFuncType::COPY) { long nRow = GetCurRow(); sal_uInt16 nColId = GetCurColumnId(); diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx index ab83348b0964..40ede51979b7 100644 --- a/svx/source/form/navigatortree.cxx +++ b/svx/source/form/navigatortree.cxx @@ -1285,16 +1285,16 @@ namespace svxform // copy'n'paste? switch ( rCode.GetFunction() ) { - case KEYFUNC_CUT: + case KeyFuncType::CUT: doCut(); break; - case KEYFUNC_PASTE: + case KeyFuncType::PASTE: if ( implAcceptPaste() ) doPaste(); break; - case KEYFUNC_COPY: + case KeyFuncType::COPY: doCopy(); break; diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx index b36b5e725719..bf7ca1cc4689 100644 --- a/svx/source/svdraw/svdview.cxx +++ b/svx/source/svdraw/svdview.cxx @@ -182,13 +182,13 @@ bool SdrView::KeyInput(const KeyEvent& rKEvt, vcl::Window* pWin) if (!bRet && !IsExtendedKeyInputDispatcherEnabled()) { bRet = true; switch (rKEvt.GetKeyCode().GetFullFunction()) { - case KEYFUNC_CUT : Cut(); break; - case KEYFUNC_COPY : Yank(); break; - case KEYFUNC_PASTE : Paste(pWin); break; - case KEYFUNC_DELETE: DeleteMarked(); break; - case KEYFUNC_UNDO: pMod->Undo(); break; - case KEYFUNC_REDO: pMod->Redo(); break; - case KEYFUNC_REPEAT: pMod->Repeat(*this); break; + case KeyFuncType::CUT : Cut(); break; + case KeyFuncType::COPY : Yank(); break; + case KeyFuncType::PASTE : Paste(pWin); break; + case KeyFuncType::DELETE: DeleteMarked(); break; + case KeyFuncType::UNDO: pMod->Undo(); break; + case KeyFuncType::REDO: pMod->Redo(); break; + case KeyFuncType::REPEAT: pMod->Repeat(*this); break; default: { switch (rKEvt.GetKeyCode().GetFullCode()) { case KEY_ESCAPE: { @@ -1390,7 +1390,7 @@ void SdrView::DeleteMarked() { if (IsTextEdit()) { - SdrObjEditView::KeyInput(KeyEvent(0,vcl::KeyCode(KEYFUNC_DELETE)),pTextEditWin); + SdrObjEditView::KeyInput(KeyEvent(0,vcl::KeyCode(KeyFuncType::DELETE)),pTextEditWin); } else { |