diff --git a/ChangeLog b/ChangeLog index f3b179ca6..e23af2b8a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,5 @@ 2004-10-26 Don Allingham + * src/docgen/OpenOfficeDoc.py: fix asian font, file extension * src/plugins/DescendReport.py: fix get_valid_year 2004-10-25 Don Allingham diff --git a/src/docgen/OpenOfficeDoc.py b/src/docgen/OpenOfficeDoc.py index aba1679c6..c95e84ee5 100644 --- a/src/docgen/OpenOfficeDoc.py +++ b/src/docgen/OpenOfficeDoc.py @@ -247,8 +247,8 @@ class OpenOfficeDoc(BaseDoc.BaseDoc): self.cntnt.write('fo:font-weight="bold" ') if font.get_italic(): self.cntnt.write('fo:font-style="italic" ') - self.cntnt.write('fo:font-size="%dpt"/>' % font.get_size()) - self.cntnt.write('style:font-size-asian="%dpt" ' % font.get_size()) + self.cntnt.write('fo:font-size="%dpt" ' % font.get_size()) + self.cntnt.write('style:font-size-asian="%dpt"/> ' % font.get_size()) self.cntnt.write('\n') for style_name in self.table_styles.keys(): @@ -977,8 +977,8 @@ try: Plugins.register_text_doc(mtype,OpenOfficeDoc,1,1,1,".sxw",print_label) Plugins.register_book_doc(mtype,OpenOfficeDoc,1,1,1,".sxw") - Plugins.register_draw_doc(mtype,OpenOfficeDoc,1,1, ".sxd",print_label); + Plugins.register_draw_doc(mtype,OpenOfficeDoc,1,1, ".sxw",print_label); except: Plugins.register_text_doc(_('OpenOffice.org Writer'), OpenOfficeDoc,1,1,1,".sxw", None) Plugins.register_book_doc(_("OpenOffice.org Writer"), OpenOfficeDoc,1,1,1,".sxw") - Plugins.register_draw_doc(_("OpenOffice.org Draw"), OpenOfficeDoc,1,1,".sxd",None); + Plugins.register_draw_doc(_("OpenOffice.org Writer"), OpenOfficeDoc,1,1,".sxx",None);