summaryrefslogtreecommitdiffstats
path: root/forms
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2017-01-16 13:38:46 +0100
committerMichael Stahl <mstahl@redhat.com>2017-01-16 13:42:56 +0100
commit39ca8c72c2090f557a1bccd241aec88c9bed52fb (patch)
tree38dbd93d61f11c9173a61fe3e08c3dd0dbda919c /forms
parentUpdated core (diff)
downloadcore-39ca8c72c2090f557a1bccd241aec88c9bed52fb.tar.gz
core-39ca8c72c2090f557a1bccd241aec88c9bed52fb.zip
forms,qadevOOo: dispatch of .uno:SwitchControlDesignMode is async
Follow-up to e19cdeaf7ddbcf39da47d9685d8e79e775dde7f4. Change-Id: Ic4f8f0373199a4237fa30a830fc89a263eb40d62
Diffstat (limited to 'forms')
-rw-r--r--forms/qa/integration/forms/DocumentViewHelper.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/forms/qa/integration/forms/DocumentViewHelper.java b/forms/qa/integration/forms/DocumentViewHelper.java
index c176247b9a07..7acdbce4e4b3 100644
--- a/forms/qa/integration/forms/DocumentViewHelper.java
+++ b/forms/qa/integration/forms/DocumentViewHelper.java
@@ -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();
}
/* ------------------------------------------------------------------ */