summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndras Timar <andras.timar@collabora.com>2015-11-06 08:22:33 -0800
committerAdolfo Jayme Barrientos <fitojb@ubuntu.com>2015-11-07 16:11:22 +0000
commit41cf71d8b9ebaf7ff0279610138a8dc941652c7d (patch)
tree844743a090586f075c5f3e6a3377acd6c8f21760
parent61a7e6f039294103a1721ec95724d067cf205d0b (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/19831 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
-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 68053778e117..25ee3f345974 100644
--- a/sfx2/source/dialog/mailmodel.cxx
+++ b/sfx2/source/dialog/mailmodel.cxx
@@ -829,7 +829,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];
}