[Libreoffice-commits] core.git: qadevOOo/tests starmath/source

[Caolán McNamara (via logerrit)]

 qadevOOo/tests/java/mod/_sm/SmEditAccessible.java |    4 ++--
 starmath/source/accessibility.cxx                 |    5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 815afb06b78b8fbf83f6a48b89500fb34dc4b40b
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Sep 2 20:45:14 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue Sep 3 12:44:50 2019 +0200

    indicate that SmEditAccessible is editable
    
    and use TEXT_FRAME like calc and other similar users of
    of an EditEngine as a frame do.
    
    Change-Id: I9d73362aa44273f87b283fcfc508d27abb50cb40
    Reviewed-on: https://gerrit.libreoffice.org/78420
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/qadevOOo/tests/java/mod/_sm/SmEditAccessible.java b/qadevOOo/tests/java/mod/_sm/SmEditAccessible.java
index 710027706969..7b7a2c28d25a 100644
--- a/qadevOOo/tests/java/mod/_sm/SmEditAccessible.java
+++ b/qadevOOo/tests/java/mod/_sm/SmEditAccessible.java
@@ -63,7 +63,7 @@ public class SmEditAccessible extends TestCase {
 
     /**
      * Creates a <code>StarMath</code> document and obtains an accessibility
-     * component with the role <code>AccessibleRole.PANEL</code>.
+     * component with the role <code>AccessibleRole.TEXT_FRAME</code>.
      */
     @Override
     protected TestEnvironment createTestEnvironment(final TestParameters Param, PrintWriter log) throws Exception {
@@ -86,7 +86,7 @@ public class SmEditAccessible extends TestCase {
         XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow);
 
         oObj = AccessibilityTools.getAccessibleObjectForRole
-            (xRoot, AccessibleRole.PANEL, "", "SmEditAccessible");
+            (xRoot, AccessibleRole.TEXT_FRAME, "", "SmEditAccessible");
 
         log.println("ImplementationName " + utils.getImplName(oObj));
         AccessibilityTools.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE));
diff --git a/starmath/source/accessibility.cxx b/starmath/source/accessibility.cxx
index 8fb20618c701..98868df14a55 100644
--- a/starmath/source/accessibility.cxx
+++ b/starmath/source/accessibility.cxx
@@ -1648,7 +1648,7 @@ sal_Int32 SAL_CALL SmEditAccessible::getAccessibleChildCount(  )
 {
     SolarMutexGuard aGuard;
     if (!pTextHelper)
-        throw RuntimeException();
+        return 0;
     return pTextHelper->GetChildCount();
 }
 
@@ -1688,7 +1688,7 @@ sal_Int32 SAL_CALL SmEditAccessible::getAccessibleIndexInParent(  )
 
 sal_Int16 SAL_CALL SmEditAccessible::getAccessibleRole(  )
 {
-    return AccessibleRole::PANEL /*TEXT ?*/;
+    return AccessibleRole::TEXT_FRAME;
 }
 
 OUString SAL_CALL SmEditAccessible::getAccessibleDescription(  )
@@ -1723,6 +1723,7 @@ uno::Reference< XAccessibleStateSet > SAL_CALL SmEditAccessible::getAccessibleSt
     {
         pStateSet->AddState( AccessibleStateType::MULTI_LINE );
         pStateSet->AddState( AccessibleStateType::ENABLED );
+        pStateSet->AddState( AccessibleStateType::EDITABLE );
         pStateSet->AddState( AccessibleStateType::FOCUSABLE );
         if (pWin->HasFocus())
             pStateSet->AddState( AccessibleStateType::FOCUSED );