[Libreoffice-commits] .: Branch 'libreoffice-3-4' - patches/dev300

[Tor Lillqvist]

 patches/dev300/apply                   |    3 ++-
 patches/dev300/win32-gw-send-mail.diff |   33 ---------------------------------
 2 files changed, 2 insertions(+), 34 deletions(-)

New commits:
commit 0335a154e61d9c28628abfbe7926b95dc6ca6dd7
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon Apr 4 15:26:17 2011 +0300

    Part of win32-gw-send-mail.diff is in and unclear whether the rest is needed

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 3151702..959795e 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -509,7 +509,8 @@ jdbc-driver-classpaths-debian.diff
 [ NovellOnly ]
 # Work around G/W mail component crasher bug #FIXME - re-file vs. i#34264
 # Also fix OOo/GW deadlock
-win32-gw-send-mail.diff, i#34264, n#418407, tml
+# FIXME 2011-04-04: Unclear whether this is actually a good thing any more
+# win32-gw-send-mail.diff, i#34264, n#418407, tml
 
 [ Win32Only ]
 # fixes for visual studio express 2005 ( ooo-build only )
diff --git a/patches/dev300/win32-gw-send-mail.diff b/patches/dev300/win32-gw-send-mail.diff
index bcd5ee5..9799191 100644
--- a/patches/dev300/win32-gw-send-mail.diff
+++ b/patches/dev300/win32-gw-send-mail.diff
@@ -1,36 +1,3 @@
---- shell/source/win32/simplemail/senddoc.cxx
-+++ shell/source/win32/simplemail/senddoc.cxx
-@@ -201,6 +201,20 @@ int main(int argc, char* argv[])
-             
-             ulRet = mapi.MAPISendMail(hSession, 0, &mapiMsg, gMapiFlags, 0);  
-                   
-+            // There is no point in treating an aborted mail sending
-+            // dialog as an error to be returned as our exit
-+            // status. If the user decided to abort sending a document
-+            // as mail, OK, that is not an error.
-+
-+            // Also, it seems that GroupWise makes MAPISendMail()
-+            // return MAPI_E_USER_ABORT even if the mail sending
-+            // dialog was not aborted by the user, and the mail was
-+            // actually sent just fine. See bnc#660241 (visible to
-+            // Novell people only, sorry).
-+
-+            if (ulRet == MAPI_E_USER_ABORT)
-+                ulRet = SUCCESS_SUCCESS;
-+
-             mapi.MAPILogoff(hSession, 0, 0, 0);
-         }            
-     }
-@@ -299,6 +299,9 @@ int main(int argc, char* argv[])
-     {
-         OSL_ENSURE(false, ex.what());
-     }        
-+    if (ulRet != SUCCESS_SUCCESS)
-+        // FIXME: Localisation of this message..
-+        MessageBox( NULL, "Sending mail failed. Please save this document instead and attach it from within your e-mail client.", "OpenOffice.org senddoc.exe", MB_OK|MB_ICONERROR|MB_TOPMOST );
-     return ulRet;
- }
- 
 --- shell/source/win32/simplemail/smplmailclient.cxx
 +++ shell/source/win32/simplemail/smplmailclient.cxx
 @@ -142,7 +142,7 @@ namespace /* private */