Kaydet (Commit) 39ca8c72 authored tarafından Michael Stahl's avatar Michael Stahl

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

Follow-up to e19cdeaf.

Change-Id: Ic4f8f0373199a4237fa30a830fc89a263eb40d62
üst 36afb355
...@@ -22,6 +22,7 @@ package integration.forms; ...@@ -22,6 +22,7 @@ package integration.forms;
import com.sun.star.awt.XControl; import com.sun.star.awt.XControl;
import com.sun.star.awt.XControlModel; import com.sun.star.awt.XControlModel;
import com.sun.star.awt.XWindow; import com.sun.star.awt.XWindow;
import com.sun.star.awt.XToolkitExperimental;
import com.sun.star.beans.PropertyValue; import com.sun.star.beans.PropertyValue;
import com.sun.star.form.XForm; import com.sun.star.form.XForm;
import com.sun.star.form.runtime.XFormController; import com.sun.star.form.runtime.XFormController;
...@@ -189,6 +190,11 @@ public class DocumentViewHelper ...@@ -189,6 +190,11 @@ public class DocumentViewHelper
dispatch( ".uno:SwitchXFormsDesignMode" ); dispatch( ".uno:SwitchXFormsDesignMode" );
else else
dispatch( ".uno:SwitchControlDesignMode" ); 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();
} }
/* ------------------------------------------------------------------ */ /* ------------------------------------------------------------------ */
......
...@@ -309,6 +309,7 @@ public class FormTools { ...@@ -309,6 +309,7 @@ public class FormTools {
com.sun.star.beans.PropertyValue[] noArgs = new com.sun.star.beans.PropertyValue[0]; com.sun.star.beans.PropertyValue[] noArgs = new com.sun.star.beans.PropertyValue[0];
aDisp.dispatch(aURL, noArgs); aDisp.dispatch(aURL, noArgs);
util.utils.waitForEventIdle(xMSF); // async dispatch
} catch (Exception e) { } catch (Exception e) {
System.out.println("******* Mist"); System.out.println("******* Mist");
e.printStackTrace(); e.printStackTrace();
......
...@@ -39,7 +39,6 @@ public class _XScrollBar extends MultiMethodTest { ...@@ -39,7 +39,6 @@ public class _XScrollBar extends MultiMethodTest {
public void _addAdjustmentListener() throws Exception { public void _addAdjustmentListener() throws Exception {
util.FormTools.switchDesignOf(tParam.getMSF(), util.FormTools.switchDesignOf(tParam.getMSF(),
(XTextDocument) tEnv.getObjRelation("Document")); (XTextDocument) tEnv.getObjRelation("Document"));
waitForEventIdle();
oObj.addAdjustmentListener(listener); oObj.addAdjustmentListener(listener);
adjustScrollBar(); adjustScrollBar();
......
...@@ -38,7 +38,6 @@ public class _XSpinValue extends MultiMethodTest { ...@@ -38,7 +38,6 @@ public class _XSpinValue extends MultiMethodTest {
public void _addAdjustmentListener() throws Exception { public void _addAdjustmentListener() throws Exception {
util.FormTools.switchDesignOf(tParam.getMSF(), util.FormTools.switchDesignOf(tParam.getMSF(),
(XTextDocument) tEnv.getObjRelation("Document")); (XTextDocument) tEnv.getObjRelation("Document"));
waitForEventIdle();
oObj.addAdjustmentListener(listener); oObj.addAdjustmentListener(listener);
adjustScrollBar(); adjustScrollBar();
......
...@@ -218,7 +218,6 @@ public class OTimeControl extends TestCase { ...@@ -218,7 +218,6 @@ public class OTimeControl extends TestCase {
tEnv.addObjRelation("TestTextListener", listener); tEnv.addObjRelation("TestTextListener", listener);
FormTools.switchDesignOf(Param.getMSF(), xTextDoc); FormTools.switchDesignOf(Param.getMSF(), xTextDoc);
util.utils.waitForEventIdle(Param.getMSF());
return tEnv; return tEnv;
} // finish method getTestEnvironment } // finish method getTestEnvironment
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment