last bitmaps that pMaskColor arg was used on converted to true transparency

Change-Id: I99bb32355bc53e2c870f84e60fc1e35b9dfe8270

include/vcl/image.hxx

@@ -82,7 +82,6 @@ public:
                                    const std::vector< OUString > &rNameVector );
     void                    InsertFromHorizontalBitmap(const ResId& rResId,
                                     sal_uInt16       nCount,
-                                    const Color *pNonAlphaMaskColor,
                                     const Color *pSearchColors,
                                     const Color *pReplaceColors,
                                     sal_uLong        nColorCount);

svx/source/dialog/frmsel.cxx

@@ -321,7 +321,7 @@ void FrameSelectorImpl::InitArrowImageList()
 
     GetRes( SVX_RES( RID_SVXSTR_BORDER_CONTROL ).SetRT( RSC_RESOURCE ) );
     maILArrows.InsertFromHorizontalBitmap(
-        SVX_RES( BMP_FRMSEL_ARROWS ), 16, nullptr, pColorAry1, pColorAry2, 3);
+        SVX_RES( BMP_FRMSEL_ARROWS ), 16, pColorAry1, pColorAry2, 3);
     FreeResource();
     DBG_ASSERT( maILArrows.GetImageSize().Height() == maILArrows.GetImageSize().Width(),
         "svx::FrameSelectorImpl::InitArrowImageList - images are not squarish" );

vcl/source/control/button.cxx

@@ -2764,10 +2764,9 @@ static void LoadThemedImageList (const StyleSettings &rStyleSettings,
     aColorAry2[4] = rStyleSettings.GetDarkShadowColor();
     aColorAry2[5] = rStyleSettings.GetWindowTextColor();
 
-    Color aMaskColor(0x00, 0x00, 0xFF );
     static_assert( sizeof(aColorAry1) == sizeof(aColorAry2), "aColorAry1 must match aColorAry2" );
     // FIXME: do we want the mask for the checkbox ?
-    pList->InsertFromHorizontalBitmap (rResId, nImages, &aMaskColor,
+    pList->InsertFromHorizontalBitmap (rResId, nImages,
         aColorAry1, aColorAry2, SAL_N_ELEMENTS(aColorAry1));
 }
 

vcl/source/image/ImageList.cxx

@@ -120,19 +120,12 @@ void ImageList::InsertFromHorizontalStrip( const BitmapEx &rBitmapEx,
 
 void ImageList::InsertFromHorizontalBitmap( const ResId& rResId,
                                             sal_uInt16       nCount,
-                                            const Color *pMaskColor,
                                             const Color *pSearchColors,
                                             const Color *pReplaceColors,
                                             sal_uLong        nColorCount)
 {
     BitmapEx aBmpEx( rResId );
-    if (!aBmpEx.IsTransparent())
-    {
-        if( pMaskColor )
-            aBmpEx = BitmapEx( aBmpEx.GetBitmap(), *pMaskColor );
-        else
-            aBmpEx = BitmapEx( aBmpEx.GetBitmap() );
-    }
+
     if ( nColorCount && pSearchColors && pReplaceColors )
         aBmpEx.Replace( pSearchColors, pReplaceColors, nColorCount );