Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ODFDoc : issue 3187 : <, > and & should be escaped

Browse Source 
svn: r13118
This commit is contained in:
Serge Noiraud 2009-08-25 16:48:12 +00:00
parent f1352ee2ee
commit 442eaf9923
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/docgen/ODFDoc.py
View File

@ -1216,6 +1216,9 @@ class ODFDoc(BaseDoc, TextDoc, DrawDoc):
""" """
text = str(styledtext) text = str(styledtext)
s_tags = styledtext.get_tags() 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) markuptext = self._backend.add_markup_from_styled(text, s_tags)
# we need to know if we have new styles to add. # we need to know if we have new styles to add.
# if markuptext contains : FontColor, FontFace, FontSize ... # if markuptext contains : FontColor, FontFace, FontSize ...
@ -1234,6 +1237,9 @@ class ODFDoc(BaseDoc, TextDoc, DrawDoc):
start = m.end() start = m.end()
linenb = 1 linenb = 1
self.start_paragraph(style_name) 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'): for line in markuptext.split('\n'):
if ( linenb > 1 ): if ( linenb > 1 ):
self.cntnt.write('<text:line-break/>') self.cntnt.write('<text:line-break/>')