Kaydet (Commit) f641e9d9 authored tarafından Noel Grandin's avatar Noel Grandin Kaydeden (comit) Ashod Nakashian

simplify Bitmap operator==/IsEqual (stage2)

Now that we've sorted out which bits are rightfully internal (see commit
7a4064cf87d23bffac987b3e39bf87d9b4d158fc), and which bits need a
comparison operator, rename IsEqual to operator==.

Change-Id: Iec229a7571d76ee18fbc0a4fe672cc2e50a44948
Reviewed-on: https://gerrit.libreoffice.org/42851Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
(cherry picked from commit 09917566)
Reviewed-on: https://gerrit.libreoffice.org/45456Reviewed-by: 's avatarAshod Nakashian <ashnakash@gmail.com>
Tested-by: 's avatarAshod Nakashian <ashnakash@gmail.com>
üst 00f776ba
...@@ -713,7 +713,7 @@ bool SvxBackgroundTabPage::FillItemSet( SfxItemSet* rCoreSet ) ...@@ -713,7 +713,7 @@ bool SvxBackgroundTabPage::FillItemSet( SfxItemSet* rCoreSet )
{ {
const Graphic* pGraphic = rOldItem.GetGraphic(); const Graphic* pGraphic = rOldItem.GetGraphic();
if (pGraphic) if (pGraphic)
bModifyBrush = !pGraphic->GetBitmap().IsEqual(aBgdGraphic.GetBitmap()); bModifyBrush = pGraphic->GetBitmap() != aBgdGraphic.GetBitmap();
} }
if (bModifyBrush) if (bModifyBrush)
{ {
......
...@@ -46,9 +46,8 @@ public: ...@@ -46,9 +46,8 @@ public:
AlphaMask& operator=( const AlphaMask& rAlphaMask ) { return static_cast<AlphaMask&>( Bitmap::operator=( rAlphaMask ) ); } 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) ) ); } AlphaMask& operator=( AlphaMask&& rAlphaMask ) { return static_cast<AlphaMask&>( Bitmap::operator=( std::move(rAlphaMask) ) ); }
bool operator!() const { return Bitmap::operator!(); } bool operator!() const { return Bitmap::operator!(); }
bool operator==( const AlphaMask& rAlphaMask ) const = delete; bool operator==( const AlphaMask& rAlphaMask ) const { return Bitmap::operator==(rAlphaMask); }
bool operator!=( const AlphaMask& rAlphaMask ) const = delete; bool operator!=( const AlphaMask& rAlphaMask ) const { return Bitmap::operator!=(rAlphaMask); }
bool IsEqual( const AlphaMask& rAlphaMask ) const { return Bitmap::IsEqual(rAlphaMask); }
void SetPrefMapMode( const MapMode& rMapMode ) { Bitmap::SetPrefMapMode( rMapMode ); } void SetPrefMapMode( const MapMode& rMapMode ) { Bitmap::SetPrefMapMode( rMapMode ); }
......
...@@ -229,10 +229,8 @@ public: ...@@ -229,10 +229,8 @@ public:
Bitmap& operator=( const Bitmap& rBitmap ); Bitmap& operator=( const Bitmap& rBitmap );
Bitmap& operator=( Bitmap&& rBitmap ); Bitmap& operator=( Bitmap&& rBitmap );
inline bool operator!() const; inline bool operator!() const;
bool operator==( const Bitmap& rBitmap ) const = delete; bool operator==( const Bitmap& rBitmap ) const;
bool operator!=( const Bitmap& rBitmap ) const = delete; bool operator!=( const Bitmap& rBitmap ) const { return !operator==(rBitmap); }
bool IsEqual( const Bitmap& rBmp ) const;
inline bool IsEmpty() const; inline bool IsEmpty() const;
void SetEmpty(); void SetEmpty();
......
...@@ -744,8 +744,8 @@ sal_uInt16 OutlineTypeMgr::GetNBOIndexForNumRule(SvxNumRule& aNum,sal_uInt16 /*m ...@@ -744,8 +744,8 @@ sal_uInt16 OutlineTypeMgr::GetNBOIndexForNumRule(SvxNumRule& aNum,sal_uInt16 /*m
const Graphic* pGrf2 = pBrsh2->GetGraphic(); const Graphic* pGrf2 = pBrsh2->GetGraphic();
if (pGrf1==pGrf2) bIsMatch = true; if (pGrf1==pGrf2) bIsMatch = true;
if (pGrf1 && pGrf2) { if (pGrf1 && pGrf2) {
if ( pGrf1->GetBitmap().IsEqual(pGrf2->GetBitmap()) && if ( pGrf1->GetBitmap() == pGrf2->GetBitmap() &&
_pSet->aSize==aFmt.GetGraphicSize()) _pSet->aSize == aFmt.GetGraphicSize())
bIsMatch = true; bIsMatch = true;
} }
} }
......
...@@ -239,7 +239,7 @@ Bitmap& Bitmap::operator=( Bitmap&& rBitmap ) ...@@ -239,7 +239,7 @@ Bitmap& Bitmap::operator=( Bitmap&& rBitmap )
return *this; return *this;
} }
bool Bitmap::IsEqual( const Bitmap& rBmp ) const bool Bitmap::operator==( const Bitmap& rBmp ) const
{ {
return rBmp.mxImpBmp == mxImpBmp || // Includes both are nullptr return rBmp.mxImpBmp == mxImpBmp || // Includes both are nullptr
(rBmp.mxImpBmp && mxImpBmp && mxImpBmp->ImplIsEqual(*rBmp.mxImpBmp)); (rBmp.mxImpBmp && mxImpBmp && mxImpBmp->ImplIsEqual(*rBmp.mxImpBmp));
......
...@@ -206,7 +206,7 @@ bool BitmapEx::operator==( const BitmapEx& rBitmapEx ) const ...@@ -206,7 +206,7 @@ bool BitmapEx::operator==( const BitmapEx& rBitmapEx ) const
if( eTransparent != rBitmapEx.eTransparent ) if( eTransparent != rBitmapEx.eTransparent )
return false; return false;
if( !aBitmap.IsEqual(rBitmapEx.aBitmap) ) if( aBitmap != rBitmapEx.aBitmap )
return false; return false;
if( aBitmapSize != rBitmapEx.aBitmapSize ) if( aBitmapSize != rBitmapEx.aBitmapSize )
...@@ -218,7 +218,7 @@ bool BitmapEx::operator==( const BitmapEx& rBitmapEx ) const ...@@ -218,7 +218,7 @@ bool BitmapEx::operator==( const BitmapEx& rBitmapEx ) const
if( eTransparent == TransparentType::Color ) if( eTransparent == TransparentType::Color )
return aTransparentColor == rBitmapEx.aTransparentColor; return aTransparentColor == rBitmapEx.aTransparentColor;
return aMask.IsEqual(rBitmapEx.aMask) && bAlpha == rBitmapEx.bAlpha; return aMask == rBitmapEx.aMask && bAlpha == rBitmapEx.bAlpha;
} }
bool BitmapEx::IsEmpty() const bool BitmapEx::IsEmpty() const
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment