summaryrefslogtreecommitdiff
path: root/instsetoo_native/inc_openoffice
diff options
context:
space:
mode:
authorIngo Schmidt <is@openoffice.org>2010-05-26 14:44:44 +0200
committerIngo Schmidt <is@openoffice.org>2010-05-26 14:44:44 +0200
commit1e96d7d75ab2fd674d80788d7ebd52ce97fb0d17 (patch)
treef6b82d265ded20ee1f5c3b10061bdff632ca9884 /instsetoo_native/inc_openoffice
parentff94b38b00f90b4fbc8f49d132d46f27c537e143 (diff)
native305 #i92977# new Windows INSTALLLOCATION settings
Diffstat (limited to 'instsetoo_native/inc_openoffice')
-rw-r--r--instsetoo_native/inc_openoffice/windows/msi_templates/AdminExe.idt3
-rw-r--r--instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt12
-rw-r--r--instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt3
-rw-r--r--instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt3
-rw-r--r--instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt6
5 files changed, 0 insertions, 27 deletions
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/AdminExe.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/AdminExe.idt
index 0be369431d84..ede3f7cb4f42 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/AdminExe.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/AdminExe.idt
@@ -11,6 +11,3 @@ InstallFinalize 400
InstallInitialize 250
InstallValidate 200
ScheduleReboot ISSCHEDULEREBOOT 375
-SetOfficeInstallLocation 410
-SetBasisInstallLocation 420
-SetUreInstallLocation 430
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt
index a4a5415fd928..9bb051e56492 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt
@@ -1,17 +1,5 @@
Property Signature_
s72 s72
AppSearch Property Signature_
-UREUNINSTALLLOCATION ureuninstalluser
-UREUNINSTALLLOCATION ureuninstallmachine
-BASISUNINSTALLLOCATION basisuninstalluser
-BASISUNINSTALLLOCATION basisuninstallmachine
-OFFICEUNINSTALLLOCATION officeuninstalluser
-OFFICEUNINSTALLLOCATION officeuninstallmachine
-UREINSTALLLOCATION ureuninstalluser
-UREINSTALLLOCATION ureuninstallmachine
-BASISINSTALLLOCATION basisuninstalluser
-BASISINSTALLLOCATION basisuninstallmachine
-OFFICEINSTALLLOCATION officeuninstalluser
-OFFICEINSTALLLOCATION officeuninstallmachine
INSTALLLOCATION installuser
INSTALLLOCATION installmachine
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt
index 80514fd1904b..17a47e8e9889 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt
@@ -122,9 +122,6 @@ setAllUsersProfile2K 51 ALLUSERSPROFILE [%ALLUSERSPROFILE]
SetAllUsersProfileNT 51 ALLUSERSPROFILE [%SystemRoot]\Profiles\All Users
setUserProfileNT 51 USERPROFILE [%USERPROFILE]
SetARPInstallLocation 51 ARPINSTALLLOCATION [INSTALLLOCATION]
-SetOfficeInstallLocation 51 OFFICEINSTALLLOCATION [OFFICEDIRECTORYGID]
-SetBasisInstallLocation 51 BASISINSTALLLOCATION [BASISDIRECTORYGID]
-SetUreInstallLocation 51 UREINSTALLLOCATION [UREDIRECTORYGID]
NewProductFound 19 OOO_CUSTOMACTION_1
SameProductFound 19 OOO_CUSTOMACTION_2
SetLanguageSelected 51 LANG_SELECTED 1
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt
index 11f97a0bb797..defde2299409 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt
@@ -173,9 +173,6 @@ ScheduleReboot ISSCHEDULEREBOOT 3125
SelfRegModules 2850
SelfUnregModules 1100
SetARPInstallLocation 990
-SetOfficeInstallLocation Not Installed 575
-SetBasisInstallLocation Not Installed 576
-SetUreInstallLocation Not Installed 577
SetODBCFolders 550
StartServices VersionNT 2800
StopServices VersionNT 950
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt
index 349aa0604ca3..2fb2d2963727 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt
@@ -1,11 +1,5 @@
Signature_ Root Key Name Type
s72 i2 s255 S255 I2
RegLocator Signature_
-ureuninstalluser 1 Software\OpenOffice.org\LAYERNAMETEMPLATE\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] UREINSTALLLOCATION 2
-ureuninstallmachine 2 Software\OpenOffice.org\LAYERNAMETEMPLATE\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] UREINSTALLLOCATION 2
-basisuninstalluser 1 Software\OpenOffice.org\LAYERNAMETEMPLATE\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] BASISINSTALLLOCATION 2
-basisuninstallmachine 2 Software\OpenOffice.org\LAYERNAMETEMPLATE\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] BASISINSTALLLOCATION 2
-officeuninstalluser 1 Software\OpenOffice.org\LAYERNAMETEMPLATE\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] OFFICEINSTALLLOCATION 2
-officeuninstallmachine 2 Software\OpenOffice.org\LAYERNAMETEMPLATE\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] OFFICEINSTALLLOCATION 2
installuser 1 Software\OpenOffice.org\LAYERNAMETEMPLATE\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] INSTALLLOCATION 2
installmachine 2 Software\OpenOffice.org\LAYERNAMETEMPLATE\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] INSTALLLOCATION 2