diff options
Diffstat (limited to 'scripting')
| -rwxr-xr-x | scripting/source/pyprov/mailmerge.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/scripting/source/pyprov/mailmerge.py b/scripting/source/pyprov/mailmerge.py index e7c30ac7b247..40a62f35a378 100755 --- a/scripting/source/pyprov/mailmerge.py +++ b/scripting/source/pyprov/mailmerge.py @@ -219,8 +219,13 @@ class PyMailSMTPService(unohelper.Base, XSmtpService): data = content.getTransferData(flavor) msgattachment.set_payload(data) encode_base64(msgattachment) + fname = attachment.ReadableName + try: + fname.encode('ascii') + except: + fname = ('utf-8','',fname.encode('utf-8')) msgattachment.add_header('Content-Disposition', 'attachment', \ - filename=('utf-8','',attachment.ReadableName.encode('utf-8'))) + filename=fname) msg.attach(msgattachment) |