[Libreoffice-commits] core.git: 2 commits - vcl/source

[Libreoffice Gerrit user]

 vcl/source/window/dialog.cxx |   10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

New commits:
commit 15aee54bb56982d57c27234a4ae946b45354c310
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Mon Nov 5 16:52:49 2018 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Mon Nov 5 16:52:53 2018 +0200

    Bin obsolete comment and the related commented-out line of code
    
    Change-Id: I158f99429ebeb4cbdaa6ca2614b689cc287c8010

diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index aae21743daf9..00f471ef9604 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -1055,12 +1055,7 @@ short Dialog::Execute()
     return static_cast<short>(nRet);
 
 #else
-
-    // touch_ui_dialog_modal was dummied out both for Android and iOS (well, TiledLibreOffice anyway)
-    // For Android it returned MLODialogOK always, for iOS Cancel. Let's go with OK.
-    // MLODialogResult result = touch_ui_dialog_modal(kind, ImplGetDialogText(this).getStr());
     return RET_OK;
-
 #endif
 }
 
commit 2a8a93b521c313aba09c034899a70849d8b17710
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Mon Nov 5 16:49:25 2018 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Mon Nov 5 16:51:24 2018 +0200

    We do need Dialog::Execute() for iOS
    
    Otherwise the Data>Sort dialog in a spreadsheet document, for
    instance, will not show up. No idea about Android, so keep it dummied
    out for that.
    
    Change-Id: If9a8f8f4cfb813721a9edd6a0a3da398615981b2

diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index 11a92bb9a8f4..aae21743daf9 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -1017,7 +1017,10 @@ BitmapEx Dialog::createScreenshot()
 
 short Dialog::Execute()
 {
-#if HAVE_FEATURE_DESKTOP
+// 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;