mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

forms,qadevOOo: dispatch of .uno:SwitchControlDesignMode is async

Browse Source 
Follow-up to e19cdeaf7ddbcf39da47d9685d8e79e775dde7f4.

Change-Id: Ic4f8f0373199a4237fa30a830fc89a263eb40d62
This commit is contained in:
Michael Stahl 2017-01-16 13:38:46 +01:00
parent 36afb355ac
commit 39ca8c72c2
5 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
forms/qa/integration/forms/DocumentViewHelper.java
View File

@ -22,6 +22,7 @@ package integration.forms;
import com.sun.star.awt.XControl;
import com.sun.star.awt.XControlModel;
import com.sun.star.awt.XWindow;
import com.sun.star.awt.XToolkitExperimental;
import com.sun.star.beans.PropertyValue;
import com.sun.star.form.XForm;
import com.sun.star.form.runtime.XFormController;
@ -189,6 +190,11 @@ public class DocumentViewHelper
dispatch( ".uno:SwitchXFormsDesignMode" );
else
dispatch( ".uno:SwitchControlDesignMode" );
// at least SwitchControlDesignMode is async, so wait for it to be done
XToolkitExperimental xToolkit = UnoRuntime.queryInterface(
XToolkitExperimental.class,
m_orb.createInstance("com.sun.star.awt.Toolkit"));
xToolkit.processEventsToIdle();
}
/* ------------------------------------------------------------------ */

1
qadevOOo/runner/util/FormTools.java
View File

@ -309,6 +309,7 @@ public class FormTools {
com.sun.star.beans.PropertyValue[] noArgs = new com.sun.star.beans.PropertyValue[0];
aDisp.dispatch(aURL, noArgs);
util.utils.waitForEventIdle(xMSF); // async dispatch
} catch (Exception e) {
System.out.println("******* Mist");
e.printStackTrace();

1
qadevOOo/tests/java/ifc/awt/_XScrollBar.java
View File

@ -39,7 +39,6 @@ public class _XScrollBar extends MultiMethodTest {
public void _addAdjustmentListener() throws Exception {
util.FormTools.switchDesignOf(tParam.getMSF(),
(XTextDocument) tEnv.getObjRelation("Document"));
waitForEventIdle();
oObj.addAdjustmentListener(listener);
adjustScrollBar();

1
qadevOOo/tests/java/ifc/awt/_XSpinValue.java
View File

@ -38,7 +38,6 @@ public class _XSpinValue extends MultiMethodTest {
public void _addAdjustmentListener() throws Exception {
util.FormTools.switchDesignOf(tParam.getMSF(),
(XTextDocument) tEnv.getObjRelation("Document"));
waitForEventIdle();
oObj.addAdjustmentListener(listener);
adjustScrollBar();

1
qadevOOo/tests/java/mod/_forms/OTimeControl.java
View File

@ -218,7 +218,6 @@ public class OTimeControl extends TestCase {
tEnv.addObjRelation("TestTextListener", listener);
FormTools.switchDesignOf(Param.getMSF(), xTextDoc);
util.utils.waitForEventIdle(Param.getMSF());
return tEnv;
} // finish method getTestEnvironment