diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-02-10 11:18:33 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-02-10 11:23:45 +0100 |
| commit | 740fe0ce142c521d3a75558dea6535017821e127 (patch) | |
| tree | 49f8f4fefa943ae6dd6803f5cd802022d2863fd9 /sfx2 | |
| parent | d33d1e316c2c5ce56be0e931f0c742d00451dc7f (diff) | |
Resolves: rhbz#1063170 Don't URI-encode filename in e-mail subject
Change-Id: I7e3f59af5bb7d89c74e2bf199a727b2419714121
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/dialog/mailmodel.cxx | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/sfx2/source/dialog/mailmodel.cxx b/sfx2/source/dialog/mailmodel.cxx index 8e2110a24e08..0efcebc9fbbb 100644 --- a/sfx2/source/dialog/mailmodel.cxx +++ b/sfx2/source/dialog/mailmodel.cxx @@ -849,8 +849,15 @@ SfxMailModel::SendMailResult SfxMailModel::Send( const css::uno::Reference< css: Sequence< OUString > aAttachmentSeq(&(maAttachedDocuments[0]),maAttachedDocuments.size()); if ( xSimpleMailMessage->getSubject().isEmpty() ) { - OUString baseName( maAttachedDocuments[0].copy( maAttachedDocuments[0].lastIndexOf( '/' ) + 1 ) ); - OUString subject( baseName ); + INetURLObject url( + maAttachedDocuments[0], INetURLObject::WAS_ENCODED); + OUString subject( + url.getName( + INetURLObject::LAST_SEGMENT, false, + INetURLObject::DECODE_WITH_CHARSET)); + if (subject.isEmpty()) { + subject = maAttachedDocuments[0]; + } if ( maAttachedDocuments.size() > 1 ) subject += ", ..."; xSimpleMailMessage->setSubject( subject ); |