summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlhan Yesil <ilhanyesil@gmx.de>2018-07-30 11:56:22 +0200
committerAdolfo Jayme Barrientos <fitojb@ubuntu.com>2018-08-24 09:44:05 +0200
commitc6dc37d8d0f0ba8a1aecb7f9e75b5e7a5ab406e8 (patch)
treeefa83252f15cdd14cb3ab4805c53d0b8b638f25c
parent18cbd5c4b408ecd96cf67590f661a4f16d8f3f21 (diff)
tdf#118994 JAWS has no access to accessibility objects
According to the MSDN, lParam must be cast to DWORD when examining WM_GETOBJECT messages on 64-bit Windows. The MSDN example also casts wParam, so in this solution, lParam and wParam are cast to the appropriate types sal_Int32 and sal_uInt32. Change-Id: I1edc00778c7da91d2baf5784e4c3f8c441e42eab Reviewed-on: https://gerrit.libreoffice.org/58312 Tested-by: Jenkins Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com> (cherry picked from commit 200fafc341c9ac5cedb0e3e8a38fcc4e88fce77c) Reviewed-on: https://gerrit.libreoffice.org/59341 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
-rw-r--r--vcl/win/window/salframe.cxx9
1 files changed, 6 insertions, 3 deletions
diff --git a/vcl/win/window/salframe.cxx b/vcl/win/window/salframe.cxx
index 5691c37cfcc9..e67aa6af90e6 100644
--- a/vcl/win/window/salframe.cxx
+++ b/vcl/win/window/salframe.cxx
@@ -5254,12 +5254,15 @@ ImplHandleGetObject(HWND hWnd, LPARAM lParam, WPARAM wParam, LRESULT & nRet)
uno::Reference< accessibility::XMSAAService > xMSAA( pSVData->mxAccessBridge, uno::UNO_QUERY );
if ( xMSAA.is() )
{
+ sal_Int32 lParam32 = (sal_Int32)lParam;
+ sal_uInt32 wParam32 = (sal_uInt32)wParam;
+
// mhOnSetTitleWnd not set to reasonable value anywhere...
- if ( lParam == OBJID_CLIENT )
+ if ( lParam32 == OBJID_CLIENT )
{
nRet = xMSAA->getAccObjectPtr(
- reinterpret_cast<sal_Int64>(hWnd), lParam, wParam);
- if( nRet != 0 )
+ reinterpret_cast<sal_Int64>(hWnd), lParam32, wParam32);
+ if (nRet != 0)
return true;
}
}