From 5fc51f8d254da21d5ed2d3fb9293020bbfbfab92 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel@peralex.com>
Date: Tue, 17 Nov 2015 09:52:47 +0200
Subject: use unique_ptr for pImpl in ucbhelper/

Change-Id: Ibae75fc4d843bd38179d4c7afc6ddb532835c7a6
---
 ucbhelper/source/client/commandenvironment.cxx   | 5 ++---
 ucbhelper/source/provider/contenthelper.cxx      | 1 -
 ucbhelper/source/provider/contentidentifier.cxx  | 3 +--
 ucbhelper/source/provider/interactionrequest.cxx | 2 --
 ucbhelper/source/provider/providerhelper.cxx     | 1 -
 ucbhelper/source/provider/resultset.cxx          | 1 -
 ucbhelper/source/provider/resultsetmetadata.cxx  | 1 -
 7 files changed, 3 insertions(+), 11 deletions(-)

(limited to 'ucbhelper/source')

diff --git a/ucbhelper/source/client/commandenvironment.cxx b/ucbhelper/source/client/commandenvironment.cxx
index d083f5a8595b..1210d301b1bb 100644
--- a/ucbhelper/source/client/commandenvironment.cxx
+++ b/ucbhelper/source/client/commandenvironment.cxx
@@ -55,15 +55,14 @@ struct CommandEnvironment_Impl
 CommandEnvironment::CommandEnvironment(
         const Reference< XInteractionHandler >& rxInteractionHandler,
         const Reference< XProgressHandler >& rxProgressHandler )
+    : m_pImpl( new CommandEnvironment_Impl( rxInteractionHandler,
+                                            rxProgressHandler ) )
 {
-    m_pImpl = new CommandEnvironment_Impl( rxInteractionHandler,
-                                           rxProgressHandler );
 }
 
 // virtual
 CommandEnvironment::~CommandEnvironment()
 {
-    delete m_pImpl;
 }
 
 // XCommandEnvironemnt methods.
diff --git a/ucbhelper/source/provider/contenthelper.cxx b/ucbhelper/source/provider/contenthelper.cxx
index f4126d44bf10..36aef580543d 100644
--- a/ucbhelper/source/provider/contenthelper.cxx
+++ b/ucbhelper/source/provider/contenthelper.cxx
@@ -136,7 +136,6 @@ ContentImplHelper::ContentImplHelper(
 // virtual
 ContentImplHelper::~ContentImplHelper()
 {
-    delete m_pImpl;
 }
 
 void SAL_CALL ContentImplHelper::acquire()
diff --git a/ucbhelper/source/provider/contentidentifier.cxx b/ucbhelper/source/provider/contentidentifier.cxx
index 86780ba76a3e..b40f28e434c4 100644
--- a/ucbhelper/source/provider/contentidentifier.cxx
+++ b/ucbhelper/source/provider/contentidentifier.cxx
@@ -82,15 +82,14 @@ ContentIdentifier_Impl::ContentIdentifier_Impl(const OUString& rURL )
 
 
 ContentIdentifier::ContentIdentifier( const OUString& rURL )
+    : m_pImpl( new ContentIdentifier_Impl( rURL ) )
 {
-    m_pImpl = new ContentIdentifier_Impl( rURL );
 }
 
 
 // virtual
 ContentIdentifier::~ContentIdentifier()
 {
-    delete m_pImpl;
 }
 
 
diff --git a/ucbhelper/source/provider/interactionrequest.cxx b/ucbhelper/source/provider/interactionrequest.cxx
index 0e13c32573bf..b3bf575d3e63 100644
--- a/ucbhelper/source/provider/interactionrequest.cxx
+++ b/ucbhelper/source/provider/interactionrequest.cxx
@@ -75,7 +75,6 @@ InteractionRequest::InteractionRequest( const uno::Any & rRequest )
 // virtual
 InteractionRequest::~InteractionRequest()
 {
-    delete m_pImpl;
 }
 
 
@@ -222,7 +221,6 @@ InteractionContinuation::InteractionContinuation(
 // virtual
 InteractionContinuation::~InteractionContinuation()
 {
-    delete m_pImpl;
 }
 
 
diff --git a/ucbhelper/source/provider/providerhelper.cxx b/ucbhelper/source/provider/providerhelper.cxx
index 9c3c53a5ff41..c4148fc82996 100644
--- a/ucbhelper/source/provider/providerhelper.cxx
+++ b/ucbhelper/source/provider/providerhelper.cxx
@@ -67,7 +67,6 @@ ContentProviderImplHelper::ContentProviderImplHelper(
 // virtual
 ContentProviderImplHelper::~ContentProviderImplHelper()
 {
-    delete m_pImpl;
 }
 
 // XInterface
diff --git a/ucbhelper/source/provider/resultset.cxx b/ucbhelper/source/provider/resultset.cxx
index 8d6194cab8c1..8328bac45bdb 100644
--- a/ucbhelper/source/provider/resultset.cxx
+++ b/ucbhelper/source/provider/resultset.cxx
@@ -228,7 +228,6 @@ ResultSet::ResultSet(
 // virtual
 ResultSet::~ResultSet()
 {
-    delete m_pImpl;
 }
 
 
diff --git a/ucbhelper/source/provider/resultsetmetadata.cxx b/ucbhelper/source/provider/resultsetmetadata.cxx
index 5afc296ca535..e75b8d9c29c3 100644
--- a/ucbhelper/source/provider/resultsetmetadata.cxx
+++ b/ucbhelper/source/provider/resultsetmetadata.cxx
@@ -111,7 +111,6 @@ ResultSetMetaData::ResultSetMetaData(
 // virtual
 ResultSetMetaData::~ResultSetMetaData()
 {
-    delete m_pImpl;
 }
 
 
-- 
cgit v1.2.3