diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-05-31 10:45:37 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-05-31 10:45:37 +0200 |
| commit | 07c1d34ec78dd6e980c4ae370042ab5e3870aa0b (patch) | |
| tree | 15568d84be2d77cb24edb7e9cc53fa0b1ceef820 /scp2 | |
| parent | 23bfe8097571fcf5c9ac223100c2fef9087aad01 (diff) | |
| parent | b75801e6ace5eec09c5d04f2f0f9a373acc1a21c (diff) | |
Merge commit 'libreoffice-3.4.0.2'
Conflicts:
configure.in
distro-configs/LibreOfficeMacOSX.conf
distro-configs/OxygenOfficeLinux.conf
distro-configs/OxygenOfficeWin32.conf
download
instsetoo_native/util/openoffice.lst
ooo.lst.in
set_soenv.in
solenv/bin/modules/installer/download.pm
solenv/gbuild/CppunitTest.mk
solenv/inc/minor.mk
solenv/inc/settings.mk
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/source/impress/module_impress.scp | 5 | ||||
| -rw-r--r-- | scp2/source/ooo/module_ooo.scp | 2 | ||||
| -rw-r--r-- | scp2/source/writer/module_writer.scp | 1 |
3 files changed, 3 insertions, 5 deletions
diff --git a/scp2/source/impress/module_impress.scp b/scp2/source/impress/module_impress.scp index abfdb1537041..e3313c821db4 100644 --- a/scp2/source/impress/module_impress.scp +++ b/scp2/source/impress/module_impress.scp @@ -44,10 +44,7 @@ Module gid_Module_Prg_Impress_Bin Styles = (HIDDEN_ROOT); Files = (gid_File_Extra_Urldesktop_Impress,gid_File_Extra_Urlnew_Impress,gid_File_Extra_Urlstart_Impress,gid_File_Extra_Urltasks_Impress,gid_File_Lib_Placeware, gid_File_Share_Registry_Impress_Xcd, - gid_File_Lib_Animcore,gid_File_Share_Config_Sofficecfg_Impress_Effects_Xml, gid_File_Share_Config_Sofficecfg_Impress_Transitions_Xml, - #if defined ENABLE_OPENGL - gid_File_Share_Config_Sofficecfg_Impress_Transitions_OGL_Xml, - #endif + gid_File_Lib_Animcore,gid_File_Share_Config_Sofficecfg_Impress_Effects_Xml, gid_File_Share_Config_Sofficecfg_Impress_Transitions_Xml, gid_File_Tmp_Userinstall_Impress_Inf); End diff --git a/scp2/source/ooo/module_ooo.scp b/scp2/source/ooo/module_ooo.scp index 3142ac6e0e20..293878bc9e71 100644 --- a/scp2/source/ooo/module_ooo.scp +++ b/scp2/source/ooo/module_ooo.scp @@ -149,7 +149,7 @@ Module gid_Module_Root_Extension_Dictionary_En Files = (gid_File_Extension_Dictionary_En); InstallOrder = "2000"; Sortkey = "550"; - Spellcheckerlanguage = "en-US"; + Spellcheckerlanguage = "en"; PackageInfo = "packinfo_office.txt"; ParentID = gid_Module_Dictionaries; Styles = (); diff --git a/scp2/source/writer/module_writer.scp b/scp2/source/writer/module_writer.scp index 3071059f282b..e66214bbc71c 100644 --- a/scp2/source/writer/module_writer.scp +++ b/scp2/source/writer/module_writer.scp @@ -51,6 +51,7 @@ Module gid_Module_Prg_Wrt_Bin gid_File_Lib_Wpft, gid_File_Lib_Msworks, gid_File_Lib_T602Filter, + gid_File_Lib_Writerfilter, gid_File_Lib_Wlwp, gid_File_Share_Config_Sofficecfg_Writer_Menubar_Xml, gid_File_Share_Config_Sofficecfg_Writerweb_Menubar_Xml, |