ooo-build r8605 - in trunk: . patches/src680

[tml svn gnome org]

Author: tml
Date: 2007-01-17 13:51:56 +0000 (Wed, 17 Jan 2007)
New Revision: 8605
ViewCVS link: http://svn.gnome.org/viewcvs/ooo-build?rev=8605&view=rev

Modified:
   trunk/ChangeLog
   trunk/patches/src680/odf-converter.diff
Log:
2007-01-17  Tor Lillqvist  <tml novell com>

	Merge from ooo-build-2-0-4:

	* patches/src680/odf-converter.diff
	(filter/source/config/fragments/filters/MOOX.xcu): Add /DOCX2ODT
	and /ODT2DOCX switches to the odfconverter.exe invocation to
	explicitly specify the conversion direction. Add ALIEN flag.

	* patches/src680/odf-converter.diff: Don't need to install
	machine.config file now that we bundle it in
	odfconverter.exe. (See patches in Mono bug #80305)