[Erp5-report] r45683 nicolas - /erp5/trunk/products/ERP5OOo/transforms/

[nobody at svn.erp5.org]

Author: nicolas
Date: Tue Apr 26 10:47:04 2011
New Revision: 45683

URL: http://svn.erp5.org?rev=45683&view=rev
Log:
Use html output and not xhtml, as given mimetype for conversion server is text/html.


Modified:
    erp5/trunk/products/ERP5OOo/transforms/html_to_odt.py
    erp5/trunk/products/ERP5OOo/transforms/oood_commandtransform.py

Modified: erp5/trunk/products/ERP5OOo/transforms/html_to_odt.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5OOo/transforms/html_to_odt.py?rev=45683&r1=45682&r2=45683&view=diff
==============================================================================
--- erp5/trunk/products/ERP5OOo/transforms/html_to_odt.py [utf8] (original)
+++ erp5/trunk/products/ERP5OOo/transforms/html_to_odt.py [utf8] Tue Apr 26 10:47:04 2011
@@ -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:

Modified: erp5/trunk/products/ERP5OOo/transforms/oood_commandtransform.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5OOo/transforms/oood_commandtransform.py?rev=45683&r1=45682&r2=45683&view=diff
==============================================================================
--- erp5/trunk/products/ERP5OOo/transforms/oood_commandtransform.py [utf8] (original)
+++ erp5/trunk/products/ERP5OOo/transforms/oood_commandtransform.py [utf8] Tue Apr 26 10:47:04 2011
@@ -212,10 +212,9 @@ class OOOdCommandTransform(commandtransf
           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):