convert to utf8 text, if possible. original text might not be utf8 encoding.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@18083 20353a03-c40f-0410-a6d1-a30d3c3de9de

product/ERP5OOo/Document/OOoDocument.py

@@ -350,13 +350,10 @@ class OOoDocument(File, ConversionCacheMixin):
       is_html = 1
     elif format in ('txt', 'text', 'text-content'):
       format_list = self.getTargetFormatList()
-      if format in format_list:
-        format = format_list[format_list.index(format)]
-      if 'txt' in format_list:
-        format = format_list[format_list.index('txt')]
-      elif 'text' in format_list:
-        format = format_list[format_list.index('text')]
-      else:
+      # if possible, we try to get utf8 text. ('enc.txt' will encode to utf8)
+      if 'enc.txt' in format_list:
+        format = 'enc.txt'
+      elif format not in format_list:
         return 'text/plain', self.asTextContent()
     # Raise an error if the format is not supported
     if not self.isTargetFormatAllowed(format):