core.git: Branch 'libreoffice-24-2' - vcl/source

[Patrick Luby (via logerrit)]

 vcl/source/bitmap/bitmappaint.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit df08a291c4aea3e777f786c65048b03b4a13dbdb
Author:     Patrick Luby <plub...@libreoffice.org>
AuthorDate: Sat Dec 23 17:25:54 2023 -0500
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Sun Dec 24 16:59:13 2023 +0100

    tdf#158807 Call UpdatePaletteForNewColor with rReplaceColor parameter
    
    Change-Id: Id9d55600c69e84f7d7ffdd9cfbf4e1b3985b79c0
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161260
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
    Reviewed-by: Patrick Luby <plub...@libreoffice.org>
    (cherry picked from commit 0e788111f13992f8323d691f2daf98e43cc7bdf8)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161224

diff --git a/vcl/source/bitmap/bitmappaint.cxx 
b/vcl/source/bitmap/bitmappaint.cxx
index fa1e8486c2e3..cc3674ad3123 100644
--- a/vcl/source/bitmap/bitmappaint.cxx
+++ b/vcl/source/bitmap/bitmappaint.cxx
@@ -919,8 +919,8 @@ bool Bitmap::ReplaceMask(const AlphaMask& rMask, const 
Color& rReplaceColor)
         const sal_uInt16 nActColors = pAcc->GetPaletteEntryCount();
         const sal_uInt16 nMaxColors = 1 << pAcc->GetBitCount();
 
-        aReplace
-            = UpdatePaletteForNewColor(pAcc, nActColors, nMaxColors, nHeight, 
nWidth, aReplace);
+        aReplace = UpdatePaletteForNewColor(pAcc, nActColors, nMaxColors, 
nHeight, nWidth,
+                                            BitmapColor(rReplaceColor));
     }
     else
         aReplace = rReplaceColor;