From 3828d35f6bc054a3f4988c98fbda49866bbbb825 Mon Sep 17 00:00:00 2001 From: Alex Roitman Date: Thu, 12 Jun 2003 14:19:30 +0000 Subject: [PATCH] * src/docgen/OpenOfficeDoc.py: Fix typo. Prevent images from being copied more than once. svn: r1713 --- ChangeLog | 4 ++++ src/docgen/OpenOfficeDoc.py | 10 ++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 692ceea8b..d867be84c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2003-06-12 Tim Waugh + * src/docgen/OpenOfficeDoc.py: Fix typo. Prevent images from being + copied more than once. + 2003-06-11 Alex Roitman * src/EditPlace.py (on_switch_page): Fix page numbers to enable proper loading of gallery and references. diff --git a/src/docgen/OpenOfficeDoc.py b/src/docgen/OpenOfficeDoc.py index 264517e22..917026c3b 100644 --- a/src/docgen/OpenOfficeDoc.py +++ b/src/docgen/OpenOfficeDoc.py @@ -1,7 +1,7 @@ # # Gramps - a GTK+/GNOME based genealogy program # -# Copyright (C) 2000 Donald N. Allingham +# Copyright (C) 2000-2003 Donald N. Allingham # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -178,7 +178,7 @@ class OpenOfficeDoc(TextDoc.TextDoc): self.f.write(' style:wrap-contour="false" style:vertical-pos="from-top"') self.f.write(' style:vertical-rel="paragraph-content"') self.f.write(' style:horizontal-pos="left"') - self.f.write(' style:horizontal-rel="paragraph-contnet"') + self.f.write(' style:horizontal-rel="paragraph-content"') self.f.write(' style:mirror="none" fo:clip="rect(0cm 0cm 0cm 0cm)"') self.f.write(' draw:luminance="0%" draw:contrast="0" draw:red="0%"') self.f.write(' draw:green="0%" draw:blue="0%" draw:gamma="1"') @@ -194,7 +194,7 @@ class OpenOfficeDoc(TextDoc.TextDoc): self.f.write(' style:wrap-contour="false" style:vertical-pos="from-top"') self.f.write(' style:vertical-rel="paragraph-content"') self.f.write(' style:horizontal-pos="right"') - self.f.write(' style:horizontal-rel="paragraph-contnet"') + self.f.write(' style:horizontal-rel="paragraph-content"') self.f.write(' style:mirror="none" fo:clip="rect(0cm 0cm 0cm 0cm)"') self.f.write(' draw:luminance="0%" draw:contrast="0" draw:red="0%"') self.f.write(' draw:green="0%" draw:blue="0%" draw:gamma="1"') @@ -252,7 +252,9 @@ class OpenOfficeDoc(TextDoc.TextDoc): act_height = y_cm act_width = x_cm/ratio - self.photo_list.append((name,act_width,act_height)) + photo_list_item = (name,act_width,act_height) + if not photo_list_item in photo_list: + self.photo_list.append(photo_list_item) base = os.path.basename(name) tag = string.replace(base,'.','_')