2 files changed, 14 insertions, 9 deletions
diff --git a/accessibility/inc/standard/vclxaccessibleedit.hxx b/accessibility/inc/standard/vclxaccessibleedit.hxx
index 187a03264718..107ff01f54de 100644
--- a/accessibility/inc/standard/vclxaccessibleedit.hxx
+++ b/accessibility/inc/standard/vclxaccessibleedit.hxx
@@ -101,6 +101,7 @@ public:
     virtual sal_Bool SAL_CALL setText( const OUString& sText ) override;
 
 private:
+    bool isComboBoxChild();
     bool isEditable();
 };
 
diff --git a/accessibility/source/standard/vclxaccessibleedit.cxx b/accessibility/source/standard/vclxaccessibleedit.cxx
index f7ce36f3187e..bc528a5c2690 100644
--- a/accessibility/source/standard/vclxaccessibleedit.cxx
+++ b/accessibility/source/standard/vclxaccessibleedit.cxx
@@ -168,15 +168,7 @@ bool VCLXAccessibleEdit::PreferFullTextInTextChangedEvent()
     // for a combobox subedit, the Orca screen reader announces the new/added text
     // so always send the whole old and new text and not just
     // the changed characters, so the whole entry text gets announced
-    Reference<XAccessible> xParent = getAccessibleParent();
-    if (xParent.is())
-    {
-        Reference<XAccessibleContext> xParentContext = xParent->getAccessibleContext();
-        if (xParentContext.is() && xParentContext->getAccessibleRole() == AccessibleRole::COMBO_BOX)
-            return true;
-    }
-
-    return false;
+    return isComboBoxChild();
 }
 
 // XServiceInfo
@@ -616,6 +608,18 @@ sal_Bool VCLXAccessibleEdit::setText( const OUString& sText )
     return bReturn;
 }
 
+bool VCLXAccessibleEdit::isComboBoxChild()
+{
+    Reference<XAccessible> xParent = getAccessibleParent();
+    if (xParent.is())
+    {
+        Reference<XAccessibleContext> xParentContext = xParent->getAccessibleContext();
+        if (xParentContext.is() && xParentContext->getAccessibleRole() == AccessibleRole::COMBO_BOX)
+            return true;
+    }
+    return false;
+}
+
 bool VCLXAccessibleEdit::isEditable()
 {
     VclPtr<Edit> pEdit = GetAs<Edit>();