ooo-build r8637 - in branches/ooo-build-2-0-4: . patches/src680

[tml svn gnome org]

Author: tml
Date: 2007-01-23 10:57:18 +0000 (Tue, 23 Jan 2007)
New Revision: 8637
ViewCVS link: http://svn.gnome.org/viewcvs/ooo-build?rev=8637&view=rev

Modified:
   branches/ooo-build-2-0-4/ChangeLog
   branches/ooo-build-2-0-4/patches/src680/odf-converter.diff
Log:
2007-01-23  Tor Lillqvist  <tml novell com>

	* patches/src680/odf-converter.diff
	(setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.hxx)
	(setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.cxx)
	(setup_native/source/win32/customactions/reg4msdoc/registrar.cxxapply):
	Check that both .doc and .docx are either nonexistent in HKCR, or
	both associated with OOo before preselecting the "Microsoft Word
	Documents" button.