swext/mediawiki/src/filter/odt2mediawiki.xsl |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d5fba1856ff1f939a9ebd523da3aa6578fbc3a25
Author: Julien Nabet <[email protected]>
Date:   Wed Feb 12 22:07:52 2014 +0100

    Related: fdo#74875 Filter of "nowiki" to be improved - Export to MediaWiki
    
    <nowiki> mustn't be called almost everytime. Now this part still need some 
work (rework?)
    
    Change-Id: I9a01c1e2fb51a51e0737296117db892e3b3b9ce6
    Reviewed-on: https://gerrit.libreoffice.org/8024
    Reviewed-by: Caolán McNamara <[email protected]>
    Tested-by: Caolán McNamara <[email protected]>

diff --git a/swext/mediawiki/src/filter/odt2mediawiki.xsl 
b/swext/mediawiki/src/filter/odt2mediawiki.xsl
index 6992249..1b14aa1 100644
--- a/swext/mediawiki/src/filter/odt2mediawiki.xsl
+++ b/swext/mediawiki/src/filter/odt2mediawiki.xsl
@@ -1130,12 +1130,13 @@
                
                <choose>
                        <when test="contains($text, '&lt;') or contains($text, 
'[') or starts-with($text, '----') or starts-with($text, '=') or 
starts-with($text, '*')  or starts-with($text, ';')  or starts-with($text, 
'#')">
-                               <text>&lt;nowiki&gt;</text>
                                <choose>
                                        <when test="contains($text, 
'&lt;/nowiki&gt;')">
+                                               <text>&lt;nowiki&gt;</text>
                                                <call-template 
name="render-escaped-text">
                                                        <with-param name="text" 
select="$text"/>
                                                </call-template>
+                                               <text>&lt;/nowiki&gt;</text>    
                
                                        </when>
                                        <otherwise>
                                                <call-template 
name="render-encoded-text">
@@ -1143,7 +1144,6 @@
                                                </call-template>
                                        </otherwise>
                                </choose>
-                               <text>&lt;/nowiki&gt;</text>                    
                        </when>
                        <otherwise>
                                <call-template name="render-encoded-text">
_______________________________________________
Libreoffice-commits mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to