vcl/source/window/dialog.cxx | 8 -------- 1 file changed, 8 deletions(-)
New commits: commit c07348292576fa755ec2c71b3912b57b050d6442 Author: Tomaž Vajngerl <[email protected]> AuthorDate: Mon May 10 15:01:19 2021 +0900 Commit: Tomaž Vajngerl <[email protected]> CommitDate: Tue May 11 10:07:21 2021 +0200 vcl: Don't just return OK when executing a dialog in Android This was probably "ifdef-ed" out for Android because of some old assumptions and isn't true anymore today. This has prevented that the dialog for macro execution shows up on Android when the document is loading. Change-Id: I662d2deb1520f9a3b421dac05f858488aef825fc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115303 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Tomaž Vajngerl <[email protected]> diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx index df02e19654bc..3cbffb41da66 100644 --- a/vcl/source/window/dialog.cxx +++ b/vcl/source/window/dialog.cxx @@ -1035,10 +1035,6 @@ void Dialog::ImplEndExecuteModal() 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 || HAVE_FEATURE_ANDROID_LOK VclPtr<vcl::Window> xWindow = this; mbInSyncExecute = true; @@ -1069,10 +1065,6 @@ short Dialog::Execute() mpDialogImpl->mnResult = -1; return static_cast<short>(nRet); - -#else - return RET_OK; -#endif } // virtual _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
