ooo-build r14926 - in trunk: . patches/dev300

[rengelhard svn gnome org]

Author: rengelhard
Date: Wed Dec 24 23:52:02 2008
New Revision: 14926
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14926&view=rev

Log:
2008-12-25  Rene Engelhard  <rene debian org>

        * patches/dev300/apply, patches/dev300/fixup-r265756.diff: fixup
          masterfix at r265756 to enable writer2latex when we want/need it
          and it doesn't do harm to smoketest


Added:
   trunk/patches/dev300/fixup-r265756.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Wed Dec 24 23:52:02 2008
@@ -338,6 +338,10 @@
 # re-direct to plugins via http://extensions.go-oo.org/
 redirect-extensions.diff
 
+[ FixesNotForUpstream >= dev300-m38 ]
+# for masterfix properly. upstream doesn't want it.
+fixup-r265756.diff
+
 # FIXME: disabled since we need the dep here right now
 # (until the reportbuilderext changed get transferred to DEV300).
 # But then maybe it'll include this fix..

Added: trunk/patches/dev300/fixup-r265756.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/fixup-r265756.diff	Wed Dec 24 23:52:02 2008
@@ -0,0 +1,60 @@
+odified: trunk/scp2/source/writer/file_writer.scp
+==============================================================================
+--- trunk/scp2/source/writer/file_writer.scp	Mon Dec 22 16:03:43 2008	(r265755)
++++ trunk/scp2/source/writer/file_writer.scp	Mon Dec 22 16:09:45 2008	(r265756)
+@@ -60,16 +60,19 @@
+ 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 PRODUCT
++#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
++#endif
+ 
+ File gid_File_Registry_Spool_Oo_Office_Embedding_Writer_Xcu
+     TXT_FILE_BODY;
+
+Modified: trunk/scp2/source/writer/module_writer.scp
+==============================================================================
+--- trunk/scp2/source/writer/module_writer.scp	Mon Dec 22 16:03:43 2008	(r265755)
++++ trunk/scp2/source/writer/module_writer.scp	Mon Dec 22 16:09:45 2008	(r265756)
+@@ -110,12 +110,13 @@
+              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"