diff options
| author | sb <sb@openoffice.org> | 2010-11-19 11:35:41 +0100 |
|---|---|---|
| committer | sb <sb@openoffice.org> | 2010-11-19 11:35:41 +0100 |
| commit | 3029080f934389f92371ab50745fe97d0a849916 (patch) | |
| tree | 44eb1f031df50259d2da1c75e3bded87a46687f9 /shell | |
| parent | fc6e7a486f45cfef31baee0c398ef513de2218ba (diff) | |
| parent | 66be5f5ee72cac49bffce08639f88cbe1fd7e444 (diff) | |
sb131: merged in re/DEV300_next towards DEV300_m94
Diffstat (limited to 'shell')
| -rwxr-xr-x | shell/qa/makefile.mk | 2 | ||||
| -rw-r--r-- | shell/source/win32/simplemail/senddoc.cxx | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/shell/qa/makefile.mk b/shell/qa/makefile.mk index cc91a6b1ad..290798bab1 100755 --- a/shell/qa/makefile.mk +++ b/shell/qa/makefile.mk @@ -28,8 +28,6 @@ PRJ=.. PRJNAME=shell TARGET=qa -# this is removed at the moment because we need some enhancements -# TESTDIR=TRUE ENABLE_EXCEPTIONS=TRUE diff --git a/shell/source/win32/simplemail/senddoc.cxx b/shell/source/win32/simplemail/senddoc.cxx index 42f5b9e244..b904902ee4 100644 --- a/shell/source/win32/simplemail/senddoc.cxx +++ b/shell/source/win32/simplemail/senddoc.cxx @@ -170,7 +170,7 @@ void initMapiMessage( 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]; + pMapiMessage->lpRecips = aMapiRecipientList.size() ? &aMapiRecipientList[0] : 0; pMapiMessage->nRecipCount = aMapiRecipientList.size(); pMapiMessage->lpFiles = &aMapiAttachmentList[0]; pMapiMessage->nFileCount = aMapiAttachmentList.size(); |