[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sfx2/source

[Andras Timar]

 sfx2/source/dialog/mailmodel.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit cf4b042c934913785ea8886b6a6b3871926c53a3
Author: Andras Timar <andras.timar at collabora.com>
Date:   Fri Nov 6 08:22:33 2015 -0800

    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 at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/sfx2/source/dialog/mailmodel.cxx b/sfx2/source/dialog/mailmodel.cxx
index b0cdda7..521b74f 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];
                     }