summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@suse.cz>2012-06-13 14:08:28 +0200
committerJan Holesovsky <kendy@suse.cz>2012-06-13 14:18:26 +0200
commitcba0dad4566652f63ea3114660da4e5c7dd88c31 (patch)
treee31282357397b4a24081ee3731e4ff46a2964901 /vcl
parenta4242df3ae36d9158317298fe01b5cfa0aae4b32 (diff)
calc input line: Fix crash with accessibility enabled.
Change-Id: I4508ec866b7e8436e1a8117ac6496ed0f1537abf
Diffstat (limited to 'vcl')
-rw-r--r--vcl/source/window/brdwin.cxx2
-rw-r--r--vcl/source/window/window.cxx2
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 8835788908fc..b0d10a16be54 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -8734,6 +8734,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: