summaryrefslogtreecommitdiff
path: root/sfx2/source
diff options
context:
space:
mode:
authorAndras Timar <andras.timar@collabora.com>2015-11-06 08:22:33 -0800
committerAndras Timar <andras.timar@collabora.com>2015-11-10 22:31:17 +0100
commit2eb8400b1359aa6a23c19fd64038f42ee89e220f (patch)
tree6240b36ed3350761243c36e29930b08597e7376c /sfx2/source
parentf89bd662ee5819b5b63558277bc69e41e0b3f500 (diff)
tdf#89852 on Windows do not decode the filename for email subject
... because MAPISendMail does not accept Unicode Change-Id: Id48a41d1cf25d1a991b0f83fd5daa1a65896e958 (cherry picked from commit 77ff51623eab0c5908c84400c6eb8448ddb1e9c8) Reviewed-on: https://gerrit.libreoffice.org/19830 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit cf4b042c934913785ea8886b6a6b3871926c53a3)
Diffstat (limited to 'sfx2/source')
-rw-r--r--sfx2/source/dialog/mailmodel.cxx4
1 files changed, 4 insertions, 0 deletions
diff --git a/sfx2/source/dialog/mailmodel.cxx b/sfx2/source/dialog/mailmodel.cxx
index b0cdda7e85f9..521b74f1f72d 100644
--- a/sfx2/source/dialog/mailmodel.cxx
+++ b/sfx2/source/dialog/mailmodel.cxx
@@ -828,7 +828,11 @@ SfxMailModel::SendMailResult SfxMailModel::Send( const css::uno::Reference< css:
OUString subject(
url.getBase(
INetURLObject::LAST_SEGMENT, false,
+#ifdef WNT
+ INetURLObject::NO_DECODE)); // MAPISendMail does not accept Unicode
+#else
INetURLObject::DECODE_WITH_CHARSET));
+#endif
if (subject.isEmpty()) {
subject = maAttachedDocuments[0];
}