1 files changed, 4 insertions, 17 deletions
diff --git a/src/plugins/platforms/windows/uiautomation/qwindowsuiatextprovider.cpp b/src/plugins/platforms/windows/uiautomation/qwindowsuiatextprovider.cpp
index e3b7c69b60..172836232e 100644
--- a/src/plugins/platforms/windows/uiautomation/qwindowsuiatextprovider.cpp
+++ b/src/plugins/platforms/windows/uiautomation/qwindowsuiatextprovider.cpp
@@ -26,20 +26,6 @@ QWindowsUiaTextProvider::~QWindowsUiaTextProvider()
 {
 }
 
-HRESULT STDMETHODCALLTYPE QWindowsUiaTextProvider::QueryInterface(REFIID iid, LPVOID *iface)
-{
-    qCDebug(lcQpaUiAutomation) << __FUNCTION__ << this;
-
-    if (!iface)
-        return E_INVALIDARG;
-    *iface = nullptr;
-
-    const bool result = qWindowsComQueryUnknownInterfaceMulti<ITextProvider>(this, iid, iface)
-        || qWindowsComQueryInterface<ITextProvider>(this, iid, iface)
-        || qWindowsComQueryInterface<ITextProvider2>(this, iid, iface);
-    return result ? S_OK : E_NOINTERFACE;
-}
-
 // Returns an array of providers for the selected text ranges.
 HRESULT STDMETHODCALLTYPE QWindowsUiaTextProvider::GetSelection(SAFEARRAY **pRetVal)
 {
@@ -146,9 +132,10 @@ HRESULT STDMETHODCALLTYPE QWindowsUiaTextProvider::RangeFromPoint(UiaPoint point
     nativeUiaPointToPoint(point, window, &pt);
 
     int offset = textInterface->offsetAtPoint(pt);
-    if ((offset >= 0) && (offset < textInterface->characterCount())) {
-        *pRetVal = new QWindowsUiaTextRangeProvider(id(), offset, offset);
-    }
+    if (offset < 0 || offset >= textInterface->characterCount())
+        return UIA_E_ELEMENTNOTAVAILABLE;
+
+    *pRetVal = new QWindowsUiaTextRangeProvider(id(), offset, offset);
     return S_OK;
 }