From cf4b042c934913785ea8886b6a6b3871926c53a3 Mon Sep 17 00:00:00 2001
From: Andras Timar <andras.timar@collabora.com>
Date: Fri, 6 Nov 2015 08:22:33 -0800
Subject: 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>
---
 sfx2/source/dialog/mailmodel.cxx | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'sfx2')

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];
                     }
-- 
cgit v1.2.3