desktop/source/app/officeipcthread.cxx | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
New commits:
commit 9d930ddacb402f02642a1d0119d258646bf0d7fd
Author: Tor Lillqvist <t...@collabora.com>
Date: Tue Jun 30 19:42:45 2015 +0300
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.
Change-Id: Ia920520ce2928787313f83199028f9c9942f61f3
diff --git a/desktop/source/app/officeipcthread.cxx
b/desktop/source/app/officeipcthread.cxx
index 4702f85..7b620d5 100644
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
@@ -515,9 +515,16 @@ OfficeIPCThread::Status
OfficeIPCThread::EnableOfficeIPCThread()
if ( aUserInstallPathHashCode.isEmpty() )
return IPC_STATUS_BOOTSTRAP_ERROR; // Something completely broken, we
cannot create a valid hash code!
+ PipeMode nPipeMode = PIPEMODE_DONTKNOW;
+
+#if HAVE_FEATURE_MACOSX_SANDBOX
+
+ nPipeMode = PIPEMODE_CREATED;
+
+#else
+
OUString aPipeIdent( "SingleOfficeIPC_" + aUserInstallPathHashCode );
- PipeMode nPipeMode = PIPEMODE_DONTKNOW;
do
{
osl::Security &rSecurity = Security::get();
@@ -560,6 +567,8 @@ OfficeIPCThread::Status
OfficeIPCThread::EnableOfficeIPCThread()
} while ( nPipeMode == PIPEMODE_DONTKNOW );
+#endif
+
if ( nPipeMode == PIPEMODE_CREATED )
{
// Seems we are the one and only, so start listening thread
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
