mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cmcfixes71: #i108945# fix From field in mailmerge

Browse Source
This commit is contained in:
Caolán McNamara
2010-02-04 11:13:49 +00:00
parent 973b606dea
commit 07e314f63e
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
scripting/source/pyprov/mailmerge.py
View File

@@ -37,6 +37,7 @@ from email import Encoders
from email.Header import Header
from email.MIMEMultipart import MIMEMultipart
from email.Utils import formatdate
from email.Utils import formataddr
import sys, smtplib, imaplib, poplib
@@ -123,8 +124,8 @@ class PyMailSMTPService(unohelper.Base, XSmtpService):
bccrecipients = xMailMessage.getBccRecipients()
if dbg:
print >> sys.stderr, "PyMailSMPTService subject", subject
print >> sys.stderr, "PyMailSMPTService from", sendername.encode('utf-8')
print >> sys.stderr, "PyMailSMTPService from", sendermail
print >> sys.stderr, "PyMailSMPTService from", sendername.encode('utf-8'), sendermail
print >> sys.stderr, "PyMailSMTPService from", formataddr((sendername.encode('utf-8'), sendermail))
print >> sys.stderr, "PyMailSMPTService send to", recipients
attachments = xMailMessage.getAttachments()
@@ -149,10 +150,8 @@ class PyMailSMTPService(unohelper.Base, XSmtpService):
else:
msg = textmsg
hdr = Header(sendername, 'utf-8')
hdr.append('<'+sendermail+'>','us-ascii')
msg['Subject'] = subject
msg['From'] = hdr
msg['From'] = formataddr((sendername.encode('utf-8'), sendermail))
msg['To'] = COMMASPACE.join(recipients)
if len(ccrecipients):
msg['Cc'] = COMMASPACE.join(ccrecipients)