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

[tml svn gnome org]

Author: tml
Date: Thu Jan 24 11:43:02 2008
New Revision: 11397
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11397&view=rev

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

	* patches/src680/sc-excform8-wntmsci-miscompilation.diff: New
	patch. Compile the file sc/source/filter/excel/excform8.cxx
	without optimization. Seems to help bug n#355304, although
	probably the fact that turning off optimization for this file
	makes the crash go away is just a coincidence, and the real bug is
	something deeper.

	* patches/src680/apply: Add it fo Fixes.



Added:
   branches/sled-10-ooo-build-2-3/patches/src680/sc-excform8-wntmsci-miscompilation.diff
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	Thu Jan 24 11:43:02 2008
@@ -1933,3 +1933,4 @@
 
 [ Fixes ]
 xmloff-input-field-reference.diff, n#346189, flr
+sc-excform8-wntmsci-miscompilation.diff, n#355304, tml

Added: branches/sled-10-ooo-build-2-3/patches/src680/sc-excform8-wntmsci-miscompilation.diff
==============================================================================
--- (empty file)
+++ branches/sled-10-ooo-build-2-3/patches/src680/sc-excform8-wntmsci-miscompilation.diff	Thu Jan 24 11:43:02 2008
@@ -0,0 +1,14 @@
+--- sc/source/filter/excel/makefile.mk
++++ sc/source/filter/excel/makefile.mk
+@@ -126,6 +126,11 @@
+ 		$(SLO)$/xiescher.obj
+ .ENDIF
+ 
++.IF "$(GUI)$(COM)$(CPU)" == "WNTMSCI"
++NOOPTFILES = \
++		$(SLO)$/excform8.obj
++.ENDIF
++
+ EXCEPTIONSFILES = \
+ 		$(SLO)$/excdoc.obj					\
+ 		$(SLO)$/excform.obj					\