diff options
| author | obo <obo@openoffice.org> | 2010-11-12 08:17:48 +0100 |
|---|---|---|
| committer | obo <obo@openoffice.org> | 2010-11-12 08:17:48 +0100 |
| commit | 3ba0f5f2afde91e5a7df5a38b762deca25263545 (patch) | |
| tree | 94f3aec1d51c75f62bcdbabd3d910f68dd8c58c1 | |
| parent | 066088ef313f136a54273075a691e71a9b7a0552 (diff) | |
| parent | 0a2c91e1fa90d5ac8eddbc6be331173fc01fb174 (diff) | |
CWS-TOOLING: integrate CWS native346
6 files changed, 14 insertions, 6 deletions
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt index 9bb051e56..3968375a8 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt @@ -2,4 +2,6 @@ Property Signature_ s72 s72 AppSearch Property Signature_ INSTALLLOCATION installuser +INSTALLLOCATION installuser_ INSTALLLOCATION installmachine +INSTALLLOCATION installmachine_ diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt index 2fb2d2963..661b9a4be 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt @@ -1,5 +1,7 @@ Signature_ Root Key Name Type s72 i2 s255 S255 I2 RegLocator Signature_ -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\Layers\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] INSTALLLOCATION 2 +installuser_ 1 Software\OpenOffice.org\Layers_\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] INSTALLLOCATION 2 +installmachine 2 Software\OpenOffice.org\Layers\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] INSTALLLOCATION 2 +installmachine_ 2 Software\OpenOffice.org\Layers_\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] INSTALLLOCATION 2 diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/AppSearc.idt b/instsetoo_native/inc_sdkoo/windows/msi_templates/AppSearc.idt index 41ff15217..9a3dac511 100644 --- a/instsetoo_native/inc_sdkoo/windows/msi_templates/AppSearc.idt +++ b/instsetoo_native/inc_sdkoo/windows/msi_templates/AppSearc.idt @@ -2,4 +2,6 @@ Property Signature_ s72 s72 AppSearch Property Signature_ INSTALLLOCATION basisinstalluser +INSTALLLOCATION basisinstalluser_ INSTALLLOCATION basisinstallmachine +INSTALLLOCATION basisinstallmachine_ diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt b/instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt index 5121f7870..072fdcf6c 100644 --- a/instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt +++ b/instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt @@ -1,5 +1,7 @@ Signature_ Root Key Name Type s72 i2 s255 S255 I2 RegLocator Signature_ -basisinstalluser 1 Software\OpenOffice.org\LAYERNAMETEMPLATE\Basis\[OOOBASEVERSION] BASISINSTALLLOCATION 2 -basisinstallmachine 2 Software\OpenOffice.org\LAYERNAMETEMPLATE\Basis\[OOOBASEVERSION] BASISINSTALLLOCATION 2 +basisinstalluser 1 Software\OpenOffice.org\Layers\Basis\[OOOBASEVERSION] BASISINSTALLLOCATION 2 +basisinstalluser_ 1 Software\OpenOffice.org\Layers_\Basis\[OOOBASEVERSION] BASISINSTALLLOCATION 2 +basisinstallmachine 2 Software\OpenOffice.org\Layers\Basis\[OOOBASEVERSION] BASISINSTALLLOCATION 2 +basisinstallmachine_ 2 Software\OpenOffice.org\Layers_\Basis\[OOOBASEVERSION] BASISINSTALLLOCATION 2 diff --git a/scp2/source/binfilter/module_binfilter.scp b/scp2/source/binfilter/module_binfilter.scp index ca3c94b75..4857ecf38 100644 --- a/scp2/source/binfilter/module_binfilter.scp +++ b/scp2/source/binfilter/module_binfilter.scp @@ -60,7 +60,7 @@ Module gid_Module_Langpack_Binfilter_Template ParentID = gid_Module_Optional_Binfilter; Name = "gid_Module_Langpack_Binfilter_Template"; Description = "gid_Module_Langpack_Binfilter_Template"; - Default = NO; + Default = YES; Styles = (TEMPLATEMODULE); Files = (gid_File_Res_Bf_Sch, gid_File_Res_Bf_Svx, diff --git a/scp2/source/templates/module_langpack_binfilter.sct b/scp2/source/templates/module_langpack_binfilter.sct index 72c209228..ffcabf0cf 100644 --- a/scp2/source/templates/module_langpack_binfilter.sct +++ b/scp2/source/templates/module_langpack_binfilter.sct @@ -28,7 +28,7 @@ Module gid_Module_Langpack_Binfilter_<LANGUAGE_> ParentID = gid_Module_Langpack_Root_<LANGUAGE_>; Sortkey = "900"; - Default = NO; + Default = YES; Language = "<LANGUAGE>"; Assigns = gid_Module_Langpack_Binfilter_Template; Name = "gid_Module_Langpack_Binfilter_<LANGUAGE_>"; |