diff options
| author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2016-03-23 15:21:09 +0100 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2016-03-23 15:50:17 +0100 |
| commit | f6a74ce9bbe4788fbeff463b52557b7e5aaa809f (patch) | |
| tree | 5ee1e2eb218f3685fcd19fd8a20ce2e4a7444c5d /desktop | |
| parent | 9f6d7d40b00fd67200c1a2a863cded790e77a40a (diff) | |
no need for IPC on Android, removes the need for the cache-hack
removing the cache on each launch prevented opening files via intents
(i.e. from your mail application) unless the viewer was already running,
as it also deleted the temporary file that was created from the intent.
Change-Id: I0a4d9432f475e8434902ae11fc2b0c35fd25a71f
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/app/officeipcthread.cxx | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx index d2764d58c276..5cc1df3562f1 100644 --- a/desktop/source/app/officeipcthread.cxx +++ b/desktop/source/app/officeipcthread.cxx @@ -54,7 +54,7 @@ using namespace ::com::sun::star::frame; namespace { -#if HAVE_FEATURE_DESKTOP || defined(ANDROID) +#if HAVE_FEATURE_DESKTOP static char const ARGUMENT_PREFIX[] = "InternalIPC::Arguments"; static char const SEND_ARGUMENTS[] = "InternalIPC::SendArguments"; @@ -101,7 +101,7 @@ namespace desktop namespace { -#if HAVE_FEATURE_DESKTOP || defined(ANDROID) +#if HAVE_FEATURE_DESKTOP class Parser: public CommandLineArgs::Supplier { public: @@ -435,7 +435,7 @@ OfficeIPCThread::Status OfficeIPCThread::EnableOfficeIPCThread() if( pGlobalOfficeIPCThread.is() ) return IPC_STATUS_OK; -#if HAVE_FEATURE_DESKTOP || defined(ANDROID) +#if HAVE_FEATURE_DESKTOP OUString aUserInstallPath; OUString aDummy; @@ -443,8 +443,6 @@ OfficeIPCThread::Status OfficeIPCThread::EnableOfficeIPCThread() PipeMode nPipeMode = PIPEMODE_DONTKNOW; -#ifndef ANDROID // On Android it might be that we still for some reason need the pipe? - // In LibreOfficeKit-based programs we want to be totally independent from any other LibreOffice // instance or LOKit-using program. Certainly no need for any IPC pipes by definition, as we // don't have any reason to do any IPC. Why we even call this EnableOfficeIPCThread function @@ -459,7 +457,6 @@ OfficeIPCThread::Status OfficeIPCThread::EnableOfficeIPCThread() nPipeMode = PIPEMODE_CREATED; } else -#endif { // The name of the named pipe is created with the hashcode of the user installation directory (without /user). We have to retrieve // this information from a unotools implementation. @@ -685,12 +682,10 @@ bool OfficeIPCThread::IsEnabled() void OfficeIPCThread::execute() { -#if HAVE_FEATURE_DESKTOP || defined(ANDROID) +#if HAVE_FEATURE_DESKTOP -#ifndef ANDROID if (comphelper::LibreOfficeKit::isActive()) return; -#endif do { |