[Libreoffice-commits] core.git: desktop/source

[Stephan Bergmann]

 desktop/source/app/officeipcthread.cxx |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

New commits:
commit b3443e16c75704e547abd57e91156b76a5e5d218
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Mar 22 16:30:11 2016 +0100

    No need for a static Security instance here
    
    Change-Id: I03f0042bd9de07b8d254118d1b4a0a016e217476

diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx
index 9eb4544..3920289 100644
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
@@ -243,7 +243,6 @@ bool addArgument(OStringBuffer &rArguments, char prefix,
 }
 
 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
 // Into a hex string of well known length ff132a86...
@@ -526,15 +525,15 @@ OfficeIPCThread::Status OfficeIPCThread::EnableOfficeIPCThread()
 
         do
         {
-            osl::Security &rSecurity = Security::get();
+            osl::Security security;
 
             // 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
                 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());
                 if (readStringFromPipe(aStreamPipe) == SEND_ARGUMENTS)