From 39ca8c72c2090f557a1bccd241aec88c9bed52fb Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Mon, 16 Jan 2017 13:38:46 +0100 Subject: forms,qadevOOo: dispatch of .uno:SwitchControlDesignMode is async Follow-up to e19cdeaf7ddbcf39da47d9685d8e79e775dde7f4. Change-Id: Ic4f8f0373199a4237fa30a830fc89a263eb40d62 --- qadevOOo/runner/util/FormTools.java | 1 + qadevOOo/tests/java/ifc/awt/_XScrollBar.java | 1 - qadevOOo/tests/java/ifc/awt/_XSpinValue.java | 1 - qadevOOo/tests/java/mod/_forms/OTimeControl.java | 1 - 4 files changed, 1 insertion(+), 3 deletions(-) (limited to 'qadevOOo') diff --git a/qadevOOo/runner/util/FormTools.java b/qadevOOo/runner/util/FormTools.java index c89e41b925dc..dd68221cdf2e 100644 --- a/qadevOOo/runner/util/FormTools.java +++ b/qadevOOo/runner/util/FormTools.java @@ -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(); diff --git a/qadevOOo/tests/java/ifc/awt/_XScrollBar.java b/qadevOOo/tests/java/ifc/awt/_XScrollBar.java index 78b4224a6021..8b0e0916e7f8 100644 --- a/qadevOOo/tests/java/ifc/awt/_XScrollBar.java +++ b/qadevOOo/tests/java/ifc/awt/_XScrollBar.java @@ -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(); diff --git a/qadevOOo/tests/java/ifc/awt/_XSpinValue.java b/qadevOOo/tests/java/ifc/awt/_XSpinValue.java index c3404c0a1637..4cf3e195650e 100644 --- a/qadevOOo/tests/java/ifc/awt/_XSpinValue.java +++ b/qadevOOo/tests/java/ifc/awt/_XSpinValue.java @@ -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(); diff --git a/qadevOOo/tests/java/mod/_forms/OTimeControl.java b/qadevOOo/tests/java/mod/_forms/OTimeControl.java index 375174149dc8..01c8f17b4aba 100644 --- a/qadevOOo/tests/java/mod/_forms/OTimeControl.java +++ b/qadevOOo/tests/java/mod/_forms/OTimeControl.java @@ -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 -- cgit