loplugin:useuniqueptr in OleEmbeddedObject

Change-Id: Ia455b86ec14320234935bce32c0bc33a88db036a
Reviewed-on: https://gerrit.libreoffice.org/53875Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

embeddedobj/source/inc/oleembobj.hxx

@@ -41,6 +41,7 @@
 #include <rtl/ref.hxx>
 
 #include <osl/thread.h>
+#include <memory>
 
 namespace cppu {
     class OMultiTypeInterfaceContainerHelper;
@@ -120,7 +121,7 @@ class OleEmbeddedObject : public ::cppu::WeakImplHelper
 
     OleComponent*   m_pOleComponent;
 
-    ::cppu::OMultiTypeInterfaceContainerHelper* m_pInterfaceContainer;
+    std::unique_ptr<::cppu::OMultiTypeInterfaceContainerHelper> m_pInterfaceContainer;
 
     bool m_bReadOnly;
 

embeddedobj/source/msole/oleembed.cxx

@@ -195,8 +195,7 @@ void OleEmbeddedObject::MoveListeners()
             }
         }
 
-        delete m_pInterfaceContainer;
-        m_pInterfaceContainer = nullptr;
+        m_pInterfaceContainer.reset();
     }
 }
 

embeddedobj/source/msole/olemisc.cxx

@@ -260,8 +260,7 @@ void OleEmbeddedObject::Dispose()
     {
         lang::EventObject aSource( static_cast< ::cppu::OWeakObject* >( this ) );
         m_pInterfaceContainer->disposeAndClear( aSource );
-        delete m_pInterfaceContainer;
-        m_pInterfaceContainer = nullptr;
+        m_pInterfaceContainer.reset();
     }
 
     if ( m_xOwnView.is() )
@@ -409,7 +408,7 @@ void SAL_CALL OleEmbeddedObject::addStateChangeListener( const uno::Reference< e
         throw lang::DisposedException(); // TODO
 
     if ( !m_pInterfaceContainer )
-        m_pInterfaceContainer = new ::cppu::OMultiTypeInterfaceContainerHelper( m_aMutex );
+        m_pInterfaceContainer.reset(new ::cppu::OMultiTypeInterfaceContainerHelper( m_aMutex ));
 
     m_pInterfaceContainer->addInterface( cppu::UnoType<embed::XStateChangeListener>::get(),
                                                         xListener );
@@ -515,7 +514,7 @@ void SAL_CALL OleEmbeddedObject::addCloseListener( const uno::Reference< util::X
         throw lang::DisposedException(); // TODO
 
     if ( !m_pInterfaceContainer )
-        m_pInterfaceContainer = new ::cppu::OMultiTypeInterfaceContainerHelper( m_aMutex );
+        m_pInterfaceContainer.reset(new ::cppu::OMultiTypeInterfaceContainerHelper( m_aMutex ));
 
     m_pInterfaceContainer->addInterface( cppu::UnoType<util::XCloseListener>::get(), xListener );
 }
@@ -560,7 +559,7 @@ void SAL_CALL OleEmbeddedObject::addEventListener( const uno::Reference< documen
         throw lang::DisposedException(); // TODO
 
     if ( !m_pInterfaceContainer )
-        m_pInterfaceContainer = new ::cppu::OMultiTypeInterfaceContainerHelper( m_aMutex );
+        m_pInterfaceContainer.reset(new ::cppu::OMultiTypeInterfaceContainerHelper( m_aMutex ));
 
     m_pInterfaceContainer->addInterface( cppu::UnoType<document::XEventListener>::get(), xListener );
 }