qadevOOo/Jar_OOoRunner.mk | 1
qadevOOo/objdsc/sm/com.sun.star.comp.unknown.SmEditAccessible.csv | 22 -
qadevOOo/tests/java/mod/_sm/SmEditAccessible.java | 129
----------
starmath/qa/unoapi/sm.sce | 1
starmath/source/view.cxx | 6
5 files changed, 3 insertions(+), 156 deletions(-)
New commits:
commit aa396ee162ee0eb223c90ab4f9bd55014cf94775
Author: Khaled Hosny <kha...@libreoffice.org>
AuthorDate: Tue Sep 5 20:37:25 2023 +0300
Commit: خالد حسني <kha...@libreoffice.org>
CommitDate: Tue Sep 12 14:14:52 2023 +0200
starmath: Keep focus on math widget when inline editing is enabled
Since originally all editing happened in the edit window, it was made to
grab focus instead of the math widget, but we don’t want that anymore
when inline editing is enable as we want to edit everything in the math
widget.
This also removes ancient test that is now failing. We will eventually
drop the edit window altogether.
Change-Id: Ia1628a454bbbdd923ff582564eca1ab4ec830f38
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156579
Tested-by: Jenkins
Reviewed-by: خالد حسني <kha...@libreoffice.org>
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index 65ed25b15758..365ea75bc71b 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -1000,7 +1000,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
qadevOOo/tests/java/mod/_simreg/SimpleRegistry \
qadevOOo/tests/java/mod/_smgr/OServiceManager \
qadevOOo/tests/java/mod/_smplmail/SimpleSystemMail \
- qadevOOo/tests/java/mod/_sm/SmEditAccessible \
qadevOOo/tests/java/mod/_sm/SmGraphicAccessible \
qadevOOo/tests/java/mod/_sm/SmModel \
qadevOOo/tests/java/mod/_sm/XMLExporter \
diff --git a/qadevOOo/objdsc/sm/com.sun.star.comp.unknown.SmEditAccessible.csv
b/qadevOOo/objdsc/sm/com.sun.star.comp.unknown.SmEditAccessible.csv
deleted file mode 100644
index 58e85c7c7973..000000000000
--- a/qadevOOo/objdsc/sm/com.sun.star.comp.unknown.SmEditAccessible.csv
+++ /dev/null
@@ -1,22 +0,0 @@
-"SmEditAccessible";"com::sun::star::accessibility::XAccessibleEventBroadcaster";"addEventListener()"
-"SmEditAccessible";"com::sun::star::accessibility::XAccessibleEventBroadcaster";"removeEventListener()"
-"SmEditAccessible";"com::sun::star::accessibility::XAccessibleComponent";"containsPoint()"
-"SmEditAccessible";"com::sun::star::accessibility::XAccessibleComponent";"getAccessibleAtPoint()"
-"SmEditAccessible";"com::sun::star::accessibility::XAccessibleComponent";"getBounds()"
-"SmEditAccessible";"com::sun::star::accessibility::XAccessibleComponent";"getLocation()"
-"SmEditAccessible";"com::sun::star::accessibility::XAccessibleComponent";"getLocationOnScreen()"
-"SmEditAccessible";"com::sun::star::accessibility::XAccessibleComponent";"getSize()"
-"SmEditAccessible";"com::sun::star::accessibility::XAccessibleComponent";"grabFocus()"
-"SmEditAccessible";"com::sun::star::accessibility::XAccessibleComponent";"getForeground()"
-"SmEditAccessible";"com::sun::star::accessibility::XAccessibleComponent";"getBackground()"
-"SmEditAccessible";"com::sun::star::accessibility::XAccessible";"getAccessibleContext()"
-"SmEditAccessible";"com::sun::star::accessibility::XAccessibleContext";"getAccessibleChildCount()"
-"SmEditAccessible";"com::sun::star::accessibility::XAccessibleContext";"getAccessibleChild()"
-"SmEditAccessible";"com::sun::star::accessibility::XAccessibleContext";"getAccessibleParent()"
-"SmEditAccessible";"com::sun::star::accessibility::XAccessibleContext";"getAccessibleIndexInParent()"
-"SmEditAccessible";"com::sun::star::accessibility::XAccessibleContext";"getAccessibleRole()"
-"SmEditAccessible";"com::sun::star::accessibility::XAccessibleContext";"getAccessibleDescription()"
-"SmEditAccessible";"com::sun::star::accessibility::XAccessibleContext";"getAccessibleName()"
-"SmEditAccessible";"com::sun::star::accessibility::XAccessibleContext";"getAccessibleRelationSet()"
-"SmEditAccessible";"com::sun::star::accessibility::XAccessibleContext";"getAccessibleStateSet()"
-"SmEditAccessible";"com::sun::star::accessibility::XAccessibleContext";"getLocale()"
diff --git a/qadevOOo/tests/java/mod/_sm/SmEditAccessible.java
b/qadevOOo/tests/java/mod/_sm/SmEditAccessible.java
deleted file mode 100644
index b32e7f4dac03..000000000000
--- a/qadevOOo/tests/java/mod/_sm/SmEditAccessible.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-package mod._sm;
-
-import java.io.PrintWriter;
-
-import lib.TestCase;
-import lib.TestEnvironment;
-import lib.TestParameters;
-import util.AccessibilityTools;
-import util.SOfficeFactory;
-import util.utils;
-
-import com.sun.star.accessibility.AccessibleRole;
-import com.sun.star.accessibility.XAccessible;
-import com.sun.star.accessibility.XAccessibleContext;
-import com.sun.star.awt.XWindow;
-import com.sun.star.beans.XPropertySet;
-import com.sun.star.frame.XModel;
-import com.sun.star.lang.XComponent;
-import com.sun.star.uno.UnoRuntime;
-import com.sun.star.uno.XInterface;
-
-/**
- * Object implements the following interfaces :
- * <ul>
- * <li> <code>::com::sun::star::accessibility::XAccessible</code></li>
- * <li>
<code>::com::sun::star::accessibility::XAccessibleComponent</code></li>
- * <li> <code>::com::sun::star::accessibility::XAccessibleContext</code></li>
- * <li>
<code>::com::sun::star::accessibility::XAccessibleEventBroadcaster</code></li>
- * <li> <code>::com::sun::star::accessibility::XAccessibleText</code></li>
- * </ul> <p>
- *
- * @see com.sun.star.accessibility.XAccessible
- * @see com.sun.star.accessibility.XAccessibleComponent
- * @see com.sun.star.accessibility.XAccessibleContext
- * @see com.sun.star.accessibility.XAccessibleEventBroadcaster
- * @see com.sun.star.accessibility.XAccessibleText
- * @see ifc.accessibility._XAccessible
- * @see ifc.accessibility._XAccessibleComponent
- * @see ifc.accessibility._XAccessibleContext
- * @see ifc.accessibility._XAccessibleEventBroadcaster
- * @see ifc.accessibility._XAccessibleText
- */
-public class SmEditAccessible extends TestCase {
- XComponent xMathDoc;
-
- /**
- * Creates a <code>StarMath</code> document and obtains an accessibility
- * component with the role <code>AccessibleRole.TEXT_FRAME</code>.
- */
- @Override
- protected TestEnvironment createTestEnvironment(final TestParameters
Param, PrintWriter log) throws Exception {
-
- SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF() );
- xMathDoc = SOF.openDoc("smath","_blank");
-
- // setting a formula in document
- final String expFormula = "sum hat a";
- final XPropertySet xPS = UnoRuntime.queryInterface
- (XPropertySet.class, xMathDoc);
- xPS.setPropertyValue("Formula", expFormula);
-
- XInterface oObj = null;
-
- XModel aModel = UnoRuntime.queryInterface(XModel.class, xMathDoc);
-
-
- XWindow xWindow = AccessibilityTools.getCurrentWindow(aModel);
- XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow);
-
- oObj = AccessibilityTools.getAccessibleObjectForRole
- (xRoot, AccessibleRole.TEXT_FRAME, "", "WeldEditAccessible");
-
- log.println("ImplementationName " + utils.getImplName(oObj));
- AccessibilityTools.printAccessibleTree(log, xRoot,
Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE));
- TestEnvironment tEnv = new TestEnvironment(oObj);
-
- tEnv.addObjRelation("Destroy", Boolean.TRUE);
-
- final XAccessibleContext con =
UnoRuntime.queryInterface(XAccessibleContext.class, oObj);
- tEnv.addObjRelation("EventProducer",
- new ifc.accessibility._XAccessibleEventBroadcaster.EventProducer(){
- public void fireEvent() {
- try {
- System.out.println("Children
"+con.getAccessibleChildCount());
- xPS.setPropertyValue("Formula", "sum hat x \n int a \n
sum b");
- util.utils.waitForEventIdle(Param.getMSF());
- System.out.println("Children
"+con.getAccessibleChildCount());
- xPS.setPropertyValue("Formula", expFormula);
- util.utils.waitForEventIdle(Param.getMSF());
- } catch(com.sun.star.lang.WrappedTargetException e) {
- } catch(com.sun.star.lang.IllegalArgumentException e) {
- } catch(com.sun.star.beans.PropertyVetoException e) {
- } catch(com.sun.star.beans.UnknownPropertyException e) {
- }
- }
- });
-
- return tEnv;
- }
-
- /**
- * Disposes the document created in <code>createTestEnvironment</code>
- * method.
- */
- @Override
- protected void cleanup( TestParameters Param, PrintWriter log) {
-
- log.println( " disposing xMathDoc " );
- xMathDoc.dispose();
- }
-} // finish class SmModel
diff --git a/starmath/qa/unoapi/sm.sce b/starmath/qa/unoapi/sm.sce
index 4e7b278a7ca2..b09f62c01055 100644
--- a/starmath/qa/unoapi/sm.sce
+++ b/starmath/qa/unoapi/sm.sce
@@ -15,7 +15,6 @@
# except in compliance with the License. You may obtain a copy of
# the License at http://www.apache.org/licenses/LICENSE-2.0 .
#
--o sm.SmEditAccessible
-o sm.SmGraphicAccessible
-o sm.SmModel
-o sm.XMLExporter
diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx
index 83b80d9c6ea7..c9a6303ba0e1 100644
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -950,8 +950,8 @@ SmCmdBoxWindow::SmCmdBoxWindow(SfxBindings *pBindings_,
SfxChildWindow *pChildWi
Hide();
- // Don't try to grab focus in LOK inline edit mode
- if (!comphelper::LibreOfficeKit::isActive())
+ // Don't try to grab focus in inline edit mode
+ if (!SmViewShell::IsInlineEditEnabled())
{
aInitialFocusTimer.SetInvokeHandler(LINK(this, SmCmdBoxWindow,
InitialFocusTimerHdl));
aInitialFocusTimer.SetTimeout(100);
@@ -2322,7 +2322,7 @@ void SmViewShell::Activate( bool bIsMDIActivate )
{
SfxViewShell::Activate( bIsMDIActivate );
- if (comphelper::LibreOfficeKit::isActive())
+ if (IsInlineEditEnabled())
{
// In LOK, activate in-place editing
GetGraphicWidget().GrabFocus();
