summaryrefslogtreecommitdiff
path: root/cui
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2018-06-21 09:54:36 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2018-06-25 09:11:55 +0200
commit9a378c7af1b0ef368f6381c8496369460fa7974d (patch)
tree465eda0c978789cae9d138ac630b6c5e41331e0c /cui
parent641cb17f5e11cafad0413e2a673fdad2b8c42903 (diff)
loplugin:useuniqueptr in BackgroundPreviewImpl
Change-Id: If7a36baa663d052a9a41c126312abff185a14bdc Reviewed-on: https://gerrit.libreoffice.org/56321 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'cui')
-rw-r--r--cui/source/tabpages/backgrnd.cxx9
1 files changed, 4 insertions, 5 deletions
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index 76f5a1567207..9d9fa98d1f54 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -161,7 +161,7 @@ private:
void recalcDrawPos();
bool bIsBmp;
- Bitmap* pBitmap;
+ std::unique_ptr<Bitmap> pBitmap;
Point aDrawPos;
Size aDrawSize;
::tools::Rectangle aDrawRect;
@@ -195,8 +195,7 @@ BackgroundPreviewImpl::~BackgroundPreviewImpl()
void BackgroundPreviewImpl::dispose()
{
- delete pBitmap;
- pBitmap = nullptr;
+ pBitmap.reset();
vcl::Window::dispose();
}
@@ -218,9 +217,9 @@ void BackgroundPreviewImpl::NotifyChange( const Bitmap* pNewBitmap )
if (pNewBitmap && pBitmap)
*pBitmap = *pNewBitmap;
else if (pNewBitmap && !pBitmap)
- pBitmap = new Bitmap(*pNewBitmap);
+ pBitmap.reset( new Bitmap(*pNewBitmap) );
else if (!pNewBitmap)
- DELETEZ(pBitmap);
+ pBitmap.reset();
recalcDrawPos();