diff options
| author | Matthias Seidel <mseidel@apache.org> | 2018-11-08 15:58:53 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-12-10 15:49:33 +0100 |
| commit | 7e5fd926adbd62148a1fdd6950ba5b33d12874a1 (patch) | |
| tree | 27f19e3e977e4d4b375d61b347e6694fc34bf0b9 /wizards | |
| parent | f6ad6eedfd21bc8f9de09d53d3be883bbc543cc7 (diff) | |
Cleaning up Document Converter wizard, moving graphics from bmp to png
(cherry picked from commit ab017c683002df7f76a792e369c00fd10e1024f0)
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>
Diffstat (limited to 'wizards')
| -rw-r--r-- | wizards/source/importwizard/Main.xba | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/wizards/source/importwizard/Main.xba b/wizards/source/importwizard/Main.xba index 46be949f88a0..b8cc8211edfb 100644 --- a/wizards/source/importwizard/Main.xba +++ b/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 ***** -' ***** 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("ImportWizard","ImportDialog") 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("optMSDocuments").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 <> 1) OR (iCurStep <> 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,"XML", "SO") If CurStep = 2 Then - sBitmapPath = SOBitmapPath & LocPrefix & "-Import_" & CurStep & "-" & Applications(CurOffice,SBAPPLKEY) + 1 & ".bmp" + sBitmapPath = SOBitmapPath & LocPrefix & "-Import_" & CurStep & "-" & Applications(CurOffice,SBAPPLKEY) + 1 & ".png" Else - sBitmapPath = SOBitmapPath & "Import_" & CurStep & ".bmp" + sBitmapPath = SOBitmapPath & "Import_" & CurStep & ".png" 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,"/") <> 0 Then CheckInstalledModule() = False @@ -266,7 +263,7 @@ Dim i as Integer End Sub -Sub TakeOverPathSettings() +Sub TakeOverPathSettings() 'Takes over the Pathsettings from the first selected application to the next applications If Applications(CurOffice,SBDOCSOURCE) = "" 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> |