callcatcher: bring HttpRequest dtor back

This partially reverts 7cb18732923040b27ebd0d1f9c9bc01766d04d59
and fixes a potential leak.

3 files changed, 11 insertions, 0 deletions

diff --git a/automation/source/testtool/httprequest.cxx b/automation/source/testtool/httprequest.cxx
index b99cc72b5..f33c9a0e1 100644
--- a/automation/source/testtool/httprequest.cxx
+++ b/automation/source/testtool/httprequest.cxx
@@ -50,6 +50,15 @@ HttpRequest::HttpRequest()
 {
 }
 
+HttpRequest::~HttpRequest()
+{
+    delete pStream;
+    pStream = NULL;
+
+    delete pOutSocket;
+    pOutSocket = NULL;
+}
+
 void HttpRequest::SetRequest( rtl::OString aHost, rtl::OString aPath, sal_uInt16 nPort )
 {
     nStatus = HTTP_REQUEST_SET;
diff --git a/automation/source/testtool/httprequest.hxx b/automation/source/testtool/httprequest.hxx
index 90e97c4c6..438dba8da 100644
--- a/automation/source/testtool/httprequest.hxx
+++ b/automation/source/testtool/httprequest.hxx
@@ -65,6 +65,7 @@ class HttpRequest
     void Init();
 public:
     HttpRequest();
+    ~HttpRequest();
 
     void SetRequest( rtl::OString aHost, rtl::OString aPath, sal_uInt16 nPort );
     void SetProxy( rtl::OString aHost, sal_uInt16 nPort );
diff --git a/automation/source/testtool/objtest.cxx b/automation/source/testtool/objtest.cxx
index 050458e89..d1ae1bf6c 100644
--- a/automation/source/testtool/objtest.cxx
+++ b/automation/source/testtool/objtest.cxx
@@ -740,6 +740,7 @@ TestToolObj::~TestToolObj()
     if ( pImpl->pTTSfxBroadcaster )
         delete pImpl->pTTSfxBroadcaster;
     delete pImpl->pChildEnv;
+    delete pImpl->pHttpRequest;
 
     pImpl->xErrorList.Clear();
     pImpl->xWarningList.Clear();