sc/source/ui/app/inputwin.cxx | 2 +-
tools/inc/tools/wintypes.hxx | 3 ++-
vcl/source/window/brdwin.cxx | 2 ++
vcl/source/window/window.cxx | 2 ++
4 files changed, 7 insertions(+), 2 deletions(-)
New commits:
commit cba0dad4566652f63ea3114660da4e5c7dd88c31
Author: Jan Holesovsky <ke...@suse.cz>
Date: Wed Jun 13 14:08:28 2012 +0200
calc input line: Fix crash with accessibility enabled.
Change-Id: I4508ec866b7e8436e1a8117ac6496ed0f1537abf
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index 37faa1d..a63fb3b 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -118,7 +118,7 @@ ScTextWndBase::ScTextWndBase( Window* pParent, WinBits
nStyle )
{
if ( IsNativeControlSupported( CTRL_EDITBOX, PART_ENTIRE_CONTROL ) )
{
- SetType( WINDOW_EDIT );
+ SetType( WINDOW_CALCINPUTLINE );
SetBorderStyle( WINDOW_BORDER_NWF );
}
}
diff --git a/tools/inc/tools/wintypes.hxx b/tools/inc/tools/wintypes.hxx
index 87657a2..cb8bb34 100644
--- a/tools/inc/tools/wintypes.hxx
+++ b/tools/inc/tools/wintypes.hxx
@@ -118,7 +118,8 @@ typedef sal_uInt16 WindowType;
#define WINDOW_LISTBOXWINDOW (WINDOW_FIRST + 0x4f)
#define WINDOW_DOCKINGAREA (WINDOW_FIRST + 0x50)
#define WINDOW_RULER (WINDOW_FIRST + 0x51)
-#define WINDOW_LAST (WINDOW_RULER)
+#define WINDOW_CALCINPUTLINE (WINDOW_FIRST + 0x52)
+#define WINDOW_LAST (WINDOW_CALCINPUTLINE)
// ---------------
diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx
index 9139f5c..5d9ac3e 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 8835788..b0d10a1 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:
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
