User: hr Date: 06/06/19 18:52:16 Modified: /dba/connectivity/source/drivers/mozab/mozillasrc/ MQueryHelper.cxx
Log: INTEGRATION: CWS warnings01 (1.12.30); FILE MERGED 2006/04/07 20:24:01 sb 1.12.30.4: RESYNC: (1.12-1.13); FILE MERGED 2005/11/21 10:07:55 fs 1.12.30.3: #i57457# warning-free code on unx* 2005/11/16 12:59:17 fs 1.12.30.2: #i57457# warning free code 2005/11/07 14:43:58 fs 1.12.30.1: #i57457# warning-free code File Changes: Directory: /dba/connectivity/source/drivers/mozab/mozillasrc/ ============================================================= File [changed]: MQueryHelper.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx?r1=1.13&r2=1.14 Delta lines: +59 -74 --------------------- --- MQueryHelper.cxx 29 Mar 2006 12:19:29 -0000 1.13 +++ MQueryHelper.cxx 20 Jun 2006 01:52:14 -0000 1.14 @@ -162,19 +162,13 @@ // MIME-types. static char PreferMailFormatTypes[2][11] = {"text/plain", "text/html"}; -// This is what mozilla returns. -static char mozPreferMailFormatTypes[3][11] = {"unknown", - "plaintext", - "html"}; - - MQueryHelper::MQueryHelper() - : mRefCnt( 0 ) // NSISUPPORTS - Initialize RefCnt to 0 - , m_nIndex( 0 ) - , m_bHasMore( sal_True ) - , m_bQueryComplete( sal_False ) - , m_bAtEnd( sal_False ) - , m_bErrorCondition( sal_False ) + :m_nIndex( 0 ) + ,m_bHasMore( sal_True ) + ,m_bAtEnd( sal_False ) + ,m_bErrorCondition( sal_False ) + ,m_bQueryComplete( sal_False ) + ,mRefCnt( 0 ) // NSISUPPORTS - Initialize RefCnt to 0 { m_aResults.clear(); #if OSL_DEBUG_LEVEL > 0 @@ -293,7 +287,7 @@ } MQueryHelperResultEntry* -MQueryHelper::getByIndex( sal_Int32 nRow ) +MQueryHelper::getByIndex( sal_uInt32 nRow ) { // Row numbers are from 1 to N, need to ensure this, and then // substract 1 @@ -327,11 +321,6 @@ return( m_aResults[ nRow -1 ] ); } } while ( sal_True ); - - OSL_TRACE("!!!!! Shouldn't have reached this!!!!\n"); - - return( NULL ); - } sal_Bool @@ -393,7 +382,7 @@ return( sal_False ); m_aMutex.acquire(); } - while ( !m_bQueryComplete && m_aResults.size() < rowNum ); + while ( !m_bQueryComplete && m_aResults.size() < (size_t)rowNum ); m_aMutex.release(); return( sal_True ); @@ -453,19 +442,16 @@ m_bErrorCondition = sal_True; notifyResultOrComplete(); return NS_OK; - break; case nsIAbDirectoryQueryResult::queryResultStopped: OSL_TRACE("\tresultType == nsIAbDirectoryQueryResult::queryResultStopped\n"); m_bQueryComplete = sal_True; notifyResultOrComplete(); return NS_OK; - break; case nsIAbDirectoryQueryResult::queryResultComplete: OSL_TRACE("\tresultType == nsIAbDirectoryQueryResult::queryResultComplete\n"); m_bQueryComplete = sal_True; notifyResultOrComplete(); return NS_OK; - break; case nsIAbDirectoryQueryResult::queryResultMatch: OSL_TRACE("IN MQueryHelper::OnQueryItem --> queryResultMatch\n"); // Don't return, continues onto rest of method. @@ -474,7 +460,6 @@ OSL_TRACE("\t******** Unexpected : resultType\n"); m_bQueryComplete = sal_True; return NS_OK; - break; } // Initialise an array that holds the resultset of the query. @@ -998,7 +983,7 @@ return sal_False; } nsIAbCard *card=resEntry->getCard(); - nsIAbCard *aNewCard = getUpdatedCard(card); + card = getUpdatedCard(card); getCardValues(card,rowIndex); return sal_True; } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
