diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2008-02-05 12:39:16 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2008-02-05 12:39:16 +0000 |
| commit | b9d3235de61a599377359b3f920f21f1ddb7c28c (patch) | |
| tree | 7960a0a254216c8c902c30121d4006f030dd5af5 /instsetoo_native | |
| parent | deb631a6120929045632886e519de34d1e7e0113 (diff) | |
INTEGRATION: CWS native127 (1.3.342); FILE MERGED
2008/01/29 11:15:22 is 1.3.342.2: #i85474# maintenance mode
2008/01/28 16:04:03 is 1.3.342.1: #i85474# avoid deselection of all application modules and language modules
Diffstat (limited to 'instsetoo_native')
| -rw-r--r-- | instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt index f8a925f83334..8e0987229e79 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt @@ -15,6 +15,7 @@ AdminNetworkLocation InstallNow NewDialog OutOfSpace OutOfNoRbDiskSpace = 1 2 AdminNetworkLocation InstallNow SetTargetPath TARGETDIR 1 1 AdminWelcome Cancel SpawnDialog CancelSetup 1 0 AdminWelcome Next NewDialog AdminNetworkLocation 1 0 +ApplicationInfo1 OK EndDialog Return 1 0 CancelSetup No EndDialog Return 1 0 CancelSetup Yes EndDialog Exit 1 2 CustomerInformation Back NewDialog LicenseAgreement 1 1 @@ -31,7 +32,15 @@ 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 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 +CustomSetup Next SpawnDialog LanguageInfo1 (isMulti = 1) And (LANG_SELECTED <> 1) 7 +CustomSetup Next DoAction ResetApplicationSelected 1 2 +CustomSetup Next DoAction SetApplicationSelected Not Installed And (APPLICATIONCONDITIONINSTALL) 5 +CustomSetup Next DoAction SetApplicationSelected Installed 5 +CustomSetup Next SpawnDialog ApplicationInfo1 APP_SELECTED <> 1 6 CustomSetupTips OK EndDialog Return 1 1 DatabaseFolder Back NewDialog CustomerInformation 1 1 DatabaseFolder Cancel SpawnDialog CancelSetup 1 1 @@ -60,6 +69,7 @@ InstallChangeFolder Up DirectoryListUp 0 1 0 InstallWelcome Back NewDialog SplashBitmap Display_IsBitmapDlg 1 InstallWelcome Cancel SpawnDialog CancelSetup 1 0 InstallWelcome Next NewDialog LicenseAgreement 1 0 +LanguageInfo1 OK EndDialog Return 1 0 LicenseAgreement Back NewDialog InstallWelcome 1 0 LicenseAgreement Cancel SpawnDialog CancelSetup 1 0 LicenseAgreement Next NewDialog CustomerInformation AgreeToLicense = "Yes" 0 |