Kaydet (Commit) 6843ce88 authored tarafından Caolán McNamara's avatar Caolán McNamara

Resolves: fdo#38713 fix multiple recipients in mailmerge

It appears I don't know the correct syntax for concatenating tuples

Change-Id: I32756caeaabfcc52e521108da917aeadf8256caa
üst ff3c4e9e
...@@ -397,12 +397,12 @@ class PyMailMessage(unohelper.Base, XMailMessage): ...@@ -397,12 +397,12 @@ class PyMailMessage(unohelper.Base, XMailMessage):
print >> dbgout, "PyMailMessage init" print >> dbgout, "PyMailMessage init"
self.ctx = ctx self.ctx = ctx
self.recipients = sTo, self.recipients = (sTo,)
self.ccrecipients = () self.ccrecipients = ()
self.bccrecipients = () self.bccrecipients = ()
self.aMailAttachments = () self.aMailAttachments = ()
if aMailAttachment != None: if aMailAttachment != None:
self.aMailAttachments = aMailAttachment, self.aMailAttachments = (aMailAttachment,)
self.SenderName, self.SenderAddress = parseaddr(sFrom) self.SenderName, self.SenderAddress = parseaddr(sFrom)
self.ReplyToAddress = sFrom self.ReplyToAddress = sFrom
...@@ -413,15 +413,15 @@ class PyMailMessage(unohelper.Base, XMailMessage): ...@@ -413,15 +413,15 @@ class PyMailMessage(unohelper.Base, XMailMessage):
def addRecipient( self, recipient ): def addRecipient( self, recipient ):
if dbg: if dbg:
print >> dbgout, "PyMailMessage.addRecipient", recipient print >> dbgout, "PyMailMessage.addRecipient", recipient
self.recipients = self.recipients, recipient self.recipients = self.recipients + (recipient,)
def addCcRecipient( self, ccrecipient ): def addCcRecipient( self, ccrecipient ):
if dbg: if dbg:
print >> dbgout, "PyMailMessage.addCcRecipient", ccrecipient print >> dbgout, "PyMailMessage.addCcRecipient", ccrecipient
self.ccrecipients = self.ccrecipients, ccrecipient self.ccrecipients = self.ccrecipients + (ccrecipient,)
def addBccRecipient( self, bccrecipient ): def addBccRecipient( self, bccrecipient ):
if dbg: if dbg:
print >> dbgout, "PyMailMessage.addBccRecipient", bccrecipient print >> dbgout, "PyMailMessage.addBccRecipient", bccrecipient
self.bccrecipients = self.bccrecipients, bccrecipient self.bccrecipients = self.bccrecipients + (bccrecipient,)
def getRecipients( self ): def getRecipients( self ):
if dbg: if dbg:
print >> dbgout, "PyMailMessage.getRecipients", self.recipients print >> dbgout, "PyMailMessage.getRecipients", self.recipients
...@@ -437,7 +437,7 @@ class PyMailMessage(unohelper.Base, XMailMessage): ...@@ -437,7 +437,7 @@ class PyMailMessage(unohelper.Base, XMailMessage):
def addAttachment( self, aMailAttachment ): def addAttachment( self, aMailAttachment ):
if dbg: if dbg:
print >> dbgout, "PyMailMessage.addAttachment" print >> dbgout, "PyMailMessage.addAttachment"
self.aMailAttachments = self.aMailAttachments, aMailAttachment self.aMailAttachments = self.aMailAttachments + (aMailAttachment,)
def getAttachments( self ): def getAttachments( self ):
if dbg: if dbg:
print >> dbgout, "PyMailMessage.getAttachments" print >> dbgout, "PyMailMessage.getAttachments"
......
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