rpms/openoffice.org/devel openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch, NONE, 1.1 openoffice.org.spec, 1.1759, 1.1760

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22626

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch 
Log Message:
Resolves: rhbz#480121 merge in F-10 patch to F-11

openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch:

--- NEW FILE openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch ---
diff -up ./filter/source/xslt/odf2xhtml/export/xhtml/body.xsl.xhtml ./filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
--- ./filter/source/xslt/odf2xhtml/export/xhtml/body.xsl.xhtml	2009-01-16 10:41:31.000000000 +0100
+++ ./filter/source/xslt/odf2xhtml/export/xhtml/body.xsl	2009-01-16 10:48:01.000000000 +0100
@@ -462,7 +462,7 @@
 	<xsl:template name="create-heading">
 		<xsl:param name="globalData"/>
 
-		<xsl:variable name="headingNumber">
+		<xsl:variable name="headerNumber">
 			<xsl:choose>
 			<xsl:when test="@text:outline-level < 6">
 				<xsl:value-of select="@text:outline-level"/>
@@ -470,7 +470,7 @@
 			<xsl:otherwise>6</xsl:otherwise>
 			</xsl:choose>
 		</xsl:variable>
-		<xsl:variable name="headertyp" select="concat('h', $headingNumber)"/>
+		<xsl:variable name="headertyp" select="concat('h', $headerNumber)"/>
 		<xsl:element name="{$headertyp}">
 			<!-- outline style 'text:min-label-width' is interpreted as a CSS 'margin-right' attribute
 			NOTE: Should be handled as CSS style in style header -->
@@ -865,7 +865,6 @@
 		<xsl:param name="listLevel" select="1"/>
 		<xsl:param name="listRestart" select="false()"/>
 		<xsl:param name="itemLabel" select="''"/>
-		<xsl:param name="listStyle"/>
 		<xsl:param name="listStyleName" select="@text:style-name"/>
 
 		<!-- To choose list type - get the list style, with the same 'text:style-name' and same 'text:level' -->


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1759
retrieving revision 1.1760
diff -u -r1.1759 -r1.1760
--- openoffice.org.spec	16 Jan 2009 10:18:10 -0000	1.1759
+++ openoffice.org.spec	16 Jan 2009 15:34:36 -0000	1.1760
@@ -134,6 +134,7 @@
 Patch61: openoffice.org-3.0.1.ooo97488.sw.ww8toc.patch
 Patch62: openoffice.org-3.0.1.oooXXXXX.fpicker.allformatsonsave.patch
 Patch63: workspace.fwk99.patch
+Patch64: openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
@@ -1415,6 +1416,7 @@
 %patch61 -p1 -b .ooo97488.sw.ww8toc.patch
 %patch62 -p1 -b .oooXXXXX.fpicker.allformatsonsave.patch
 %patch63 -p1 -b .workspace.fwk99.patch
+%patch64 -p1 -b .ooo98137.filter.redeclared-variables.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3828,8 +3830,11 @@
 - Resolves: rhbz#479624 add
   openoffice.org-3.0.1.ooo98024.vcl.emboldenoverlap.patch
 - add hyphen-uk, hyphen-pt dependency
-- Resolves: rhbz#479163 openoffice.org-3.0.1.oooXXXXX.fpicker.allformatsonsave.patch
+- Resolves: rhbz#479163 add
+  openoffice.org-3.0.1.oooXXXXX.fpicker.allformatsonsave.patch
 - Resolves: rhbz#480117 workspace.fwk99.patch
+- Resolves: rhbz#480121 add
+  openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch
 
 * Mon Jan 12 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.0.1-15.1
 - next milestone