diff options
| author | os <os@openoffice.org> | 2010-11-17 07:23:52 +0100 |
|---|---|---|
| committer | os <os@openoffice.org> | 2010-11-17 07:23:52 +0100 |
| commit | ec5053850baa6b4667243d1890afcb223bc90fe2 (patch) | |
| tree | 0760c70e99177b3dbecc3f29062ee88c0d029d7e /scp2 | |
| parent | #i10000# regenerated configure (diff) | |
| parent | #i10000# regenerated configure (diff) | |
| download | core-ec5053850baa6b4667243d1890afcb223bc90fe2.tar.gz core-ec5053850baa6b4667243d1890afcb223bc90fe2.zip | |
merged DEV300:m93
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/source/javafilter/registryitem_javafilter.scp | 8 | ||||
| -rwxr-xr-x | scp2/source/ooo/directory_ooo_macosx.scp | 4 | ||||
| -rw-r--r-- | scp2/source/sdkoo/sdkoo.scp | 3 |
3 files changed, 8 insertions, 7 deletions
diff --git a/scp2/source/javafilter/registryitem_javafilter.scp b/scp2/source/javafilter/registryitem_javafilter.scp index 1340d637e009..3626d914bef4 100644 --- a/scp2/source/javafilter/registryitem_javafilter.scp +++ b/scp2/source/javafilter/registryitem_javafilter.scp @@ -46,7 +46,7 @@ RegistryItem gid_Regitem_Clsid__43887c67_4d5d_4127_Baac_87a288494c7c__Inprocserv ParentID = PREDEFINED_HKEY_CLASSES_ROOT; Subkey = "CLSID\{43887C67-4D5D-4127-BAAC-87A288494C7C}\InProcServer32"; ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Excel; - Value = "[INSTALLLOCATION]Basis\program\xmergesync.dll"; + Value = "[INSTALLLOCATION]program\xmergesync.dll"; End RegistryItem gid_Regitem_Clsid__43887c67_4d5d_4127_Baac_87a288494c7c__Inprocserver32_Threadingmodel @@ -106,7 +106,7 @@ RegistryItem gid_Regitem_Clsid__Bdd611c3_7bab_460f_8711_5b9ac9ef6020__Inprocserv ParentID = PREDEFINED_HKEY_CLASSES_ROOT; Subkey = "CLSID\{BDD611C3-7BAB-460F-8711-5B9AC9EF6020}\InProcServer32"; ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Word; - Value = "[INSTALLLOCATION]Basis\program\xmergesync.dll"; + Value = "[INSTALLLOCATION]program\xmergesync.dll"; End RegistryItem gid_Regitem_Clsid__Bdd611c3_7bab_460f_8711_5b9ac9ef6020__Inprocserver32_Threadingmodel @@ -166,7 +166,7 @@ RegistryItem gid_Regitem_Clsid__C6ab3e74_9f4f_4370_8120_A8a6fabb7a7c__Inprocserv ParentID = PREDEFINED_HKEY_CLASSES_ROOT; Subkey = "CLSID\{C6AB3E74-9F4F-4370-8120-A8A6FABB7A7C}\InProcServer32"; ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Excel; - Value = "[INSTALLLOCATION]Basis\program\xmergesync.dll"; + Value = "[INSTALLLOCATION]program\xmergesync.dll"; End RegistryItem gid_Regitem_Clsid__C6ab3e74_9f4f_4370_8120_A8a6fabb7a7c__Inprocserver32_Threadingmodel @@ -226,7 +226,7 @@ RegistryItem gid_Regitem_Clsid__Cb43f086_838d_4fa4_B5f6_3406b9a57439__Inprocserv ParentID = PREDEFINED_HKEY_CLASSES_ROOT; Subkey = "CLSID\{CB43F086-838D-4FA4-B5F6-3406B9A57439}\InProcServer32"; ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Word; - Value = "[INSTALLLOCATION]Basis\program\xmergesync.dll"; + Value = "[INSTALLLOCATION]program\xmergesync.dll"; End RegistryItem gid_Regitem_Clsid__Cb43f086_838d_4fa4_B5f6_3406b9a57439__Inprocserver32_Threadingmodel diff --git a/scp2/source/ooo/directory_ooo_macosx.scp b/scp2/source/ooo/directory_ooo_macosx.scp index 9cd00117dcbf..ee4ad7522938 100755 --- a/scp2/source/ooo/directory_ooo_macosx.scp +++ b/scp2/source/ooo/directory_ooo_macosx.scp @@ -31,8 +31,8 @@ Directory gid_Dir_Bundle ParentID = PD_PROGDIR; HostName = "%PRODUCTNAME.app"; - LangPackHostName = "%PRODUCTNAME %PRODUCTVERSION Language Pack.app"; - PatchHostName = "%PRODUCTNAME %PRODUCTVERSION Patch.app"; + LangPackHostName = "%PRODUCTNAME Language Pack.app"; + PatchHostName = "%PRODUCTNAME Patch.app"; End #endif diff --git a/scp2/source/sdkoo/sdkoo.scp b/scp2/source/sdkoo/sdkoo.scp index d47e14d0a63a..c9319f68dfd4 100644 --- a/scp2/source/sdkoo/sdkoo.scp +++ b/scp2/source/sdkoo/sdkoo.scp @@ -82,7 +82,8 @@ End Directory gid_Dir_Basis_Sdk #if defined MACOSX ParentID = PREDEFINED_PROGDIR; - DosName = "OpenOffice.org${OOOBASEVERSION}_SDK"; + // DosName = "OpenOffice.org${OOOBASEVERSION}_SDK"; + DosName = "OpenOffice.org_SDK"; #else #if defined WNT ParentID = gid_Dir_Sdkoo_Root; |