From 740fe0ce142c521d3a75558dea6535017821e127 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Mon, 10 Feb 2014 11:18:33 +0100
Subject: Resolves: rhbz#1063170 Don't URI-encode filename in e-mail subject

Change-Id: I7e3f59af5bb7d89c74e2bf199a727b2419714121
---
 sfx2/source/dialog/mailmodel.cxx | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'sfx2')

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 );
-- 
cgit