Cleaning up FormWizard, moving graphics from bmp to png

5 files changed, 15 insertions, 17 deletions

diff --git a/extras/source/templates/wizard/bitmap/FormWizard_1.bmp b/extras/source/templates/wizard/bitmap/FormWizard_1.bmp
deleted file mode 100644
index aa7cb4940d1d..000000000000
--- a/extras/source/templates/wizard/bitmap/FormWizard_1.bmp
+++ /dev/null
diff --git a/extras/source/templates/wizard/bitmap/FormWizard_1.png b/extras/source/templates/wizard/bitmap/FormWizard_1.png
new file mode 100644
index 000000000000..75e25dc6f20f
--- /dev/null
+++ b/extras/source/templates/wizard/bitmap/FormWizard_1.png
diff --git a/extras/source/templates/wizard/bitmap/FormWizard_2.bmp b/extras/source/templates/wizard/bitmap/FormWizard_2.bmp
deleted file mode 100644
index 347c8c36e52b..000000000000
--- a/extras/source/templates/wizard/bitmap/FormWizard_2.bmp
+++ /dev/null
diff --git a/extras/source/templates/wizard/bitmap/FormWizard_2.png b/extras/source/templates/wizard/bitmap/FormWizard_2.png
new file mode 100644
index 000000000000..b56bdaf84f7f
--- /dev/null
+++ b/extras/source/templates/wizard/bitmap/FormWizard_2.png
diff --git a/wizards/source/formwizard/FormWizard.xba b/wizards/source/formwizard/FormWizard.xba
index d61a3f73e4e1..df36a6e1fad6 100644
--- a/wizards/source/formwizard/FormWizard.xba
+++ b/wizards/source/formwizard/FormWizard.xba
@@ -1,7 +1,7 @@
 <?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,16 +9,16 @@
  * 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="FormWizard" script:language="StarBasic">Option Explicit
 
@@ -189,7 +189,7 @@ Dim LocList() as String
 	ControlCaptionsToStandardLayout()
 	oDocument.GetCurrentController().Frame.ComponentWindow.Enable = True
 	oProgressBar.Value = 90
-	DialogModel.imgTheme.ImageURL = FormPath &amp; &quot;FormWizard_1.bmp&quot;
+	DialogModel.imgTheme.ImageURL = FormPath &amp; &quot;FormWizard_1.png&quot;
 	DialogModel.imgTheme.BackGroundColor = RGB(0,60,126)
 	ToggleDatabasePage(True)
 	oProgressBar.Value = 100
@@ -202,11 +202,11 @@ Dim LocList() as String
 		oFormDocuments = oDataSource.getFormDocuments()
 		DlgFormDB.Dispose()
 		oDocument.dispose()
-		Dim	bLinkExists as Boolean
+		Dim bLinkExists as Boolean
 		i = 1
-		Dim FormBaseName  as String
+		Dim FormBaseName as String
 		FormBaseName = FormName
-		Do								 
+		Do
 			bLinkExists = oFormDocuments.HasbyHierarchicalName(FormName)
 			If bLinkExists Then
 				i = i + 1
@@ -227,7 +227,7 @@ Dim LocList() as String
 	End If
 	If ((Not IsNull(oDBConnection)) And (Not bConnectionIsovergiven)) Then
 		oDBConnection.Dispose()
-	End If	
+	End If
 WIZARDERROR:
 	If Err &lt;&gt; 0 Then
 		Msgbox(sMsgErrMsg, 16, GetProductName())
@@ -262,7 +262,7 @@ Dim QueryIndex as Integer
 			CurCommandType = iCommandTypes(SelIndex)
 		End If
 		If CurCommandType = com.sun.star.sdb.CommandType.QUERY Then
-			QueryIndex = SelIndex  - Ubound(Tablenames()) - 1
+			QueryIndex = SelIndex - Ubound(Tablenames()) - 1
 			Tablename = QueryNames(QueryIndex)
 			oColumns = oDBConnection.Queries.GetByName(TableName).Columns
 		Else
@@ -292,7 +292,7 @@ Sub PreviousStep()
 		.cmdGoOn.Enabled = True
 		.lstSelFields.Tag = Not bControlsareCreated
 		.cmdGoOn.Label = sGoOn
-		.imgTheme.ImageUrl = FormPath &amp; &quot;FormWizard_1.bmp&quot;
+		.imgTheme.ImageUrl = FormPath &amp; &quot;FormWizard_1.png&quot;
 	End With
 	FormSetMoveRights()
 WIZARDERROR:
@@ -327,7 +327,7 @@ Sub NextStep()
 			DlgFormDB.EndExecute()
 			exit Sub
 	End Select
-	DialogModel.imgTheme.ImageUrl = FormPath &amp; &quot;FormWizard_&quot; &amp; DialogModel.Step &amp; &quot;.bmp&quot;
+	DialogModel.imgTheme.ImageUrl = FormPath &amp; &quot;FormWizard_&quot; &amp; DialogModel.Step &amp; &quot;.png&quot;
 	DlgFormDB.Title = WizardTitle(DialogModel.Step)
 WIZARDERROR:
 	If Err &lt;&gt; 0 Then
@@ -391,7 +391,7 @@ End Sub
 
 
 Sub StoreFormInDatabase()
-	Dim NoArgs() as new com.sun.star.beans.PropertyValue	
+	Dim NoArgs() as new com.sun.star.beans.PropertyValue
 	FormName = &quot;Form_&quot; &amp; sDBName &amp; &quot;_&quot; &amp; TableName &amp; &quot;.sxw&quot;
 	sFormUrl = TempPath &amp; &quot;/&quot; &amp; FormName
 	oDocument.StoreAsUrl(sFormUrl, NoArgs())
@@ -400,7 +400,6 @@ Sub StoreFormInDatabase()
 End Sub
 
 
-
 Sub StoreForm()
 Dim sTargetPath as String
 Dim TypeNames(0,2) as String
@@ -416,7 +415,6 @@ Dim oTypes() as Object
 End Sub
 
 
-
 Sub EmptyFieldsListboxes()
 Dim NullList() as String
 	ToggleListboxControls(DialogModel, False)
@@ -438,9 +436,9 @@ dim iSelPos as Integer
 	sFirstItem = oListBox.getItem(0)
 	If sFirstItem = DelEntryName Then
 		iSelPos = oListBox.getSelectedItemPos()
-	    oListBox.removeItems(0, 1)
+		oListBox.removeItems(0, 1)
 		If iSelPos &gt; 0 Then
-		    oListBox.selectItemPos(iSelPos-1, True)
+			oListBox.selectItemPos(iSelPos-1, True)
 		End If
 	End If
 End Sub