Commit ee6d0e92 authored by Nicolas Delaby's avatar Nicolas Delaby

follows r44921

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@44923 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 3761f551
...@@ -324,11 +324,10 @@ class OOoDocument(OOoDocumentExtensibleTraversableMixin, BaseConvertableFileMixi ...@@ -324,11 +324,10 @@ class OOoDocument(OOoDocumentExtensibleTraversableMixin, BaseConvertableFileMixi
format = format_list[0] format = format_list[0]
is_html = 1 is_html = 1
elif format in ('txt', 'text', 'text-content'): 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 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' 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 #Text conversion is not supported by oood, do it in other way
if not self.hasConversion(format=original_format): if not self.hasConversion(format=original_format):
#Do real conversion for text #Do real conversion for text
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment