diff options
| author | Tor Lillqvist <tlillqvist@suse.com> | 2012-04-04 22:21:07 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2012-04-04 22:29:49 +0300 |
| commit | bc21df051670cc78094779d9b4cd1d6cc78e9509 (patch) | |
| tree | b5fbe70096fe9747897c77f5343a0f81dbcc1ea5 /vcl | |
| parent | a5aa747d59dd67731d46c7f023bf15f2b431cdb3 (diff) | |
No dialogs to be shown from vcl in a non-NativeActivity Android app
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/window/dialog.cxx | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx index 6e10da618442..1353c6c01031 100644 --- a/vcl/source/window/dialog.cxx +++ b/vcl/source/window/dialog.cxx @@ -46,7 +46,9 @@ #include <vcl/msgbox.hxx> #include <vcl/unowrap.hxx> - +#ifdef ANDROID +#include <osl/detail/android-bootstrap.h> +#endif // ======================================================================= @@ -592,6 +594,14 @@ sal_Bool Dialog::Close() sal_Bool Dialog::ImplStartExecuteModal() { +#ifdef ANDROID + // If a non-NativeActivity app, we shouldn't be showing any dialogs + if (lo_get_app() == NULL) { + fprintf(stderr, "%s: Should not do anything, returning false\n", __FUNCTION__); + return sal_False; + } +#endif + if ( mbInExecute ) { #ifdef DBG_UTIL |