Author: gmcdonald Date: Wed Oct 1 16:08:37 2008 New Revision: 700970 URL: http://svn.apache.org/viewvc?rev=700970&view=rev Log: Cure for images not displaying correct sizes, fix for FOR-1098
Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.OOo/resources/stylesheets/xdoc-to-odt.xsl Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.OOo/resources/stylesheets/xdoc-to-odt.xsl URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.OOo/resources/stylesheets/xdoc-to-odt.xsl?rev=700970&r1=700969&r2=700970&view=diff ============================================================================== --- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.OOo/resources/stylesheets/xdoc-to-odt.xsl (original) +++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.OOo/resources/stylesheets/xdoc-to-odt.xsl Wed Oct 1 16:08:37 2008 @@ -29,6 +29,7 @@ xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" + xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:datetime="http://exslt.org/dates-and-times" exclude-result-prefixes="datetime"> @@ -193,10 +194,9 @@ <xsl:attribute name="draw:name"><xsl:value-of select="@alt"/></xsl:attribute> <xsl:attribute name="text:anchor-type">paragraph</xsl:attribute> <xsl:attribute name="draw:z-index">0</xsl:attribute> - <!-- FIXME: See FOR-1098 - The svg attributes below are being ignored. --> - <xsl:attribute name="svg:y">0cm</xsl:attribute> - <xsl:attribute name="svg:width"><xsl:value-of select="@width"/>px</xsl:attribute> - <xsl:attribute name="svg:height"><xsl:value-of select="@height"/>px</xsl:attribute> + <!-- <xsl:attribute name="svg:y">0cm</xsl:attribute> --> + <xsl:attribute name="svg:width"><xsl:value-of select="substring-before(@width, 'p') div 36"/>cm</xsl:attribute> + <xsl:attribute name="svg:height"><xsl:value-of select="substring-before(@height, 'p') div 36"/>cm</xsl:attribute> <xsl:call-template name="drawImage"/> </draw:frame> <xsl:apply-templates/>