solenv/bin/native-code.py | 1 + vcl/source/window/dialog.cxx | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-)
New commits: commit a632d90b3e17c7efb9b9f712758896e8d8fdf2ea Author: merttumer <[email protected]> AuthorDate: Thu Apr 29 06:20:56 2021 +0000 Commit: Mert Tumer <[email protected]> CommitDate: Mon May 3 06:54:15 2021 +0200 Wait for dialog response on Android Do not return RET_OK immediately. Change-Id: I1ff22edce54e4717e418457bde1dca830346f197 Signed-off-by: merttumer <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114831 Tested-by: Jenkins CollaboraOffice <[email protected]> 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; commit 661e6b9a993e262f96e2d2b02ed356017c1fa436 Author: merttumer <[email protected]> AuthorDate: Thu Apr 29 06:20:19 2021 +0000 Commit: Mert Tumer <[email protected]> CommitDate: Mon May 3 06:54:05 2021 +0200 Add missing FilterOptionsDialog constructor for android Change-Id: I8bdd44e1b2f45a6d62e6b7220762da62787e04fa Signed-off-by: merttumer <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114830 Tested-by: Jenkins CollaboraOffice <[email protected]> diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py index 996a12247ca8..8248a69bdb63 100755 --- a/solenv/bin/native-code.py +++ b/solenv/bin/native-code.py @@ -362,6 +362,7 @@ edit_constructor_list = [ "Calc_XMLOasisMetaExporter_get_implementation", "Calc_XMLOasisSettingsExporter_get_implementation", "Calc_XMLOasisStylesExporter_get_implementation", + "Calc_FilterOptionsDialog_get_implementation", # starmath/util/sm.component "Math_XMLOasisMetaExporter_get_implementation", "Math_XMLOasisSettingsExporter_get_implementation", _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
