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

[Caolán McNamara]

 dev/null                                     |binary
 icon-themes/elementary/svx/res/frmsel.png    |binary
 icon-themes/elementary/vcl/res/checkmono.png |binary
 icon-themes/elementary/vcl/res/radiomono.png |binary
 icon-themes/galaxy/svx/res/frmsel.png        |binary
 icon-themes/galaxy/vcl/res/checkmono.png     |binary
 icon-themes/galaxy/vcl/res/radiomono.png     |binary
 svx/source/dialog/frmsel.src                 |    2 +-
 vcl/source/src/images.src                    |    4 ++--
 9 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 10fc6e968827d6ce0cbe8517d7e39e2435ef4680
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Jan 4 18:33:36 2017 +0000

    Resolves: tdf#105463 convert bmps to png
    
    because bmps aren't seen since...
    
    commit c3043a3072465c489d3b20991b17d222771305eb
    Date:   Mon Oct 31 13:28:26 2016 +0100
    
        tdf#103591 icon theme name resolving, ui fixes, prioritize png
    
        - Prefer "png" over "svg" because for Tango theme we include both
    
    (cherry picked from commit a3c4f39868226151b4b01906cbcf1b6d40740a28)
    
    convert from bmp to png
    
    (cherry picked from commit 1b7d1d16e3a6826433271b3eed4a2d542585961b)
    
    Change-Id: I93755ac95c170c457b32adac07557ed48ad8beee
    7fe47f47f19b93eab5d0cef0afde63e6f61c21b4
    Reviewed-on: https://gerrit.libreoffice.org/35535
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
    Tested-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>

