[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - swext/mediawiki

[Arianna Masciolini]

 swext/mediawiki/src/filter/odt2mediawiki.xsl |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 6ef9fca590622d3269c0ba11e3782910ac573261
Author: Arianna Masciolini <uzkamascio at gmail.com>
Date:   Mon May 29 17:10:40 2017 +0200

    tdf#33831 swext: mention images by name in the mediawiki export
    
    odt files with pictures exported in mediawiki format now contain references to each image
    
    Change-Id: Idd73da997e2fe983899dd4514d3c393b3607a52d
    Reviewed-on: https://gerrit.libreoffice.org/38160
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    (cherry picked from commit a8124c2eaf401741e2235939a20cef2617ad8bd1)
    Reviewed-on: https://gerrit.libreoffice.org/38717

diff --git a/swext/mediawiki/src/filter/odt2mediawiki.xsl b/swext/mediawiki/src/filter/odt2mediawiki.xsl
index 25fa68fddca2..8812be4d282d 100644
--- a/swext/mediawiki/src/filter/odt2mediawiki.xsl
+++ b/swext/mediawiki/src/filter/odt2mediawiki.xsl
@@ -1017,6 +1017,8 @@
 			<text>[[</text>
 			<call-template name="mk-image-name">
 				<with-param name="image" select="$image"/>
+				<with-param name="frame" select="."/>
+				<with-param name="extension" select="'.png'"/>
 			</call-template>
 			<text>|thumb</text>
 		</variable>
@@ -1038,6 +1040,7 @@
 			<text>[[</text>
 			<call-template name="mk-image-name">
 				<with-param name="image" select="."/>
+				<with-param name="frame" select="parent::node()"/>
 			</call-template>
 		</variable>
 
@@ -1155,7 +1158,9 @@
 
 	<template name="mk-image-name">
 		<param name="image"/>
-		
+		<param name="frame"/>
+		<param name="extension"/>
+
  		<variable name="base-name">
  			<call-template name="mk-base-name">
  				<with-param name="href" select="$image/@xlink:href"/>
@@ -1166,6 +1171,8 @@
 			<value-of select="'Image:'"/>
 		</if>
 		<value-of select="$base-name"/>
+		<value-of select="$frame/@draw:name"/>
+		<value-of select="'.png'"/>
 	</template>	
  	
  	<template name="mk-base-name">