Cleaning up Document Converter wizard, moving graphics from bmp to png

(cherry picked from commit ab017c68)

Change-Id: I1904652b60d49d7c2c79e8fda5803a2f0932f61d
Reviewed-on: https://gerrit.libreoffice.org/64865
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

extras/Package_tplwizbitmap.mk

@@ -21,23 +21,23 @@ $(eval $(call gb_Package_add_files,extras_tplwizbitmap,$(LIBO_SHARE_FOLDER)/temp
 	ftpconnecting.gif \
 	ftperror.gif \
 	ftpunknown.gif \
-	Import_1.bmp \
-	Import_3.bmp \
-	Import_4.bmp \
+	Import_1.png \
+	Import_3.png \
+	Import_4.png \
 	maximize.bmp \
 	minimize.bmp \
-	MS-Import_2-1.bmp \
-	MS-Import_2-2.bmp \
-	MS-Import_2-3.bmp \
+	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.bmp \
-	XML-Import_2-2.bmp \
-	XML-Import_2-3.bmp \
-	XML-Import_2-4.bmp \
+	XML-Import_2-1.png \
+	XML-Import_2-2.png \
+	XML-Import_2-3.png \
+	XML-Import_2-4.png \
 ))
 
 # vim: set noet sw=4 ts=4:

wizards/source/importwizard/Main.xba

@@ -18,8 +18,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 -->
 <script:module xmlns:script="http://openoffice.org/2000/script" script:name="Main" script:language="StarBasic">Option Explicit
+REM ***** BASIC *****
 
-&apos;  *****  BASIC  *****
 Public HeaderPreviews(4) as Object
 Public ImportDialog as Object
 Public ImportDialogArea as Object
@@ -47,8 +47,8 @@ Sub Main()
 	If GetImportWizardPaths() = False Then
 		Exit Sub
 	End If
-  	bCancelTask = False
-  	bDoKeepApplValues = False
+	bCancelTask = False
+	bDoKeepApplValues = False
 	CurOffice = 0
 	ImportDialogArea = LoadDialog(&quot;ImportWizard&quot;,&quot;ImportDialog&quot;)
 	ImportDialog = ImportDialogArea.Model
@@ -57,13 +57,13 @@ Sub Main()
 	MaxApplCount = 3
 	FillStep_Welcome()
 	RepaintHeaderPreview()
-	ImportDialog.ImportPreview.BackGroundColor = RGB(0,60,126)	
+	ImportDialog.ImportPreview.BackGroundColor = RGB(0,60,126)
 	ImportDialog.cmdGoOn.DefaultButton = True
 	ImportDialogArea.GetControl(&quot;optMSDocuments&quot;).SetFocus()
 	ToggleCheckboxesWithBoolean(True)
 
 	RetValue = ImportDialogArea.Execute()
-	If bShowLogFile=TRUE Then 
+	If bShowLogFile=TRUE Then
 		OpenDocument(sLogUrl, NoArgs())
 	End if
 	If RetValue = 0 Then
@@ -77,7 +77,6 @@ RTError:
 End Sub
 
 
-
 Sub NextStep()
 Dim iCurStep as Integer
 	If Not bDebugWizard Then
@@ -112,15 +111,14 @@ Dim iCurStep as Integer
 	If ((ImportDialog.chkLogfile.State &lt;&gt; 1) OR (iCurStep &lt;&gt; 3)) Then
 		ImportDialog.cmdGoOn.DefaultButton = True
 	End If
-	
-	RepaintHeaderPreview()	
+
+	RepaintHeaderPreview()
 	Exit Sub
 RTError:
 	Msgbox sRTErrorDesc, 16, sRTErrorHeader
 End Sub
 
 
-
 Sub PrevStep()
 Dim iCurStep as Integer
 	If Not bDebugWizard Then
@@ -146,14 +144,13 @@ Dim iCurStep as Integer
 			End If
 	End Select
 	ImportDialog.cmdGoOn.DefaultButton = True
-	RepaintHeaderPreview()	
+	RepaintHeaderPreview()
 	Exit Sub
 RTError:
 	Msgbox sRTErrorDesc, 16, sRTErrorHeader
 End Sub
 
 
-
 Sub CancelTask()
 	If bConversionIsRunning Then
 		If Msgbox(sConvertError1, 36, sConvertError2) = 6 Then
@@ -183,9 +180,9 @@ Dim LocPrefix as String
 	LocPrefix = WizardMode
 	LocPrefix = ReplaceString(LocPrefix,&quot;XML&quot;, &quot;SO&quot;)
 	If CurStep = 2 Then
-		sBitmapPath = SOBitmapPath &amp; LocPrefix &amp; &quot;-Import_&quot; &amp; CurStep &amp; &quot;-&quot; &amp; Applications(CurOffice,SBAPPLKEY) + 1 &amp; &quot;.bmp&quot;
+		sBitmapPath = SOBitmapPath &amp; LocPrefix &amp; &quot;-Import_&quot; &amp; CurStep &amp; &quot;-&quot; &amp; Applications(CurOffice,SBAPPLKEY) + 1 &amp; &quot;.png&quot;
 	Else
-		sBitmapPath = SOBitmapPath &amp; &quot;Import_&quot; &amp; CurStep &amp; &quot;.bmp&quot;
+		sBitmapPath = SOBitmapPath &amp; &quot;Import_&quot; &amp; CurStep &amp; &quot;.png&quot;
 	End If
 	ImportDialog.ImportPreview.ImageURL = sBitmapPath
 End Sub
@@ -203,7 +200,7 @@ Function CheckInstalledModule(Index as Integer) as Boolean
 Dim ModuleName as String
 Dim NameList() as String
 Dim MaxIndex as Integer
-Dim i as Integer		
+Dim i as Integer
 	ModuleName = ModuleList(Index)
 	If Instr(1,ModuleName,&quot;/&quot;) &lt;&gt; 0 Then
 		CheckInstalledModule() = False
@@ -266,7 +263,7 @@ Dim i as Integer
 End Sub
 
 
-Sub TakeOverPathSettings()					
+Sub TakeOverPathSettings()
 &apos;Takes over the Pathsettings from the first selected application to the next applications
 	If Applications(CurOffice,SBDOCSOURCE) = &quot;&quot; Then
 		Applications(CurOffice,SBDOCSOURCE) = Applications(0,SBDOCSOURCE)
@@ -288,7 +285,7 @@ Function GetImportWizardPaths() as Boolean
 				Exit Function
 			End If
 		End If
-	End  If
+	End If
 	GetImportWizardPaths() = False
 End Function
 </script:module>