diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2014-02-22 09:06:05 +0100 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2014-03-25 11:40:21 +0200 |
| commit | 4e0dee2d5464199a0b9284a395fef3f0df69f7a8 (patch) | |
| tree | 7338841ec3dc7e9dbfef87db2a064c4ca70f0357 /swext | |
| parent | 43deae42db5df2b278e4c075a529cf331ecb9b41 (diff) | |
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@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'swext')
| -rw-r--r-- | swext/mediawiki/src/filter/odt2mediawiki.xsl | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/swext/mediawiki/src/filter/odt2mediawiki.xsl b/swext/mediawiki/src/filter/odt2mediawiki.xsl index 1b14aa19e96a..64474b334ea2 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"> |