diff options
| author | Mathias Bauer <mba@openoffice.org> | 2009-10-26 17:41:29 +0100 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2009-10-26 17:41:29 +0100 |
| commit | 0a0c0f5f5716d0932cf3f58328006e3a185abd0e (patch) | |
| tree | 7bea4888c9f330d4a0e78a5fa52635831e0090e6 /scp2/source/ooo | |
| parent | e1e7e5906a2c62add6715499f180c8a4c8ed4c65 (diff) | |
| parent | 099781c3ed4b97abb73891b63e796d60b4951bb2 (diff) | |
merge commit for 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 d376a46b32b7..ec6e855435c8 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -1719,7 +1719,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 @@ -1730,7 +1730,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 519a2f865a38..7d1d8bb5cc40 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 @@ -3047,6 +3036,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 1d7e0f297148..9607c88b6e0c 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, @@ -1061,6 +1060,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"; |