ooo-build r15122 - in branches/opensuse-11-1: . patches/dev300

[tml svn gnome org]

Author: tml
Date: Wed Jan 21 19:28:19 2009
New Revision: 15122
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15122&view=rev

Log:
2009-01-21  Tor Lillqvist  <tml novell com>

	* patches/dev300/mail-document-subject.diff
	(sfx2/source/dialog/mailmodel.cxx): New file. Tentative fix for
	bnc#459176. If no subject has been set, use the basename of the
	first attached document as the subject, and in case there are
	several attached documents, append a comma and an ellipsis. I
	don't know if it is actually possible to send several documents as
	mail from OOo at the same time, though.

	* patches/dev300/apply: Add it to NovellOnly.



Added:
   branches/opensuse-11-1/patches/dev300/mail-document-subject.diff
Modified:
   branches/opensuse-11-1/ChangeLog
   branches/opensuse-11-1/patches/dev300/apply

Modified: branches/opensuse-11-1/patches/dev300/apply
==============================================================================
--- branches/opensuse-11-1/patches/dev300/apply	(original)
+++ branches/opensuse-11-1/patches/dev300/apply	Wed Jan 21 19:28:19 2009
@@ -2763,3 +2763,6 @@
 # implementation of nested tables
 cws-hb10.diff
 cws-hb11.diff
+
+[ NovellOnly ]
+mail-document-subject.diff, n#459176

Added: branches/opensuse-11-1/patches/dev300/mail-document-subject.diff
==============================================================================
--- (empty file)
+++ branches/opensuse-11-1/patches/dev300/mail-document-subject.diff	Wed Jan 21 19:28:19 2009
@@ -0,0 +1,17 @@
+--- sfx2/source/dialog/mailmodel.cxx.original
++++ sfx2/source/dialog/mailmodel.cxx
+@@ -851,7 +851,13 @@
+ 
+ 					Sequence< OUString > aAttachmentSeq(&(maAttachedDocuments[0]),maAttachedDocuments.size());
+  
+-				    xSimpleMailMessage->setSubject( maSubject );
++					if ( xSimpleMailMessage->getSubject().getLength() == 0 ) {
++						OUString baseName( maAttachedDocuments[0].copy( maAttachedDocuments[0].lastIndexOf( '/' ) + 1 ) );
++						OUString subject( baseName );
++						if ( maAttachedDocuments.size() > 1 )
++							subject += OUString::createFromAscii( ", ..." );
++						xSimpleMailMessage->setSubject( subject );
++					}
+ 				    xSimpleMailMessage->setAttachement( aAttachmentSeq );
+ 
+ 	                sal_Bool bSend( sal_False );