[Libreoffice-commits] core.git: 2 commits - embeddedobj/source filter/source

[Noel Grandin]

 embeddedobj/source/inc/oleembobj.hxx  |    3 ++-
 embeddedobj/source/msole/oleembed.cxx |    3 +--
 embeddedobj/source/msole/olemisc.cxx  |    9 ++++-----
 filter/source/flash/swfexporter.cxx   |   15 ++++++---------
 filter/source/flash/swfexporter.hxx   |    3 ++-
 5 files changed, 15 insertions(+), 18 deletions(-)

New commits:
commit 8f0167d0e005b2872bba966ab9d72f5cd0f5ad17
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date:   Thu May 3 17:01:55 2018 +0200

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

diff --git a/embeddedobj/source/inc/oleembobj.hxx b/embeddedobj/source/inc/oleembobj.hxx
index e944c6cfd842..59a3782fb7f4 100644
--- a/embeddedobj/source/inc/oleembobj.hxx
+++ b/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;
 
diff --git a/embeddedobj/source/msole/oleembed.cxx b/embeddedobj/source/msole/oleembed.cxx
index e84871d5f304..64d95c3d7a56 100644
--- a/embeddedobj/source/msole/oleembed.cxx
+++ b/embeddedobj/source/msole/oleembed.cxx
@@ -195,8 +195,7 @@ void OleEmbeddedObject::MoveListeners()
             }
         }
 
-        delete m_pInterfaceContainer;
-        m_pInterfaceContainer = nullptr;
+        m_pInterfaceContainer.reset();
     }
 }
 
diff --git a/embeddedobj/source/msole/olemisc.cxx b/embeddedobj/source/msole/olemisc.cxx
index 4ae70b745a7a..73c6ffd61a57 100644
--- a/embeddedobj/source/msole/olemisc.cxx
+++ b/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 );
 }
commit d655a8d2455c75921eba7a4431fa3d71048e8129
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date:   Thu May 3 15:10:21 2018 +0200

    loplugin:useuniqueptr in FlashExporter
    
    Change-Id: Ie03889d482bc7504db2e35f9ee667157f18bcc3a
    Reviewed-on: https://gerrit.libreoffice.org/53874
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/filter/source/flash/swfexporter.cxx b/filter/source/flash/swfexporter.cxx
index 2b9d8acd675b..185a382b5ba3 100644
--- a/filter/source/flash/swfexporter.cxx
+++ b/filter/source/flash/swfexporter.cxx
@@ -102,9 +102,7 @@ FlashExporter::~FlashExporter()
 
 void FlashExporter::Flush()
 {
-    delete mpWriter;
-    mpWriter = nullptr;
-
+    mpWriter.reset();
     maPagesMap.clear();
 }
 
@@ -148,8 +146,7 @@ bool FlashExporter::exportAll( const Reference< XComponent >& xDoc, Reference< X
 
         sal_Int32 nOutputWidth = 14400;
         sal_Int32 nOutputHeight = (nOutputWidth * mnDocHeight ) / mnDocWidth;
-        delete mpWriter;
-        mpWriter = new Writer( nOutputWidth, nOutputHeight, mnDocWidth, mnDocHeight, mnJPEGcompressMode  );
+        mpWriter.reset(new Writer( nOutputWidth, nOutputHeight, mnDocWidth, mnDocHeight, mnJPEGcompressMode  ));
     }
     catch( const Exception& )
     {
@@ -264,12 +261,12 @@ bool FlashExporter::exportSlides( const Reference< XDrawPage >& xDrawPage, Refer
 
     try
     {
-        if( nullptr == mpWriter )
+        if( !mpWriter )
         {
             xPropSet->getPropertyValue( "Width" ) >>= mnDocWidth;
             xPropSet->getPropertyValue( "Height" ) >>= mnDocHeight;
 
-            mpWriter = new Writer( 14400, 10800, mnDocWidth, mnDocHeight, mnJPEGcompressMode );
+            mpWriter.reset(new Writer( 14400, 10800, mnDocWidth, mnDocHeight, mnJPEGcompressMode ));
         }
 
         if( mbPresentation )
@@ -298,12 +295,12 @@ sal_uInt16 FlashExporter::exportBackgrounds( const Reference< XDrawPage >& xDraw
     if( !xDrawPage.is() || !xPropSet.is() )
         return 0;
 
-    if( nullptr == mpWriter )
+    if( !mpWriter )
     {
         xPropSet->getPropertyValue( "Width" ) >>= mnDocWidth;
         xPropSet->getPropertyValue( "Height" ) >>= mnDocHeight;
 
-        mpWriter = new Writer( 14400, 10800, mnDocWidth, mnDocHeight, mnJPEGcompressMode );
+        mpWriter.reset(new Writer( 14400, 10800, mnDocWidth, mnDocHeight, mnJPEGcompressMode ));
     }
 
     sal_uInt16 ret = exportBackgrounds(xDrawPage, nPage, bExportObjects);
diff --git a/filter/source/flash/swfexporter.hxx b/filter/source/flash/swfexporter.hxx
index 8e72bd6ef33c..f39f4c6a0a0b 100644
--- a/filter/source/flash/swfexporter.hxx
+++ b/filter/source/flash/swfexporter.hxx
@@ -28,6 +28,7 @@
 
 #include <vector>
 #include <map>
+#include <memory>
 
 typedef ::std::map<BitmapChecksum, sal_uInt16> ChecksumCache;
 
@@ -115,7 +116,7 @@ private:
 
     bool getMetaFile( css::uno::Reference< css::lang::XComponent > const &xComponent, GDIMetaFile& rMtf, bool bOnlyBackground = false, bool bExportAsJPEG = false );
 
-    Writer* mpWriter;
+    std::unique_ptr<Writer> mpWriter;
 
     sal_Int32 mnDocWidth;
     sal_Int32 mnDocHeight;