2 files changed, 5 insertions, 8 deletions
diff --git a/comphelper/source/property/MasterPropertySet.cxx b/comphelper/source/property/MasterPropertySet.cxx
index 9fbba145a14b..bd32900ab860 100644
--- a/comphelper/source/property/MasterPropertySet.cxx
+++ b/comphelper/source/property/MasterPropertySet.cxx
@@ -27,27 +27,25 @@
 #include <osl/diagnose.h>
 
 #include <memory>
+#include <vector>
 
 class AutoOGuardArray
 {
-    std::unique_ptr< osl::Guard< comphelper::SolarMutex > > *  mpGuardArray;
+    std::vector<std::unique_ptr< osl::Guard< comphelper::SolarMutex > >>  maGuardArray;
 
 public:
     explicit AutoOGuardArray( sal_Int32 nNumElements );
     ~AutoOGuardArray();
 
-    std::unique_ptr< osl::Guard< comphelper::SolarMutex > > &  operator[] ( sal_Int32 i ) { return mpGuardArray[i]; }
+    std::unique_ptr< osl::Guard< comphelper::SolarMutex > > &  operator[] ( sal_Int32 i ) { return maGuardArray[i]; }
 };
 
-AutoOGuardArray::AutoOGuardArray( sal_Int32 nNumElements ) : mpGuardArray(new std::unique_ptr< osl::Guard< comphelper::SolarMutex > >[nNumElements])
+AutoOGuardArray::AutoOGuardArray( sal_Int32 nNumElements ) : maGuardArray(nNumElements)
 {
 }
 
 AutoOGuardArray::~AutoOGuardArray()
 {
-    //!! release unique_ptr's and thus the mutexes locks
-    delete [] mpGuardArray;
-
 }
 
 
diff --git a/comphelper/source/property/propagg.cxx b/comphelper/source/property/propagg.cxx
index 92a37a697258..e68ad495314b 100644
--- a/comphelper/source/property/propagg.cxx
+++ b/comphelper/source/property/propagg.cxx
@@ -334,13 +334,12 @@ OPropertySetAggregationHelper::OPropertySetAggregationHelper( ::cppu::OBroadcast
     :OPropertyStateHelper( rBHlp )
     ,m_bListening( false )
 {
-    m_pForwarder = new PropertyForwarder( *this );
+    m_pForwarder.reset( new PropertyForwarder( *this ) );
 }
 
 
 OPropertySetAggregationHelper::~OPropertySetAggregationHelper()
 {
-    delete m_pForwarder;
 }