* src/BaseDoc.py (SheetParser.startElement): Tolerate missing

tmargin and bmargin (when reading older style files).


svn: r5427
This commit is contained in:
Alex Roitman 2005-11-23 22:14:56 +00:00
parent a9b53b1a9f
commit 3c426c0ffc
2 changed files with 9 additions and 2 deletions

View File

@ -5,6 +5,8 @@
* test/runtest.sh: Add txt format and family_group report.
* test/impex.sh: Add import/export test set.
* example/gramps/example.gramps: Correct errors.
* src/BaseDoc.py (SheetParser.startElement): Tolerate missing
tmargin and bmargin (when reading older style files).
2005-11-22 Don Allingham <don@gramps-project.org>
* src/docgen/AbiWord2Doc.py: fix spacing for top and bottom margin

View File

@ -993,8 +993,13 @@ class SheetParser(handler.ContentHandler):
self.p.set_right_margin(Utils.gfloat(attrs['rmargin']))
self.p.set_left_margin(Utils.gfloat(attrs['lmargin']))
self.p.set_first_indent(Utils.gfloat(attrs['first']))
self.p.set_top_margin(Utils.gfloat(attrs['tmargin']))
self.p.set_bottom_margin(Utils.gfloat(attrs['bmargin']))
try:
# This is needed to read older style files
# lacking tmargin and bmargin
self.p.set_top_margin(Utils.gfloat(attrs['tmargin']))
self.p.set_bottom_margin(Utils.gfloat(attrs['bmargin']))
except KeyError:
pass
self.p.set_padding(Utils.gfloat(attrs['pad']))
self.p.set_alignment(int(attrs['align']))
self.p.set_right_border(int(attrs['rborder']))