diff options
| -rw-r--r-- | cui/source/tabpages/backgrnd.cxx | 2 | ||||
| -rw-r--r-- | include/vcl/alpha.hxx | 5 | ||||
| -rw-r--r-- | include/vcl/bitmap.hxx | 6 | ||||
| -rw-r--r-- | svx/source/sidebar/nbdtmg.cxx | 4 | ||||
| -rw-r--r-- | vcl/source/gdi/bitmap.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/gdi/bitmapex.cxx | 4 |
6 files changed, 10 insertions, 13 deletions
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx index e93ab92180f7..6d483aecb0f1 100644 --- a/cui/source/tabpages/backgrnd.cxx +++ b/cui/source/tabpages/backgrnd.cxx @@ -683,7 +683,7 @@ bool SvxBackgroundTabPage::FillItemSet( SfxItemSet* rCoreSet ) { const Graphic* pGraphic = rOldItem.GetGraphic(); if (pGraphic) - bModifyBrush = !pGraphic->GetBitmap().IsEqual(aBgdGraphic.GetBitmap()); + bModifyBrush = pGraphic->GetBitmap() != aBgdGraphic.GetBitmap(); } if (bModifyBrush) { diff --git a/include/vcl/alpha.hxx b/include/vcl/alpha.hxx index f4cd32936d63..e21bcc3b0732 100644 --- a/include/vcl/alpha.hxx +++ b/include/vcl/alpha.hxx @@ -44,9 +44,8 @@ public: AlphaMask& operator=( const AlphaMask& rAlphaMask ) { return static_cast<AlphaMask&>( Bitmap::operator=( rAlphaMask ) ); } AlphaMask& operator=( AlphaMask&& rAlphaMask ) { return static_cast<AlphaMask&>( Bitmap::operator=( std::move(rAlphaMask) ) ); } bool operator!() const { return Bitmap::operator!(); } - bool operator==( const AlphaMask& rAlphaMask ) const = delete; - bool operator!=( const AlphaMask& rAlphaMask ) const = delete; - bool IsEqual( const AlphaMask& rAlphaMask ) const { return Bitmap::IsEqual(rAlphaMask); } + bool operator==( const AlphaMask& rAlphaMask ) const { return Bitmap::operator==(rAlphaMask); } + bool operator!=( const AlphaMask& rAlphaMask ) const { return Bitmap::operator!=(rAlphaMask); } void SetPrefMapMode( const MapMode& rMapMode ) { Bitmap::SetPrefMapMode( rMapMode ); } diff --git a/include/vcl/bitmap.hxx b/include/vcl/bitmap.hxx index 321c4969e3e7..0be13c12bf3e 100644 --- a/include/vcl/bitmap.hxx +++ b/include/vcl/bitmap.hxx @@ -224,10 +224,8 @@ public: Bitmap& operator=( const Bitmap& rBitmap ); Bitmap& operator=( Bitmap&& rBitmap ); inline bool operator!() const; - bool operator==( const Bitmap& rBitmap ) const = delete; - bool operator!=( const Bitmap& rBitmap ) const = delete; - - bool IsEqual( const Bitmap& rBmp ) const; + bool operator==( const Bitmap& rBitmap ) const; + bool operator!=( const Bitmap& rBitmap ) const { return !operator==(rBitmap); } inline bool IsEmpty() const; void SetEmpty(); diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx index 0b97abe3bbb6..df87e2242620 100644 --- a/svx/source/sidebar/nbdtmg.cxx +++ b/svx/source/sidebar/nbdtmg.cxx @@ -670,8 +670,8 @@ sal_uInt16 OutlineTypeMgr::GetNBOIndexForNumRule(SvxNumRule& aNum,sal_uInt16 /*m const Graphic* pGrf2 = pBrsh2->GetGraphic(); if (pGrf1==pGrf2) bIsMatch = true; if (pGrf1 && pGrf2) { - if ( pGrf1->GetBitmap().IsEqual(pGrf2->GetBitmap()) && - _pSet->aSize==aFmt.GetGraphicSize()) + if ( pGrf1->GetBitmap() == pGrf2->GetBitmap() && + _pSet->aSize == aFmt.GetGraphicSize()) bIsMatch = true; } } diff --git a/vcl/source/gdi/bitmap.cxx b/vcl/source/gdi/bitmap.cxx index aef5cf4b2428..2c1a6bff4f6b 100644 --- a/vcl/source/gdi/bitmap.cxx +++ b/vcl/source/gdi/bitmap.cxx @@ -231,7 +231,7 @@ Bitmap& Bitmap::operator=( Bitmap&& rBitmap ) return *this; } -bool Bitmap::IsEqual( const Bitmap& rBmp ) const +bool Bitmap::operator==( const Bitmap& rBmp ) const { return rBmp.mxImpBmp == mxImpBmp || // Includes both are nullptr (rBmp.mxImpBmp && mxImpBmp && mxImpBmp->ImplIsEqual(*rBmp.mxImpBmp)); diff --git a/vcl/source/gdi/bitmapex.cxx b/vcl/source/gdi/bitmapex.cxx index 4a15547435cf..5f27cba71e3a 100644 --- a/vcl/source/gdi/bitmapex.cxx +++ b/vcl/source/gdi/bitmapex.cxx @@ -193,7 +193,7 @@ bool BitmapEx::operator==( const BitmapEx& rBitmapEx ) const if( eTransparent != rBitmapEx.eTransparent ) return false; - if( !aBitmap.IsEqual(rBitmapEx.aBitmap) ) + if( aBitmap != rBitmapEx.aBitmap ) return false; if( aBitmapSize != rBitmapEx.aBitmapSize ) @@ -205,7 +205,7 @@ bool BitmapEx::operator==( const BitmapEx& rBitmapEx ) const if( eTransparent == TransparentType::Color ) return aTransparentColor == rBitmapEx.aTransparentColor; - return aMask.IsEqual(rBitmapEx.aMask) && bAlpha == rBitmapEx.bAlpha; + return aMask == rBitmapEx.aMask && bAlpha == rBitmapEx.bAlpha; } bool BitmapEx::IsEmpty() const |