winaccessibility/source/UAccCOM/AccActionBase.cxx | 93 ---------------------- winaccessibility/source/UAccCOM/AccActionBase.h | 3 2 files changed, 96 deletions(-)
New commits: commit ff2c158adcbcad5a35c11fd46a95e37136936797 Author: Samuel Mehrbrodt <samuel.mehrbr...@cib.de> AuthorDate: Mon Oct 1 12:27:31 2018 +0200 Commit: Samuel Mehrbrodt <samuel.mehrbr...@cib.de> CommitDate: Tue Oct 2 08:18:34 2018 +0200 Remove unused getOLECHARFromKeyCode Change-Id: Idacfeff59f8578c5be72cb1de25447d6e147c975 Reviewed-on: https://gerrit.libreoffice.org/61197 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <samuel.mehrbr...@cib.de> diff --git a/winaccessibility/source/UAccCOM/AccActionBase.cxx b/winaccessibility/source/UAccCOM/AccActionBase.cxx index a074c4895b37..660e084edf81 100644 --- a/winaccessibility/source/UAccCOM/AccActionBase.cxx +++ b/winaccessibility/source/UAccCOM/AccActionBase.cxx @@ -233,97 +233,4 @@ OUString CAccActionBase::GetkeyBindingStrByXkeyBinding( const Sequence< KeyStrok return buf.makeStringAndClear(); } -/** - * Helper function used for converting key code to ole string. - * - * @param key the key code. - */ -OLECHAR const * CAccActionBase::getOLECHARFromKeyCode(long key) -{ - static struct keyMap - { - int keyCode; - OLECHAR const * key; - } - map[] = - { -#define CODEENTRY(key) {KEYCODE_##key, L#key} - {MODIFIER_SHIFT, L"SHIFT" }, - {MODIFIER_CTRL, L"CTRL" }, - {MODIFIER_ALT, L"ALT" }, - CODEENTRY(NUM0),CODEENTRY(NUM1),CODEENTRY(NUM2),CODEENTRY(NUM3),CODEENTRY(NUM4),CODEENTRY(NUM5), - CODEENTRY(NUM6),CODEENTRY(NUM7),CODEENTRY(NUM8),CODEENTRY(NUM9), - CODEENTRY(A),CODEENTRY(B),CODEENTRY(C),CODEENTRY(D),CODEENTRY(E),CODEENTRY(F), - CODEENTRY(G),CODEENTRY(H),CODEENTRY(I),CODEENTRY(J),CODEENTRY(K),CODEENTRY(L), - CODEENTRY(M),CODEENTRY(N),CODEENTRY(O),CODEENTRY(P),CODEENTRY(Q),CODEENTRY(R), - CODEENTRY(S),CODEENTRY(T),CODEENTRY(U),CODEENTRY(V),CODEENTRY(W),CODEENTRY(X), - CODEENTRY(Y),CODEENTRY(Z), - CODEENTRY(F1),CODEENTRY(F2),CODEENTRY(F3),CODEENTRY(F4),CODEENTRY(F5),CODEENTRY(F6), - CODEENTRY(F7),CODEENTRY(F8),CODEENTRY(F9),CODEENTRY(F10),CODEENTRY(F11),CODEENTRY(F12), - CODEENTRY(F13),CODEENTRY(F14),CODEENTRY(F15),CODEENTRY(F16),CODEENTRY(F17),CODEENTRY(F18), - CODEENTRY(F19),CODEENTRY(F20),CODEENTRY(F21),CODEENTRY(F22),CODEENTRY(F23),CODEENTRY(F24), - CODEENTRY(F25),CODEENTRY(F26), - - { KEYCODE_DOWN, L"DOWN" }, - { KEYCODE_UP, L"UP" }, - { KEYCODE_LEFT, L"LEFT" }, - { KEYCODE_RIGHT, L"RIGHT" }, - { KEYCODE_HOME, L"HOME" }, - { KEYCODE_END, L"END" }, - { KEYCODE_PAGEUP, L"PAGEUP" }, - { KEYCODE_PAGEDOWN, L"PAGEDOWN" }, - { KEYCODE_RETURN, L"RETURN" }, - { KEYCODE_ESCAPE, L"ESCAPE" }, - { KEYCODE_TAB, L"TAB" }, - { KEYCODE_BACKSPACE, L"BACKSPACE" }, - { KEYCODE_SPACE, L"SPACE" }, - { KEYCODE_INSERT, L"INSERT" }, - { KEYCODE_DELETE, L"DELETE" }, - { KEYCODE_ADD, L"ADD" }, - { KEYCODE_SUBTRACT, L"SUBTRACT" }, - { KEYCODE_MULTIPLY, L"MULTIPLY" }, - { KEYCODE_DIVIDE, L"DIVIDE" }, - { KEYCODE_POINT, L"POINT" }, - { KEYCODE_COMMA, L"COMMA" }, - { KEYCODE_LESS, L"LESS" }, - { KEYCODE_GREATER, L"GREATER" }, - { KEYCODE_EQUAL, L"EQUAL" }, - { KEYCODE_OPEN, L"OPEN" }, - { KEYCODE_CUT, L"CUT" }, - { KEYCODE_COPY, L"COPY" }, - { KEYCODE_PASTE, L"PASTE" }, - { KEYCODE_UNDO, L"UNDO" }, - { KEYCODE_REPEAT, L"REPEAT" }, - { KEYCODE_FIND, L"FIND" }, - { KEYCODE_PROPERTIES, L"PROPERTIES" }, - { KEYCODE_FRONT, L"FRONT" }, - { KEYCODE_CONTEXTMENU, L"CONTEXTMENU" }, - { KEYCODE_HELP, L"HELP" }, - }; - static long nCount = SAL_N_ELEMENTS(map); - - long min = 0; - long max = nCount-1; - long mid = nCount/2; - while(min<max) - { - if(key<map[mid].keyCode) - max = mid-1; - else if(key>map[mid].keyCode) - min = mid+1; - else - break; - mid = (min+max)/2; - } - - if(key == map[mid].keyCode) - { - return map[mid].key; - } - else - { - return nullptr; - } -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/winaccessibility/source/UAccCOM/AccActionBase.h b/winaccessibility/source/UAccCOM/AccActionBase.h index 9410012d41a5..56a4980842d8 100644 --- a/winaccessibility/source/UAccCOM/AccActionBase.h +++ b/winaccessibility/source/UAccCOM/AccActionBase.h @@ -67,9 +67,6 @@ public: static OUString GetkeyBindingStrByXkeyBinding( const css::uno::Sequence< css::awt::KeyStroke > &keySet ); protected: - - static OLECHAR const * getOLECHARFromKeyCode(long key); - css::uno::Reference<css::accessibility::XAccessibleAction> pRXAct; private: _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits