[Libreoffice-commits] .: patches/dev300

[Fridrich Strba]

 patches/dev300/apply                      |    5 --
 patches/dev300/mail-document-subject.diff |   62 ------------------------------
 2 files changed, 67 deletions(-)

New commits:
commit 92d82048c7d2688851cc177efae4bbc9e3b261af
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Fri Oct 15 11:15:10 2010 +0200

    mail-document-subject.diff: Migrated to git

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 19211d4..3900cf2 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1929,8 +1929,6 @@ ooowikipedia_toolbars.diff
 # So you can upgrade to OxygenOffice without removing OpenOffice.org
 ooop-updatable-sameversion.diff
 
-mail-document-subject.diff, n#459176
-
 [ OxygenOfficeLinuxOnly ]
 #Always use default iconset
 always_default_iconset.diff
@@ -2071,9 +2069,6 @@ base64.diff, i#100620, hmth
 #Create langpack and full installers
 ooop-langpack-policy.diff
 
-[ NovellOnly ]
-mail-document-subject.diff, n#459176
-
 [ OOXMLExport ]
 pptx-filter-as-a-separate-lib.diff
 
diff --git a/patches/dev300/mail-document-subject.diff b/patches/dev300/mail-document-subject.diff
deleted file mode 100644
index 30d5466..0000000
--- a/patches/dev300/mail-document-subject.diff
+++ /dev/null
@@ -1,62 +0,0 @@
----
- sfx2/source/dialog/mailmodel.cxx          |   10 ++++++++--
- shell/source/win32/simplemail/senddoc.cxx |   17 ++++++++++++++---
- 2 files changed, 22 insertions(+), 5 deletions(-)
-
-diff --git sfx2/source/dialog/mailmodel.cxx sfx2/source/dialog/mailmodel.cxx
-index cea40e6..a4ec594 100644
---- sfx2/source/dialog/mailmodel.cxx
-+++ sfx2/source/dialog/mailmodel.cxx
-@@ -847,8 +847,14 @@ SfxMailModel::SendMailResult SfxMailModel::Send( const css::uno::Reference< css:
-                     }
- 
-                     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 );
-diff --git shell/source/win32/simplemail/senddoc.cxx shell/source/win32/simplemail/senddoc.cxx
-index 0b51c58..9338669 100644
---- shell/source/win32/simplemail/senddoc.cxx
-+++ shell/source/win32/simplemail/senddoc.cxx
-@@ -29,6 +29,9 @@
- #include <osl/diagnose.h>
- #include <sal/macros.h>
- #include <rtl/string.hxx>
-+#include <rtl/ustring.hxx>
-+#include <rtl/uri.hxx>
-+#include <osl/thread.hxx>
- 
- #include "simplemapi.hxx"
- 
-@@ -167,7 +168,17 @@ void initMapiMessage(
- {
-     ZeroMemory(pMapiMessage, sizeof(MapiMessage));
-              
--    pMapiMessage->lpszSubject = const_cast<char*>(gSubject.c_str());   
-+    try {
-+         rtl_uString *subject = NULL;
-+         rtl_uString_newFromAscii(&subject, const_cast<char*>(gSubject.c_str()));
-+         rtl_uString *decoded_subject = NULL;
-+         rtl_uriDecode(subject, rtl_UriDecodeWithCharset, RTL_TEXTENCODING_UTF8, &decoded_subject);
-+         rtl::OUString ou_subject(decoded_subject);
-+         pMapiMessage->lpszSubject = strdup(OUStringToOString(ou_subject, osl_getThreadTextEncoding(), RTL_UNICODETOTEXT_FLAGS_UNDEFINED_QUESTIONMARK).getStr());
-+    }
-+    catch (...) {
-+    pMapiMessage->lpszSubject = const_cast<char*>(gSubject.c_str());
-+    }
-     pMapiMessage->lpszNoteText = (gBody.length() ? const_cast<char*>(gBody.c_str()) : NULL);
-     pMapiMessage->lpOriginator = aMapiOriginator;       
-     pMapiMessage->lpRecips = &aMapiRecipientList[0];
--- 
-1.7.0.1
-