summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2017-01-04 18:33:36 +0000
committerChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2017-03-29 17:28:46 +0000
commit10fc6e968827d6ce0cbe8517d7e39e2435ef4680 (patch)
treea745d4a2eacac5209f21dde7bd53986ec399bc87
parent4725c2a282f2c6468125073ba9cb5ba66f488e08 (diff)
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@ubuntu.com> Reviewed-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
-rw-r--r--icon-themes/elementary/sc/res/sidebar/morebutton.bmpbin5346 -> 0 bytes
-rw-r--r--icon-themes/elementary/svx/res/frmsel.bmpbin510 -> 0 bytes
-rw-r--r--icon-themes/elementary/svx/res/frmsel.pngbin0 -> 411 bytes
-rw-r--r--icon-themes/elementary/vcl/res/checkmono.bmpbin898 -> 0 bytes
-rw-r--r--icon-themes/elementary/vcl/res/checkmono.pngbin0 -> 476 bytes
-rw-r--r--icon-themes/elementary/vcl/res/radiomono.bmpbin638 -> 0 bytes
-rw-r--r--icon-themes/elementary/vcl/res/radiomono.pngbin0 -> 437 bytes
-rw-r--r--icon-themes/galaxy/sc/res/sidebar/morebutton.bmpbin5346 -> 0 bytes
-rw-r--r--icon-themes/galaxy/svx/res/frmsel.bmpbin510 -> 0 bytes
-rw-r--r--icon-themes/galaxy/svx/res/frmsel.pngbin0 -> 411 bytes
-rw-r--r--icon-themes/galaxy/vcl/res/checkmono.bmpbin898 -> 0 bytes
-rw-r--r--icon-themes/galaxy/vcl/res/checkmono.pngbin0 -> 476 bytes
-rw-r--r--icon-themes/galaxy/vcl/res/radiomono.bmpbin638 -> 0 bytes
-rw-r--r--icon-themes/galaxy/vcl/res/radiomono.pngbin0 -> 437 bytes
-rw-r--r--icon-themes/hicontrast/sc/res/sidebar/morebutton.bmpbin5346 -> 0 bytes
-rw-r--r--svx/source/dialog/frmsel.src2
-rw-r--r--vcl/source/src/images.src4
17 files changed, 3 insertions, 3 deletions
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
--- a/icon-themes/elementary/sc/res/sidebar/morebutton.bmp
+++ /dev/null
Binary files 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
--- a/icon-themes/elementary/svx/res/frmsel.bmp
+++ /dev/null
Binary files 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
--- /dev/null
+++ b/icon-themes/elementary/svx/res/frmsel.png
Binary files 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
--- a/icon-themes/elementary/vcl/res/checkmono.bmp
+++ /dev/null
Binary files 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
--- /dev/null
+++ b/icon-themes/elementary/vcl/res/checkmono.png
Binary files 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
--- a/icon-themes/elementary/vcl/res/radiomono.bmp
+++ /dev/null
Binary files 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
--- /dev/null
+++ b/icon-themes/elementary/vcl/res/radiomono.png
Binary files 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
--- a/icon-themes/galaxy/sc/res/sidebar/morebutton.bmp
+++ /dev/null
Binary files 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
--- a/icon-themes/galaxy/svx/res/frmsel.bmp
+++ /dev/null
Binary files 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
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/frmsel.png
Binary files 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
--- a/icon-themes/galaxy/vcl/res/checkmono.bmp
+++ /dev/null
Binary files 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
--- /dev/null
+++ b/icon-themes/galaxy/vcl/res/checkmono.png
Binary files 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
--- a/icon-themes/galaxy/vcl/res/radiomono.bmp
+++ /dev/null
Binary files 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
--- /dev/null
+++ b/icon-themes/galaxy/vcl/res/radiomono.png
Binary files 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
--- a/icon-themes/hicontrast/sc/res/sidebar/morebutton.bmp
+++ /dev/null
Binary files 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