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

[Tor Lillqvist]

 patches/dev300/win32-gw-send-mail.diff |   21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

New commits:
commit cb19dcc18f28e0f7424e5acc187bc73f9c0eeb40
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Tue Jan 11 19:00:00 2011 +0200

    Treat MAPI_E_USER_ABORT as success (bnc#660241)

diff --git a/patches/dev300/win32-gw-send-mail.diff b/patches/dev300/win32-gw-send-mail.diff
index 4aa1cac..bcd5ee5 100644
--- a/patches/dev300/win32-gw-send-mail.diff
+++ b/patches/dev300/win32-gw-send-mail.diff
@@ -1,5 +1,26 @@
 --- 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());