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

2007-04-17 Don Allingham <don@gramps-project.org>

Browse Source 
* src/DataViews/_FamilyList.py: add marriage date column
	* src/GrampsDb/_DbUtils.py: add function for finding a marriage event
	* src/DisplayModels/_FamilyModel.py: add marriage date column
	* src/GrampsDbUtils/_GedcomParse.py: handle place form handing
	* src/GrampsDbUtils/_GedcomLex.py: handle place form handing
	* src/GrampsDbUtils/_WriteGedcom.py: handle note list
	* src/docgen/ODFDoc.py: escape special characters



svn: r8398
This commit is contained in:
Don Allingham
2007-04-18 02:12:40 +00:00
parent ec251900c5
commit 6edbffe3a3
10 changed files with 84 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/docgen/ODFDoc.py
View File

@@ -32,6 +32,7 @@ import time
import locale
from cStringIO import StringIO
from math import pi, cos, sin
from xml.sax.saxutils import escape
#-------------------------------------------------------------------------
#
@@ -853,7 +854,7 @@ class ODFDoc(BaseDoc.BaseDoc):
self.start_paragraph(style_name)
self.cntnt.write('<text:span text:style-name="GRAMPS-preformat">')
self.cntnt.write(text)
self.cntnt.write(escape(text))
self.cntnt.write('</text:span>')
self.end_paragraph()
elif format == 0:
@@ -997,7 +998,7 @@ class ODFDoc(BaseDoc.BaseDoc):
self.cntnt.write('<text:p text:style-name="X%s"> ' % pname)
self.cntnt.write('<text:span text:style-name="F%s">\n' % pname)
self.write_text('\n'.join(text))
self.write_text('\n'.join(escape(text)))
self.cntnt.write('</text:span>\n</text:p>\n</draw:text-box>\n')
self.cntnt.write('</draw:frame>\n')
@@ -1066,7 +1067,7 @@ class ODFDoc(BaseDoc.BaseDoc):
self.cntnt.write('<text:p text:style-name="F%s">' % para_name)
self.cntnt.write('<text:span text:style-name="F%s"' % para_name)
self.cntnt.write(' fo:max-height="%.2f">' % font.get_size() )
self.cntnt.write(text)
self.cntnt.write(escape(text))
self.cntnt.write('</text:span></text:p>')
self.cntnt.write('</draw:text-box>\n')
self.cntnt.write('</draw:frame>\n')
@@ -1124,7 +1125,7 @@ class ODFDoc(BaseDoc.BaseDoc):
self.cntnt.write('<draw:text-box>')
self.cntnt.write('<text:p text:style-name="X%s">' % para_name)
self.cntnt.write('<text:span text:style-name="F%s">' % para_name)
self.cntnt.write(text)
self.cntnt.write(escape(text))
self.cntnt.write('</text:span>\n')
self.cntnt.write('</text:p>\n')
self.cntnt.write('</draw:text-box>')