Author: mseidel
Date: Sat Dec 8 00:00:11 2018
New Revision: 1848427
URL: http://svn.apache.org/viewvc?rev=1848427&view=rev
Log:
Cleaning up FormWizard, moving graphics from bmp to png
Added:
openoffice/trunk/main/extras/source/templates/wizard/bitmap/FormWizard_1.png
(with props)
openoffice/trunk/main/extras/source/templates/wizard/bitmap/FormWizard_2.png
(with props)
Removed:
openoffice/trunk/main/extras/source/templates/wizard/bitmap/FormWizard_1.bmp
openoffice/trunk/main/extras/source/templates/wizard/bitmap/FormWizard_2.bmp
Modified:
openoffice/trunk/main/wizards/source/formwizard/FormWizard.xba
Added:
openoffice/trunk/main/extras/source/templates/wizard/bitmap/FormWizard_1.png
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/extras/source/templates/wizard/bitmap/FormWizard_1.png?rev=1848427&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
openoffice/trunk/main/extras/source/templates/wizard/bitmap/FormWizard_1.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added:
openoffice/trunk/main/extras/source/templates/wizard/bitmap/FormWizard_2.png
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/extras/source/templates/wizard/bitmap/FormWizard_2.png?rev=1848427&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
openoffice/trunk/main/extras/source/templates/wizard/bitmap/FormWizard_2.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Modified: openoffice/trunk/main/wizards/source/formwizard/FormWizard.xba
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/wizards/source/formwizard/FormWizard.xba?rev=1848427&r1=1848426&r2=1848427&view=diff
==============================================================================
--- openoffice/trunk/main/wizards/source/formwizard/FormWizard.xba (original)
+++ openoffice/trunk/main/wizards/source/formwizard/FormWizard.xba Sat Dec 8
00:00:11 2018
@@ -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 &
"FormWizard_1.bmp"
+ DialogModel.imgTheme.ImageURL = FormPath &
"FormWizard_1.png"
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 <> 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 & "FormWizard_1.bmp"
+ .imgTheme.ImageUrl = FormPath & "FormWizard_1.png"
End With
FormSetMoveRights()
WIZARDERROR:
@@ -327,7 +327,7 @@ Sub NextStep()
DlgFormDB.EndExecute()
exit Sub
End Select
- DialogModel.imgTheme.ImageUrl = FormPath & "FormWizard_"
& DialogModel.Step & ".bmp"
+ DialogModel.imgTheme.ImageUrl = FormPath & "FormWizard_"
& DialogModel.Step & ".png"
DlgFormDB.Title = WizardTitle(DialogModel.Step)
WIZARDERROR:
If Err <> 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 = "Form_" & sDBName & "_" &
TableName & ".sxw"
sFormUrl = TempPath & "/" & 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 > 0 Then
- oListBox.selectItemPos(iSelPos-1, True)
+ oListBox.selectItemPos(iSelPos-1, True)
End If
End If
End Sub
