diff options
| author | Tor Lillqvist <tlillqvist@suse.com> | 2012-11-21 23:02:32 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2012-11-21 23:03:57 +0200 |
| commit | cecc926070ee3d2ad6296fc5e0cfcde8642bb140 (patch) | |
| tree | 50ac14acc645af18f7ee9cb6907f127a99de5185 /vcl/source/window | |
| parent | 679628f248a94d54e78c8531d13e65f3ae221876 (diff) | |
Clean up remains of NativeActivity-based Android app support
We haven't been able to build NativeActivity-based apps (like the
android/qa/sc and anroid/qa/desktop thingies) since we switched to
DISABLE_DYNLOADING and a single DSO liblo-native-code.so anyway.
No lo_main() any more. <sal/main.h> should not be included ever when
compiling for Android of iOS now.
Lots of stuff binned from vcl's androidinst.cxx, in the (vain?) hope
that it will reduce the amount of never invoked GUI code that gets
linked in.
Change-Id: I25f584864c40110774c728a23151e089620442d9
Diffstat (limited to 'vcl/source/window')
| -rw-r--r-- | vcl/source/window/dialog.cxx | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx index 2ea9c57ed9db..4fca0b17d7f1 100644 --- a/vcl/source/window/dialog.cxx +++ b/vcl/source/window/dialog.cxx @@ -50,6 +50,8 @@ // ======================================================================= +#ifndef ANDROID + static rtl::OString ImplGetDialogText( Dialog* pDialog ) { rtl::OStringBuffer aErrorStr(rtl::OUStringToOString( @@ -67,6 +69,8 @@ static rtl::OString ImplGetDialogText( Dialog* pDialog ) return aErrorStr.makeStringAndClear(); } +#endif + // ======================================================================= static sal_Bool ImplIsMnemonicCtrl( Window* pWindow ) @@ -778,11 +782,9 @@ 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 + fprintf(stderr, "%s: Should not do anything, returning false\n", __FUNCTION__); + return sal_False; +#else if ( mbInExecute ) { @@ -858,6 +860,7 @@ sal_Bool Dialog::ImplStartExecuteModal() pSVData->maAppData.mnModalMode++; return sal_True; +#endif } // ----------------------------------------------------------------------- |