diff --git a/icon-themes/elementary/sc/res/sidebar/morebutton.bmp b/icon-themes/elementary/sc/res/sidebar/morebutton.bmp
deleted file mode 100644
index c665b3e866a8..000000000000
Binary files a/icon-themes/elementary/sc/res/sidebar/morebutton.bmp and /dev/null differ
diff --git a/icon-themes/elementary/svx/res/frmsel.bmp b/icon-themes/elementary/svx/res/frmsel.bmp
deleted file mode 100644
index fd22f2b0c6a6..000000000000
Binary files a/icon-themes/elementary/svx/res/frmsel.bmp and /dev/null differ
diff --git a/icon-themes/elementary/svx/res/frmsel.png b/icon-themes/elementary/svx/res/frmsel.png
new file mode 100644
index 000000000000..7f0319496c29
Binary files /dev/null and b/icon-themes/elementary/svx/res/frmsel.png differ
diff --git a/icon-themes/elementary/vcl/res/checkmono.bmp b/icon-themes/elementary/vcl/res/checkmono.bmp
deleted file mode 100644
index 7e0610d5e9d8..000000000000
Binary files a/icon-themes/elementary/vcl/res/checkmono.bmp and /dev/null differ
diff --git a/icon-themes/elementary/vcl/res/checkmono.png b/icon-themes/elementary/vcl/res/checkmono.png
new file mode 100644
index 000000000000..69c89139bf49
Binary files /dev/null and b/icon-themes/elementary/vcl/res/checkmono.png differ
diff --git a/icon-themes/elementary/vcl/res/radiomono.bmp b/icon-themes/elementary/vcl/res/radiomono.bmp
deleted file mode 100644
index 6c757c34bac8..000000000000
Binary files a/icon-themes/elementary/vcl/res/radiomono.bmp and /dev/null differ
diff --git a/icon-themes/elementary/vcl/res/radiomono.png b/icon-themes/elementary/vcl/res/radiomono.png
new file mode 100644
index 000000000000..d9e447102afd
Binary files /dev/null and b/icon-themes/elementary/vcl/res/radiomono.png differ
diff --git a/icon-themes/galaxy/sc/res/sidebar/morebutton.bmp b/icon-themes/galaxy/sc/res/sidebar/morebutton.bmp
deleted file mode 100644
index c665b3e866a8..000000000000
Binary files a/icon-themes/galaxy/sc/res/sidebar/morebutton.bmp and /dev/null differ
diff --git a/icon-themes/galaxy/svx/res/frmsel.bmp b/icon-themes/galaxy/svx/res/frmsel.bmp
deleted file mode 100644
index fd22f2b0c6a6..000000000000
Binary files a/icon-themes/galaxy/svx/res/frmsel.bmp and /dev/null differ
diff --git a/icon-themes/galaxy/svx/res/frmsel.png b/icon-themes/galaxy/svx/res/frmsel.png
new file mode 100644
index 000000000000..7f0319496c29
Binary files /dev/null and b/icon-themes/galaxy/svx/res/frmsel.png differ
diff --git a/icon-themes/galaxy/vcl/res/checkmono.bmp b/icon-themes/galaxy/vcl/res/checkmono.bmp
deleted file mode 100644
index 7e0610d5e9d8..000000000000
Binary files a/icon-themes/galaxy/vcl/res/checkmono.bmp and /dev/null differ
diff --git a/icon-themes/galaxy/vcl/res/checkmono.png b/icon-themes/galaxy/vcl/res/checkmono.png
new file mode 100644
index 000000000000..4cabe1284025
Binary files /dev/null and b/icon-themes/galaxy/vcl/res/checkmono.png differ
diff --git a/icon-themes/galaxy/vcl/res/radiomono.bmp b/icon-themes/galaxy/vcl/res/radiomono.bmp
deleted file mode 100644
index 6c757c34bac8..000000000000
Binary files a/icon-themes/galaxy/vcl/res/radiomono.bmp and /dev/null differ
diff --git a/icon-themes/galaxy/vcl/res/radiomono.png b/icon-themes/galaxy/vcl/res/radiomono.png
new file mode 100644
index 000000000000..aba237e266d2
Binary files /dev/null and b/icon-themes/galaxy/vcl/res/radiomono.png differ
diff --git a/icon-themes/hicontrast/sc/res/sidebar/morebutton.bmp b/icon-themes/hicontrast/sc/res/sidebar/morebutton.bmp
deleted file mode 100644
index c665b3e866a8..000000000000
Binary files a/icon-themes/hicontrast/sc/res/sidebar/morebutton.bmp and /dev/null differ
diff --git a/svx/source/dialog/frmsel.src b/svx/source/dialog/frmsel.src
index 3001d3222865..5018d9283d70 100644
--- a/svx/source/dialog/frmsel.src
+++ b/svx/source/dialog/frmsel.src
@@ -53,7 +53,7 @@ Resource RID_SVXSTR_BORDER_CONTROL
         };
     };
 
-    Bitmap BMP_FRMSEL_ARROWS { File = "frmsel.bmp"; };
+    Bitmap BMP_FRMSEL_ARROWS { File = "frmsel.png"; };
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/src/images.src b/vcl/source/src/images.src
index 77cfb392831a..3bc9ab52dc64 100644
--- a/vcl/source/src/images.src
+++ b/vcl/source/src/images.src
@@ -26,7 +26,7 @@ Bitmap (SV_RESID_BITMAP_CHECK + SV_RESID_STDOFFSET)
 
 Bitmap (SV_RESID_BITMAP_CHECK + SV_RESID_MONOOFFSET)
 {
-    File = "checkmono.bmp";
+    File = "checkmono.png";
 };
 
 Bitmap (SV_RESID_BITMAP_SCROLLBMP)
@@ -46,7 +46,7 @@ Bitmap (SV_RESID_BITMAP_RADIO + SV_RESID_STDOFFSET)
 
 Bitmap (SV_RESID_BITMAP_RADIO + SV_RESID_MONOOFFSET)
 {
-    File = "radiomono.bmp";
+    File = "radiomono.png";
 };
 
 Bitmap SV_RESID_BITMAP_MSGBOX