From 5848cf17b22d59900dcb7f667ff70d2c102dfe30 Mon Sep 17 00:00:00 2001 From: Alex Roitman Date: Sun, 4 Jun 2006 18:27:50 +0000 Subject: [PATCH] * src/docgen/PSDrawDoc.py: Use ReportUtils.pt2cm. * src/docgen/OpenOfficeDoc.py: Use ReportUtils.pt2cm. * src/docgen/ODFDoc.py: Use ReportUtils.pt2cm. svn: r6858 --- ChangeLog | 3 +++ src/docgen/ODFDoc.py | 6 +++--- src/docgen/OpenOfficeDoc.py | 3 +-- src/docgen/PSDrawDoc.py | 21 ++++++++------------- 4 files changed, 15 insertions(+), 18 deletions(-) diff --git a/ChangeLog b/ChangeLog index dc05f661b..f5f05e019 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,7 @@ 2006-06-04 Alex Roitman + * src/docgen/PSDrawDoc.py: Use ReportUtils.pt2cm. + * src/docgen/OpenOfficeDoc.py: Use ReportUtils.pt2cm. + * src/docgen/ODFDoc.py: Use ReportUtils.pt2cm. * src/ReportBase/Makefile.am (pkgdata_PYTHON): Remove _BookReport.py * src/plugins/Makefile.am (pkgdata_PYTHON): Move BookReport.py diff --git a/src/docgen/ODFDoc.py b/src/docgen/ODFDoc.py index 57c3d9d7f..8951eba9c 100644 --- a/src/docgen/ODFDoc.py +++ b/src/docgen/ODFDoc.py @@ -42,7 +42,6 @@ import BaseDoc import const from PluginUtils import register_text_doc, register_draw_doc, register_book_doc from ReportBase import ReportUtils -pt2cm = ReportUtils.pt2cm import ImgManip import FontScale import Mime @@ -1014,13 +1013,14 @@ class ODFDoc(BaseDoc.BaseDoc): if box_style.get_width(): sw = box_style.get_width()*2.0 # *1.2 else: - sw = pt2cm(FontScale.string_width(font,text))*1.3 + sw = ReportUtils.pt2cm(FontScale.string_width(font,text))*1.3 self.cntnt.write('' % float(y)) diff --git a/src/docgen/OpenOfficeDoc.py b/src/docgen/OpenOfficeDoc.py index 06237c996..9380b5fdf 100644 --- a/src/docgen/OpenOfficeDoc.py +++ b/src/docgen/OpenOfficeDoc.py @@ -42,7 +42,6 @@ import BaseDoc import const from PluginUtils import register_text_doc, register_draw_doc, register_book_doc from ReportBase import ReportUtils -pt2cm = ReportUtils.pt2cm import ImgManip import FontScale import Mime @@ -891,7 +890,7 @@ class OpenOfficeDoc(BaseDoc.BaseDoc): if box_style.get_width(): sw = box_style.get_width() else: - sw = pt2cm(FontScale.string_width(font,text))*1.3 + sw = ReportUtils.pt2cm(FontScale.string_width(font,text))*1.3 self.cntnt.write('