summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Kaganski <mike.kaganski@collabora.com>2019-03-13 13:21:26 +0300
committerMike Kaganski <mike.kaganski@collabora.com>2019-03-13 12:31:35 +0100
commitc61cda4472f14f27e6c50b3e9b791c50d95d0ca1 (patch)
tree7af41135568aa0fc8e0118e116eeb454317bbafd
parente89eba0e1fa56c64e0d572b4f32ce5951378c1d7 (diff)
tdf#40966: convert last used BMPs to PNG; cleanup unused
Change-Id: Id92fcd2fd33500cc9c60645c627c2fedf2378fb9 Reviewed-on: https://gerrit.libreoffice.org/69158 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
-rw-r--r--extras/Package_tplwizbitmap.mk12
-rw-r--r--extras/source/templates/wizard/bitmap/cancel_down.bmpbin416 -> 0 bytes
-rw-r--r--extras/source/templates/wizard/bitmap/cancel_up.bmpbin416 -> 0 bytes
-rw-r--r--extras/source/templates/wizard/bitmap/down.bmpbin644 -> 0 bytes
-rw-r--r--extras/source/templates/wizard/bitmap/end.bmpbin13190 -> 0 bytes
-rw-r--r--extras/source/templates/wizard/bitmap/maximize.bmpbin822 -> 0 bytes
-rw-r--r--extras/source/templates/wizard/bitmap/maximize.pngbin0 -> 252 bytes
-rw-r--r--extras/source/templates/wizard/bitmap/minimize.bmpbin726 -> 0 bytes
-rw-r--r--extras/source/templates/wizard/bitmap/minimize.pngbin0 -> 247 bytes
-rw-r--r--extras/source/templates/wizard/bitmap/okay_down.bmpbin416 -> 0 bytes
-rw-r--r--extras/source/templates/wizard/bitmap/okay_up.bmpbin416 -> 0 bytes
-rw-r--r--extras/source/templates/wizard/bitmap/report.bmpbin15744 -> 0 bytes
-rw-r--r--extras/source/templates/wizard/bitmap/up.bmpbin644 -> 0 bytes
-rw-r--r--wizards/source/tutorials/Functions.xba8
14 files changed, 6 insertions, 14 deletions
diff --git a/extras/Package_tplwizbitmap.mk b/extras/Package_tplwizbitmap.mk
index 4ebdf03b2b5f..ed7980ca670e 100644
--- a/extras/Package_tplwizbitmap.mk
+++ b/extras/Package_tplwizbitmap.mk
@@ -10,10 +10,6 @@
$(eval $(call gb_Package_Package,extras_tplwizbitmap,$(SRCDIR)/extras/source/templates/wizard/bitmap))
$(eval $(call gb_Package_add_files,extras_tplwizbitmap,$(LIBO_SHARE_FOLDER)/template/wizard/bitmap,\
- cancel_down.bmp \
- cancel_up.bmp \
- down.bmp \
- end.bmp \
euro_1.png \
euro_2.png \
euro_3.png \
@@ -24,16 +20,12 @@ $(eval $(call gb_Package_add_files,extras_tplwizbitmap,$(LIBO_SHARE_FOLDER)/temp
Import_1.png \
Import_3.png \
Import_4.png \
- maximize.bmp \
- minimize.bmp \
+ maximize.png \
+ minimize.png \
MS-Import_2-1.png \
MS-Import_2-2.png \
MS-Import_2-3.png \
- okay_down.bmp \
- okay_up.bmp \
- report.bmp \
tutorial_background.gif \
- up.bmp \
XML-Import_2-1.png \
XML-Import_2-2.png \
XML-Import_2-3.png \
diff --git a/extras/source/templates/wizard/bitmap/cancel_down.bmp b/extras/source/templates/wizard/bitmap/cancel_down.bmp
deleted file mode 100644
index 6356e823a6e4..000000000000
--- a/extras/source/templates/wizard/bitmap/cancel_down.bmp
+++ /dev/null
Binary files differ
diff --git a/extras/source/templates/wizard/bitmap/cancel_up.bmp b/extras/source/templates/wizard/bitmap/cancel_up.bmp
deleted file mode 100644
index ca3d08bd918b..000000000000
--- a/extras/source/templates/wizard/bitmap/cancel_up.bmp
+++ /dev/null
Binary files differ
diff --git a/extras/source/templates/wizard/bitmap/down.bmp b/extras/source/templates/wizard/bitmap/down.bmp
deleted file mode 100644
index 281acfaec6fe..000000000000
--- a/extras/source/templates/wizard/bitmap/down.bmp
+++ /dev/null
Binary files differ
diff --git a/extras/source/templates/wizard/bitmap/end.bmp b/extras/source/templates/wizard/bitmap/end.bmp
deleted file mode 100644
index 876992aaf0da..000000000000
--- a/extras/source/templates/wizard/bitmap/end.bmp
+++ /dev/null
Binary files differ
diff --git a/extras/source/templates/wizard/bitmap/maximize.bmp b/extras/source/templates/wizard/bitmap/maximize.bmp
deleted file mode 100644
index be5fcf772f81..000000000000
--- a/extras/source/templates/wizard/bitmap/maximize.bmp
+++ /dev/null
Binary files differ
diff --git a/extras/source/templates/wizard/bitmap/maximize.png b/extras/source/templates/wizard/bitmap/maximize.png
new file mode 100644
index 000000000000..ed7dba4b0684
--- /dev/null
+++ b/extras/source/templates/wizard/bitmap/maximize.png
Binary files differ
diff --git a/extras/source/templates/wizard/bitmap/minimize.bmp b/extras/source/templates/wizard/bitmap/minimize.bmp
deleted file mode 100644
index f892786a6811..000000000000
--- a/extras/source/templates/wizard/bitmap/minimize.bmp
+++ /dev/null
Binary files differ
diff --git a/extras/source/templates/wizard/bitmap/minimize.png b/extras/source/templates/wizard/bitmap/minimize.png
new file mode 100644
index 000000000000..0e1d401372a0
--- /dev/null
+++ b/extras/source/templates/wizard/bitmap/minimize.png
Binary files differ
diff --git a/extras/source/templates/wizard/bitmap/okay_down.bmp b/extras/source/templates/wizard/bitmap/okay_down.bmp
deleted file mode 100644
index bbff5f5f2c4c..000000000000
--- a/extras/source/templates/wizard/bitmap/okay_down.bmp
+++ /dev/null
Binary files differ
diff --git a/extras/source/templates/wizard/bitmap/okay_up.bmp b/extras/source/templates/wizard/bitmap/okay_up.bmp
deleted file mode 100644
index 76baac6aea92..000000000000
--- a/extras/source/templates/wizard/bitmap/okay_up.bmp
+++ /dev/null
Binary files differ
diff --git a/extras/source/templates/wizard/bitmap/report.bmp b/extras/source/templates/wizard/bitmap/report.bmp
deleted file mode 100644
index 488347335ae1..000000000000
--- a/extras/source/templates/wizard/bitmap/report.bmp
+++ /dev/null
Binary files differ
diff --git a/extras/source/templates/wizard/bitmap/up.bmp b/extras/source/templates/wizard/bitmap/up.bmp
deleted file mode 100644
index 1d4d132b6629..000000000000
--- a/extras/source/templates/wizard/bitmap/up.bmp
+++ /dev/null
Binary files differ
diff --git a/wizards/source/tutorials/Functions.xba b/wizards/source/tutorials/Functions.xba
index cded8504ea30..4b422c80b177 100644
--- a/wizards/source/tutorials/Functions.xba
+++ b/wizards/source/tutorials/Functions.xba
@@ -95,15 +95,15 @@ Sub setMaxMinImage(param As String)
iPos = InStr(templatePath,&quot;/&quot;)
If(iPos &gt; 0) Then
If(param = &quot;MAX&quot;) Then
- bitmapPath = templatePath &amp; &quot;../wizard/bitmap/maximize.bmp&quot;
+ bitmapPath = templatePath &amp; &quot;../wizard/bitmap/maximize.png&quot;
ElseIf(param = &quot;MIN&quot;) Then
- bitmapPath = templatePath &amp; &quot;../wizard/bitmap/minimize.bmp&quot;
+ bitmapPath = templatePath &amp; &quot;../wizard/bitmap/minimize.png&quot;
End If
Else
If(param = &quot;MAX&quot;) Then
- bitmapPath = templatePath &amp; &quot;..\wizard\bitmap\maximize.bmp&quot;
+ bitmapPath = templatePath &amp; &quot;..\wizard\bitmap\maximize.png&quot;
ElseIf(param = &quot;MIN&quot;) Then
- bitmapPath = templatePath &amp; &quot;..\wizard\bitmap\minimize.bmp&quot;
+ bitmapPath = templatePath &amp; &quot;..\wizard\bitmap\minimize.png&quot;
End If
End If
&apos;printdbgInfo oCommandButton.Model