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

[nobody at svn.erp5.org]

Author: nicolas
Date: Thu Mar 31 17:15:43 2011
New Revision: 44923

URL: http://svn.erp5.org?rev=44923&view=rev
Log:
follows r44921

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=44923&r1=44922&r2=44923&view=diff
==============================================================================
--- erp5/trunk/products/ERP5OOo/Document/OOoDocument.py [utf8] (original)
+++ erp5/trunk/products/ERP5OOo/Document/OOoDocument.py [utf8] Thu Mar 31 17:15:43 2011
@@ -324,11 +324,10 @@ class OOoDocument(OOoDocumentExtensibleT
       format = format_list[0]
       is_html = 1
     elif format in ('txt', 'text', 'text-content'):
-      format_list = self.getTargetFormatList()
       # if possible, we try to get utf8 text. ('enc.txt' will encode to utf8)
-      if 'enc.txt' in format_list:
+      if 'enc.txt' in allowed_format_list:
         format = 'enc.txt'
-      elif format not in format_list:
+      elif format not in allowed_format_list:
         #Text conversion is not supported by oood, do it in other way
         if not self.hasConversion(format=original_format):
           #Do real conversion for text