Bail-out early and rework loops to use correct unsigned type

Change-Id: If70d600e1253e9d9271282c361e7edf01314eaa1

1 files changed, 10 insertions, 10 deletions

diff --git a/include/vcl/salbtype.hxx b/include/vcl/salbtype.hxx
index 11f263f4e090..fc9445080961 100644
--- a/include/vcl/salbtype.hxx
+++ b/include/vcl/salbtype.hxx
@@ -544,28 +544,28 @@ inline sal_uInt16 BitmapPalette::GetBestIndex( const BitmapColor& rCol ) const
 
     if( mpBitmapColor && mnCount )
     {
-        bool bFound = false;
-
-        for( long j = 0L; ( j < mnCount ) && !bFound; j++ )
+        for( sal_uInt16 j = 0; j < mnCount; ++j )
             if( rCol == mpBitmapColor[ j ] )
             {
-                nRetIndex = ( (sal_uInt16) j );
-                bFound = true;
+                return j;
             }
 
-        if( !bFound )
+        nRetIndex = mnCount - 1;
+        if( nRetIndex )
         {
-            nRetIndex = mnCount - 1;
             sal_uLong nLastErr = rCol.GetColorError( mpBitmapColor[ nRetIndex ] );
-
-            for( long i = nRetIndex - 1; i >= 0L; i-- )
+            sal_uInt16 i = nRetIndex - 1;
+            for(;;)
             {
                 const sal_uLong nActErr = rCol.GetColorError( mpBitmapColor[ i ] );
                 if ( nActErr < nLastErr )
                 {
                     nLastErr = nActErr;
-                    nRetIndex = (sal_uInt16) i;
+                    nRetIndex = i;
                 }
+                if (!i)
+                    break;
+                --i;
             }
         }
     }