dev/null |binary extras/Package_tplwizbitmap.mk | 12 ++---------- extras/source/templates/wizard/bitmap/maximize.png |binary extras/source/templates/wizard/bitmap/minimize.png |binary wizards/source/tutorials/Functions.xba | 8 ++++---- 5 files changed, 6 insertions(+), 14 deletions(-)
New commits: commit c61cda4472f14f27e6c50b3e9b791c50d95d0ca1 Author: Mike Kaganski <[email protected]> AuthorDate: Wed Mar 13 13:21:26 2019 +0300 Commit: Mike Kaganski <[email protected]> CommitDate: Wed Mar 13 12:31:35 2019 +0100 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 <[email protected]> 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 Binary files a/extras/source/templates/wizard/bitmap/cancel_down.bmp and /dev/null 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 Binary files a/extras/source/templates/wizard/bitmap/cancel_up.bmp and /dev/null 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 Binary files a/extras/source/templates/wizard/bitmap/down.bmp and /dev/null 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 Binary files a/extras/source/templates/wizard/bitmap/end.bmp and /dev/null 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 Binary files a/extras/source/templates/wizard/bitmap/maximize.bmp and /dev/null 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 Binary files /dev/null and b/extras/source/templates/wizard/bitmap/maximize.png 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 Binary files a/extras/source/templates/wizard/bitmap/minimize.bmp and /dev/null 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 Binary files /dev/null and b/extras/source/templates/wizard/bitmap/minimize.png 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 Binary files a/extras/source/templates/wizard/bitmap/okay_down.bmp and /dev/null 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 Binary files a/extras/source/templates/wizard/bitmap/okay_up.bmp and /dev/null 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 Binary files a/extras/source/templates/wizard/bitmap/report.bmp and /dev/null 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 Binary files a/extras/source/templates/wizard/bitmap/up.bmp and /dev/null 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,"/") If(iPos > 0) Then If(param = "MAX") Then - bitmapPath = templatePath & "../wizard/bitmap/maximize.bmp" + bitmapPath = templatePath & "../wizard/bitmap/maximize.png" ElseIf(param = "MIN") Then - bitmapPath = templatePath & "../wizard/bitmap/minimize.bmp" + bitmapPath = templatePath & "../wizard/bitmap/minimize.png" End If Else If(param = "MAX") Then - bitmapPath = templatePath & "..\wizard\bitmap\maximize.bmp" + bitmapPath = templatePath & "..\wizard\bitmap\maximize.png" ElseIf(param = "MIN") Then - bitmapPath = templatePath & "..\wizard\bitmap\minimize.bmp" + bitmapPath = templatePath & "..\wizard\bitmap\minimize.png" End If End If 'printdbgInfo oCommandButton.Model _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
