diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-09-30 09:06:00 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-09-30 09:59:47 +0100 |
| commit | 9e09827b0111b2acd8c2b78369ed46a5732931aa (patch) | |
| tree | eceb06fe751463b1e51a7e49ac304b3449f0d3b3 | |
| parent | 6c76ade9516ada09222a18af69eb381b2e859b24 (diff) | |
these are equal to the defaults
Change-Id: Ib1ab02264b7fc68af880c90f20d3244e42dab090
| -rw-r--r-- | include/vcl/alpha.hxx | 5 | ||||
| -rw-r--r-- | vcl/source/gdi/alpha.cxx | 9 |
2 files changed, 2 insertions, 12 deletions
diff --git a/include/vcl/alpha.hxx b/include/vcl/alpha.hxx index 2445cf2bbec7..56c72eb16077 100644 --- a/include/vcl/alpha.hxx +++ b/include/vcl/alpha.hxx @@ -33,12 +33,11 @@ public: AlphaMask(); AlphaMask( const Bitmap& rBitmap ); - AlphaMask( const AlphaMask& rAlphaMask ); + AlphaMask( const AlphaMask& rAlphaMask ) = default; AlphaMask( const Size& rSizePixel, sal_uInt8* pEraseTransparency = nullptr ); - virtual ~AlphaMask() override; AlphaMask& operator=( const Bitmap& rBitmap ); - AlphaMask& operator=( const AlphaMask& rAlphaMask ) { return static_cast<AlphaMask&>( Bitmap::operator=( rAlphaMask ) ); } + AlphaMask& operator=( const AlphaMask& rAlphaMask ) = default; bool operator!() const { return Bitmap::operator!(); } bool operator==( const AlphaMask& rAlphaMask ) const { return Bitmap::operator==( rAlphaMask ); } bool operator!=( const AlphaMask& rAlphaMask ) const { return Bitmap::operator!=( rAlphaMask ); } diff --git a/vcl/source/gdi/alpha.cxx b/vcl/source/gdi/alpha.cxx index 01a57f61e0ed..ec39af5aae00 100644 --- a/vcl/source/gdi/alpha.cxx +++ b/vcl/source/gdi/alpha.cxx @@ -33,11 +33,6 @@ AlphaMask::AlphaMask( const Bitmap& rBitmap ) : Bitmap::Convert( BMP_CONVERSION_8BIT_GREYS ); } -AlphaMask::AlphaMask( const AlphaMask& rAlphaMask ) : - Bitmap( rAlphaMask ) -{ -} - AlphaMask::AlphaMask( const Size& rSizePixel, sal_uInt8* pEraseTransparency ) : Bitmap( rSizePixel, 8, &Bitmap::GetGreyPalette( 256 ) ) { @@ -45,10 +40,6 @@ AlphaMask::AlphaMask( const Size& rSizePixel, sal_uInt8* pEraseTransparency ) : Bitmap::Erase( Color( *pEraseTransparency, *pEraseTransparency, *pEraseTransparency ) ); } -AlphaMask::~AlphaMask() -{ -} - AlphaMask& AlphaMask::operator=( const Bitmap& rBitmap ) { *static_cast<Bitmap*>(this) = rBitmap; |