[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - vcl/source

[Tomaž Vajngerl (via logerrit)]

 vcl/source/window/dialog.cxx |    8 --------
 1 file changed, 8 deletions(-)

New commits:
commit 5c0d4b915c3328ce1613b103845296667793cb8c
Author:     Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
AuthorDate: Mon May 10 15:01:19 2021 +0900
Commit:     Tomaž Vajngerl <quikee at gmail.com>
CommitDate: Thu May 13 12:15:25 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 <quikee at gmail.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115534
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>

diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index 27949e4d19b7..a30aa19f71b4 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -1037,10 +1037,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;
@@ -1071,10 +1067,6 @@ short Dialog::Execute()
     mpDialogImpl->mnResult = -1;
 
     return static_cast<short>(nRet);
-
-#else
-    return RET_OK;
-#endif
 }
 
 // virtual