Kaydet (Commit) b3443e16 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

No need for a static Security instance here

Change-Id: I03f0042bd9de07b8d254118d1b4a0a016e217476
üst 59a89dc6
...@@ -243,7 +243,6 @@ bool addArgument(OStringBuffer &rArguments, char prefix, ...@@ -243,7 +243,6 @@ bool addArgument(OStringBuffer &rArguments, char prefix,
} }
rtl::Reference< OfficeIPCThread > OfficeIPCThread::pGlobalOfficeIPCThread; rtl::Reference< OfficeIPCThread > OfficeIPCThread::pGlobalOfficeIPCThread;
namespace { struct Security : public rtl::Static<osl::Security, Security> {}; }
// Turns a string in aMsg such as file:///home/foo/.libreoffice/3 // Turns a string in aMsg such as file:///home/foo/.libreoffice/3
// Into a hex string of well known length ff132a86... // Into a hex string of well known length ff132a86...
...@@ -526,15 +525,15 @@ OfficeIPCThread::Status OfficeIPCThread::EnableOfficeIPCThread() ...@@ -526,15 +525,15 @@ OfficeIPCThread::Status OfficeIPCThread::EnableOfficeIPCThread()
do do
{ {
osl::Security &rSecurity = Security::get(); osl::Security security;
// Try to create pipe // Try to create pipe
if ( pThread->maPipe.create( aPipeIdent.getStr(), osl_Pipe_CREATE, rSecurity )) if ( pThread->maPipe.create( aPipeIdent.getStr(), osl_Pipe_CREATE, security ))
{ {
// Pipe created // Pipe created
nPipeMode = PIPEMODE_CREATED; nPipeMode = PIPEMODE_CREATED;
} }
else if( pThread->maPipe.create( aPipeIdent.getStr(), osl_Pipe_OPEN, rSecurity )) // Creation not successful, now we try to connect else if( pThread->maPipe.create( aPipeIdent.getStr(), osl_Pipe_OPEN, security )) // Creation not successful, now we try to connect
{ {
osl::StreamPipe aStreamPipe(pThread->maPipe.getHandle()); osl::StreamPipe aStreamPipe(pThread->maPipe.getHandle());
if (readStringFromPipe(aStreamPipe) == SEND_ARGUMENTS) if (readStringFromPipe(aStreamPipe) == SEND_ARGUMENTS)
......
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