diff options
| author | Andras Timar <atimar@suse.com> | 2012-05-30 15:54:14 +0200 |
|---|---|---|
| committer | Andras Timar <atimar@suse.com> | 2012-05-30 20:21:36 +0200 |
| commit | 5e01d13b84c1dbd82da54be3f25b522f825febfe (patch) | |
| tree | 33b7f806e898a74c4f9f73fd1a8082d2b9b65ec8 | |
| parent | 0d30946780e9d86d9be92c3c6d30b33305c5830f (diff) | |
fdo#46559 bypass CustomerInformation dialog in Windows installer
User name and Company asked here are useless, and misleading. Users
think that they are related to Tools - Options - LibreOffice -
User Data. Also per-user installation context makes little sense.
If anybody still wants to install LibreOffice only for the current
user, it is still possible with the ALLUSERS property.
Change-Id: I537b45ab77d6d227264e1dc0bcaf93a9cfa8ea71
| -rw-r--r-- | instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt index 2c6b4572d849..a7683a72519d 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt @@ -58,11 +58,11 @@ InstallChangeFolder Up DirectoryListUp 0 1 0 InstallWelcome Back NewDialog SplashBitmap Display_IsBitmapDlg 1 InstallWelcome Cancel SpawnDialog CancelSetup 1 0 InstallWelcome Next NewDialog LicenseAgreement HIDEEULA <> 1 0 -InstallWelcome Next NewDialog CustomerInformation HIDEEULA = 1 0 +InstallWelcome Next NewDialog SetupType HIDEEULA = 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 +LicenseAgreement Next NewDialog SetupType AgreeToLicense = "Yes" 0 MaintenanceType Back NewDialog MaintenanceWelcome 1 0 MaintenanceType Cancel SpawnDialog CancelSetup 1 0 MaintenanceType Next [ProgressType0] Modify _IsMaintenance = "Change" 2 @@ -127,7 +127,8 @@ SetupProgress Cancel SpawnDialog CancelSetup 1 0 SetupResume Cancel SpawnDialog CancelSetup 1 0 SetupResume Next EndDialog Return OutOfNoRbDiskSpace <> 1 0 SetupResume Next NewDialog OutOfSpace OutOfNoRbDiskSpace = 1 0 -SetupType Back NewDialog CustomerInformation 1 0 +SetupType Back NewDialog LicenseAgreement HIDEEULA <> 1 1 +SetupType Back NewDialog InstallWelcome HIDEEULA = 1 1 SetupType Cancel SpawnDialog CancelSetup 1 0 SetupType Next NewDialog CustomSetup _IsSetupTypeMin = "Custom" 0 SetupType Next [FILETYPEDIALOGUSED] 0 _IsSetupTypeMin <> "Custom" 5 |