diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-10-01 21:26:12 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-10-05 18:51:31 -0500 |
| commit | d77ccd3a6a675993483c4bdaa5bf7687f73b5936 (patch) | |
| tree | 984dffaf7a1ac8be0727c62e25b01b0d6ce25d32 | |
| parent | 9a284131d1ede5fde45f8db101a5a2a4a3b2f126 (diff) | |
accfixes2: Some changes to accessible roles
| -rw-r--r-- | vcl/source/window/window.cxx | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index 774d20c689cc..eca2983d3690 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -8811,11 +8811,12 @@ sal_uInt16 Window::GetAccessibleRole() const case WINDOW_CANCELBUTTON: case WINDOW_HELPBUTTON: case WINDOW_IMAGEBUTTON: - case WINDOW_MENUBUTTON: case WINDOW_MOREBUTTON: case WINDOW_SPINBUTTON: case WINDOW_BUTTON: nRole = accessibility::AccessibleRole::PUSH_BUTTON; break; + case WINDOW_MENUBUTTON: nRole = accessibility::AccessibleRole::BUTTON_MENU; break; + case WINDOW_PATHDIALOG: nRole = accessibility::AccessibleRole::DIRECTORY_PANE; break; case WINDOW_FILEDIALOG: nRole = accessibility::AccessibleRole::FILE_CHOOSER; break; case WINDOW_COLORDIALOG: nRole = accessibility::AccessibleRole::COLOR_CHOOSER; break; @@ -8829,10 +8830,6 @@ sal_uInt16 Window::GetAccessibleRole() const case WINDOW_MULTILINEEDIT: nRole = accessibility::AccessibleRole::SCROLL_PANE; break; case WINDOW_PATTERNFIELD: - case WINDOW_NUMERICFIELD: - case WINDOW_METRICFIELD: - case WINDOW_CURRENCYFIELD: - case WINDOW_LONGCURRENCYFIELD: case WINDOW_EDIT: nRole = ( GetStyle() & WB_PASSWORD ) ? (accessibility::AccessibleRole::PASSWORD_TEXT) : (accessibility::AccessibleRole::TEXT); break; case WINDOW_PATTERNBOX: @@ -8870,7 +8867,14 @@ sal_uInt16 Window::GetAccessibleRole() const case WINDOW_DATEFIELD: case WINDOW_TIMEFIELD: nRole = accessibility::AccessibleRole::DATE_EDITOR; break; - case WINDOW_SPINFIELD: nRole = accessibility::AccessibleRole::SPIN_BOX; break; + case WINDOW_NUMERICFIELD: + case WINDOW_METRICFIELD: + case WINDOW_CURRENCYFIELD: + case WINDOW_LONGCURRENCYFIELD: + case WINDOW_SPINFIELD: nRole = ( GetStyle() & WB_SPIN ) ? + accessibility::AccessibleRole::SPIN_BOX : + accessibility::AccessibleRole::TEXT; + break; case WINDOW_TOOLBOX: nRole = accessibility::AccessibleRole::TOOL_BAR; break; case WINDOW_STATUSBAR: nRole = accessibility::AccessibleRole::STATUS_BAR; break; |