Skip to content

C
core
Kaydet (Commit) 7abe546e authored tarafından Stephan Bergmann's avatar Stephan Bergmann
Dosyalara gözat
Seçenekler

bool improvements 

Change-Id: I3a3a2122902e1731e95d8469dfe9efc5a6b567ee
üst 12546c85
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 10 deletions
include/vcl/font.hxx
Dosyayı görüntüle @ 7abe546e
...@@ -126,8 +126,8 @@ public: ...@@ -126,8 +126,8 @@ public:
void GetFontAttributes( ImplFontAttributes& rAttrs ) const; void GetFontAttributes( ImplFontAttributes& rAttrs ) const;
Font& operator=( const Font& ); Font& operator=( const Font& );
sal_Bool operator==( const Font& ) const; bool operator==( const Font& ) const;
sal_Bool operator!=( const Font& rFont ) const bool operator!=( const Font& rFont ) const
{ return !(Font::operator==( rFont )); } { return !(Font::operator==( rFont )); }
sal_Bool IsSameInstance( const Font& ) const; sal_Bool IsSameInstance( const Font& ) const;
......
vcl/source/gdi/font.cxx
Dosyayı görüntüle @ 7abe546e
...@@ -587,15 +587,9 @@ Font& Font::operator=( const Font& rFont ) ...@@ -587,15 +587,9 @@ Font& Font::operator=( const Font& rFont )
return *this; return *this;
} }
sal_Bool Font::operator==( const Font& rFont ) const bool Font::operator==( const Font& rFont ) const
{ {
return mpImplFont == rFont.mpImplFont || *mpImplFont == *rFont.mpImplFont;
if( mpImplFont == rFont.mpImplFont )
return sal_True;
if( *mpImplFont == *rFont.mpImplFont )
return sal_True;
return sal_False;
} }
void Font::Merge( const Font& rFont ) void Font::Merge( const Font& rFont )
......
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