From ef428c448804defe899993d3a9a36411810c3ce6 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Tue, 13 Feb 2018 16:35:37 +0000
Subject: use a11y description if offline help doesn't have an entry

Change-Id: I0090e10f6fa7b5e86be7ace8f1bd61f3f790fa11
---
 vcl/source/window/window.cxx | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'vcl')

diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 25120bea663b..c93e194ab88c 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -3139,6 +3139,9 @@ const OUString& Window::GetHelpText() const
         mpWindowImpl->mbHelpTextDynamic = false;
     }
 
+    //Fallback to Window::GetAccessibleDescription without reentry to GetHelpText()
+    if (mpWindowImpl->maHelpText.isEmpty() && mpWindowImpl->mpAccessibleInfos && mpWindowImpl->mpAccessibleInfos->pAccessibleDescription)
+        return *mpWindowImpl->mpAccessibleInfos->pAccessibleDescription;
     return mpWindowImpl->maHelpText;
 }
 
-- 
cgit