From a5cefd4007be4789f550ee559aa832ddb04c2dc3 Mon Sep 17 00:00:00 2001 From: Ariel Constenla-Haile Date: Wed, 25 Jan 2012 07:36:15 +0000 Subject: i118791 - Encode ReadableName in UTF-8 only when necessary Conflicts: scripting/source/pyprov/mailmerge.py Change-Id: I5275bdbbc21f422248a32b824ea6de965c23abd0 --- scripting/source/pyprov/mailmerge.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'scripting/source/pyprov') 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) -- cgit