diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-02-28 14:41:37 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-02-28 22:34:23 +0200 |
| commit | 658824e43dc306b986a85e73cb1bffaf0e48b879 (patch) | |
| tree | 4cc7d026a35a7c5b24d3c5664b778e66ab2db24a /desktop/source | |
| parent | 1b05f8686849527698c960fb79624a544f21e71c (diff) | |
Bypass a little more stuff for Android (and iOS)
Still tons of stuff left that make no sense on Android or iOS.
Change-Id: I4bb1555b5d2aefc175d544aa220102aa78697b89
Diffstat (limited to 'desktop/source')
| -rw-r--r-- | desktop/source/app/app.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 59ded967c233..9899b1a9a69c 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -1386,6 +1386,7 @@ int Desktop::Main() new DesktopContext( com::sun::star::uno::getCurrentContext() ) ); CommandLineArgs& rCmdLineArgs = GetCommandLineArgs(); +#if !defined(ANDROID) && !defined(IOS) OUString aUnknown( rCmdLineArgs.GetUnknown() ); if ( !aUnknown.isEmpty() ) { @@ -1402,7 +1403,7 @@ int Desktop::Main() displayVersion(); return EXIT_SUCCESS; } - +#endif // setup configuration error handling ConfigurationErrorHandler aConfigErrHandler; if (!ShouldSuppressUI(rCmdLineArgs)) @@ -1449,7 +1450,7 @@ int Desktop::Main() // there is no other instance using our data files from a remote host RTL_LOGFILE_CONTEXT_TRACE( aLog, "desktop (lo119109) Desktop::Main -> Lockfile" ); m_xLockfile.reset(new Lockfile); -#ifndef ANDROID +#if !defined(ANDROID) && !defined(IOS) if ( !rCmdLineArgs.IsHeadless() && !rCmdLineArgs.IsInvisible() && !rCmdLineArgs.IsNoLockcheck() && !m_xLockfile->check( Lockfile_execWarning )) { @@ -1536,7 +1537,7 @@ int Desktop::Main() */ Application::GetDefaultDevice(); -#ifndef ANDROID +#if !defined(ANDROID) && !defined(IOS) // Check if bundled or shared extensions were added /removed // and process those extensions (has to be done before checking // the extension dependencies! |