From 6843ce885e3e128d24ea8472da4883de223213cd Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Fri, 29 Jun 2012 12:20:16 +0100 Subject: Resolves: fdo#38713 fix multiple recipients in mailmerge It appears I don't know the correct syntax for concatenating tuples Change-Id: I32756caeaabfcc52e521108da917aeadf8256caa --- scripting/source/pyprov/mailmerge.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'scripting') diff --git a/scripting/source/pyprov/mailmerge.py b/scripting/source/pyprov/mailmerge.py index 38a40d1348b9..f8ccbd6af76e 100755 --- a/scripting/source/pyprov/mailmerge.py +++ b/scripting/source/pyprov/mailmerge.py @@ -397,12 +397,12 @@ class PyMailMessage(unohelper.Base, XMailMessage): print >> dbgout, "PyMailMessage init" self.ctx = ctx - self.recipients = sTo, + self.recipients = (sTo,) self.ccrecipients = () self.bccrecipients = () self.aMailAttachments = () if aMailAttachment != None: - self.aMailAttachments = aMailAttachment, + self.aMailAttachments = (aMailAttachment,) self.SenderName, self.SenderAddress = parseaddr(sFrom) self.ReplyToAddress = sFrom @@ -413,15 +413,15 @@ class PyMailMessage(unohelper.Base, XMailMessage): def addRecipient( self, recipient ): if dbg: print >> dbgout, "PyMailMessage.addRecipient", recipient - self.recipients = self.recipients, recipient + self.recipients = self.recipients + (recipient,) def addCcRecipient( self, ccrecipient ): if dbg: print >> dbgout, "PyMailMessage.addCcRecipient", ccrecipient - self.ccrecipients = self.ccrecipients, ccrecipient + self.ccrecipients = self.ccrecipients + (ccrecipient,) def addBccRecipient( self, bccrecipient ): if dbg: print >> dbgout, "PyMailMessage.addBccRecipient", bccrecipient - self.bccrecipients = self.bccrecipients, bccrecipient + self.bccrecipients = self.bccrecipients + (bccrecipient,) def getRecipients( self ): if dbg: print >> dbgout, "PyMailMessage.getRecipients", self.recipients @@ -437,7 +437,7 @@ class PyMailMessage(unohelper.Base, XMailMessage): def addAttachment( self, aMailAttachment ): if dbg: print >> dbgout, "PyMailMessage.addAttachment" - self.aMailAttachments = self.aMailAttachments, aMailAttachment + self.aMailAttachments = self.aMailAttachments + (aMailAttachment,) def getAttachments( self ): if dbg: print >> dbgout, "PyMailMessage.getAttachments" -- cgit