diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-03-31 11:55:22 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-03-31 11:55:22 +0200 |
| commit | 385f6862e303030d24a2c9d3459c074fcf15c279 (patch) | |
| tree | e3873ca972c2eda02a6a79e90728eb89c51f59ed /desktop | |
| parent | 8138dae8577b4fcc30bd269516d9213587f6d732 (diff) | |
HAVE_FEATURE_MACOSX_SANDBOX doesn't want to launch the PipeReaderThread
Change-Id: I55ca1b91ed3b52e9b2b0f802692cbe45d50826e1
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/app/officeipcthread.cxx | 7 |
1 files changed, 1 insertions, 6 deletions
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 ) { |