rpms/openoffice.org/devel openoffice.org-3.2.0.ooo105827.filter.xpath-on-rtf-not-allowed.patch, NONE, 1.1 openoffice.org.spec, 1.2028, 1.2029

[David Tardon]

Author: dtardon

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

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.2.0.ooo105827.filter.xpath-on-rtf-not-allowed.patch 
Log Message:
 add openoffice.org-3.2.0.ooo105827.filter.xpath-on-rtf-not-allowed.patch

openoffice.org-3.2.0.ooo105827.filter.xpath-on-rtf-not-allowed.patch:
 body.xsl |   44 +++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 41 insertions(+), 3 deletions(-)

--- NEW FILE openoffice.org-3.2.0.ooo105827.filter.xpath-on-rtf-not-allowed.patch ---
Index: filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
===================================================================
--- filter/source/xslt/odf2xhtml/export/xhtml/body.xsl	(revision 276736)
+++ filter/source/xslt/odf2xhtml/export/xhtml/body.xsl	(working copy)
@@ -61,9 +61,17 @@
     <xsl:key match="style:master-page" name="masterPageElements" use="@style:name"/>
     <xsl:key match="style:page-layout" name="pageLayoutElements" use="@style:name"/>
     <xsl:key name="writingModeStyles" match="/*/office:styles/style:style/style:paragraph-properties/@style:writing-mode | /*/office:automatic-styles/style:style/style:paragraph-properties/@style:writing-mode" use="'test'"/>
+
     <xsl:template name="create-body">
         <xsl:param name="globalData"/>
+        <xsl:call-template name="create-body.collect-page-properties">
+            <xsl:with-param name="globalData" select="$globalData"/>
+        </xsl:call-template>
+    </xsl:template>
 
+    <xsl:template name="create-body.collect-page-properties">
+        <xsl:param name="globalData"/>
+
 		<!-- approximation to find the correct master page style (with page dimensions) -->
         <xsl:variable name="masterPageNames">
 			<!-- Loop over every style:style containing a @style:master-page-name attribute -->
@@ -76,13 +84,13 @@
                 </xsl:if>
             </xsl:for-each>
         </xsl:variable>
-				
+
 		<!-- Take the first of the masterpage list and get the according style:master-page element and find the @style:page-layout-name  -->
         <xsl:variable name="pageLayoutName" select="key('masterPageElements', substring-before($masterPageNames,';'))/@style:page-layout-name"/>
-        <xsl:variable name="pageProperties">
+        <xsl:variable name="pagePropertiesRTF">
             <xsl:choose>
                 <xsl:when test="not($pageLayoutName) or $pageLayoutName = ''">
-                    <xsl:copy-of select="$globalData/styles-file/*/office:automatic-styles/style:page-layout[1]/style:page-layout-properties"/>
+                    <xsl:value-of select="$globalData/styles-file/*/office:automatic-styles/style:page-layout[1]/style:page-layout-properties"/>
                 </xsl:when>
                 <xsl:otherwise>
 					<!-- Find the according style:page-layout and store the properties in a variable  -->
@@ -90,6 +98,36 @@
                 </xsl:otherwise>
             </xsl:choose>
         </xsl:variable>
+
+        <xsl:choose>
+            <xsl:when test="function-available('common:node-set')">
+                <xsl:call-template name="create-body.create">
+                    <xsl:with-param name="globalData" select="common:node-set($globalData)"/>
+                    <xsl:with-param name="pageProperties" select="common:node-set($pagePropertiesRTF)"/>
+                </xsl:call-template>
+            </xsl:when>
+            <xsl:when test="function-available('xalan:nodeset')">
+                <xsl:call-template name="create-body.create">
+                    <xsl:with-param name="globalData" select="xalan:nodeset($globalData)"/>
+                    <xsl:with-param name="pageProperties" select="xalan:nodeset($pagePropertiesRTF)"/>
+                </xsl:call-template>
+            </xsl:when>
+            <xsl:when test="function-available('xt:node-set')">
+                <xsl:call-template name="create-body.create">
+                    <xsl:with-param name="globalData" select="xt:node-set($globalData)"/>
+                    <xsl:with-param name="pageProperties" select="xt:node-set($pagePropertiesRTF)"/>
+                </xsl:call-template>
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:message terminate="yes">The required node-set function was not found!</xsl:message>
+            </xsl:otherwise>
+        </xsl:choose>
+    </xsl:template>
+
+    <xsl:template name="create-body.create">
+        <xsl:param name="globalData"/>
+        <xsl:param name="pageProperties"/>
+
         <xsl:element name="body">
 			<!-- direction of text flow -->
             <xsl:variable name="writingMode" select="$pageProperties/style:page-layout-properties/@style:writing-mode"/>


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/extras/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2028
retrieving revision 1.2029
diff -u -p -r1.2028 -r1.2029
--- openoffice.org.spec	12 Oct 2009 12:53:33 -0000	1.2028
+++ openoffice.org.spec	12 Oct 2009 13:19:32 -0000	1.2029
@@ -117,6 +117,7 @@ Patch43: workspace.vcl106.patch
 Patch44: openoffice.org-3.1.1.ooo105784.vcl.sniffscriptforsubs.patch
 Patch45: workspace.dba32h.patch
 Patch46: openoffice.org-3.2.0.ooo105815.officecfg.default-font-for-si-locale.patch
+Patch47: openoffice.org-3.2.0.ooo105827.filter.xpath-on-rtf-not-allowed.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1623,6 +1624,7 @@ cat %{PATCH10} >> svtools/source/dialogs
 %patch44 -p0 -b .ooo105784.vcl.sniffscriptforsubs.patch
 %patch45 -p0 -b .workspace.dba32h.patch
 %patch46 -p0 -b .officecfg.default-font-for-si-locale.patch
+%patch47 -p0 -b .ooo105827.filter.xpath-on-rtf-not-allowed.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4183,6 +4185,7 @@ fi
 - Resolves: rhbz#528409 [si_LK] Default font in oowriter is not
   Language Default (LKLUG), but DejaVu Sans (dtardon)
 - update openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch (dtardon)
+- add openoffice.org-3.2.0.ooo105827.filter.xpath-on-rtf-not-allowed.patch (dtardon)
 
 * Thu Oct 08 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.1-19.11
 - merge openoffice.org-3.1.1.ooo104157.svx.crashonencryptparse.patch