summaryrefslogtreecommitdiff
path: root/instsetoo_native/inc_ooolangpack
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2008-10-02 08:34:45 +0000
committerVladimir Glazounov <vg@openoffice.org>2008-10-02 08:34:45 +0000
commit4c25522a6ba9c4cc22b57557baa53c87c39086fd (patch)
treeb9a9b75c646aa1d8eda5e2dfcdeeff61f27905d2 /instsetoo_native/inc_ooolangpack
parentc697830f1594f8959060d802775ae6c88ade285e (diff)
CWS-TOOLING: integrate CWS native196_DEV300
Diffstat (limited to 'instsetoo_native/inc_ooolangpack')
-rw-r--r--instsetoo_native/inc_ooolangpack/windows/msi_templates/CustomAc.idt2
-rw-r--r--instsetoo_native/inc_ooolangpack/windows/msi_templates/InstallE.idt6
2 files changed, 2 insertions, 6 deletions
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/CustomAc.idt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/CustomAc.idt
index 06aaf935b923..467f79934f09 100644
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/CustomAc.idt
+++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/CustomAc.idt
@@ -6,7 +6,5 @@ SetAllUsersProfileNT 51 ALLUSERSPROFILE [%SystemRoot]\Profiles\All Users
setUserProfileNT 51 USERPROFILE [%USERPROFILE]
SetARPInstallLocation 51 ARPINSTALLLOCATION [INSTALLLOCATION]
SetOfficeInstallLocation 51 OFFICEINSTALLLOCATION [OFFICEDIRECTORYGID]
-SetBasisDir 51 BASISDIRECTORYGID [BASISINSTALLLOCATION]
SetBasisInstallLocation 51 BASISINSTALLLOCATION [BASISDIRECTORYGID]
-SetUreDir 51 UREDIRECTORYGID [UREINSTALLLOCATION]
SetUreInstallLocation 51 UREINSTALLLOCATION [UREDIRECTORYGID]
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/InstallE.idt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/InstallE.idt
index 02b2e7a184c5..a7637851bc9c 100644
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/InstallE.idt
+++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/InstallE.idt
@@ -54,10 +54,8 @@ SelfRegModules 2850
SelfUnregModules 1100
SetARPInstallLocation Not Installed 990
SetOfficeInstallLocation Not Installed 575
-SetBasisDir Not Installed AND BASISINSTALLLOCATION<>"" 379
-SetBasisInstallLocation Not Installed AND BASISINSTALLLOCATION="" 576
-SetUreDir Not Installed AND UREINSTALLLOCATION<>"" 380
-SetUreInstallLocation Not Installed AND UREINSTALLLOCATION="" 577
+SetBasisInstallLocation Not Installed 576
+SetUreInstallLocation Not Installed 577
SetODBCFolders 550
StartServices VersionNT 2800
StopServices VersionNT 950