summaryrefslogtreecommitdiff
path: root/vcl/inc/wall2.hxx
diff options
context:
space:
mode:
authorMark Page <aptitude@btconnect.com>2016-12-06 07:55:14 +0000
committerNoel Grandin <noel.grandin@collabora.co.uk>2016-12-08 05:57:16 +0000
commitc54eb45230ef54c10e7a86d1c249ea42b07881fe (patch)
tree77bea288ada244da2552a6fce823e3ec0d63f276 /vcl/inc/wall2.hxx
parentbcdaa1ffb5d8a107d687c797425550ab859d9041 (diff)
ImplWallpaper to use std::unique_ptr
Also remove ImplWallpaper::operator==, that does not make sense since members are unique Change-Id: I69d32d91ba33691eb1f86e70ce3c53fa2761e34b Reviewed-on: https://gerrit.libreoffice.org/31666 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl/inc/wall2.hxx')
-rw-r--r--vcl/inc/wall2.hxx12
1 files changed, 6 insertions, 6 deletions
diff --git a/vcl/inc/wall2.hxx b/vcl/inc/wall2.hxx
index 59f2ebb2bc66..52393dd937a4 100644
--- a/vcl/inc/wall2.hxx
+++ b/vcl/inc/wall2.hxx
@@ -25,19 +25,19 @@ class ImplWallpaper
friend class Wallpaper;
private:
- Color maColor;
- BitmapEx* mpBitmap;
- Gradient* mpGradient;
- Rectangle* mpRect;
+ Color maColor;
+ std::unique_ptr<BitmapEx> mpBitmap;
+ std::unique_ptr<Gradient> mpGradient;
+ std::unique_ptr<Rectangle> mpRect;
WallpaperStyle meStyle;
- BitmapEx* mpCache;
+ std::unique_ptr<BitmapEx> mpCache;
public:
ImplWallpaper();
ImplWallpaper( const ImplWallpaper& rImplWallpaper );
~ImplWallpaper();
- bool operator==( const ImplWallpaper& rImplWallpaper ) const;
+ bool operator==( const ImplWallpaper& rImplWallpaper ) const = delete;
friend SvStream& ReadImplWallpaper( SvStream& rIStm, ImplWallpaper& rImplWallpaper );
friend SvStream& WriteImplWallpaper( SvStream& rOStm, const ImplWallpaper& rImplWallpaper );