From 950460101fb718308b9aafa321508913b49e85a8 Mon Sep 17 00:00:00 2001 From: Nicolas Delaby <nicolas@nexedi.com> Date: Tue, 26 Apr 2011 08:47:04 +0000 Subject: [PATCH] Use html output and not xhtml, as given mimetype for conversion server is text/html. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@45683 20353a03-c40f-0410-a6d1-a30d3c3de9de --- product/ERP5OOo/transforms/html_to_odt.py | 5 +---- product/ERP5OOo/transforms/oood_commandtransform.py | 3 +-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/product/ERP5OOo/transforms/html_to_odt.py b/product/ERP5OOo/transforms/html_to_odt.py index 92d65e6339..98ce746d6d 100644 --- a/product/ERP5OOo/transforms/html_to_odt.py +++ b/product/ERP5OOo/transforms/html_to_odt.py @@ -34,12 +34,9 @@ class HTMLToOdt: # Try to recover broken HTML documents, specially regarding encoding used html_node = etree.XML(orig, parser=html_parser) includeMetaContentType(html_node) - orig = html.tostring(html_node, encoding='utf-8', method='xml', + orig = html.tostring(html_node, encoding='utf-8', include_meta_content_type=True) - # workaround a Bug in LibreOffice HTML import filter. - # https://bugs.freedesktop.org/show_bug.cgi?id=36080 - orig = orig.replace('<title/>', '<title></title>') doc = OOOdCommandTransform(context, filename, orig, self.inputs[0]) odt = doc.convertTo('odt') if cache is not None: diff --git a/product/ERP5OOo/transforms/oood_commandtransform.py b/product/ERP5OOo/transforms/oood_commandtransform.py index 4a3360c177..f017195f4f 100644 --- a/product/ERP5OOo/transforms/oood_commandtransform.py +++ b/product/ERP5OOo/transforms/oood_commandtransform.py @@ -212,10 +212,9 @@ class OOOdCommandTransform(commandtransform): parent_node.remove(css_link_tag) includeMetaContentType(xml_doc) - xml_output = html.tostring(xml_doc, encoding='utf-8', method='xml', + xml_output = html.tostring(xml_doc, encoding='utf-8', include_meta_content_type=True) - xml_output = xml_output.replace('<title/>', '<title></title>') return xml_output def convertTo(self, format): -- 2.30.9