diff options
| -rw-r--r-- | scp2/source/writer/file_writer.scp | 21 | ||||
| -rw-r--r-- | scp2/source/writer/module_writer.scp | 15 | ||||
| -rw-r--r-- | soltools/prj/build.lst | 2 | ||||
| -rw-r--r-- | stlport/prj/build.lst | 2 |
4 files changed, 19 insertions, 21 deletions
diff --git a/scp2/source/writer/file_writer.scp b/scp2/source/writer/file_writer.scp index f7b0444e7cce..8df9f80c5a2e 100644 --- a/scp2/source/writer/file_writer.scp +++ b/scp2/source/writer/file_writer.scp @@ -60,17 +60,16 @@ File gid_File_Exe_Sweb End #endif -# temporarily disable writer2latex filter due to issue i97440 -##ifdef SOLAR_JAVA -##ifndef WITHOUT_WRITER2LATEX -#File gid_File_Oxt_Writer2latex -# TXT_FILE_BODY; -# Name = "writer2latex.oxt"; -# Dir = gid_Brand_Dir_Share_Extension_Install; -# Styles = (PACKED); -#End -##endif -##endif +#ifdef SOLAR_JAVA +#ifndef WITHOUT_WRITER2LATEX +File gid_File_Oxt_Writer2latex + TXT_FILE_BODY; + Name = "writer2latex.oxt"; + Dir = gid_Brand_Dir_Share_Extension_Install; + Styles = (PACKED); +End +#endif +#endif File gid_File_Registry_Spool_Oo_Office_Embedding_Writer_Xcu TXT_FILE_BODY; diff --git a/scp2/source/writer/module_writer.scp b/scp2/source/writer/module_writer.scp index 2e933c40c081..ec4b3ba9dc9b 100644 --- a/scp2/source/writer/module_writer.scp +++ b/scp2/source/writer/module_writer.scp @@ -111,13 +111,12 @@ Module gid_Module_Langpack_Writer_Template gid_File_Res_T602Filter); End -# temporarily disable writer2latex filter due to issue i97440 -#Module gid_Module_Optional_Writer2latex -# MOD_NAME_DESC(MODULE_PRG_WRT_WRITER2LATEX); -# ParentID = gid_Module_Optional; -# Default = YES; -# PackageInfo = "packinfo_office.txt"; -# Files = (gid_File_Oxt_Writer2latex); -#End +Module gid_Module_Optional_Writer2latex + MOD_NAME_DESC(MODULE_PRG_WRT_WRITER2LATEX); + ParentID = gid_Module_Optional; + Default = YES; + PackageInfo = "packinfo_office.txt"; + Files = (gid_File_Oxt_Writer2latex); +End #include "alllangmodules_writer.inc" diff --git a/soltools/prj/build.lst b/soltools/prj/build.lst index 7079dff8f55e..0a3ed598db0e 100644 --- a/soltools/prj/build.lst +++ b/soltools/prj/build.lst @@ -1,4 +1,4 @@ -so soltools : stlport SUN:officenames NULL +so soltools : stlport SUN:so_prereq NULL so soltools usr1 - all so_usr1 NULL so soltools\inc get - all so_inc NULL so soltools\ldump nmake - all so_ldump so_mkdep NULL diff --git a/stlport/prj/build.lst b/stlport/prj/build.lst index aea67ee26a46..259feec2f6bc 100644 --- a/stlport/prj/build.lst +++ b/stlport/prj/build.lst @@ -1,2 +1,2 @@ -sl stlport : SO:officenames solenv NULL +sl stlport : SO:so_prereq solenv NULL sl stlport nmake - all sl_mkout NULL |