diff options
| author | Tor Lillqvist <tml@collabora.com> | 2015-06-30 19:42:45 +0300 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2015-10-15 17:57:26 +0200 |
| commit | 00b16b98f91bbef6b2dc22c8bac0608f73297e24 (patch) | |
| tree | ea21bdfbdf442a5a09d43f2afe65a6c5836c7d77 /desktop | |
| parent | 32e13ccac64777722a96df47aca868e263db94cd (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
Diffstat (limited to 'desktop')
| -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 cb6ad0b98c02..0168764e2066 100644 --- a/desktop/source/app/officeipcthread.cxx +++ b/desktop/source/app/officeipcthread.cxx @@ -534,6 +534,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 @@ -577,6 +581,7 @@ OfficeIPCThread::Status OfficeIPCThread::EnableOfficeIPCThread() } } while ( nPipeMode == PIPEMODE_DONTKNOW ); +#endif } if ( nPipeMode == PIPEMODE_CREATED ) |