diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2008-07-16 15:06:59 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2008-07-16 15:06:59 +0000 |
| commit | 1ee619089be5d02f8f69035f656f523d41a65018 (patch) | |
| tree | 6dd6ae8a4ba20421e55d0d940390472b0f2ef7dd /instsetoo_native/inc_sdkoo | |
| parent | 5cdaa96ab98b7e8ec8f49b8abf2a2dda9e777662 (diff) | |
INTEGRATION: CWS sysui26 (1.4.30); FILE MERGED
2008/06/25 14:19:09 dv 1.4.30.1: removed all references to FileTypeDialog
Diffstat (limited to 'instsetoo_native/inc_sdkoo')
| -rw-r--r-- | instsetoo_native/inc_sdkoo/windows/msi_templates/ControlE.idt | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/ControlE.idt b/instsetoo_native/inc_sdkoo/windows/msi_templates/ControlE.idt index 640c619b3b0d..c015497810cb 100644 --- a/instsetoo_native/inc_sdkoo/windows/msi_templates/ControlE.idt +++ b/instsetoo_native/inc_sdkoo/windows/msi_templates/ControlE.idt @@ -31,7 +31,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 FileTypeDialog OutOfNoRbDiskSpace <> 1 0 +CustomSetup Next NewDialog ReadyToInstall OutOfNoRbDiskSpace <> 1 0 CustomSetupTips OK EndDialog Return 1 1 DatabaseFolder Back NewDialog CustomerInformation 1 1 DatabaseFolder Cancel SpawnDialog CancelSetup 1 1 @@ -48,10 +48,6 @@ 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 Cancel SpawnDialog CancelSetup 1 0 -FileTypeDialog Next NewDialog ReadyToInstall 1 0 InstallChangeFolder Cancel EndDialog Return 1 2 InstallChangeFolder Cancel Reset 0 1 1 InstallChangeFolder NewFolder DirectoryListNew 0 1 0 @@ -135,6 +131,6 @@ 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 FileTypeDialog _IsSetupTypeMin <> "Custom" 0 +SetupType Next NewDialog ReadyToInstall _IsSetupTypeMin <> "Custom" 0 SplashBitmap Cancel SpawnDialog CancelSetup 1 0 SplashBitmap Next NewDialog InstallWelcome 1 0 |