diff options
Diffstat (limited to 'include/vcl/salbtype.hxx')
-rw-r--r-- | include/vcl/salbtype.hxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/vcl/salbtype.hxx b/include/vcl/salbtype.hxx index d5bbc7310ac4..95d9c5834717 100644 --- a/include/vcl/salbtype.hxx +++ b/include/vcl/salbtype.hxx @@ -105,7 +105,7 @@ private: sal_uInt8 mcBlueOrIndex; sal_uInt8 mcGreen; sal_uInt8 mcRed; - sal_uInt8 mbIndex; + sal_uInt8 mbIndex; // should be bool, but see above warning public: @@ -272,7 +272,7 @@ inline BitmapColor::BitmapColor() : mcBlueOrIndex ( 0 ), mcGreen ( 0 ), mcRed ( 0 ), - mbIndex ( false ) + mbIndex ( sal_uInt8(false) ) { } @@ -280,7 +280,7 @@ inline BitmapColor::BitmapColor( sal_uInt8 cRed, sal_uInt8 cGreen, sal_uInt8 cBl mcBlueOrIndex ( cBlue ), mcGreen ( cGreen ), mcRed ( cRed ), - mbIndex ( false ) + mbIndex ( sal_uInt8(false) ) { } @@ -296,7 +296,7 @@ inline BitmapColor::BitmapColor( const Color& rColor ) : mcBlueOrIndex ( rColor.GetBlue() ), mcGreen ( rColor.GetGreen() ), mcRed ( rColor.GetRed() ), - mbIndex ( 0 ) + mbIndex ( sal_uInt8(false) ) { } @@ -304,14 +304,14 @@ inline BitmapColor::BitmapColor( sal_uInt8 cIndex ) : mcBlueOrIndex ( cIndex ), mcGreen ( 0 ), mcRed ( 0 ), - mbIndex ( true ) + mbIndex ( sal_uInt8(true) ) { } inline bool BitmapColor::operator==( const BitmapColor& rBitmapColor ) const { return( ( mcBlueOrIndex == rBitmapColor.mcBlueOrIndex ) && - ( mbIndex ? rBitmapColor.mbIndex : + ( mbIndex ? bool(rBitmapColor.mbIndex) : ( mcGreen == rBitmapColor.mcGreen && mcRed == rBitmapColor.mcRed ) ) ); } |