diff options
| author | Tor Lillqvist <tml@collabora.com> | 2015-06-30 19:42:45 +0300 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2016-03-04 11:17:55 +0100 |
| commit | 2bcef51421963677daed826d6ea4be19ecdc174b (patch) | |
| tree | 7a2b9e3030eb4c5f0119e560ceff478e41fca9fc | |
| parent | 8ba6e0d6b1471d56fd0733d5966bdc2e34cc0a05 (diff) | |
tdf#92191: Don't use any IPC pipe in a sandboxed OS X app
Creating the pipe fails when sandboxed. This caused us to not start
the OfficeIPCThread, and that then meant that the file open requests
coming in through VCL_NSApplication's application:openFile: method in
vclnsapp.mm were not processed properly.
The OS takes care of not starting multiple LO apps simultaneously
anyway, so we don't really need any pipe, I hope.
Conflicts:
desktop/source/app/officeipcthread.cxx
Change-Id: Ia920520ce2928787313f83199028f9c9942f61f3
(cherry picked from commit e2f4c9eae3f53aaba968d7567f912df6fa911326)
| -rw-r--r-- | desktop/source/app/officeipcthread.cxx | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx index 2a726277c4b6..b672ce73d9e8 100644 --- a/desktop/source/app/officeipcthread.cxx +++ b/desktop/source/app/officeipcthread.cxx @@ -527,6 +527,10 @@ OfficeIPCThread::Status OfficeIPCThread::EnableOfficeIPCThread() if ( aUserInstallPathHashCode.isEmpty() ) return IPC_STATUS_BOOTSTRAP_ERROR; // Something completely broken, we cannot create a valid hash code! +#if HAVE_FEATURE_MACOSX_SANDBOX + nPipeMode = PIPEMODE_CREATED; +#else + OUString aPipeIdent( "SingleOfficeIPC_" + aUserInstallPathHashCode ); do @@ -570,6 +574,7 @@ OfficeIPCThread::Status OfficeIPCThread::EnableOfficeIPCThread() } } while ( nPipeMode == PIPEMODE_DONTKNOW ); +#endif } if ( nPipeMode == PIPEMODE_CREATED ) |