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

[Stephan Bergmann]

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

New commits:
commit 54dae86076d01306ecfe74fa21d577d82332ab3a
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Mar 22 17:25:26 2016 +0100

    ~OfficeIPCThread can only be reached with pGlobalOfficeIPCThread cleared
    
    ...as only one instance of OfficeIPCThread is ever created (in
    OfficeIPCThread::EnableOfficeIPCThread), which is then either assigned to
    pGlobalOfficeIPCThread (if this is the first soffice instance), or
    pGlobalOfficeIPCThread is left unassigned and the OfficeIPCThread instance goes
    out of scope at the end of EnableOfficeIPCThread (if another soffice instance is
    already running).
    
    So mpDispatchWatcher also does not need to be cleared here, as it is only ever
    accessed through pGlobalOfficeIPCThread.  And thus, there is no longer a need to
    lock GetMutex() here, either.
    
    Change-Id: I56cffc43361d01d747084153f318b8488519cf9b

diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx
index 9c6fab9..42d89cc 100644
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
@@ -653,11 +653,7 @@ OfficeIPCThread::OfficeIPCThread() :
 
 OfficeIPCThread::~OfficeIPCThread()
 {
-    ::osl::ClearableMutexGuard  aGuard( GetMutex() );
-
-    mpDispatchWatcher.clear();
     maPipe.close();
-    pGlobalOfficeIPCThread.clear();
 }
 
 void OfficeIPCThread::SetReady()