Kaydet (Commit) 2bcef514 authored tarafından Tor Lillqvist's avatar Tor Lillqvist Kaydeden (comit) Andras Timar

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 e2f4c9ea)
üst 8ba6e0d6
......@@ -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 )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment