summaryrefslogtreecommitdiff
path: root/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt
diff options
context:
space:
mode:
Diffstat (limited to 'instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt')
-rw-r--r--instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt10
1 files changed, 5 insertions, 5 deletions
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt
index 9aff71e515d9..2200f4d28a3a 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt
@@ -33,7 +33,7 @@ CustomSetup Details SelectionBrowse DiskSpaceRequirements 1 1
CustomSetup Help SpawnDialog CustomSetupTips 1 1
CustomSetup Next [_IsSetupTypeMin] Custom 1 0
CustomSetup Next NewDialog OutOfSpace OutOfNoRbDiskSpace = 1 0
-CustomSetup Next NewDialog ReadyToInstall OutOfNoRbDiskSpace <> 1 And (LANG_SELECTED = 1) And (APP_SELECTED = 1) 9
+CustomSetup Next NewDialog FileTypeDialog OutOfNoRbDiskSpace <> 1 And (LANG_SELECTED = 1) And (APP_SELECTED = 1) 9
CustomSetup Next DoAction ResetLanguageSelected 1 1
CustomSetup Next DoAction SetLanguageSelected (isMulti <> 1) Or Installed 3
CustomSetup Next DoAction SetLanguageSelected (isMulti = 1) And Not Installed And (LANGUAGECONDITIONINSTALL) 4
@@ -57,8 +57,7 @@ DiskSpaceRequirements OK EndDialog Return 1 0
FilesInUse Exit EndDialog Exit 1 0
FilesInUse Ignore EndDialog Ignore 1 0
FilesInUse Retry EndDialog Retry 1 0
-FileTypeDialog Back NewDialog CustomSetup Installed OR _IsSetupTypeMin = "Custom" 2
-FileTypeDialog Back NewDialog SetupType NOT Installed AND _IsSetupTypeMin <> "Custom" 1
+FileTypeDialog Back NewDialog CustomSetup 1 1
FileTypeDialog Cancel SpawnDialog CancelSetup 1 0
FileTypeDialog Next NewDialog ReadyToInstall 1 0
InstallChangeFolder Cancel EndDialog Return 1 2
@@ -102,7 +101,7 @@ PatchWelcome Cancel SpawnDialog CancelSetup 1 1
PatchWelcome Next EndDialog Return 1 3
PatchWelcome Next Reinstall ALL PATCH And REINSTALL="" 1
PatchWelcome Next ReinstallMode omus PATCH And REINSTALLMODE="" 2
-ReadyToInstall Back NewDialog CustomSetup Installed OR _IsSetupTypeMin = "Custom" 2
+ReadyToInstall Back NewDialog FileTypeDialog Installed OR _IsSetupTypeMin = "Custom" 2
ReadyToInstall Back NewDialog MaintenanceType Installed AND _IsMaintenance = "Reinstall" 3
ReadyToInstall Back NewDialog SetupType NOT Installed AND _IsSetupTypeMin <> "Custom" 1
ReadyToInstall Cancel SpawnDialog CancelSetup 1 0
@@ -148,6 +147,7 @@ SetupType Back NewDialog CustomerInformation 1 0
SetupType Cancel SpawnDialog CancelSetup 1 0
SetupType Next AddLocal ALL _IsSetupTypeMin = "Typical" 0
SetupType Next NewDialog CustomSetup _IsSetupTypeMin = "Custom" 0
-SetupType Next NewDialog ReadyToInstall _IsSetupTypeMin <> "Custom" 0
+SetupType Next [FILETYPEDIALOGUSED] 0 _IsSetupTypeMin <> "Custom" 5
+SetupType Next NewDialog ReadyToInstall _IsSetupTypeMin <> "Custom" 6
SplashBitmap Cancel SpawnDialog CancelSetup 1 0
SplashBitmap Next NewDialog InstallWelcome 1 0