diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-10-02 08:34:45 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-10-02 08:34:45 +0000 |
| commit | 4c25522a6ba9c4cc22b57557baa53c87c39086fd (patch) | |
| tree | b9a9b75c646aa1d8eda5e2dfcdeeff61f27905d2 /instsetoo_native/inc_openoffice | |
| parent | c697830f1594f8959060d802775ae6c88ade285e (diff) | |
CWS-TOOLING: integrate CWS native196_DEV300
Diffstat (limited to 'instsetoo_native/inc_openoffice')
4 files changed, 2 insertions, 18 deletions
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt index 2220bbcf4596..596866c29a87 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt @@ -1,12 +1,6 @@ Property Signature_ s72 s72 AppSearch Property Signature_ -UREINSTALLLOCATION ureinstalluser -UREINSTALLLOCATION ureinstallmachine -BASISINSTALLLOCATION basisinstalluser -BASISINSTALLLOCATION basisinstallmachine -OFFICEINSTALLLOCATION officeinstalluser -OFFICEINSTALLLOCATION officeinstallmachine UREUNINSTALLLOCATION ureuninstalluser UREUNINSTALLLOCATION ureuninstallmachine BASISUNINSTALLLOCATION basisuninstalluser diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt index 419bda21fbbd..dfbe5239fe76 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt @@ -38,9 +38,7 @@ 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] NewProductFound 19 OOO_CUSTOMACTION_1 SameProductFound 19 OOO_CUSTOMACTION_2 diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt index 53c0337fcc9c..10eeba30f108 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt @@ -88,10 +88,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 diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt index 28babd413383..8a68f66d8063 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt @@ -1,12 +1,6 @@ Signature_ Root Key Name Type s72 i2 s255 S255 I2 RegLocator Signature_ -ureinstalluser 1 Software\OpenOffice.org\LAYERNAMETEMPLATE\URE\[URELAYERVERSION] UREINSTALLLOCATION 2 -ureinstallmachine 2 Software\OpenOffice.org\LAYERNAMETEMPLATE\URE\[URELAYERVERSION] UREINSTALLLOCATION 2 -basisinstalluser 1 Software\OpenOffice.org\LAYERNAMETEMPLATE\Basis\[OOOBASEVERSION] BASISINSTALLLOCATION 2 -basisinstallmachine 2 Software\OpenOffice.org\LAYERNAMETEMPLATE\Basis\[OOOBASEVERSION] BASISINSTALLLOCATION 2 -officeinstalluser 1 Software\OpenOffice.org\LAYERNAMETEMPLATE\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] OFFICEINSTALLLOCATION 2 -officeinstallmachine 2 Software\OpenOffice.org\LAYERNAMETEMPLATE\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] OFFICEINSTALLLOCATION 2 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 |