diff options
Diffstat (limited to 'wizards/source/importwizard/Main.xba')
| -rw-r--r-- | wizards/source/importwizard/Main.xba | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/wizards/source/importwizard/Main.xba b/wizards/source/importwizard/Main.xba index 9065cd3a5a3c..e25df463fc74 100644 --- a/wizards/source/importwizard/Main.xba +++ b/wizards/source/importwizard/Main.xba @@ -16,6 +16,7 @@ Public bCallCancelMsg as Boolean Sub Main() BasicLibraries.LoadLibrary("Tools") bSetFonts = False + bCallCancelMsg = False If bSetFonts Then BasicLibraries.LoadLibrary("Translater") GetFontNames() @@ -37,11 +38,13 @@ Sub Main() FillStep_Welcome() RepaintHeaderPreview() SetStates() - ImportDialogArea.Visible = True ImportDialog.cbGoOn.DefaultButton = True + ImportDialogArea.Execute() + ImportDialogArea.Dispose() + End Exit Sub RTError: - Msgbox sRTErrorDesc, 16, sRTErrorHeader +' Msgbox sRTErrorDesc, 16, sRTErrorHeader End Sub @@ -107,7 +110,6 @@ Dim iCurStep as Integer ImportDialog.cbCancel.Label = sCancelButton FillStep_Summary() Case 3 -'Todo: muessen auch beim Zuruecksteppen wirklich die Importpfade auf ihre Gueltigkeit hin Ueberprueft werden? FillStep_InputPaths(Applcount-1, False) Case 2 SaveStep_InputPath @@ -130,26 +132,25 @@ End Sub Sub CancelButton() If bCallCancelMsg Then ' Conversion is already running - ImportDialog.cbCancel.Enabled = False - bCancelTask = True + CancelTask() +' ImportDialog.cbCancel.Enabled = False +' bCancelTask = True Else ImportDialogArea.EndExecute() - ImportDialogArea.Dispose() - End End If End Sub -Sub CancelTask() +Function CancelTask() If Msgbox(sConvertError1, 36, sConvertError2) = 6 Then ImportDialogArea.EndExecute 'Visible = False - ImportDialogArea.Dispose - End +' CancelTask = True Else bCancelTask = False ImportDialog.cbCancel.Enabled = True + CancelTask = False End If -End Sub +End Function |