4370: Reports in ODT format are corrupted

svn: r16210
This commit is contained in:
Benny Malengier
2010-11-18 20:19:50 +00:00
parent df18b2427d
commit a5122b4d1d
3 changed files with 32 additions and 12 deletions

View File

@@ -1390,9 +1390,6 @@ class ODFDoc(BaseDoc, TextDoc, DrawDoc):
"""
text = str(styledtext)
s_tags = styledtext.get_tags()
text = text.replace('&', '\1') # must be the first
text = text.replace('<', '\2')
text = text.replace('>', '\3')
markuptext = self._backend.add_markup_from_styled(text, s_tags, '\n')
# we need to know if we have new styles to add.
# if markuptext contains : FontColor, FontFace, FontSize ...
@@ -1411,9 +1408,6 @@ class ODFDoc(BaseDoc, TextDoc, DrawDoc):
start = m.end()
linenb = 1
self.start_paragraph(style_name)
markuptext = markuptext.replace('\1', '&amp;') # must be the first
markuptext = markuptext.replace('\2', '&lt;')
markuptext = markuptext.replace('\3', '&gt;')
for line in markuptext.split('\n'):
[line, sigcount] = process_spaces(line, format)
if sigcount == 0:

View File

@@ -61,7 +61,13 @@ LOG = logging.getLogger(".odfbackend.py")
def _escape(string):
""" a write to the file
""""""
change text in text that latex shows correctly
special characters: & < and >
"""
string = string.replace('&', '&amp;') # must be the first
string = string.replace('<', '&lt;')
string = string.replace('>', '&gt;')
return string
class OdfBackend(DocBackend):