diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-03-18 11:46:30 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-03-18 11:46:30 +0000 |
| commit | adabf8ed6e22a76532af3087076a87a9e6801154 (patch) | |
| tree | b623620d31722b04ace0899b79daabb347d2b393 /instsetoo_native | |
| parent | 4ebbfa1d9713736e804267edd0d817ccbddf2eb3 (diff) | |
INTEGRATION: CWS sb83 (1.3.326); FILE MERGED
2008/02/22 06:00:54 sb 1.3.326.3: RESYNC: (1.3-1.4); FILE MERGED
2008/02/06 13:55:07 is 1.3.326.2: #i85916# INSTALLLOCATION no longer only valid path
2008/01/29 15:24:38 sb 1.3.326.1: #i85112# merged in cws_src680_native121
Diffstat (limited to 'instsetoo_native')
| -rw-r--r-- | instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt index 8e0987229e79..0e91af8a7323 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt @@ -13,6 +13,9 @@ AdminNetworkLocation Cancel SpawnDialog CancelSetup 1 0 AdminNetworkLocation InstallNow EndDialog Return OutOfNoRbDiskSpace <> 1 3 AdminNetworkLocation InstallNow NewDialog OutOfSpace OutOfNoRbDiskSpace = 1 2 AdminNetworkLocation InstallNow SetTargetPath TARGETDIR 1 1 +AdminNetworkLocation InstallNow DoAction SetOfficeInstallLocation 1 1 +AdminNetworkLocation InstallNow DoAction SetBasisInstallLocation 1 1 +AdminNetworkLocation InstallNow DoAction SetUreInstallLocation 1 1 AdminWelcome Cancel SpawnDialog CancelSetup 1 0 AdminWelcome Next NewDialog AdminNetworkLocation 1 0 ApplicationInfo1 OK EndDialog Return 1 0 @@ -33,6 +36,9 @@ 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 And (LANG_SELECTED = 1) And (APP_SELECTED = 1) 9 +CustomSetup Next DoAction SetOfficeInstallLocation 1 1 +CustomSetup Next DoAction SetBasisInstallLocation 1 1 +CustomSetup Next DoAction SetUreInstallLocation 1 1 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 @@ -70,6 +76,9 @@ 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 +LanguageSelection Back NewDialog CustomerInformation 1 1 +LanguageSelection Cancel SpawnDialog CancelSetup 1 1 +LanguageSelection Next NewDialog SetupType 1 1 LicenseAgreement Back NewDialog InstallWelcome 1 0 LicenseAgreement Cancel SpawnDialog CancelSetup 1 0 LicenseAgreement Next NewDialog CustomerInformation AgreeToLicense = "Yes" 0 |