summaryrefslogtreecommitdiff
path: root/winaccessibility
diff options
context:
space:
mode:
authorMichael Weghorn <m.weghorn@posteo.de>2023-08-08 13:12:49 +0100
committerMichael Weghorn <m.weghorn@posteo.de>2023-08-09 06:14:38 +0200
commit0044ec90b3182a25740b53fb8679d83f0dc8f369 (patch)
tree0194b046ef86e9d2b52885527e68349069fd81e6 /winaccessibility
parentc3cf88f73e29a79f890782b31d1ecc6ed1c376ea (diff)
wina11y: Move these 2 checks out of try/catch
Change-Id: I4ae7527d9b5047d46aab44a1ab6fa42a99c43a14 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155490 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
Diffstat (limited to 'winaccessibility')
-rw-r--r--winaccessibility/source/UAccCOM/MAccessible.cxx12
1 files changed, 6 insertions, 6 deletions
diff --git a/winaccessibility/source/UAccCOM/MAccessible.cxx b/winaccessibility/source/UAccCOM/MAccessible.cxx
index 091acfeb780c..7ca1a8eca836 100644
--- a/winaccessibility/source/UAccCOM/MAccessible.cxx
+++ b/winaccessibility/source/UAccCOM/MAccessible.cxx
@@ -968,13 +968,13 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CMAccessible::accHitTest(long xLeft, long yTop
{
SolarMutexGuard g;
+ if (m_isDestroy)
+ return S_FALSE;
+
+ if (!pvarChild)
+ return E_INVALIDARG;
+
try {
- if (m_isDestroy) return S_FALSE;
- // #CHECK#
- if(pvarChild == nullptr)
- {
- return E_INVALIDARG;
- }
long x, y, w, h;
VARIANT varSelf;
VariantInit(&varSelf);