callcatcher: fix leak

2 files changed, 11 insertions, 17 deletions

diff --git a/automation/source/testtool/httprequest.cxx b/automation/source/testtool/httprequest.cxx
index f33c9a0e1..b94082843 100644
--- a/automation/source/testtool/httprequest.cxx
+++ b/automation/source/testtool/httprequest.cxx
@@ -53,10 +53,7 @@ HttpRequest::HttpRequest()
 HttpRequest::~HttpRequest()
 {
     delete pStream;
-    pStream = NULL;
-
     delete pOutSocket;
-    pOutSocket = NULL;
 }
 
 void HttpRequest::SetRequest( rtl::OString aHost, rtl::OString aPath, sal_uInt16 nPort )
diff --git a/automation/source/testtool/objtest.cxx b/automation/source/testtool/objtest.cxx
index 57c9455d0..dabf805ad 100644
--- a/automation/source/testtool/objtest.cxx
+++ b/automation/source/testtool/objtest.cxx
@@ -714,31 +714,28 @@ TestToolObj::~TestToolObj()
         pImpl->pMyVars[i].Clear();
     }
 
-    if (m_pControls)
-        delete m_pControls;
-    if (m_pReverseSlots)
-        delete m_pReverseSlots;
-    if (m_pReverseControls)
-        delete m_pReverseControls;
-    if (m_pReverseControlsSon)
-        delete m_pReverseControlsSon;
-    if (m_pReverseUIds)
-        delete m_pReverseUIds;
-    if (m_pSIds)
-        delete m_pSIds;
+    delete m_pControls;
+    delete m_pReverseSlots;
+    delete m_pReverseControls;
+    delete m_pReverseControlsSon;
+    delete m_pReverseUIds;
+    delete m_pSIds;
+
     if (pFehlerListe)
     {
         delete pFehlerListe;
         pFehlerListe = NULL;    // da pFehlerListe static ist!!
     }
+
     if ( pCommunicationManager )
     {
         pCommunicationManager->StopCommunication();
         delete pCommunicationManager;
     }
+
     delete In;
-    if ( pImpl->pTTSfxBroadcaster )
-        delete pImpl->pTTSfxBroadcaster;
+    delete pImpl->pTTSfxBroadcaster;
+    delete pImpl->pHttpRequest;
     delete pImpl->pChildEnv;
     delete pImpl->pHttpRequest;