[Erp5-report] r39027 nicolas - /erp5/trunk/products/ERP5OOo/Document/OOoDocument.py

[nobody at svn.erp5.org]

Author: nicolas
Date: Mon Oct 11 17:32:57 2010
New Revision: 39027

URL: http://svn.erp5.org?rev=39027&view=rev
Log:
Improve conversion to base_format for OOoDocuments.
If we pass content_type parameter to the conversion tool,
it can find the appropriate Import Filter according content_type of document.
With this patch HTML => odt and XHTML => odt, are working without hackish code
in oood_commandtranforms.
Reviewed by romain

Modified:
    erp5/trunk/products/ERP5OOo/Document/OOoDocument.py

Modified: erp5/trunk/products/ERP5OOo/Document/OOoDocument.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5OOo/Document/OOoDocument.py?rev=39027&r1=39026&r2=39027&view=diff
==============================================================================
--- erp5/trunk/products/ERP5OOo/Document/OOoDocument.py [utf8] (original)
+++ erp5/trunk/products/ERP5OOo/Document/OOoDocument.py [utf8] Mon Oct 11 17:32:57 2010
@@ -426,7 +426,10 @@ class OOoDocument(OOoDocumentExtensibleT
     server_proxy = self._mkProxy()
     response_code, response_dict, response_message = server_proxy.run_convert(
                                       self.getSourceReference() or self.getId(),
-                                      enc(str(self.getData())))
+                                      enc(str(self.getData())),
+                                      None,
+                                      None,
+                                      self.getContentType())
     if response_code == 200:
       # sucessfully converted document
       self._setBaseData(dec(response_dict['data']))