diff options
| author | Behrend Cornelius <bc@openoffice.org> | 2001-08-10 08:28:06 +0000 |
|---|---|---|
| committer | Behrend Cornelius <bc@openoffice.org> | 2001-08-10 08:28:06 +0000 |
| commit | ca5d0e43f31b3e24ed22379157870b3ad97bfb98 (patch) | |
| tree | 8e2f889d6b6b76c325928d2b43f9ebaca40dd589 /wizards/source/importwizard/FilesModul.xba | |
| parent | a124ecadb77ac75782b175c4545d0d653c8bb401 (diff) | |
#88899# Cancel Dialog routine improved
Diffstat (limited to 'wizards/source/importwizard/FilesModul.xba')
| -rw-r--r-- | wizards/source/importwizard/FilesModul.xba | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/wizards/source/importwizard/FilesModul.xba b/wizards/source/importwizard/FilesModul.xba index 2a83b03c2dfc..ad0bb192aed5 100644 --- a/wizards/source/importwizard/FilesModul.xba +++ b/wizards/source/importwizard/FilesModul.xba @@ -97,7 +97,7 @@ Dim oTask as Object Dim oModel as Object Dim oTaskController as Object Dim MaxFileIndex as Integer - + bConversionIsRunnig = True AbsTemplateFound = 0 AbsDocuFound = 0 For i = 0 To ApplCount-1 @@ -116,18 +116,16 @@ Dim MaxFileIndex as Integer TotFound = AbsTemplateFound + AbsDocuFound CreateLogDocument(OpenProperties()) If TotFound > 0 Then - bCallCancelMsg = True InitializeProgressPage(ImportDialog) OpenProperties(0).Name = "Hidden" OpenProperties(0).Value = True MaxFileIndex = Ubound(FilesList(),1) For i = 0 To MaxFileIndex - bDoSave = True If bCancelTask Then - If CancelTask() Then - Exit Sub - End If + bConversionIsRunnig = False + Exit Sub End if + bDoSave = True sFullName = FilesList(i,0) CurFiltername = GetFilterName(FilesList(i,1), sFilterName(), sExtension, FilterIndex) ApplIndex = FilesList(i,2) @@ -167,9 +165,8 @@ Dim MaxFileIndex as Integer ' In the FileProperty-Bean this is already default bDoSave = True Case 2 ' Abort - bCallCancelMsg = False - Exit For -' Call CancelTask() + CancelTask(False) + bDoSave = False Case 7 ' No bDoSave = False End Select @@ -204,7 +201,7 @@ Dim MaxFileIndex as Integer ImportDialog.cbCancel.Label = sCloseButton ImportDialog.cbGoOn.Label = sReady ImportDialog.cbGoOn.Enabled = True - bCallCancelMsg = False + bConversionIsRunnig = False Exit Sub RTError: Msgbox sRTErrorDesc, 16, sRTErrorHeader |