diff options
| author | merttumer <mert.tumer@collabora.com> | 2021-04-29 06:20:56 +0000 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2021-05-12 10:51:47 +0200 |
| commit | a7abfb8391a4aacb18205cc16740f92b5b0d1a07 (patch) | |
| tree | 70142270311f4d30ade357baf3f39ef59f2c411c | |
| parent | 0cc13793645e268b2f26dfcd44082dcd6d4cce7e (diff) | |
Wait for dialog response on Android
Do not return RET_OK immediately.
Change-Id: I1ff22edce54e4717e418457bde1dca830346f197
Signed-off-by: merttumer <mert.tumer@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114831
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
| -rw-r--r-- | vcl/source/window/dialog.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx index bf6bf188f14c..df02e19654bc 100644 --- a/vcl/source/window/dialog.cxx +++ b/vcl/source/window/dialog.cxx @@ -18,6 +18,7 @@ */ #include <config_feature_desktop.h> +#include <config_features.h> #ifdef IOS #include <premac.h> @@ -1037,7 +1038,7 @@ short Dialog::Execute() // Once the Android app is based on same idea as the iOS one currently // being developed, no conditional should be needed here. Until then, // play it safe. -#if HAVE_FEATURE_DESKTOP || defined IOS +#if HAVE_FEATURE_DESKTOP || defined IOS || HAVE_FEATURE_ANDROID_LOK VclPtr<vcl::Window> xWindow = this; mbInSyncExecute = true; |