diff options
| author | Rene Engelhard <rene@debian.org> | 2011-01-02 01:15:14 +0100 |
|---|---|---|
| committer | Rene Engelhard <rene@debian.org> | 2011-01-02 01:15:14 +0100 |
| commit | 09482c61494ee76fd33f6e482cd77ad2753bbf3e (patch) | |
| tree | 0d4a98b8b3418371dce197476668bc4c2d76084e /scp2 | |
| parent | WaE: Tweak this to prefer boost::unordered_map (diff) | |
| parent | Remove version info from extension folder name too. (diff) | |
| download | core-09482c61494ee76fd33f6e482cd77ad2753bbf3e.tar.gz core-09482c61494ee76fd33f6e482cd77ad2753bbf3e.zip | |
Merge remote branch 'origin/libreoffice-3-3'
Conflicts:
scp2/source/extensions/directory_extensions.scp
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/source/extensions/directory_extensions.scp | 16 | ||||
| -rw-r--r-- | scp2/source/extensions/file_extensions.scp | 12 |
2 files changed, 20 insertions, 8 deletions
diff --git a/scp2/source/extensions/directory_extensions.scp b/scp2/source/extensions/directory_extensions.scp index 9bbb77976b2a..4d846689f8dd 100644 --- a/scp2/source/extensions/directory_extensions.scp +++ b/scp2/source/extensions/directory_extensions.scp @@ -113,7 +113,7 @@ End Directory gid_Brand_Dir_Share_Extensions_CT2N ParentID = gid_Brand_Dir_Share_Extensions; - DosName = "ConvertTextToNumber-1.3.2"; + DosName = "ConvertTextToNumber"; End #endif @@ -234,13 +234,25 @@ End Directory gid_Brand_Dir_Share_Extensions_OOoBlogger ParentID = gid_Brand_Dir_Share_Extensions; - DosName = "oooblogger-0.1"; + DosName = "oooblogger"; End #endif /* ** Sun Template Pack ** */ +#ifdef WITH_EXTENSION_SUN_TEMPLATE_PACK + +Directory gid_Brand_Dir_Share_Extensions_Sun_Template_Pack + ParentID = gid_Brand_Dir_Share_Extensions; + DosName (en-US)= "Sun_ODF_Template_Pack_en-US"; + DosName (de) = "Sun_ODF_Template_Pack_de"; + DosName (it) = "Sun_ODF_Template_Pack_it"; + DosName (fr) = "Sun_ODF_Template_Pack_fr"; + DosName (es) = "Sun_ODF_Template_Pack_es"; + DosName (hu) = "Sun_ODF_Template_Pack_hu"; +End + #endif /* script providers */ diff --git a/scp2/source/extensions/file_extensions.scp b/scp2/source/extensions/file_extensions.scp index 53f563acff3e..85b31a860c5f 100644 --- a/scp2/source/extensions/file_extensions.scp +++ b/scp2/source/extensions/file_extensions.scp @@ -110,7 +110,7 @@ End File gid_File_Oxt_LightProof TXT_FILE_BODY; - Styles = (PACKED); + Styles = (PACKED, ARCHIVE); Dir = gid_Brand_Dir_Share_Extensions_Install; Name (hu) = "lightproof-hu-1.2.oxt"; Name (en-US) = "lightproof-en-US-0.1.oxt"; @@ -139,7 +139,7 @@ File gid_File_Oxt_CT2N TXT_FILE_BODY; Styles = (PACKED, ARCHIVE); Dir = gid_Brand_Dir_Share_Extensions_CT2N; - Name = "ConvertTextToNumber-1.3.2.oxt"; + Name = "ConvertTextToNumber.oxt"; End #endif @@ -282,7 +282,7 @@ File gid_File_Oxt_OOoBlogger TXT_FILE_BODY; Styles = (PACKED, ARCHIVE); Dir = gid_Brand_Dir_Share_Extensions_OOoBlogger; - Name = "oooblogger-0.1.oxt"; + Name = "oooblogger.oxt"; End #endif @@ -293,15 +293,15 @@ End #ifdef WITH_EXTENSION_SUN_TEMPLATE_PACK File gid_File_Optional_Extensions_Sun_Template_Pack - Dir = gid_Brand_Dir_Share_Extensions_Install; + TXT_FILE_BODY; + Styles = (PACKED, ARCHIVE); + Dir = gid_Brand_Dir_Share_Extensions_Sun_Template_Pack; Name (en-US) = "Sun_ODF_Template_Pack_en-US.oxt"; Name (de) = "Sun_ODF_Template_Pack_de.oxt"; Name (it) = "Sun_ODF_Template_Pack_it.oxt"; Name (fr) = "Sun_ODF_Template_Pack_fr.oxt"; Name (es) = "Sun_ODF_Template_Pack_es.oxt"; Name (hu) = "Sun_ODF_Template_Pack_hu.oxt"; - Styles = (PACKED); - UnixRights = 444; End /* script providers */ |