From c61cda4472f14f27e6c50b3e9b791c50d95d0ca1 Mon Sep 17 00:00:00 2001 From: Mike Kaganski Date: Wed, 13 Mar 2019 13:21:26 +0300 Subject: [PATCH] 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 --- extras/Package_tplwizbitmap.mk | 12 ++---------- .../templates/wizard/bitmap/cancel_down.bmp | Bin 416 -> 0 bytes .../templates/wizard/bitmap/cancel_up.bmp | Bin 416 -> 0 bytes extras/source/templates/wizard/bitmap/down.bmp | Bin 644 -> 0 bytes extras/source/templates/wizard/bitmap/end.bmp | Bin 13190 -> 0 bytes .../source/templates/wizard/bitmap/maximize.bmp | Bin 822 -> 0 bytes .../source/templates/wizard/bitmap/maximize.png | Bin 0 -> 252 bytes .../source/templates/wizard/bitmap/minimize.bmp | Bin 726 -> 0 bytes .../source/templates/wizard/bitmap/minimize.png | Bin 0 -> 247 bytes .../templates/wizard/bitmap/okay_down.bmp | Bin 416 -> 0 bytes .../source/templates/wizard/bitmap/okay_up.bmp | Bin 416 -> 0 bytes .../source/templates/wizard/bitmap/report.bmp | Bin 15744 -> 0 bytes extras/source/templates/wizard/bitmap/up.bmp | Bin 644 -> 0 bytes wizards/source/tutorials/Functions.xba | 8 ++++---- 14 files changed, 6 insertions(+), 14 deletions(-) delete mode 100644 extras/source/templates/wizard/bitmap/cancel_down.bmp delete mode 100644 extras/source/templates/wizard/bitmap/cancel_up.bmp delete mode 100644 extras/source/templates/wizard/bitmap/down.bmp delete mode 100644 extras/source/templates/wizard/bitmap/end.bmp delete mode 100644 extras/source/templates/wizard/bitmap/maximize.bmp create mode 100644 extras/source/templates/wizard/bitmap/maximize.png delete mode 100644 extras/source/templates/wizard/bitmap/minimize.bmp create mode 100644 extras/source/templates/wizard/bitmap/minimize.png delete mode 100644 extras/source/templates/wizard/bitmap/okay_down.bmp delete mode 100644 extras/source/templates/wizard/bitmap/okay_up.bmp delete mode 100644 extras/source/templates/wizard/bitmap/report.bmp delete mode 100644 extras/source/templates/wizard/bitmap/up.bmp 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 6356e823a6e4f676ec34c329b547a9159c7b6d2c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 416 zcmZ{gF%E+;5Cj(yr%8h%rASMa(#m}x0@_3om>=orHzf9OFE~joz!!sI58clDEYPt>KM{7|NXuG~84hMX%Y&WI%d{S4uJ@&g VWqqEv{WSQ;T~ed}F&dFOU|$R5iv&0^NeYlFpguc1|^T`+qg|0A=I*}^JpBo>r07T z3)u{%_G1gvi*c-#z6IVEVPydZmNw=C7)Ji{IFQ;K=S0ORLHEgAspq}gF9LJd`z>Ds aYMytinc1>a{lrxHzIN3${ohH6+yV=Z1w>N- diff --git a/extras/source/templates/wizard/bitmap/down.bmp b/extras/source/templates/wizard/bitmap/down.bmp deleted file mode 100644 index 281acfaec6fe14932571879c99d842dc16d1e595..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 644 zcmc(dF%H8Z3`HH%EemGqm}JV*OR(owIT$x1-=x)dCB{^>^bLMs{0H)W1Zk0xH|PaD zp+O$VSENbAG@>-sTBVfI4z(L;?P87c1HSN0|9%R6K1Vh@rO>+qAoiC diff --git a/extras/source/templates/wizard/bitmap/end.bmp b/extras/source/templates/wizard/bitmap/end.bmp deleted file mode 100644 index 876992aaf0da0df537f5249bbf417fad9852b435..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 13190 zcmeI2F|Ok_5QY^XfCae8G1BJ->2nuXkpMQTVgfGG<`5}f6&X;ox7u>^|3l7jBvP{d zc1tsBnG(g1Gye=F(s{rC@z-yils|F&6`z0b`4^v`x}S0Ex?gg;)OpT|l&S0RubZay zg(IrnmoH!N&4zFCulx3mHGJ?NFX1p8mKgs&Y=5P(kMZj(_aEIm{y^5{M>_c`0wP+gq@PC`Xsxf*q;TXnPCR5asC7X9c@9 zpr2c~hWprHeQM#lgm7;e_WHs#EGW0wFzjW)NSf#Sy}^1$u-Nxq_9+m>(sJ?{!TLD$ z*dno<6KM&zPYTxelYks+UOp)pP_mOFFx$243)V8Yh#QNK#tJRFAXpq)N;+2BV2Ynv zFhsI7K3LbK)nKrxM<8=i@s}O(ZwRqrJ1dl`;4a6C_3IWIUkE)Emv;P{*V}iPhuU4fFa0CI@SG?!QUf`E)W3mTy8e-1$gL7bWi4HIDh5gIf?z)q ztb>mQmIXt<4U4EQJ`iknVa$&(cI(zo3aWb~*gOx*l5Pb6b_r<1%I%K?!vmg?UX~Aq zgogQ{}}{dqx33CW>gbZ{`{1+rk7b%EFogmvVoKuho6Q zu=Yh4u`ScIj~5J9*%6m6=ek`m@9gHKf^|X9LWoFKl|xvtX;vdmxEEzt5~4U1UOTsREg$unX;dM{NMJi;0*vUdc-dUc-N*r+Nih;*)v4RYERY#!j`Fb}=6 zEVHN-s%ya#x&4+5DD#X}fa{WUkzQ+7r{c8*o1vGu30@i#M|CB+YnNT6Ef`iNgRUsB zLh6wd=IpPKLlwgn>u`-Ol`S{f`D4zaDh4g+SG zv0-3=b^P)y_ROGFOLJMlWCex0A_49;Na1QP*j3kKJKvQ9K9$ng8DVsb+; z=q1?-Ka+oiZCUwY!zOdTm0^q{Vh9(-sK5@T$4i1;nW$7OL41*asa z8C5z|;+Ljcu1m=f|Wp)rdEcH(2Hs@xAv04iEqQy%L%ysia9N?eB+NTH+rM%l8QVd5kOtd+X| z8+%FWg|#8v>|~d9K@asKZDnu)XaV`QO0bcFah-{!A^zn(o3WNGn1VcOD;O+7;jse_ ztNql;So1PDOseh*cEy@WO3&X~v94R+4^@QgGtO9B!7w8Q#b2hm&)Txmyjx|j8C?km zQnIYa>ag$P#;(9E14Movf+5o^k(87oM%o)c_La*2=Jfy9&0jFkiF z#W$m?hd#s-y=0MZnwcN6WdPYbnFqp3pEbV}7{`_JVl1`Gvr;2&tOXk~45@0# zYAg+;cTyTTX8ezam9-On6zRz+3w_=sMYb}iv9A_Atp!6Q8Au3kX8EMZfm}P8sI_2u zO3H&;N48kue?8sAz7VCMW1Otnv!7hlVCD}FdG|eK-Ffmf^Y6+HT^7D?~hCcH!$XW7{f~A@ZYAqNogQF14 zk`>)}Ny+?H5WX!CNigZYJzS>glDiX??aEh5I0~z^a4pc>v732mWtU@FP}_USLi05x z%eQmVuI~xvA*oKg&eqSdiePfFOv##ISHLlUH0RjcSj`Nx?!E%MTxNc!V9W%w!Dodz zexsSs_&ADR){otCu>qK2{?Y2)TGz!CV>u^{#SB~b**lZo*3YplBAAj-{@Hn;OU7yn zhTry{`+Im{nGK$01DwVuSp)4VEa#-MP6Pf>ZH=o)-+`I>Su-nFeWj>2Ie>iiwlT(C_C3lO8&c hz?v0d-&jO^wUh6xJe^_BjPsIU4}dQUc1VL@{{x&T2o3-M diff --git a/extras/source/templates/wizard/bitmap/maximize.bmp b/extras/source/templates/wizard/bitmap/maximize.bmp deleted file mode 100644 index be5fcf772f81b817cd3a6ea806d8c70bb09dd844..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 822 zcmZ?rHDhJ~12Z700mK4O%*Y@C7H5FULpTuf#>+Q!Mls%Q#s70#LT=By}Z;C1rt3( zJ<}BT2#__oo-U3d7XHZmdKI;Vst02lvEcK`qY literal 0 HcmV?d00001 diff --git a/extras/source/templates/wizard/bitmap/minimize.bmp b/extras/source/templates/wizard/bitmap/minimize.bmp deleted file mode 100644 index f892786a6811677c78f905c5ccd1d016c30a458e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 726 zcmZ?ry~e}<24+A~1BeBHm=A~<86Nn{1`ISV`@i-8&rgD~Uq{1qucL5ULAh?3y^w370~qEv>0#LT=By}Z;C1rt3( zJ<}BT2#_@yo-U3d8o|jGpFg=}eW_Lw3^0t8swqhq?pz@CPnef2z&R*t=j?KxDa|Y! zvKdzC{fp;unNhVNqha;2RqV0Mv$8mxt~I+dvmBi2BoH#I#{PgWlM)*nTMDm(-X@(8 kW+|s@4QgMXJ>_NKbNK%xW#*<=Ksy;cUHx3vIVCg!0Pwg=#sB~S literal 0 HcmV?d00001 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 bbff5f5f2c4cff7f13277aa813d969e22e57cbfe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 416 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 aviYd)M7U?Lxf2#L5E|i5%ESeLX$Sz*qAoiC 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