From 385f6862e303030d24a2c9d3459c074fcf15c279 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Thu, 31 Mar 2016 11:55:22 +0200
Subject: HAVE_FEATURE_MACOSX_SANDBOX doesn't want to launch the
 PipeReaderThread

Change-Id: I55ca1b91ed3b52e9b2b0f802692cbe45d50826e1
---
 desktop/source/app/officeipcthread.cxx | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'desktop')

diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx
index efb23a53a0c7..63114c65683c 100644
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
@@ -450,7 +450,7 @@ RequestHandler::Status RequestHandler::Enable(bool ipc)
     if( pGlobal.is() )
         return IPC_STATUS_OK;
 
-#if !HAVE_FEATURE_DESKTOP
+#if !HAVE_FEATURE_DESKTOP || HAVE_FEATURE_MACOSX_SANDBOX
     ipc = false;
 #endif
 
@@ -488,10 +488,6 @@ RequestHandler::Status RequestHandler::Enable(bool ipc)
     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
@@ -535,7 +531,6 @@ RequestHandler::Status RequestHandler::Enable(bool ipc)
         }
 
     } while ( nPipeMode == PIPEMODE_DONTKNOW );
-#endif
 
     if ( nPipeMode == PIPEMODE_CREATED )
     {
-- 
cgit