From ffce4f06d5aec6e04159eede595015d4f6386a7d Mon Sep 17 00:00:00 2001 From: Alex Roitman Date: Mon, 22 Mar 2004 16:29:38 +0000 Subject: [PATCH] * src/docgen/LPRDoc.py: Fix colliding name. svn: r3044 --- gramps2/ChangeLog | 3 +++ gramps2/src/docgen/LPRDoc.py | 10 +++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index d30bace7b..b90e235a0 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -1,3 +1,6 @@ +2004-03-22 Alex Roitman + * src/docgen/LPRDoc.py: Fix colliding name. + 2004-03-21 Don Allingham * src/AddMedia.py: GenericTreeModel changes * src/AddSpouse.py: GenericTreeModel changes diff --git a/gramps2/src/docgen/LPRDoc.py b/gramps2/src/docgen/LPRDoc.py index cac1cd52e..5a058d64a 100644 --- a/gramps2/src/docgen/LPRDoc.py +++ b/gramps2/src/docgen/LPRDoc.py @@ -627,7 +627,7 @@ class LPRDoc(BaseDoc.BaseDoc): self.table_width = (self.right_margin - self.left_margin) * \ self.tbl_style.get_width() / 100.0 self.cell_widths = [] - self.cell_styles = [] + self.gp_cell_styles = [] self.brand_new_page = 0 def end_table(self): @@ -646,7 +646,7 @@ class LPRDoc(BaseDoc.BaseDoc): self.cellnum = -1 self.span = 1 self.cell_widths.append([0] * self.ncols) - self.cell_styles.append([None] * self.ncols) + self.gp_cell_styles.append([None] * self.ncols) for cell in range(self.ncols): self.cell_widths[self.rownum][cell] = self.table_width * \ self.tbl_style.get_column_width(cell) / 100.0 @@ -666,7 +666,7 @@ class LPRDoc(BaseDoc.BaseDoc): self.cell_data = [] self.cellnum = self.cellnum + self.span self.span = span - self.cell_styles[self.rownum][self.cellnum] = \ + self.gp_cell_styles[self.rownum][self.cellnum] = \ self.cell_styles[style_name] for extra_cell in range(1,span): self.cell_widths[self.rownum][self.cellnum] += \ @@ -907,7 +907,7 @@ class LPRDoc(BaseDoc.BaseDoc): if not self.cell_widths[row_num][col]: continue - padding = cm2u(self.cell_styles[row_num][col].get_padding()) + padding = cm2u(self.gp_cell_styles[row_num][col].get_padding()) the_max = 0 for paragraph in row[col]: the_min = paragraph.get_min_width() @@ -943,7 +943,7 @@ class LPRDoc(BaseDoc.BaseDoc): if not self.cell_widths[row_num][col]: continue self.y = col_y - padding = cm2u(self.cell_styles [row_num][col].get_padding()) + padding = cm2u(self.gp_cell_styles [row_num][col].get_padding()) for paragraph in row[col]: if paragraph.__class__.__name__ == 'GnomePrintPhoto': write_item = self.write_photo