summaryrefslogtreecommitdiff
path: root/scripting
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2010-07-22 13:43:20 +0200
committerJens-Heiner Rechtien <hr@openoffice.org>2010-07-22 13:43:20 +0200
commit70b37e6e72d2397e8c23dc2b1ddb3d38ee8cc21b (patch)
tree11be38330b3fd9fb338fdbede14874ef1e883c04 /scripting
parent689c6285852a97aef9e32736ec7b809809f0b147 (diff)
parent36f6cbe7c1ade67ab66e8ee20c13eb9a1d5a8a12 (diff)
CWS-TOOLING: integrate CWS emailmerge33fix
Diffstat (limited to 'scripting')
-rw-r--r--scripting/source/pyprov/mailmerge.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripting/source/pyprov/mailmerge.py b/scripting/source/pyprov/mailmerge.py
index 55c204f87d..6592a59d18 100644
--- a/scripting/source/pyprov/mailmerge.py
+++ b/scripting/source/pyprov/mailmerge.py
@@ -153,8 +153,8 @@ class PyMailSMTPService(unohelper.Base, XSmtpService):
if len(textbody):
mimeEncoding = re.sub("charset=.*", "charset=UTF-8", flavor.MimeType)
- if mimeEncoding.find('charset=UTF-8') == -1:
- mimeEncoding = mimeEncoding + "; charset=UTF-8"
+ if mimeEncoding.find('charset=UTF-8') == -1:
+ mimeEncoding = mimeEncoding + "; charset=UTF-8"
textmsg['Content-Type'] = mimeEncoding
textmsg['MIME-Version'] = '1.0'
textmsg.set_payload(textbody)