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
commite2701370d7a8ddd1cced6d339fb5501b82cc4b43 (patch)
treea870d8f1b3d87f7532e19a94f70ed4b2cfd7782f /scripting
parentc69c246bce52f6712d3ce8f1a9f76982112e61f7 (diff)
parentaa183d45c83d5465ad77e8902e2314f2477ba2c5 (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 55c204f87dbf..6592a59d1843 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)