diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-05-14 12:10:36 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-05-14 12:10:36 +0000 |
| commit | ebf0416da38c580d3f2aa9c34f346f901ec6b7ae (patch) | |
| tree | 8d99e21ea65bf454cfbe12bf5d5983b92476f095 /scp2/source/ooo/registryitem_ooo.scp | |
| parent | 288070a5e27e1ba336c83abbd4b11c98857eaeb0 (diff) | |
INTEGRATION: CWS native149 (1.27.4); FILE MERGED
2008/05/05 13:28:16 is 1.27.4.4: #i88541# fix component id for layer entries in registry
2008/04/30 15:48:39 is 1.27.4.3: #i88541# dynamic layer linking for windows
2008/04/30 13:22:43 is 1.27.4.2: #i88541# dynamic layer linking for windows
2008/04/29 15:56:51 is 1.27.4.1: #i88541# dynamic Windows linking
Diffstat (limited to 'scp2/source/ooo/registryitem_ooo.scp')
| -rw-r--r-- | scp2/source/ooo/registryitem_ooo.scp | 28 |
1 files changed, 23 insertions, 5 deletions
diff --git a/scp2/source/ooo/registryitem_ooo.scp b/scp2/source/ooo/registryitem_ooo.scp index baa4b5a16c37..0ed3078df8d9 100644 --- a/scp2/source/ooo/registryitem_ooo.scp +++ b/scp2/source/ooo/registryitem_ooo.scp @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: registryitem_ooo.scp,v $ - * $Revision: 1.27 $ + * $Revision: 1.28 $ * * This file is part of OpenOffice.org. * @@ -408,7 +408,7 @@ End RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Install ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; - Subkey = "Software\OpenOffice.org\%OOOBASEVERSION"; + Subkey = "Software\OpenOffice.org\Layer\%PRODUCTNAME\%BRANDPACKAGEVERSION"; ModuleID = gid_Module_Root; Name = "INSTALLLOCATION"; Value = "[INSTALLLOCATION]"; @@ -435,7 +435,7 @@ End RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Officeinstall ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; - Subkey = "Software\OpenOffice.org\%OOOBASEVERSION"; + Subkey = "Software\OpenOffice.org\Layer\%PRODUCTNAME\%BRANDPACKAGEVERSION"; ModuleID = gid_Module_Root; Name = "OFFICEINSTALLLOCATION"; Value = "[OFFICEINSTALLLOCATION]"; @@ -462,7 +462,16 @@ End RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Basisinstall ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; - Subkey = "Software\OpenOffice.org\%OOOBASEVERSION"; + Subkey = "Software\OpenOffice.org\Layer\Basis\%OOOBASEVERSION"; + ModuleID = gid_Module_Root; + Name = "BASISINSTALLLOCATION"; + Value = "[BASISINSTALLLOCATION]"; + Styles = (LANGUAGEPACK,ALWAYS_REQUIRED,LAYER_REGISTRY,USE_OOOBASEVERSION); +End + +RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Layer_Basisinstall + ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; + Subkey = "Software\OpenOffice.org\Layer\%PRODUCTNAME\%BRANDPACKAGEVERSION"; ModuleID = gid_Module_Root; Name = "BASISINSTALLLOCATION"; Value = "[BASISINSTALLLOCATION]"; @@ -489,7 +498,16 @@ End RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Ureinstall ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; - Subkey = "Software\OpenOffice.org\%OOOBASEVERSION"; + Subkey = "Software\OpenOffice.org\Layer\URE\%URELAYERVERSION"; + ModuleID = gid_Module_Root; + Name = "UREINSTALLLOCATION"; + Value = "[UREINSTALLLOCATION]"; + Styles = (LANGUAGEPACK,ALWAYS_REQUIRED,LAYER_REGISTRY,USE_URELAYERVERSION); +End + +RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Layer_Ureinstall + ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; + Subkey = "Software\OpenOffice.org\Layer\%PRODUCTNAME\%BRANDPACKAGEVERSION"; ModuleID = gid_Module_Root; Name = "UREINSTALLLOCATION"; Value = "[UREINSTALLLOCATION]"; |