summaryrefslogtreecommitdiff
path: root/instsetoo_native/inc_ooolangpack
diff options
context:
space:
mode:
authorIvo Hinkelmann <ihi@openoffice.org>2008-07-16 15:06:30 +0000
committerIvo Hinkelmann <ihi@openoffice.org>2008-07-16 15:06:30 +0000
commitfd48ed44be7c402f079b76b86127961c03af3afd (patch)
treee475c4e32666c1e0331317410c30f7e814d249ad /instsetoo_native/inc_ooolangpack
parentee1db2ea6c89d2222b1c1fc7b32854c5e0663903 (diff)
INTEGRATION: CWS sysui26 (1.9.32); FILE MERGED
2008/06/25 14:19:08 dv 1.9.32.1: removed all references to FileTypeDialog
Diffstat (limited to 'instsetoo_native/inc_ooolangpack')
-rw-r--r--instsetoo_native/inc_ooolangpack/windows/msi_templates/ControlE.idt8
1 files changed, 2 insertions, 6 deletions
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/ControlE.idt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/ControlE.idt
index ff52e917934f..76f9fe5eeb8c 100644
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/ControlE.idt
+++ b/instsetoo_native/inc_ooolangpack/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 NewDialog DestinationFolder 1 2
InstallChangeFolder Cancel Reset 0 1 1
InstallChangeFolder OK NewDialog DestinationFolder 1 3
@@ -137,6 +133,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