diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2013-06-29 23:57:38 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2013-06-30 04:58:49 +0000 |
| commit | 710f41b7aec8e7d35a0da8be332aa289f98942af (patch) | |
| tree | b894ef2d3f06a63a85f423b2713a654ea57f9c69 /include/tools/color.hxx | |
| parent | remove all my debug code (diff) | |
| download | core-710f41b7aec8e7d35a0da8be332aa289f98942af.tar.gz core-710f41b7aec8e7d35a0da8be332aa289f98942af.zip | |
Clean String and sal_Bool in tools
Change-Id: I6a92196f33d7a5278c7dcc426112e9c56d582655
Reviewed-on: https://gerrit.libreoffice.org/4627
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
Diffstat (limited to 'include/tools/color.hxx')
| -rw-r--r-- | include/tools/color.hxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/include/tools/color.hxx b/include/tools/color.hxx index 911088b9cad1..f992c32f01d7 100644 --- a/include/tools/color.hxx +++ b/include/tools/color.hxx @@ -138,11 +138,11 @@ public: void Merge( const Color& rMergeColor, sal_uInt8 cTransparency ); - sal_Bool IsRGBEqual( const Color& rColor ) const; + bool IsRGBEqual( const Color& rColor ) const; // comparison with luminance thresholds - sal_Bool IsDark() const; - sal_Bool IsBright() const; + bool IsDark() const; + bool IsBright() const; // color space conversion tools // the range for h/s/b is: @@ -152,13 +152,13 @@ public: static ColorData HSBtoRGB( sal_uInt16 nHue, sal_uInt16 nSat, sal_uInt16 nBri ); void RGBtoHSB( sal_uInt16& nHue, sal_uInt16& nSat, sal_uInt16& nBri ) const; - sal_Bool operator==( const Color& rColor ) const - { return (mnColor == rColor.mnColor); } - sal_Bool operator!=( const Color& rColor ) const - { return !(Color::operator==( rColor )); } + bool operator==( const Color& rColor ) const + { return (mnColor == rColor.mnColor); } + bool operator!=( const Color& rColor ) const + { return !(Color::operator==( rColor )); } - SvStream& Read( SvStream& rIStm, sal_Bool bNewFormat = sal_True ); - SvStream& Write( SvStream& rOStm, sal_Bool bNewFormat = sal_True ); + SvStream& Read( SvStream& rIStm, bool bNewFormat = true ); + SvStream& Write( SvStream& rOStm, bool bNewFormat = true ); TOOLS_DLLPUBLIC friend SvStream& operator>>( SvStream& rIStream, Color& rColor ); TOOLS_DLLPUBLIC friend SvStream& operator<<( SvStream& rOStream, const Color& rColor ); @@ -191,7 +191,7 @@ inline void Color::SetTransparency( sal_uInt8 nTransparency ) mnColor |= ((sal_uInt32)nTransparency)<<24; } -inline sal_Bool Color::IsRGBEqual( const Color& rColor ) const +inline bool Color::IsRGBEqual( const Color& rColor ) const { return (COLORDATA_RGB( mnColor ) == COLORDATA_RGB( rColor.mnColor )); } |