diff options
| author | Andras Timar <andras.timar@collabora.com> | 2015-11-06 08:22:33 -0800 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-11-10 07:31:56 +0000 |
| commit | cf4b042c934913785ea8886b6a6b3871926c53a3 (patch) | |
| tree | 04c1c61bea23d265a2b405bc39c666af837f1578 | |
| parent | 08337202b175b8ccf4bd1336abad5d817b006213 (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>
| -rw-r--r-- | sfx2/source/dialog/mailmodel.cxx | 4 |
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]; } |