loplugin:useuniqueptr in vcl

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

1 files changed, 9 insertions, 12 deletions

diff --git a/vcl/source/bitmap/bitmap.cxx b/vcl/source/bitmap/bitmap.cxx
index a63c0b49d590..d76ae3950b4d 100644
--- a/vcl/source/bitmap/bitmap.cxx
+++ b/vcl/source/bitmap/bitmap.cxx
@@ -348,41 +348,38 @@ void Bitmap::ImplSetSalBitmap(const std::shared_ptr<SalBitmap>& xImpBmp)
 
 BitmapInfoAccess* Bitmap::AcquireInfoAccess()
 {
-    BitmapInfoAccess* pInfoAccess = new BitmapInfoAccess( *this );
+    std::unique_ptr<BitmapInfoAccess> pInfoAccess(new BitmapInfoAccess( *this ));
 
     if( !*pInfoAccess )
     {
-        delete pInfoAccess;
-        pInfoAccess = nullptr;
+        return nullptr;;
     }
 
-    return pInfoAccess;
+    return pInfoAccess.release();
 }
 
 BitmapReadAccess* Bitmap::AcquireReadAccess()
 {
-    BitmapReadAccess* pReadAccess = new BitmapReadAccess( *this );
+    std::unique_ptr<BitmapReadAccess> pReadAccess(new BitmapReadAccess( *this ));
 
     if( !*pReadAccess )
     {
-        delete pReadAccess;
-        pReadAccess = nullptr;
+        return nullptr;
     }
 
-    return pReadAccess;
+    return pReadAccess.release();
 }
 
 BitmapWriteAccess* Bitmap::AcquireWriteAccess()
 {
-    BitmapWriteAccess* pWriteAccess = new BitmapWriteAccess( *this );
+    std::unique_ptr<BitmapWriteAccess> pWriteAccess(new BitmapWriteAccess( *this ));
 
     if( !*pWriteAccess )
     {
-        delete pWriteAccess;
-        pWriteAccess = nullptr;
+        return nullptr;
     }
 
-    return pWriteAccess;
+    return pWriteAccess.release();
 }
 
 void Bitmap::ReleaseAccess( BitmapInfoAccess* pBitmapAccess )