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

[kyoshida svn gnome org]

Author: kyoshida
Date: Wed Feb 11 01:12:37 2009
New Revision: 15316
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15316&view=rev

Log:
2009-02-10  Daniel Watson  <daniel watsonbros gmail com>

	* patches/dev300/filter-xls2003-xml-export-fix.diff:
	* patches/dev300/apply: fix a Write error during export when built with
	--with-system-libxslt and --with-system-saxon. (i#99097)


Added:
   trunk/patches/dev300/filter-xls2003-xml-export-fix.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Wed Feb 11 01:12:37 2009
@@ -1794,6 +1794,9 @@
 calc-sheet-tab-color-svtools.diff, kohei
 calc-sheet-tab-color-sc.diff, kohei
 
+# Fix error on xls 2003 xml export (by Daniel Watson)
+filter-xls2003-xml-export-fix.diff, i#99097, kohei
+
 [ CalcRowLimit ]
 # The work to increase Calc's row size limit, and any work associated with it.
 SectionOwner => kohei

Added: trunk/patches/dev300/filter-xls2003-xml-export-fix.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/filter-xls2003-xml-export-fix.diff	Wed Feb 11 01:12:37 2009
@@ -0,0 +1,25 @@
+Index: filter/source/xslt/export/spreadsheetml/formular.xsl
+===================================================================
+--- filter/source/xslt/export/spreadsheetml/formular.xsl	(revision 266747)
++++ filter/source/xslt/export/spreadsheetml/formular.xsl	(working copy)
+@@ -381,7 +381,7 @@
+ 					</xsl:when>
+ 					<xsl:otherwise>
+ 						<xsl:value-of select="$earlierCandidate" />
+-						<xsl:variable name="parameterCandidate">
++						<xsl:variable name="parameterCandidate2">
+ 							<xsl:variable name="formularAfterCandidate" select="substring-after($expressionSuffix, $earlierCandidate)" />
+ 							<xsl:variable name="parameterTillBracket" select="concat(substring-before($formularAfterCandidate,')'),')')" />
+ 							<xsl:variable name="parameterTillComma" select="substring-before(substring-after($expressionSuffix, $parameterTillBracket),',')" />
+@@ -405,8 +405,8 @@
+ 						<xsl:call-template name="getParameter">
+ 							<xsl:with-param name="closingBracketCount" select="$closingBracketCount" />
+ 							<xsl:with-param name="openingBracketCount" select="$openingBracketCount" />
+-							<xsl:with-param name="parameterCandidate" select="$parameterCandidate" />
+-							<xsl:with-param name="earlierCandidate" select="$parameterCandidate" />
++							<xsl:with-param name="parameterCandidate" select="$parameterCandidate2" />
++							<xsl:with-param name="earlierCandidate" select="$parameterCandidate2" />
+ 							<xsl:with-param name="expressionSuffix" select="$expressionSuffix" />
+ 						</xsl:call-template>
+ 					</xsl:otherwise>
+