diff options
| author | Matthias Seidel <mseidel@apache.org> | 2018-12-08 00:00:11 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-12-10 12:31:42 +0100 |
| commit | dd89dc8df8d82ab43f34a0c8fcfa67f93aefcb99 (patch) | |
| tree | 06d670652901e502dfcc45dcf185db1ddc3d0f30 /wizards | |
| parent | ed81fe44d4e6b36c4c61a22e9e28a3a94fef9238 (diff) | |
Cleaning up FormWizard, moving graphics from bmp to png
(cherry picked from commit 6e5c06d0fe430c9e71c6705c14b160c950fc2c59)
Change-Id: Ib805072d371a6a57d7406d955a173d7d7f5ab626
Reviewed-on: https://gerrit.libreoffice.org/64851
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'wizards')
| -rw-r--r-- | wizards/source/formwizard/FormWizard.xba | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/wizards/source/formwizard/FormWizard.xba b/wizards/source/formwizard/FormWizard.xba index a744014634a5..68a80ff88eff 100644 --- a/wizards/source/formwizard/FormWizard.xba +++ b/wizards/source/formwizard/FormWizard.xba @@ -184,7 +184,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 @@ -197,11 +197,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 @@ -222,7 +222,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()) @@ -257,7 +257,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 @@ -287,7 +287,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: @@ -322,7 +322,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 @@ -386,7 +386,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()) @@ -395,7 +395,6 @@ Sub StoreFormInDatabase() End Sub - Sub StoreForm() Dim sTargetPath as String Dim TypeNames(0,2) as String @@ -411,7 +410,6 @@ Dim oTypes() as Object End Sub - Sub EmptyFieldsListboxes() Dim NullList() as String ToggleListboxControls(DialogModel, False) @@ -433,9 +431,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 |