diff options
| author | sb <sb@openoffice.org> | 2009-10-21 16:53:02 +0200 |
|---|---|---|
| committer | sb <sb@openoffice.org> | 2009-10-21 16:53:02 +0200 |
| commit | 5481010878bb849ea28ede741bfc39bdc21ca0ec (patch) | |
| tree | 48bd5ea1410928b7ecf8e7cb6badfcf5acf134c8 /scp2/source/ooo | |
| parent | 9751861070f6746d46defe34cbcd8766c53ae665 (diff) | |
| parent | 099781c3ed4b97abb73891b63e796d60b4951bb2 (diff) | |
merged in DEV300_m62
Diffstat (limited to 'scp2/source/ooo')
| -rw-r--r-- | scp2/source/ooo/file_library_ooo.scp | 4 | ||||
| -rw-r--r-- | scp2/source/ooo/file_ooo.scp | 20 | ||||
| -rw-r--r-- | scp2/source/ooo/module_hidden_ooo.scp | 12 |
3 files changed, 22 insertions, 14 deletions
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index ac75f20a37f0..4de3e573ddeb 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -1596,7 +1596,7 @@ End File gid_File_Lib_LibXMLSec_xmlseccore TXT_FILE_BODY; #ifdef _gcc3 - Name = "libxmlsec1-1.dll"; + Name = "libxmlsec1.dll"; #else Name = "libxmlsec.dll"; #endif @@ -1607,7 +1607,7 @@ End File gid_File_Lib_LibXMLSec_xmlsecmscrypto TXT_FILE_BODY; #ifdef _gcc3 - Name = "libxmlsec1-mscrypto-1.dll"; + Name = "libxmlsec1-mscrypto.dll"; #else Name = "libxmlsec-mscrypto.dll"; #endif diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index 4f21eb5d6280..c5532e2ada32 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -178,17 +178,6 @@ End #endif -#ifndef WITHOUT_FONTOOO - -File gid_File_Exe_Msfontextract - BIN_FILE_BODY; - Dir = gid_Dir_Program; - Name = EXENAME(msfontextract); - Styles = (PACKED); -End - -#endif - #ifdef UNX File gid_File_Bin_Open_Url @@ -1969,6 +1958,15 @@ End #endif #ifndef WITHOUT_MYSPELL_DICTS +File gid_File_Extension_Dictionary_He + Dir = gid_Brand_Dir_Share_Extension_Install; + Name = "dict-he.oxt"; + Styles = (PACKED, FORCELANGUAGEPACK); + UnixRights = 444; +End +#endif + +#ifndef WITHOUT_MYSPELL_DICTS File gid_File_Extension_Dictionary_Hu Dir = gid_Brand_Dir_Share_Extension_Install; Name = "dict-hu.oxt"; diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp index 32fa83702170..06c3d73803e5 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -52,7 +52,6 @@ Module gid_Module_Root_Files_2 gid_File_Profile_Gengal, gid_File_Bin_Spadmin_Bin, gid_File_Bin_Uri_Encode, - gid_File_Exe_Msfontextract, gid_File_Exe_Nsplugin, gid_File_Lib_Npsoplugin, gid_File_Lib_Soffice, @@ -904,6 +903,17 @@ Module gid_Module_Root_Extension_Dictionary_Gl Styles = (HIDDEN_ROOT); End +Module gid_Module_Root_Extension_Dictionary_He + Name = "gid_Module_Root_Extension_Dictionary_He"; + Description = "gid_Module_Root_Extension_Dictionary_He"; + Files = (gid_File_Extension_Dictionary_He); + InstallOrder = "2000"; + Spellcheckerlanguage = "he"; + PackageInfo = "packinfo_office.txt"; + ParentID = gid_Module_Root; + Styles = (HIDDEN_ROOT); +End + Module gid_Module_Root_Extension_Dictionary_Hu Name = "gid_Module_Root_Extension_Dictionary_Hu"; Description = "gid_Module_Root_Extension_Dictionary_Hu"; |