[Libreoffice-commits] .: 3 commits - vcl/inc

[Caolán McNamara]

 vcl/inc/vcl/salbtype.hxx |   20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

New commits:
commit 6598e65cfcabd270199d09d11d9d93639bca620d
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Nov 3 15:36:28 2011 +0000

    probably need to add mbIsGrey to operator== comparison

diff --git a/vcl/inc/vcl/salbtype.hxx b/vcl/inc/vcl/salbtype.hxx
index 8e238be..41c90e9 100644
--- a/vcl/inc/vcl/salbtype.hxx
+++ b/vcl/inc/vcl/salbtype.hxx
@@ -607,7 +607,7 @@ inline sal_Bool BitmapPalette::operator==( const BitmapPalette& rBitmapPalette )
 {
     sal_Bool bRet = sal_False;
 
-    if( rBitmapPalette.mnCount == mnCount )
+    if( rBitmapPalette.mnCount == mnCount && rBitmapPalette.mbIsGrey == mbIsGrey )
     {
         bRet = sal_True;
 
commit 33a49504779cae71e079bc13f71ff2a77352b116
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Nov 3 15:20:36 2011 +0000

    need to assign mbIsGrey in operator=

diff --git a/vcl/inc/vcl/salbtype.hxx b/vcl/inc/vcl/salbtype.hxx
index efd981a..8e238be 100644
--- a/vcl/inc/vcl/salbtype.hxx
+++ b/vcl/inc/vcl/salbtype.hxx
@@ -587,6 +587,7 @@ inline BitmapPalette& BitmapPalette::operator=( const BitmapPalette& rBitmapPale
 {
     delete[] (sal_uInt8*) mpBitmapColor;
     mnCount = rBitmapPalette.mnCount;
+    mbIsGrey = rBitmapPalette.mbIsGrey;
 
     if( mnCount )
     {
commit d0d1cd58cf0e51ba1dcb60291abe623c504c3c18
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Nov 3 15:06:52 2011 +0000

    mbIsGrey needs to be initialized in ctor

diff --git a/vcl/inc/vcl/salbtype.hxx b/vcl/inc/vcl/salbtype.hxx
index 3e8c4c9..efd981a 100644
--- a/vcl/inc/vcl/salbtype.hxx
+++ b/vcl/inc/vcl/salbtype.hxx
@@ -535,16 +535,18 @@ inline sal_uLong BitmapColor::GetColorError( const BitmapColor& rBitmapColor ) c
 
 // ------------------------------------------------------------------
 
-inline BitmapPalette::BitmapPalette() :
-            mpBitmapColor   ( NULL ),
-            mnCount         ( 0 )
+inline BitmapPalette::BitmapPalette()
+    : mpBitmapColor(NULL)
+    , mnCount(0)
+    , mbIsGrey(false)
 {
 }
 
 // ------------------------------------------------------------------
 
-inline BitmapPalette::BitmapPalette( const BitmapPalette& rBitmapPalette ) :
-            mnCount( rBitmapPalette.mnCount )
+inline BitmapPalette::BitmapPalette( const BitmapPalette& rBitmapPalette )
+    : mnCount(rBitmapPalette.mnCount)
+    , mbIsGrey(rBitmapPalette.mbIsGrey)
 {
     if( mnCount )
     {
@@ -558,8 +560,9 @@ inline BitmapPalette::BitmapPalette( const BitmapPalette& rBitmapPalette ) :
 
 // ------------------------------------------------------------------
 
-inline BitmapPalette::BitmapPalette( sal_uInt16 nCount ) :
-            mnCount( nCount )
+inline BitmapPalette::BitmapPalette( sal_uInt16 nCount )
+    : mnCount(nCount)
+    , mbIsGrey(false)
 {
     if( mnCount )
     {