rpms/openoffice.org/devel openoffice.org-3.1.0.ooo101355.filter.no-variables-in-keys.patch, NONE, 1.1 openoffice.org.spec, 1.1900, 1.1901

[David Tardon]

Author: dtardon

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

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.1.0.ooo101355.filter.no-variables-in-keys.patch 
Log Message:
add openoffice.org-3.1.0.ooo101355.filter.no-variables-in-keys.patch

openoffice.org-3.1.0.ooo101355.filter.no-variables-in-keys.patch:

--- NEW FILE openoffice.org-3.1.0.ooo101355.filter.no-variables-in-keys.patch ---
Index: filter/source/docbook/sofftodocbookheadings.xsl
===================================================================
--- filter/source/docbook/sofftodocbookheadings.xsl	(revision 270724)
+++ filter/source/docbook/sofftodocbookheadings.xsl	(working copy)
@@ -73,11 +73,6 @@
 			 match="text:h"
 			 use="generate-id(preceding::text:h[@text:level < current()/@text:level][1])"/>
 
-	<!-- All those headings have not the lowest outline level (mapped to section1), but come before the first heading mapped to section1  -->
-	<xsl:key name="preludingHeadings"
-			 match="text:h"
-			 use="generate-id(following::text:h[@text:level = $section1_OutlineLevel][1])"/>
-
 	<!-- The key function "getHeadingsByOutline" returns all headings of a certain outline level -->
 	<xsl:key name="getHeadingsByOutline"
 			 match="text:h"
@@ -175,7 +170,7 @@
 				<xsl:text disable-output-escaping="yes">&lt;sect1&gt;</xsl:text>
 				<title></title>
 				<!-- create sections for all the first section1 preluding headings -->
-				<xsl:for-each select="key('preludingHeadings', generate-id())">
+                <xsl:for-each select="key('getHeadingsByOutline', $section1_OutlineLevel)[1]/preceding::text:h">
 					<xsl:call-template name="make-section">
 						<xsl:with-param name="previousSectionLevel" select="$section1_OutlineLevel"/>
 						<xsl:with-param name="currentSectionLevel">
@@ -1186,4 +1181,4 @@
 			<xsl:with-param name="whitespaces" select="8"/>
 		</xsl:call-template>
 	</xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
+</xsl:stylesheet>


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/extras/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1900
retrieving revision 1.1901
diff -u -r1.1900 -r1.1901
--- openoffice.org.spec	27 Apr 2009 06:02:35 -0000	1.1900
+++ openoffice.org.spec	27 Apr 2009 10:49:28 -0000	1.1901
@@ -136,6 +136,7 @@
 Patch61: openoffice.org-3.1.0.ooo90439.sfx2.qstart.hackaround.patch
 Patch62: openoffice.org-3.1.0.ooo101274.opening-a-directory.patch
 Patch63: openoffice.org-3.1.0.ooo101354.filter.xhtml.do-not-label-list-headers.patch
+Patch64: openoffice.org-3.1.0.ooo101355.filter.no-variables-in-keys.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1630,6 +1631,7 @@
 %patch61 -p0 -b .ooo90439.sfx2.qstart.hackaround.patch
 %patch62 -p0 -b .ooo101274.opening-a-directory.patch
 %patch63 -p0 -b .ooo101354.filter.xhtml.do-not-label-list-headers.patch
+%patch64 -p0 -b .ooo101355.filter.no-variables-in-keys.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4131,6 +4133,7 @@
    + add openoffice.org-3.1.0-ooo101274.opening-a-directory.patch
 - silence stupid survey dialog
 - Resolves: rhbz#484177 openoffice.org-3.1.0.ooo101354.filter.xhtml.do-not-label-list-headers.patch
+- add openoffice.org-3.1.0.ooo101355.filter.no-variables-in-keys.patch
 
 * Sun Apr 19 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.0-10.2
 - Resolves: rhbz#496280 ooo#101184 dynamically detect multiple monitors