[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - chart2/inc svx/inc
Caolán McNamara
caolanm at redhat.com
Tue Aug 8 13:34:59 UTC 2017
chart2/inc/bitmaps.hlst | 2 -
svx/inc/bitmaps.hlst | 94 ++++++++++++++++++++++++------------------------
2 files changed, 48 insertions(+), 48 deletions(-)
New commits:
commit fb786089da572e46f7f3dece2e5876ac70e9e569
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Aug 3 15:44:28 2017 +0100
Resolves: tdf#111087 change names from bmp to png
they are really png in icon-themese and while some fallback
code will find the png if they get included in the final zips
the zip builder won't include them if the name doesn't match
Change-Id: I0f08685403f8e4a92b7661edcbb8b14af1034fea
Reviewed-on: https://gerrit.libreoffice.org/40729
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
diff --git a/chart2/inc/bitmaps.hlst b/chart2/inc/bitmaps.hlst
index f85f49233e9f..4e8a3109a5c4 100644
--- a/chart2/inc/bitmaps.hlst
+++ b/chart2/inc/bitmaps.hlst
@@ -133,7 +133,7 @@
#define BMP_REGRESSION_MOVING_AVERAGE "chart2/res/regavg.png"
#define RID_SVXBMP_LAMP_ON "svx/res/lighton.png"
-#define RID_SVXBMP_LAMP_OFF "svx/res/light.bmp"
+#define RID_SVXBMP_LAMP_OFF "svx/res/light.png"
#endif
diff --git a/svx/inc/bitmaps.hlst b/svx/inc/bitmaps.hlst
index 7fee73590cae..5ae8d9e3ea60 100644
--- a/svx/inc/bitmaps.hlst
+++ b/svx/inc/bitmaps.hlst
@@ -40,58 +40,58 @@
#define RID_SVXBMP_SHADOW_XDIST "svx/res/fw016.png"
#define RID_SVXBMP_SHADOW_YDIST "svx/res/fw017.png"
-#define RID_SVXBMP_DIRECTION_DIRECTION_NW "svx/res/directionnorthwest_22.bmp"
-#define RID_SVXBMP_DIRECTION_DIRECTION_N "svx/res/directionnorth_22.bmp"
-#define RID_SVXBMP_DIRECTION_DIRECTION_NE "svx/res/directionnortheast_22.bmp"
-#define RID_SVXBMP_DIRECTION_DIRECTION_W "svx/res/directionwest_22.bmp"
-#define RID_SVXBMP_DIRECTION_DIRECTION_NONE "svx/res/directionstraight_22.bmp"
-#define RID_SVXBMP_DIRECTION_DIRECTION_E "svx/res/directioneast_22.bmp"
-#define RID_SVXBMP_DIRECTION_DIRECTION_SW "svx/res/directionsouthwest_22.bmp"
-#define RID_SVXBMP_DIRECTION_DIRECTION_S "svx/res/directionsouth_22.bmp"
-#define RID_SVXBMP_DIRECTION_DIRECTION_SE "svx/res/directionsoutheast_22.bmp"
-#define RID_SVXBMP_PERSPECTIVE "svx/res/perspective_16.bmp"
-#define RID_SVXBMP_PARALLEL "svx/res/parallel_16.bmp"
-#define RID_SVXBMP_LIGHT_OFF_FROM_TOP_LEFT "svx/res/lightofffromtopleft_22.bmp"
-#define RID_SVXBMP_LIGHT_OFF_FROM_TOP "svx/res/lightofffromtop_22.bmp"
-#define RID_SVXBMP_LIGHT_OFF_FROM_TOP_RIGHT "svx/res/lightofffromtopright_22.bmp"
-#define RID_SVXBMP_LIGHT_OFF_FROM_LEFT "svx/res/lightofffromleft_22.bmp"
-#define RID_SVXBMP_LIGHT_OFF_FROM_RIGHT "svx/res/lightofffromright_22.bmp"
-#define RID_SVXBMP_LIGHT_OFF_FROM_BOTTOM_LEFT "svx/res/lightofffrombottomleft_22.bmp"
-#define RID_SVXBMP_LIGHT_OFF_FROM_BOTTOM "svx/res/lightofffrombottom_22.bmp"
-#define RID_SVXBMP_LIGHT_OFF_FROM_BOTTOM_RIGHT "svx/res/lightofffrombottomright_22.bmp"
-#define RID_SVXBMP_LIGHT_ON_FROM_TOP_LEFT "svx/res/lightonfromtopleft_22.bmp"
-#define RID_SVXBMP_LIGHT_ON_FROM_TOP "svx/res/lightonfromtop_22.bmp"
-#define RID_SVXBMP_LIGHT_ON_FROM_TOP_RIGHT "svx/res/lightonfromtopright_22.bmp"
-#define RID_SVXBMP_LIGHT_ON_FROM_LEFT "svx/res/lightonfromleft_22.bmp"
-#define RID_SVXBMP_LIGHT_ON_FROM_RIGHT "svx/res/lightonfromright_22.bmp"
-#define RID_SVXBMP_LIGHT_ON_FROM_BOTTOM_LEFT "svx/res/lightonfrombottomleft_22.bmp"
-#define RID_SVXBMP_LIGHT_ON_FROM_BOTTOM "svx/res/lightonfrombottom_22.bmp"
-#define RID_SVXBMP_LIGHT_ON_FROM_BOTTOM_RIGHT "svx/res/lightonfrombottomright_22.bmp"
-#define RID_SVXBMP_LIGHT_PREVIEW_FROM_TOP_LEFT "svx/res/lightfromtopleft_22.bmp"
-#define RID_SVXBMP_LIGHT_PREVIEW_FROM_TOP "svx/res/lightfromtop_22.bmp"
-#define RID_SVXBMP_LIGHT_PREVIEW_FROM_TOP_RIGHT "svx/res/lightfromtopright_22.bmp"
-#define RID_SVXBMP_LIGHT_PREVIEW_FROM_LEFT "svx/res/lightfromleft_22.bmp"
-#define RID_SVXBMP_LIGHT_PREVIEW_FROM_RIGHT "svx/res/lightfromright_22.bmp"
-#define RID_SVXBMP_LIGHT_PREVIEW_FROM_FRONT "svx/res/lightfromfront_22.bmp"
-#define RID_SVXBMP_LIGHT_PREVIEW_FROM_BOTTOM_LEFT "svx/res/lightfrombottomleft_22.bmp"
-#define RID_SVXBMP_LIGHT_PREVIEW_FROM_BOTTOM "svx/res/lightfrombottom_22.bmp"
-#define RID_SVXBMP_LIGHT_PREVIEW_FROM_BOTTOM_RIGHT "svx/res/lightfrombottomright_22.bmp"
+#define RID_SVXBMP_DIRECTION_DIRECTION_NW "svx/res/directionnorthwest_22.png"
+#define RID_SVXBMP_DIRECTION_DIRECTION_N "svx/res/directionnorth_22.png"
+#define RID_SVXBMP_DIRECTION_DIRECTION_NE "svx/res/directionnortheast_22.png"
+#define RID_SVXBMP_DIRECTION_DIRECTION_W "svx/res/directionwest_22.png"
+#define RID_SVXBMP_DIRECTION_DIRECTION_NONE "svx/res/directionstraight_22.png"
+#define RID_SVXBMP_DIRECTION_DIRECTION_E "svx/res/directioneast_22.png"
+#define RID_SVXBMP_DIRECTION_DIRECTION_SW "svx/res/directionsouthwest_22.png"
+#define RID_SVXBMP_DIRECTION_DIRECTION_S "svx/res/directionsouth_22.png"
+#define RID_SVXBMP_DIRECTION_DIRECTION_SE "svx/res/directionsoutheast_22.png"
+#define RID_SVXBMP_PERSPECTIVE "svx/res/perspective_16.png"
+#define RID_SVXBMP_PARALLEL "svx/res/parallel_16.png"
+#define RID_SVXBMP_LIGHT_OFF_FROM_TOP_LEFT "svx/res/lightofffromtopleft_22.png"
+#define RID_SVXBMP_LIGHT_OFF_FROM_TOP "svx/res/lightofffromtop_22.png"
+#define RID_SVXBMP_LIGHT_OFF_FROM_TOP_RIGHT "svx/res/lightofffromtopright_22.png"
+#define RID_SVXBMP_LIGHT_OFF_FROM_LEFT "svx/res/lightofffromleft_22.png"
+#define RID_SVXBMP_LIGHT_OFF_FROM_RIGHT "svx/res/lightofffromright_22.png"
+#define RID_SVXBMP_LIGHT_OFF_FROM_BOTTOM_LEFT "svx/res/lightofffrombottomleft_22.png"
+#define RID_SVXBMP_LIGHT_OFF_FROM_BOTTOM "svx/res/lightofffrombottom_22.png"
+#define RID_SVXBMP_LIGHT_OFF_FROM_BOTTOM_RIGHT "svx/res/lightofffrombottomright_22.png"
+#define RID_SVXBMP_LIGHT_ON_FROM_TOP_LEFT "svx/res/lightonfromtopleft_22.png"
+#define RID_SVXBMP_LIGHT_ON_FROM_TOP "svx/res/lightonfromtop_22.png"
+#define RID_SVXBMP_LIGHT_ON_FROM_TOP_RIGHT "svx/res/lightonfromtopright_22.png"
+#define RID_SVXBMP_LIGHT_ON_FROM_LEFT "svx/res/lightonfromleft_22.png"
+#define RID_SVXBMP_LIGHT_ON_FROM_RIGHT "svx/res/lightonfromright_22.png"
+#define RID_SVXBMP_LIGHT_ON_FROM_BOTTOM_LEFT "svx/res/lightonfrombottomleft_22.png"
+#define RID_SVXBMP_LIGHT_ON_FROM_BOTTOM "svx/res/lightonfrombottom_22.png"
+#define RID_SVXBMP_LIGHT_ON_FROM_BOTTOM_RIGHT "svx/res/lightonfrombottomright_22.png"
+#define RID_SVXBMP_LIGHT_PREVIEW_FROM_TOP_LEFT "svx/res/lightfromtopleft_22.png"
+#define RID_SVXBMP_LIGHT_PREVIEW_FROM_TOP "svx/res/lightfromtop_22.png"
+#define RID_SVXBMP_LIGHT_PREVIEW_FROM_TOP_RIGHT "svx/res/lightfromtopright_22.png"
+#define RID_SVXBMP_LIGHT_PREVIEW_FROM_LEFT "svx/res/lightfromleft_22.png"
+#define RID_SVXBMP_LIGHT_PREVIEW_FROM_RIGHT "svx/res/lightfromright_22.png"
+#define RID_SVXBMP_LIGHT_PREVIEW_FROM_FRONT "svx/res/lightfromfront_22.png"
+#define RID_SVXBMP_LIGHT_PREVIEW_FROM_BOTTOM_LEFT "svx/res/lightfrombottomleft_22.png"
+#define RID_SVXBMP_LIGHT_PREVIEW_FROM_BOTTOM "svx/res/lightfrombottom_22.png"
+#define RID_SVXBMP_LIGHT_PREVIEW_FROM_BOTTOM_RIGHT "svx/res/lightfrombottomright_22.png"
#define RID_SVXBMP_LIGHTING_BRIGHT "svx/res/brightlit_16.png"
#define RID_SVXBMP_LIGHTING_NORMAL "svx/res/normallit_16.png"
#define RID_SVXBMP_LIGHTING_DIM "svx/res/dimlit_16.png"
-#define RID_SVXBMP_WIRE_FRAME "svx/res/wireframe_16.bmp"
-#define RID_SVXBMP_MATTE "svx/res/matte_16.bmp"
-#define RID_SVXBMP_PLASTIC "svx/res/plastic_16.bmp"
-#define RID_SVXBMP_METAL "svx/res/metal_16.bmp"
-#define RID_SVXBMP_DEPTH_0 "svx/res/extrusion0inch_16.bmp"
-#define RID_SVXBMP_DEPTH_1 "svx/res/extrusion05inch_16.bmp"
-#define RID_SVXBMP_DEPTH_2 "svx/res/extrusion1inch_16.bmp"
-#define RID_SVXBMP_DEPTH_3 "svx/res/extrusion2inch_16.bmp"
-#define RID_SVXBMP_DEPTH_4 "svx/res/extrusion4inch_16.bmp"
-#define RID_SVXBMP_DEPTH_INFINITY "svx/res/extrusioninfinity_16.bmp"
+#define RID_SVXBMP_WIRE_FRAME "svx/res/wireframe_16.png"
+#define RID_SVXBMP_MATTE "svx/res/matte_16.png"
+#define RID_SVXBMP_PLASTIC "svx/res/plastic_16.png"
+#define RID_SVXBMP_METAL "svx/res/metal_16.png"
+#define RID_SVXBMP_DEPTH_0 "svx/res/extrusion0inch_16.png"
+#define RID_SVXBMP_DEPTH_1 "svx/res/extrusion05inch_16.png"
+#define RID_SVXBMP_DEPTH_2 "svx/res/extrusion1inch_16.png"
+#define RID_SVXBMP_DEPTH_3 "svx/res/extrusion2inch_16.png"
+#define RID_SVXBMP_DEPTH_4 "svx/res/extrusion4inch_16.png"
+#define RID_SVXBMP_DEPTH_INFINITY "svx/res/extrusioninfinity_16.png"
#define RID_SVXBMP_LAMP_ON "svx/res/lighton.png"
-#define RID_SVXBMP_LAMP_OFF "svx/res/light.bmp"
+#define RID_SVXBMP_LAMP_OFF "svx/res/light.png"
#define RID_SVXBMP_ADD "res/tb01.png"
#define RID_SVXBMP_ADD_ELEMENT "res/tb02.png"
More information about the Libreoffice-commits
mailing list