diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2012-06-13 14:08:28 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2012-06-14 11:44:59 +0200 |
| commit | 30903d907a96aac96756e3cd0aa384dfd6993787 (patch) | |
| tree | b6ce236a1dbd3041ad3f97b8c27e8575c7a8ae7d /vcl | |
| parent | e81aa423367882a074b50c9e7c822e186141b9a2 (diff) | |
calc input line: Fix crash with accessibility enabled.
Conflicts:
tools/inc/tools/wintypes.hxx
Change-Id: I4508ec866b7e8436e1a8117ac6496ed0f1537abf
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/window/brdwin.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/window/window.cxx | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx index 9139f5cba360..5d9ac3e61a98 100644 --- a/vcl/source/window/brdwin.cxx +++ b/vcl/source/window/brdwin.cxx @@ -1138,6 +1138,7 @@ void ImplSmallBorderWindowView::Init( OutputDevice* pDev, long nWidth, long nHei case WINDOW_LONGCURRENCYFIELD: case WINDOW_NUMERICFIELD: case WINDOW_SPINFIELD: + case WINDOW_CALCINPUTLINE: mbNWFBorder = true; aCtrlType = (pCtrl->GetStyle() & WB_SPIN) ? CTRL_SPINBOX : CTRL_EDITBOX; break; @@ -1271,6 +1272,7 @@ void ImplSmallBorderWindowView::DrawWindow( sal_uInt16 nDrawFlags, OutputDevice* case WINDOW_LONGCURRENCYFIELD: case WINDOW_NUMERICFIELD: case WINDOW_SPINFIELD: + case WINDOW_CALCINPUTLINE: if( pCtrl->GetStyle() & WB_SPIN ) aCtrlType = CTRL_SPINBOX; else diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index a7c3d1165846..04f10dfccc83 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -8733,6 +8733,7 @@ sal_uInt16 Window::GetAccessibleRole() const case WINDOW_METRICFIELD: case WINDOW_CURRENCYFIELD: case WINDOW_LONGCURRENCYFIELD: + case WINDOW_CALCINPUTLINE: case WINDOW_EDIT: nRole = ( GetStyle() & WB_PASSWORD ) ? (accessibility::AccessibleRole::PASSWORD_TEXT) : (accessibility::AccessibleRole::TEXT); break; case WINDOW_PATTERNBOX: @@ -8837,6 +8838,7 @@ String Window::GetAccessibleName() const case WINDOW_METRICFIELD: case WINDOW_CURRENCYFIELD: case WINDOW_LONGCURRENCYFIELD: + case WINDOW_CALCINPUTLINE: case WINDOW_EDIT: case WINDOW_DATEBOX: |