[Libreoffice-commits] core.git: swext/mediawiki

[Julien Nabet]

 swext/mediawiki/src/filter/odt2mediawiki.xsl |   21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

New commits:
commit dbc78f2e41c22e0b25598c349e4496a5e0c53164
Author: Julien Nabet <serval2...@yahoo.fr>
Date:   Sat Feb 22 09:06:05 2014 +0100

    Resolves: fdo#75308 Asterisk at the beginning of Paragraph without "Nowiki"
    
    The fix of fdo#74875 brings a huge regression since nowiki must be used
    With this patch, fdo#74875 is still ok hopefully.
    
    Change-Id: Ic6ed34630b40b09ab4f63166cbb1985b6313d168

diff --git a/swext/mediawiki/src/filter/odt2mediawiki.xsl 
b/swext/mediawiki/src/filter/odt2mediawiki.xsl
index 1b14aa1..64474b3 100644
--- a/swext/mediawiki/src/filter/odt2mediawiki.xsl
+++ b/swext/mediawiki/src/filter/odt2mediawiki.xsl
@@ -1129,21 +1129,12 @@
                <param name="text"/>
                
                <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, 
'#')">
-                               <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">
-                                                       <with-param name="text" 
select="$text"/>
-                                               </call-template>
-                                       </otherwise>
-                               </choose>
+                       <when test="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>
+                                       <call-template 
name="render-encoded-text">
+                                               <with-param name="text" 
select="$text"/>
+                                       </call-template>
+                               <text>&lt;/nowiki&gt;</text>                    
                        </when>
                        <otherwise>
                                <call-template name="render-encoded-text">
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits