ooo-build r11263 - in branches/sled-10-ooo-build-2-3: . patches/src680

[tml svn gnome org]

Author: tml
Date: Tue Jan 15 10:57:38 2008
New Revision: 11263
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11263&view=rev

Log:
2008-01-15  Tor Lillqvist  <tml novell com>

	* patches/src680/apply: Add
	win32-installer-register-moox-types.diff to the Win32Only set,
	too, so that it will be applied on Win32 even if the rest of the
	OOXML set isn't. Thus if the person running the installer chooses
	to associate OOo with MS file types, also the OOXML types will be
	associated. (OOo as presently built in this branch without the
	OOXML patch set won't be able to do anything with them, though,
	unless the odf-converter extension is installed. But still this is
	probably what we want.)



Modified:
   branches/sled-10-ooo-build-2-3/ChangeLog
   branches/sled-10-ooo-build-2-3/patches/src680/apply

Modified: branches/sled-10-ooo-build-2-3/patches/src680/apply
==============================================================================
--- branches/sled-10-ooo-build-2-3/patches/src680/apply	(original)
+++ branches/sled-10-ooo-build-2-3/patches/src680/apply	Tue Jan 15 10:57:38 2008
@@ -1538,6 +1538,14 @@
 win32-installer-register-moox-types.diff
 
 
+[ Win32Only ]
+# As the OOXML set is not used on Win32 in this branch now (which as such
+# was an unnecessarily harsh thing to do, but too late to change that now),
+# but we do want to associate also the OOXML file extensions to OOo when
+# asked to, duplicate this patch in the Win32Only set.
+win32-installer-register-moox-types.diff
+
+
 [ OOXSTLport5 ]
 SectionOwner => hmth