[Libreoffice-commits] core.git: avmedia/source

[Noel Grandin]

 avmedia/source/viewer/mediawindow_impl.cxx |   14 ++++++--------
 avmedia/source/viewer/mediawindow_impl.hxx |    4 ++--
 2 files changed, 8 insertions(+), 10 deletions(-)

New commits:
commit 311c5a98b8cc6d5e4ef97a59c113cfd7df59312a
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date:   Wed May 9 10:00:30 2018 +0200

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

diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx
index da0d87ba5ad8..75c2d9a70af2 100644
--- a/avmedia/source/viewer/mediawindow_impl.cxx
+++ b/avmedia/source/viewer/mediawindow_impl.cxx
@@ -164,10 +164,8 @@ void MediaWindowImpl::dispose()
 
     mpMediaWindow = nullptr;
 
-    delete mpEmptyBmpEx;
-    mpEmptyBmpEx = nullptr;
-    delete mpAudioBmpEx;
-    mpAudioBmpEx = nullptr;
+    mpEmptyBmpEx.reset();
+    mpAudioBmpEx.reset();
     mpMediaWindowControl.disposeAndClear();
     mpChildWindow.disposeAndClear();
 
@@ -578,16 +576,16 @@ void MediaWindowImpl::Paint(vcl::RenderContext& rRenderContext, const tools::Rec
     if (!mxPlayer.is())
     {
         if (!mpEmptyBmpEx)
-            mpEmptyBmpEx = new BitmapEx(AVMEDIA_BMP_EMPTYLOGO);
+            mpEmptyBmpEx.reset(new BitmapEx(AVMEDIA_BMP_EMPTYLOGO));
 
-        pLogo = mpEmptyBmpEx;
+        pLogo = mpEmptyBmpEx.get();
     }
     else if (!mxPlayerWindow.is())
     {
         if (!mpAudioBmpEx)
-            mpAudioBmpEx = new BitmapEx(AVMEDIA_BMP_AUDIOLOGO);
+            mpAudioBmpEx.reset(new BitmapEx(AVMEDIA_BMP_AUDIOLOGO));
 
-        pLogo = mpAudioBmpEx;
+        pLogo = mpAudioBmpEx.get();
     }
 
     if (!mpChildWindow)
diff --git a/avmedia/source/viewer/mediawindow_impl.hxx b/avmedia/source/viewer/mediawindow_impl.hxx
index bed32852e5ce..a313d927f1bd 100644
--- a/avmedia/source/viewer/mediawindow_impl.hxx
+++ b/avmedia/source/viewer/mediawindow_impl.hxx
@@ -149,8 +149,8 @@ private:
     rtl::Reference<MediaEventListenersImpl> mxEvents;
     VclPtr<MediaChildWindow> mpChildWindow;
     VclPtr<MediaWindowControl> mpMediaWindowControl;
-    BitmapEx* mpEmptyBmpEx;
-    BitmapEx* mpAudioBmpEx;
+    std::unique_ptr<BitmapEx> mpEmptyBmpEx;
+    std::unique_ptr<BitmapEx> mpAudioBmpEx;
 };
 
 }} // end namespace avmedia::priv