diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-12-16 08:51:36 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-12-16 08:51:36 +0000 |
| commit | 2f4d5c35d405ce8e4a046921754b83de80788d9f (patch) | |
| tree | e6044ad1ebf0964ea01c1c92cb9d2ed702cd8ced /instsetoo_native | |
| parent | 92151164078b33588e773aabcfdbb1d31d3a6b4f (diff) | |
CWS-TOOLING: integrate CWS native209_DEV300
Diffstat (limited to 'instsetoo_native')
8 files changed, 16 insertions, 0 deletions
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/CustomAc.idt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/CustomAc.idt index 21bca75fca84..d9971918d3f5 100644 --- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/CustomAc.idt +++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/CustomAc.idt @@ -10,3 +10,4 @@ SetBasisInstallLocation 51 BASISINSTALLLOCATION [BASISDIRECTORYGID] SetUreInstallLocation 51 UREINSTALLLOCATION [UREDIRECTORYGID] NewProductFound 19 OOO_CUSTOMACTION_1 SameProductFound 19 OOO_CUSTOMACTION_2 +RunningOffice 19 OOO_CUSTOMACTION_4 diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/InstallE.idt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/InstallE.idt index 6e10edd181cb..4b8ac3782c09 100644 --- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/InstallE.idt +++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/InstallE.idt @@ -49,6 +49,7 @@ RemoveIniValues 1550 RemoveODBC 1200 RemoveRegistryValues 1300 RemoveShortcuts 1600 +RunningOffice OFFICERUNS="1" 65 RMCCPSearch Not CCP_SUCCESS And CCP_TEST 250 SameProductFound SAMEPRODUCTS 120 ScheduleReboot ISSCHEDULEREBOOT 3125 diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Property.idt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Property.idt index a4b5edc3b9a1..0f3ed1e1bba3 100644 --- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Property.idt +++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Property.idt @@ -28,6 +28,7 @@ ISSCRIPT_VERSION_MISSING IDS_ISSCRIPT_VERSION_MISSING ISSCRIPT_VERSION_OLD IDS_ISSCRIPT_VERSION_OLD ISVROOT_PORT_NO 0 Manufacturer MANUFACTURERTEMPLATE +OFFICERUNS 0 PIDTemplate 12345<###-%%%%%%%>@@@@@ ProductCode PRODUCTCODETEMPLATE ProductID none diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt index a4a5415fd928..307279041866 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt @@ -15,3 +15,11 @@ OFFICEINSTALLLOCATION officeuninstalluser OFFICEINSTALLLOCATION officeuninstallmachine INSTALLLOCATION installuser INSTALLLOCATION installmachine +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 dfbe5239fe76..e3bb73b9ed90 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt @@ -46,3 +46,4 @@ SetLanguageSelected 51 LANG_SELECTED 1 ResetLanguageSelected 51 LANG_SELECTED 0 SetApplicationSelected 51 APP_SELECTED 1 ResetApplicationSelected 51 APP_SELECTED 0 +RunningOffice 19 OOO_CUSTOMACTION_4 diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt index 26b6069a9c4d..dc528293b869 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt @@ -81,6 +81,7 @@ RemoveIniValues 1550 RemoveODBC 1200 RemoveRegistryValues 1300 RemoveShortcuts 1600 +RunningOffice OFFICERUNS="1" 65 RMCCPSearch Not CCP_SUCCESS And CCP_TEST 250 SameProductFound SAMEPRODUCTS 120 ScheduleReboot ISSCHEDULEREBOOT 3125 diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt index a1ee346422b9..c9f672b2548e 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt @@ -28,6 +28,7 @@ ISSCRIPT_VERSION_MISSING IDS_ISSCRIPT_VERSION_MISSING ISSCRIPT_VERSION_OLD IDS_ISSCRIPT_VERSION_OLD ISVROOT_PORT_NO 0 Manufacturer MANUFACTURERTEMPLATE +OFFICERUNS 0 PIDTemplate 12345<###-%%%%%%%>@@@@@ ProductCode PRODUCTCODETEMPLATE ProductID none diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt index 349aa0604ca3..67510d19a2d4 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt @@ -9,3 +9,5 @@ officeuninstalluser 1 Software\OpenOffice.org\LAYERNAMETEMPLATE\[DEFINEDPRODUCT] 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 +installuser 1 Software\OpenOffice.org\LAYERNAMETEMPLATE\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] INSTALLLOCATION 2 +installmachine 2 Software\OpenOffice.org\LAYERNAMETEMPLATE\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] INSTALLLOCATION 2 |