vcl/source/window/dialog.cxx | 8 --------
1 file changed, 8 deletions(-)
New commits:
commit b137ff671f25a605334083c0f87ada84eaa0fcf2
Author: Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
AuthorDate: Mon May 10 15:01:19 2021 +0900
Commit: Tomaž Vajngerl <qui...@gmail.com>
CommitDate: Tue May 11 02:21:15 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/+/115307
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <qui...@gmail.com>
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index a8bd2d5dc37e..882d6c0e985b 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -1036,10 +1036,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
VclPtr<vcl::Window> xWindow = this;
mbInSyncExecute = true;
@@ -1070,10 +1066,6 @@ short Dialog::Execute()
mpDialogImpl->mnResult = -1;
return static_cast<short>(nRet);
-
-#else
- return RET_OK;
-#endif
}
// virtual
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
