14 files changed, 18 insertions, 19 deletions
diff --git a/include/ucbhelper/commandenvironment.hxx b/include/ucbhelper/commandenvironment.hxx
index 11bc5e3e4a89..5bd8ee6451bb 100644
--- a/include/ucbhelper/commandenvironment.hxx
+++ b/include/ucbhelper/commandenvironment.hxx
@@ -23,6 +23,7 @@
 #include <com/sun/star/ucb/XCommandEnvironment.hpp>
 #include <ucbhelper/ucbhelperdllapi.h>
 #include <cppuhelper/implbase1.hxx>
+#include <memory>
 
 namespace ucbhelper
 {
@@ -36,7 +37,7 @@ struct CommandEnvironment_Impl;
 class UCBHELPER_DLLPUBLIC CommandEnvironment :
             public cppu::WeakImplHelper1< css::ucb::XCommandEnvironment >
 {
-    CommandEnvironment_Impl* m_pImpl;
+    std::unique_ptr<CommandEnvironment_Impl> m_pImpl;
 
 private:
     CommandEnvironment( const CommandEnvironment& ) = delete;
diff --git a/include/ucbhelper/contenthelper.hxx b/include/ucbhelper/contenthelper.hxx
index 20b15c71f8aa..91cf9934ae94 100644
--- a/include/ucbhelper/contenthelper.hxx
+++ b/include/ucbhelper/contenthelper.hxx
@@ -38,6 +38,7 @@
 #include <rtl/ref.hxx>
 #include <ucbhelper/macros.hxx>
 #include <ucbhelper/ucbhelperdllapi.h>
+#include <memory>
 
 namespace com { namespace sun { namespace star { namespace ucb {
     struct CommandInfo;
@@ -96,7 +97,7 @@ class UCBHELPER_DLLPUBLIC ContentImplHelper :
     friend class PropertySetInfo;
     friend class CommandProcessorInfo;
 
-    ucbhelper_impl::ContentImplHelper_Impl* m_pImpl;
+    std::unique_ptr<ucbhelper_impl::ContentImplHelper_Impl> m_pImpl;
 
 protected:
     osl::Mutex                       m_aMutex;
diff --git a/include/ucbhelper/contentidentifier.hxx b/include/ucbhelper/contentidentifier.hxx
index 29ff8676db7e..702febc060ee 100644
--- a/include/ucbhelper/contentidentifier.hxx
+++ b/include/ucbhelper/contentidentifier.hxx
@@ -24,6 +24,7 @@
 #include <com/sun/star/lang/XTypeProvider.hpp>
 #include <com/sun/star/ucb/XContentIdentifier.hpp>
 #include <ucbhelper/ucbhelperdllapi.h>
+#include <memory>
 
 
 namespace ucbhelper
@@ -74,7 +75,7 @@ public:
         throw( css::uno::RuntimeException, std::exception ) override;
 
 private:
-    ContentIdentifier_Impl* m_pImpl;
+    std::unique_ptr<ContentIdentifier_Impl> m_pImpl;
 };
 
 } /* namespace ucbhelper */
diff --git a/include/ucbhelper/interactionrequest.hxx b/include/ucbhelper/interactionrequest.hxx
index 3361ccb04274..03122c18742f 100644
--- a/include/ucbhelper/interactionrequest.hxx
+++ b/include/ucbhelper/interactionrequest.hxx
@@ -32,6 +32,7 @@
 #include <rtl/ref.hxx>
 #include <cppuhelper/weak.hxx>
 #include <ucbhelper/ucbhelperdllapi.h>
+#include <memory>
 
 namespace ucbhelper {
 
@@ -63,7 +64,7 @@ class UCBHELPER_DLLPUBLIC InteractionRequest : public cppu::OWeakObject,
                            public css::lang::XTypeProvider,
                            public css::task::XInteractionRequest
 {
-    InteractionRequest_Impl * m_pImpl;
+    std::unique_ptr<InteractionRequest_Impl> m_pImpl;
 
 protected:
     void setRequest( const css::uno::Any & rRequest );
@@ -151,7 +152,7 @@ struct InteractionContinuation_Impl;
   */
 class UCBHELPER_DLLPUBLIC InteractionContinuation : public cppu::OWeakObject
 {
-    InteractionContinuation_Impl * m_pImpl;
+    std::unique_ptr<InteractionContinuation_Impl> m_pImpl;
 
 protected:
     /**
diff --git a/include/ucbhelper/providerhelper.hxx b/include/ucbhelper/providerhelper.hxx
index 91c76f140560..0941e085f530 100644
--- a/include/ucbhelper/providerhelper.hxx
+++ b/include/ucbhelper/providerhelper.hxx
@@ -21,6 +21,7 @@
 #define INCLUDED_UCBHELPER_PROVIDERHELPER_HXX
 
 #include <list>
+#include <memory>
 #include <com/sun/star/ucb/XContentProvider.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
@@ -70,7 +71,7 @@ class UCBHELPER_DLLPUBLIC ContentProviderImplHelper : public cppu::OWeakObject,
 {
     friend class ContentImplHelper;
 
-    ucbhelper_impl::ContentProviderImplHelper_Impl* m_pImpl;
+    std::unique_ptr<ucbhelper_impl::ContentProviderImplHelper_Impl> m_pImpl;
 
 protected:
     osl::Mutex m_aMutex;
diff --git a/include/ucbhelper/resultset.hxx b/include/ucbhelper/resultset.hxx
index 2acd65d1c24b..63dec4212149 100644
--- a/include/ucbhelper/resultset.hxx
+++ b/include/ucbhelper/resultset.hxx
@@ -37,6 +37,7 @@
 #include <cppuhelper/weak.hxx>
 #include <ucbhelper/macros.hxx>
 #include <ucbhelper/ucbhelperdllapi.h>
+#include <memory>
 
 namespace ucbhelper {
 
@@ -70,7 +71,7 @@ class UCBHELPER_DLLPUBLIC ResultSet :
                 public css::sdbc::XCloseable,
                 public css::beans::XPropertySet
 {
-    ResultSet_Impl* m_pImpl;
+    std::unique_ptr<ResultSet_Impl> m_pImpl;
 
 public:
     /**
diff --git a/include/ucbhelper/resultsetmetadata.hxx b/include/ucbhelper/resultsetmetadata.hxx
index 730bdf1a5ab9..cda709eb045e 100644
--- a/include/ucbhelper/resultsetmetadata.hxx
+++ b/include/ucbhelper/resultsetmetadata.hxx
@@ -21,6 +21,7 @@
 #define INCLUDED_UCBHELPER_RESULTSETMETADATA_HXX
 
 #include <vector>
+#include <memory>
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/lang/XTypeProvider.hpp>
@@ -141,7 +142,7 @@ class UCBHELPER_DLLPUBLIC ResultSetMetaData :
                 public css::sdbc::XResultSetMetaData
 {
 private:
-    ucbhelper_impl::ResultSetMetaData_Impl* m_pImpl;
+    std::unique_ptr<ucbhelper_impl::ResultSetMetaData_Impl> m_pImpl;
 
 protected:
     css::uno::Reference< css::uno::XComponentContext >    m_xContext;
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;
 }