diff options
| author | Tor Lillqvist <tml@collabora.com> | 2018-11-05 16:49:25 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2018-11-05 18:24:39 +0100 |
| commit | c2a4c0aefdbea0729252146623a90c0ed787e4bc (patch) | |
| tree | 4e5b19ed06a08093b55641b449912a23a7bcbfc2 /vcl | |
| parent | a24b393dd584fe1bb6a9524c91a043fccf99e694 (diff) | |
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
(cherry picked from commit 2a8a93b521c313aba09c034899a70849d8b17710)
Reviewed-on: https://gerrit.libreoffice.org/62918
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/window/dialog.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx index dc95f7772703..3ea4a14466cc 100644 --- a/vcl/source/window/dialog.cxx +++ b/vcl/source/window/dialog.cxx @@ -970,7 +970,10 @@ Bitmap 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; |