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

[Andras Timar]

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

New commits:
commit 41cf71d8b9ebaf7ff0279610138a8dc941652c7d
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/19831
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
    Tested-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>

diff --git a/sfx2/source/dialog/mailmodel.cxx b/sfx2/source/dialog/mailmodel.cxx
index 6805377..25ee3f3 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];
                     }