From 2460b966fedd574bab174887c358616dab543392 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Tue, 19 Nov 2013 20:42:39 +0100 Subject: winaccessibility: move ROLE_TABLE to the cxx file that needs it Change-Id: I8e183e68edcbf3ebfb4172350c31b66688eb66e0 --- winaccessibility/inc/AccObject.hxx | 8 +++ winaccessibility/inc/accHelper.hxx | 106 ------------------------------------- 2 files changed, 8 insertions(+), 106 deletions(-) (limited to 'winaccessibility/inc') diff --git a/winaccessibility/inc/AccObject.hxx b/winaccessibility/inc/AccObject.hxx index ae63900187a1..eef53cce0823 100644 --- a/winaccessibility/inc/AccObject.hxx +++ b/winaccessibility/inc/AccObject.hxx @@ -36,6 +36,14 @@ class AccEventListener; class AccObjectManagerAgent; class AccObject; +struct ltstr4 +{ + bool operator()(const long s1, const long s2) const + { + return long(s1) IAccSelectionList; typedef std::vector IAccChildList; diff --git a/winaccessibility/inc/accHelper.hxx b/winaccessibility/inc/accHelper.hxx index 0c475ca36078..c92f1653698c 100644 --- a/winaccessibility/inc/accHelper.hxx +++ b/winaccessibility/inc/accHelper.hxx @@ -20,10 +20,6 @@ #ifndef __ACCHELPER_HXX #define __ACCHELPER_HXX -#include -#include -#include - #include "UAccCOM2.h" enum DIRECTION @@ -37,108 +33,6 @@ enum DIRECTION #define CHILDID_SELF 0 #define UNO_MSAA_UNMAPPING 0x00000000 -using namespace com::sun::star::uno; -using namespace com::sun::star::accessibility::AccessibleRole; -using namespace com::sun::star::accessibility::AccessibleStateType; - -//Role mapping table,left side is UNO role, right side is MSAA role -const short ROLE_TABLE[][2] = - { - {UNKNOWN, IA2_ROLE_UNKNOWN}, - {ALERT , ROLE_SYSTEM_DIALOG}, - {COLUMN_HEADER , ROLE_SYSTEM_COLUMNHEADER}, - //{CANVAS , ROLE_SYSTEM_CLIENT}, - {CANVAS , IA2_ROLE_CANVAS}, - {CHECK_BOX , ROLE_SYSTEM_CHECKBUTTON}, - {CHECK_MENU_ITEM , IA2_ROLE_CHECK_MENU_ITEM}, - {COLOR_CHOOSER, IA2_ROLE_COLOR_CHOOSER}, - {COMBO_BOX , ROLE_SYSTEM_COMBOBOX}, - {DATE_EDITOR , IA2_ROLE_DATE_EDITOR}, - {DESKTOP_ICON , IA2_ROLE_DESKTOP_ICON}, - {DESKTOP_PANE, IA2_ROLE_DESKTOP_PANE}, - {DIRECTORY_PANE, IA2_ROLE_DIRECTORY_PANE}, - {DIALOG, ROLE_SYSTEM_DIALOG}, - {DOCUMENT, ROLE_SYSTEM_DOCUMENT}, - {EMBEDDED_OBJECT , IA2_ROLE_EMBEDDED_OBJECT }, - {END_NOTE , IA2_ROLE_ENDNOTE }, - {FILE_CHOOSER , IA2_ROLE_FILE_CHOOSER }, - {FILLER, ROLE_SYSTEM_WHITESPACE}, - {FONT_CHOOSER, IA2_ROLE_FONT_CHOOSER}, - {FOOTER, IA2_ROLE_FOOTER}, - {FOOTNOTE, IA2_ROLE_FOOTNOTE}, - //{FRAME, IA2_ROLE_FRAME}, - {FRAME, ROLE_SYSTEM_DIALOG}, - {GLASS_PANE , IA2_ROLE_GLASS_PANE}, - {GRAPHIC , ROLE_SYSTEM_GRAPHIC}, - {GROUP_BOX, ROLE_SYSTEM_GROUPING}, - {HEADER , IA2_ROLE_HEADER}, - {HEADING , IA2_ROLE_HEADING}, - {HYPER_LINK , ROLE_SYSTEM_TEXT}, - {ICON , IA2_ROLE_ICON}, - {INTERNAL_FRAME, IA2_ROLE_INTERNAL_FRAME}, - {LABEL, ROLE_SYSTEM_STATICTEXT}, - {LAYERED_PANE , IA2_ROLE_LAYERED_PANE}, - {LIST , ROLE_SYSTEM_LIST}, - {LIST_ITEM , ROLE_SYSTEM_LISTITEM}, - //{MENU , ROLE_SYSTEM_MENUPOPUP}, - {MENU, ROLE_SYSTEM_MENUITEM}, - {MENU_BAR, ROLE_SYSTEM_MENUBAR}, - {MENU_ITEM, ROLE_SYSTEM_MENUITEM}, - {OPTION_PANE , IA2_ROLE_OPTION_PANE}, - {PAGE_TAB, ROLE_SYSTEM_PAGETAB}, - {PAGE_TAB_LIST, ROLE_SYSTEM_PAGETABLIST}, - {PANEL, IA2_ROLE_OPTION_PANE}, - {PARAGRAPH, IA2_ROLE_PARAGRAPH}, - {PASSWORD_TEXT, ROLE_SYSTEM_TEXT}, - {POPUP_MENU, ROLE_SYSTEM_MENUPOPUP}, - {PUSH_BUTTON, ROLE_SYSTEM_PUSHBUTTON}, - {PROGRESS_BAR, ROLE_SYSTEM_PROGRESSBAR}, - {RADIO_BUTTON, ROLE_SYSTEM_RADIOBUTTON}, - {RADIO_MENU_ITEM, IA2_ROLE_RADIO_MENU_ITEM}, - {ROW_HEADER , ROLE_SYSTEM_ROWHEADER}, - {ROOT_PANE, IA2_ROLE_ROOT_PANE}, - {SCROLL_BAR , ROLE_SYSTEM_SCROLLBAR}, - {SCROLL_PANE , IA2_ROLE_SCROLL_PANE}, - {SHAPE, IA2_ROLE_SHAPE}, - {SEPARATOR , ROLE_SYSTEM_SEPARATOR}, - {SLIDER , ROLE_SYSTEM_SLIDER}, - {SPIN_BOX , ROLE_SYSTEM_SPINBUTTON}, - {SPLIT_PANE, IA2_ROLE_SPLIT_PANE}, - {STATUS_BAR, ROLE_SYSTEM_STATUSBAR}, - {TABLE, ROLE_SYSTEM_TABLE}, - {TABLE_CELL , ROLE_SYSTEM_CELL}, - {TEXT, ROLE_SYSTEM_TEXT}, - {TEXT_FRAME , IA2_ROLE_TEXT_FRAME}, - //for change toggle button to push button for jaws - {TOGGLE_BUTTON, ROLE_SYSTEM_PUSHBUTTON}, - - {TOOL_BAR, ROLE_SYSTEM_TOOLBAR}, - {TOOL_TIP, ROLE_SYSTEM_TOOLTIP}, - {TREE , ROLE_SYSTEM_OUTLINE}, - {VIEW_PORT , IA2_ROLE_VIEW_PORT}, - {WINDOW, ROLE_SYSTEM_WINDOW}, - {BUTTON_DROPDOWN, ROLE_SYSTEM_BUTTONDROPDOWN}, - {BUTTON_MENU, ROLE_SYSTEM_BUTTONMENU}, - {CAPTION, IA2_ROLE_CAPTION}, - {CHART, IA2_ROLE_SHAPE}, - {EDIT_BAR, IA2_ROLE_EDITBAR}, - {FORM, IA2_ROLE_FORM}, - {IMAGE_MAP , IA2_ROLE_IMAGE_MAP}, - {NOTE, IA2_ROLE_NOTE}, - {PAGE, IA2_ROLE_PAGE}, - {RULER , IA2_ROLE_RULER}, - {SECTION, IA2_ROLE_SECTION}, - {TREE_ITEM , ROLE_SYSTEM_OUTLINEITEM}, - {TREE_TABLE, ROLE_SYSTEM_OUTLINE} - }; - -struct ltstr4 -{ - bool operator()(const long s1, const long s2) const - { - return long(s1)