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

[Julien Nabet]

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

New commits:
commit 895c13faf15b4ebf45be23c461f49a8ab0fd4e09
Author: Julien Nabet <serval2412 at 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
    Reviewed-on: https://gerrit.libreoffice.org/8167
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

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, '<') 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, '</nowiki>')">
-				                <text><nowiki></text>
-						<call-template name="render-escaped-text">
-							<with-param name="text" select="$text"/>
-						</call-template>
-				                <text></nowiki></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><nowiki></text>
+					<call-template name="render-encoded-text">
+						<with-param name="text" select="$text"/>
+					</call-template>
+				<text></nowiki></text>			
 			</when>
 			<otherwise>
 				<call-template name="render-encoded-text">