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

[kyoshida svn gnome org]

Author: kyoshida
Date: Wed Dec 31 19:29:53 2008
New Revision: 14980
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14980&view=rev

Log:
2008-12-31  Kohei Yoshida  <kyoshida novell com>

	* patches/dev300/remove-preferred-filter-writer2latex.diff: remove the 
	PreferredFilter filter property from the writer2latex extension, 
	because this property is valid only when the filter is an IMPORT filter
	which writer2latex isn't.  Adding this property causes soffice to fail
	when dbgutil is enabled.

	* patches/dev300/apply: apply this new patch.


Added:
   trunk/patches/dev300/remove-preferred-filter-writer2latex.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Wed Dec 31 19:29:53 2008
@@ -1203,6 +1203,10 @@
 [ BuildBits ]
 fix-mozbootstrap.diff, i#97010, jholesov
 
+# 'PreferredFilter' filter option should only be used if the filter is an 
+# IMPORT filter.
+remove-preferred-filter-writer2latex.diff, kohei
+
 [ Java14 ]
 
 # enable build with Java 1.4; can't go upstream

Added: trunk/patches/dev300/remove-preferred-filter-writer2latex.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/remove-preferred-filter-writer2latex.diff	Wed Dec 31 19:29:53 2008
@@ -0,0 +1,56 @@
+diff --git writer2latex/writer2latex05.patch writer2latex/writer2latex05.patch
+index 1492215..9d9da31 100644
+--- writer2latex/writer2latex05.patch
++++ writer2latex/writer2latex05.patch
+@@ -41,3 +41,51 @@
+                      System.err.println("Oops - error converting base64");
+                  }
+                  sMIME = MIMETypes.getMagicMIMEType(blob);
++diff --git source/oxt/writer2latex/w2l_types.xcu source/oxt/writer2latex/w2l_types.xcu
++index 99b5b32..dfce54c 100644
++--- misc/build/writer2latex05/source/oxt/writer2latex/w2l_types.xcu
+++++ misc/build/writer2latex05/source/oxt/writer2latex/w2l_types.xcu
++@@ -9,7 +9,6 @@
++ 		<prop oor:name="Extensions"><value>bib</value></prop>
++ 		<prop oor:name="MediaType"/>
++ 		<prop oor:name="Preferred"><value>false</value></prop>
++-		<prop oor:name="PreferredFilter"><value>BibTeX Data File</value></prop>
++ 		<prop oor:name="UIName">
++ 			<value>BibTeX Data File</value>
++ 		</prop>
++@@ -22,7 +21,6 @@
++ 		<prop oor:name="Extensions"><value>tex</value></prop>
++ 		<prop oor:name="MediaType"/>
++ 		<prop oor:name="Preferred"><value>false</value></prop>
++-		<prop oor:name="PreferredFilter"><value>LaTeX File</value></prop>
++ 		<prop oor:name="UIName">
++ 			<value>LaTeX 2e</value>
++ 		</prop>
++diff --git source/oxt/writer2xhtml/w2x_types.xcu source/oxt/writer2xhtml/w2x_types.xcu
++index ee4d4fd..c9dad65 100644
++--- misc/build/writer2latex05/source/oxt/writer2xhtml/w2x_types.xcu
+++++ misc/build/writer2latex05/source/oxt/writer2xhtml/w2x_types.xcu
++@@ -9,7 +9,6 @@
++ 		<prop oor:name="Extensions"><value>html</value></prop>
++ 		<prop oor:name="MediaType"/>
++ 		<prop oor:name="Preferred"><value>false</value></prop>
++-		<prop oor:name="PreferredFilter"><value>XHTML 1.0 strict File</value></prop>
++ 		<prop oor:name="UIName">
++ 			<value>XHTML 1.0 strict</value>
++ 		</prop>
++@@ -22,7 +21,6 @@
++ 		<prop oor:name="Extensions"><value>xhtml</value></prop>
++ 		<prop oor:name="MediaType"/>
++ 		<prop oor:name="Preferred"><value>false</value></prop>
++-		<prop oor:name="PreferredFilter"><value>XHTML 1.1 plus MathML 2.0 File</value></prop>
++ 		<prop oor:name="UIName">
++ 			<value>XHTML 1.1 + MathML 2.0</value>
++ 		</prop>
++@@ -35,7 +33,6 @@
++ 		<prop oor:name="Extensions"><value>xml</value></prop>
++ 		<prop oor:name="MediaType"/>
++ 		<prop oor:name="Preferred"><value>false</value></prop>
++-		<prop oor:name="PreferredFilter"><value>XHTML 1.1 plus MathML 2.0 (xsl) File</value></prop>
++ 		<prop oor:name="UIName">
++ 			<value>XHTML 1.1 + MathML 2.0 (xsl)</value>
++ 		</prop>