summaryrefslogtreecommitdiff
path: root/instsetoo_native
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2008-05-14 12:03:11 +0000
committerVladimir Glazounov <vg@openoffice.org>2008-05-14 12:03:11 +0000
commit2472918dafa5e73620e179ae422daa23508cd38d (patch)
tree021ff872e6347ad2316abcb89ef567be631a9d67 /instsetoo_native
parentbc3690314998029dc01125d462fc338c971d1e29 (diff)
INTEGRATION: CWS native149 (1.5.24); FILE MERGED
2008/04/24 11:49:43 is 1.5.24.1: #i88541# dynamic link creation for Windows
Diffstat (limited to 'instsetoo_native')
-rw-r--r--instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt6
1 files changed, 0 insertions, 6 deletions
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt
index 0163e92820b5..9a1a59402570 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt
@@ -13,9 +13,6 @@ 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
@@ -37,9 +34,6 @@ 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