summaryrefslogtreecommitdiff
path: root/mailnews/import
diff options
context:
space:
mode:
authorMatt A. Tobin <email@mattatobin.com>2019-11-11 02:08:59 -0500
committerMatt A. Tobin <email@mattatobin.com>2019-11-11 02:08:59 -0500
commit7406d488b363588be8f677f698be11ea478f377b (patch)
tree4eace33f71b9b53b7500bcadc59c9979ec6f45b1 /mailnews/import
parent73e14fb7049306439a5637ff261f1370a94518e5 (diff)
downloaduxp-7406d488b363588be8f677f698be11ea478f377b.tar.gz
Bug 1584473 - Fix several issues
* Fix undefined HRESULT codes in class CMapiApi in MapiApi.cpp. * Fix doubled up sub-expressions in MIME and MAPI. * Remove broken/unused morkRowCellCursor::MakeCell() Tag #1273
Diffstat (limited to 'mailnews/import')
-rw-r--r--mailnews/import/outlook/src/MapiApi.cpp9
1 files changed, 3 insertions, 6 deletions
diff --git a/mailnews/import/outlook/src/MapiApi.cpp b/mailnews/import/outlook/src/MapiApi.cpp
index d6a1597549..d23b44dd1f 100644
--- a/mailnews/import/outlook/src/MapiApi.cpp
+++ b/mailnews/import/outlook/src/MapiApi.cpp
@@ -887,7 +887,7 @@ BOOL CMapiApi::IterateStores(CMapiFolderList& stores)
if (!m_lpSession) {
MAPI_TRACE0("IterateStores called before session is open\n");
- m_lastError = -1;
+ m_lastError = E_UNEXPECTED;
return FALSE;
}
@@ -1124,7 +1124,7 @@ CMsgStore * CMapiApi::FindMessageStore(ULONG cbEid, LPENTRYID lpEid)
{
if (!m_lpSession) {
MAPI_TRACE0("FindMessageStore called before session is open\n");
- m_lastError = -1;
+ m_lastError = E_UNEXPECTED;
return NULL;
}
@@ -1409,9 +1409,6 @@ void CMapiApi::ReportLongProp(const char *pTag, LPSPropValue pVal)
else if (pVal && (PROP_TYPE(pVal->ulPropTag) == PT_ERROR)) {
MAPI_TRACE1("%s {Error retrieving property}\n", pTag);
}
- else if (pVal && (PROP_TYPE(pVal->ulPropTag) == PT_ERROR)) {
- MAPI_TRACE1("%s {Error retrieving property}\n", pTag);
- }
else {
MAPI_TRACE1("%s invalid value, expecting long\n", pTag);
}
@@ -1843,7 +1840,7 @@ BOOL CMapiFolderContents::SetUpIter(void)
}
if (ulObjType != MAPI_FOLDER) {
- m_lastError = -1;
+ m_lastError = E_UNEXPECTED;
MAPI_TRACE0("CMapiFolderContents - bad object type, not a folder.\n");
return FALSE;
}