diff options
Diffstat (limited to 'wizards/source/importwizard/Main.xba')
| -rw-r--r-- | wizards/source/importwizard/Main.xba | 37 |
1 files changed, 28 insertions, 9 deletions
diff --git a/wizards/source/importwizard/Main.xba b/wizards/source/importwizard/Main.xba index ea1b12875024..ad4ac88ba4b0 100644 --- a/wizards/source/importwizard/Main.xba +++ b/wizards/source/importwizard/Main.xba @@ -11,7 +11,7 @@ Public oFactoryKey as Object ' If the ProgressPage ist already on Top The Dialog will be immediately closed when this flag is ' set to False -Public bConversionIsRunnig as Boolean +Public bConversionIsRunning as Boolean Public RetValue as Integer Sub Main() @@ -20,13 +20,13 @@ Sub Main() End If BasicLibraries.LoadLibrary("Tools") RetValue = 10 - bConversionIsRunnig = False + bConversionIsRunning = False sCRLF = CHR(13) & CHR(10) oUcb = createUnoService("com.sun.star.ucb.SimpleFileAccess") oFactoryKey = GetRegistryKeyContent("org.openoffice.Setup/Office/Factories") - SOBitmapPath = GetOfficeSubPath("Template", "wizard/bitmap") - SOWorkPath = GetPathSettings("Work", False) - SOTemplatePath = GetPathSettings("Template",False,1) + If GetImportWizardPaths() = False Then + Exit Sub + End If bCancelTask = False bDoKeepApplValues = False CurOffice = 0 @@ -37,6 +37,7 @@ Sub Main() MaxApplCount = 4 FillStep_Welcome() RepaintHeaderPreview() + ImportDialog.ImportPreview.BackGroundColor = RGB(0,60,126) ImportDialog.cmdGoOn.DefaultButton = True ImportDialogArea.GetControl("optSODocuments").SetFocus() RetValue = ImportDialogArea.Execute() @@ -57,7 +58,7 @@ Dim iCurStep as Integer If Not bDebugWizard Then On Error Goto RTError End If - bConversionIsRunnig = False + bConversionIsRunning = False iCurStep = ImportDialog.Step Select Case iCurStep Case 1 @@ -102,7 +103,7 @@ Dim iCurStep as Integer If Not bDebugWizard Then On Error Goto RTError End If - bConversionIsRunnig = False + bConversionIsRunning = False iCurStep = ImportDialog.Step Select Case iCurStep Case 4 @@ -130,9 +131,10 @@ End Sub Sub CancelTask() - If bConversionIsRunnig Then + If bConversionIsRunning Then If Msgbox(sConvertError1, 36, sConvertError2) = 6 Then bCancelTask = True + bInterruptSearch = True Else bCancelTask = False ImportDialog.cmdCancel.Enabled = True @@ -255,4 +257,21 @@ Sub TakeOverPathSettings() Applications(CurOffice,SBTEMPLTARGET) = Applications(0,SBTEMPLTARGET) End If End If -End Sub</script:module>
\ No newline at end of file +End Sub + + +Function GetImportWizardPaths() as Boolean + SOBitmapPath = GetOfficeSubPath("Template", "wizard/bitmap") + If SOBitmapPath <> "" Then + SOWorkPath = GetPathSettings("Work", False) + If SOWorkPath <> "" Then + SOTemplatePath = GetPathSettings("Template",False,1) + If SOTemplatePath <> "" Then + GetImportWizardPaths() = True + Exit Function + End If + End If + End If + GetImportWizardPaths() = False +End Function +</script:module>
\ No newline at end of file |