[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - icon-themes/elementary icon-themes/galaxy vcl/source

[Caolán McNamara]

 icon-themes/elementary/vcl/res/check.png     |binary
 icon-themes/elementary/vcl/res/checkmono.png |binary
 icon-themes/elementary/vcl/res/radio.png     |binary
 icon-themes/elementary/vcl/res/radiomono.png |binary
 icon-themes/galaxy/vcl/res/check.png         |binary
 icon-themes/galaxy/vcl/res/checkmono.png     |binary
 icon-themes/galaxy/vcl/res/radio.png         |binary
 icon-themes/galaxy/vcl/res/radiomono.png     |binary
 vcl/source/control/button.cxx                |    4 +---
 9 files changed, 1 insertion(+), 3 deletions(-)

New commits:
commit ec49295718144aeeb81683bcfe5923c3610e8d21
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Jan 4 18:39:34 2017 +0000

    Resolves: tdf#108111 backport mono checkboxes fix
    
    replace the blue which will be set to transparent, with transparent
    
    and then we don't "manually" replace a color with transparent which
    makes tdf#108111 look right again
    
    (cherry picked from commit f1a8e00764b32c3b799ecd40dcb4dd632493bc45)
    
    Change-Id: I95923685d412145e88b672a50311c767d1425493
    Reviewed-on: https://gerrit.libreoffice.org/38223
    Reviewed-by: Justin Luth <justin_luth at sil.org>
    Tested-by: Justin Luth <justin_luth at sil.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/icon-themes/elementary/vcl/res/check.png b/icon-themes/elementary/vcl/res/check.png
index daeddd2ddcca..05f8b1c381c3 100644
Binary files a/icon-themes/elementary/vcl/res/check.png and b/icon-themes/elementary/vcl/res/check.png differ
diff --git a/icon-themes/elementary/vcl/res/checkmono.png b/icon-themes/elementary/vcl/res/checkmono.png
index 69c89139bf49..dc8888e0442c 100644
Binary files a/icon-themes/elementary/vcl/res/checkmono.png and b/icon-themes/elementary/vcl/res/checkmono.png differ
diff --git a/icon-themes/elementary/vcl/res/radio.png b/icon-themes/elementary/vcl/res/radio.png
index 73e2a04c474c..dff083949b97 100644
Binary files a/icon-themes/elementary/vcl/res/radio.png and b/icon-themes/elementary/vcl/res/radio.png differ
diff --git a/icon-themes/elementary/vcl/res/radiomono.png b/icon-themes/elementary/vcl/res/radiomono.png
index d9e447102afd..cdee168c1351 100644
Binary files a/icon-themes/elementary/vcl/res/radiomono.png and b/icon-themes/elementary/vcl/res/radiomono.png differ
diff --git a/icon-themes/galaxy/vcl/res/check.png b/icon-themes/galaxy/vcl/res/check.png
index 3bf35b2d6ae5..05f8b1c381c3 100644
Binary files a/icon-themes/galaxy/vcl/res/check.png and b/icon-themes/galaxy/vcl/res/check.png differ
diff --git a/icon-themes/galaxy/vcl/res/checkmono.png b/icon-themes/galaxy/vcl/res/checkmono.png
index 4cabe1284025..afdf871f4fe9 100644
Binary files a/icon-themes/galaxy/vcl/res/checkmono.png and b/icon-themes/galaxy/vcl/res/checkmono.png differ
diff --git a/icon-themes/galaxy/vcl/res/radio.png b/icon-themes/galaxy/vcl/res/radio.png
index c198a6d9ef90..dff083949b97 100644
Binary files a/icon-themes/galaxy/vcl/res/radio.png and b/icon-themes/galaxy/vcl/res/radio.png differ
diff --git a/icon-themes/galaxy/vcl/res/radiomono.png b/icon-themes/galaxy/vcl/res/radiomono.png
index aba237e266d2..88f101430b82 100644
Binary files a/icon-themes/galaxy/vcl/res/radiomono.png and b/icon-themes/galaxy/vcl/res/radiomono.png differ
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index 47dc44a22564..02cd28ca270a 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -2766,10 +2766,8 @@ 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, nullptr,
         aColorAry1, aColorAry2, SAL_N_ELEMENTS(aColorAry1));
 }