summaryrefslogtreecommitdiff
path: root/desktop
diff options
context:
space:
mode:
authorRüdiger Timm <rt@openoffice.org>2005-08-18 11:06:48 +0000
committerRüdiger Timm <rt@openoffice.org>2005-08-18 11:06:48 +0000
commited3e4f228fa4a1ce47768656233c001188824471 (patch)
tree5b28af163bbcf835ccdb75ed1abe9346ee1e9bec /desktop
parent82623a399f4c27ec7558dd738ce10f0842116d61 (diff)
INTEGRATION: CWS mh19121 (1.47.88); FILE MERGED
2005/08/10 08:48:37 mh 1.47.88.1: desktop: permission to connect to OSL_foo pipe may be denied, e.g. selinux, #i53026#
Diffstat (limited to 'desktop')
-rw-r--r--desktop/source/app/officeipcthread.cxx8
1 files changed, 6 insertions, 2 deletions
diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx
index 73b7dcc5f9e6..ab0fe3fc4507 100644
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: officeipcthread.cxx,v $
*
- * $Revision: 1.47 $
+ * $Revision: 1.48 $
*
- * last change: $Author: obo $ $Date: 2005-04-18 14:43:23 $
+ * last change: $Author: rt $ $Date: 2005-08-18 12:06:48 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -376,6 +376,10 @@ OfficeIPCThread::Status OfficeIPCThread::EnableOfficeIPCThread()
}
else
{
+ OPipe::TPipeError eReason = pThread->maPipe.getError();
+ if ((eReason == OPipe::E_ConnectionRefused) || (eReason == OPipe::E_invalidError))
+ return IPC_STATUS_BOOTSTRAP_ERROR;
+
// Wait for second office to be ready
TimeValue aTimeValue;
aTimeValue.Seconds = 0;