diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-05-06 09:49:48 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-05-06 09:49:48 +0000 |
| commit | 19ddf47103da6afa7a5c98c0c44a43eebf1ce583 (patch) | |
| tree | 39389773e8b7bb4c176591c7e1d7351e8d771d51 /instsetoo_native/inc_openoffice | |
| parent | 80d382a2999464b115d0a5511bc4fe9aa37cb83e (diff) | |
INTEGRATION: CWS native147 (1.5.16); FILE MERGED
2008/04/16 12:55:16 is 1.5.16.1: #i88008# do not show license dialog
Diffstat (limited to 'instsetoo_native/inc_openoffice')
| -rw-r--r-- | instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt index 0e91af8a7323..0163e92820b5 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt @@ -21,7 +21,8 @@ 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 +CustomerInformation Back NewDialog LicenseAgreement HIDEEULA <> 1 1 +CustomerInformation Back NewDialog InstallWelcome HIDEEULA = 1 1 CustomerInformation Cancel SpawnDialog CancelSetup 1 0 CustomerInformation Next [ALLUSERS] {} ApplicationUsers = "OnlyCurrentUser" And Privileged 2 CustomerInformation Next [ALLUSERS] 1 ApplicationUsers = "AllUsers" And Privileged 1 @@ -74,7 +75,8 @@ InstallChangeFolder OK SetTargetPath [_BrowseProperty] 1 2 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 +InstallWelcome Next NewDialog LicenseAgreement HIDEEULA <> 1 0 +InstallWelcome Next NewDialog CustomerInformation HIDEEULA = 1 0 LanguageInfo1 OK EndDialog Return 1 0 LanguageSelection Back NewDialog CustomerInformation 1 1 LanguageSelection Cancel SpawnDialog CancelSetup 1 1 |