diff options
author | Herbert Dürr <hdu@apache.org> | 2013-01-16 11:31:37 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2013-04-12 18:47:22 +0100 |
commit | d859e54534994d2e6f0c62e7711fa674406f8e22 (patch) | |
tree | 6a653febf4fdeac7a4b5938ea905d9b8ac406bc4 /vcl | |
parent | 9617741fdfc0b22ff39d2195af5a2966f4fe51e2 (diff) |
AlphaMask derives from Bitmap so their destructors should be virtual
(cherry picked from commit 846a7425314d1782bae3b517d1394a46ff980256)
Conflicts:
vcl/inc/vcl/alpha.hxx
vcl/inc/vcl/bitmap.hxx
Change-Id: I8bf83e2edde33f9aee50a7feffe18bcb5c352dd4
Notes
Notes:
merged as: d859e54534994d2e6f0c62e7711fa674406f8e22
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/inc/vcl/alpha.hxx | 2 | ||||
-rw-r--r-- | vcl/inc/vcl/bitmap.hxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/vcl/inc/vcl/alpha.hxx b/vcl/inc/vcl/alpha.hxx index ddad314771cf..95bb0ea29de2 100644 --- a/vcl/inc/vcl/alpha.hxx +++ b/vcl/inc/vcl/alpha.hxx @@ -47,7 +47,7 @@ public: AlphaMask( const Bitmap& rBitmap ); AlphaMask( const AlphaMask& rAlphaMask ); AlphaMask( const Size& rSizePixel, sal_uInt8* pEraseTransparency = NULL ); - ~AlphaMask(); + virtual ~AlphaMask(); AlphaMask& operator=( const Bitmap& rBitmap ); AlphaMask& operator=( const AlphaMask& rAlphaMask ) diff --git a/vcl/inc/vcl/bitmap.hxx b/vcl/inc/vcl/bitmap.hxx index 7753083ace72..c0ec5b17870c 100644 --- a/vcl/inc/vcl/bitmap.hxx +++ b/vcl/inc/vcl/bitmap.hxx @@ -379,7 +379,7 @@ public: Bitmap( const Size& rSizePixel, sal_uInt16 nBitCount, const BitmapPalette* pPal = NULL ); Bitmap( const ResId& rResId ); Bitmap( SalBitmap* pSalBitmap ); - ~Bitmap(); + virtual ~Bitmap(); Bitmap& operator=( const Bitmap& rBitmap ); inline sal_Bool operator!() const; |