rpms/openoffice.org/devel openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch, 1.2, 1.3

[David Tardon]

Author: dtardon

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

Modified Files:
	openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch 
Log Message:
simplify the XSLT patch

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

Index: openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch
===================================================================
RCS file: /cvs/extras/rpms/openoffice.org/devel/openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch	24 Apr 2009 08:42:53 -0000	1.2
+++ openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch	27 Apr 2009 06:24:57 -0000	1.3
@@ -53,36 +53,18 @@
 diff -ru filter.orig/source/xslt/export/uof/odf2uof_text.xsl filter/source/xslt/export/uof/odf2uof_text.xsl
 --- filter.orig/source/xslt/export/uof/odf2uof_text.xsl	2009-04-24 09:31:14.000000000 +0100
 +++ filter/source/xslt/export/uof/odf2uof_text.xsl	2009-04-24 09:32:29.000000000 +0100
-@@ -4016,26 +4016,26 @@
- 									<xsl:attribute name="uof:locID">t0122</xsl:attribute>
- 									<xsl:attribute name="uof:attrList">æ ‡è¯†ç¬¦å¼•ç”¨</xsl:attribute>
- 								</xsl:element>
--								<xsl:variable name="stt">
-+								<xsl:variable name="stt1">
- 									<xsl:value-of select="./text:a"/>
- 								</xsl:variable>
--								<xsl:variable name="end">
-+								<xsl:variable name="end1">
- 									<xsl:value-of select="."/>
- 								</xsl:variable>
- 								<xsl:variable name="bijiao">
--									<xsl:value-of select="substring-after($end,$stt)"/>
-+									<xsl:value-of select="substring-after($end1,$stt1)"/>
- 								</xsl:variable>
- 								<xsl:if test="not($bijiao='')">
+@@ -4029,13 +4029,7 @@
  									<xsl:element name="字:文本串">
  										<xsl:attribute name="uof:locID">t0109</xsl:attribute>
  										<xsl:attribute name="uof:attrList">æ ‡è¯†ç¬¦</xsl:attribute>
 -										<xsl:variable name="stt">
-+										<xsl:variable name="stt2">
- 											<xsl:value-of select="./text:a"/>
- 										</xsl:variable>
+-											<xsl:value-of select="./text:a"/>
+-										</xsl:variable>
 -										<xsl:variable name="end">
-+										<xsl:variable name="end2">
- 											<xsl:value-of select="."/>
- 										</xsl:variable>
+-											<xsl:value-of select="."/>
+-										</xsl:variable>
 -										<xsl:value-of select="substring-after($end,$stt)"/>
-+										<xsl:value-of select="substring-after($end2,$stt2)"/>
++										<xsl:value-of select="$bijiao"/>
  									</xsl:element>
  								</xsl:if>
  							</字:句>