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

wizards/source/importwizard/Main.xba

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
 <!--***********************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -9,20 +9,20 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  ***********************************************************-->
 <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
@@ -50,8 +50,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
@@ -60,12 +60,12 @@ Sub Main()
 	MaxApplCount = 4
 	FillStep_Welcome()
 	RepaintHeaderPreview()
-	ImportDialog.ImportPreview.BackGroundColor = RGB(0,60,126)	
+	ImportDialog.ImportPreview.BackGroundColor = RGB(0,60,126)
 	ImportDialog.cmdGoOn.DefaultButton = True
 	ImportDialogArea.GetControl(&quot;optSODocuments&quot;).SetFocus()
 	ToggleCheckboxesWithBoolean(False)
 	RetValue = ImportDialogArea.Execute()
-	If bShowLogFile=TRUE Then 
+	If bShowLogFile=TRUE Then
 		OpenDocument(sLogUrl, NoArgs())
 	End if
 	If RetValue = 0 Then
@@ -79,7 +79,6 @@ RTError:
 End Sub
 
 
-
 Sub NextStep()
 Dim iCurStep as Integer
 	If Not bDebugWizard Then
@@ -116,15 +115,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
@@ -149,14 +147,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
@@ -186,9 +183,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
@@ -206,7 +203,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
@@ -263,9 +260,9 @@ Dim i as Integer
 		Case 1
 			With ImportDialog
 				If .optMSDocuments.State = 1 Then
-          			bDoEnable = .chkMSApplication1.State = 1 Or .chkMSApplication2.State = 1 Or .chkMSApplication3.State = 1
+					bDoEnable = .chkMSApplication1.State = 1 Or .chkMSApplication2.State = 1 Or .chkMSApplication3.State = 1
 				Else
-          			bDoEnable = .chkSOApplication1.State = 1 Or .chkSOApplication2.State = 1 Or .chkSOApplication3.State = 1 Or .chkSOApplication4.State = 1
+	 				bDoEnable = .chkSOApplication1.State = 1 Or .chkSOApplication2.State = 1 Or .chkSOApplication3.State = 1 Or .chkSOApplication4.State = 1
 				End If
 			End With
 			bDoKeepApplValues = False
@@ -277,14 +274,14 @@ 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)
 		Applications(CurOffice,SBDOCTARGET) = Applications(0,SBDOCTARGET)
 		If WizardMode = SBXMLMODE AND Applications(CurOffice,SBAPPLKEY) = 3 Then
 			Applications(CurOffice,SBTEMPLSOURCE) = Applications(CurOffice,SBDOCSOURCE)
-			Applications(CurOffice,SBTEMPLTARGET) = Applications(CurOffice,SBDOCTARGET)											
+			Applications(CurOffice,SBTEMPLTARGET) = Applications(CurOffice,SBDOCTARGET)
 		Else
 			Applications(CurOffice,SBTEMPLSOURCE) = Applications(0,SBTEMPLSOURCE)
 			Applications(CurOffice,SBTEMPLTARGET) = Applications(0,SBTEMPLTARGET)
@@ -304,7 +301,7 @@ Function GetImportWizardPaths() as Boolean
 				Exit Function
 			End If
 		End If
-	End  If
+	End If
 	GetImportWizardPaths() = False
 End Function
 </script:module>