Tag: cws_src680_warnings01 User: sb Date: 06/04/07 13:23:10 Modified: /dba/connectivity/source/drivers/mozab/mozillasrc/ MQuery.cxx
Log: RESYNC: (1.15-1.16); FILE MERGED File Changes: Directory: /dba/connectivity/source/drivers/mozab/mozillasrc/ ============================================================= File [changed]: MQuery.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx?r1=1.15.30.2&r2=1.15.30.3 Delta lines: +13 -13 --------------------- --- MQuery.cxx 22 Dec 2005 11:44:55 -0000 1.15.30.2 +++ MQuery.cxx 7 Apr 2006 20:23:07 -0000 1.15.30.3 @@ -485,7 +485,7 @@ args.arg2 = (void*)&rowIndex; args.arg3 = (void*)m_aQueryDirectory->directory; nsresult rv = xMProxy.StartProxy(&args,m_Product,m_Profile); - m_aErrorString = m_aQueryHelper->getErrorString(); + setError( m_aQueryHelper->getErrorResourceId() ); return rv; } @@ -502,7 +502,7 @@ args.arg2 = (void*)&rowIndex; args.arg3 = (void*)m_aQueryDirectory->directory; nsresult rv = xMProxy.StartProxy(&args,m_Product,m_Profile); - m_aErrorString = m_aQueryHelper->getErrorString(); + setError( m_aQueryHelper->getErrorResourceId() ); return rv; } @@ -713,7 +713,7 @@ { if( m_aQueryHelper->waitForQueryComplete( ) ) return sal_True; - m_aErrorString = m_aQueryHelper->getErrorString(); + setError( m_aQueryHelper->getErrorResourceId() ); m_aErrorOccurred = sal_True; return( sal_False ); } @@ -726,7 +726,7 @@ while( !queryComplete() && m_aQueryHelper->getRealCount() <= (sal_uInt32)nDBRow ) if ( !m_aQueryHelper->waitForRow( nDBRow ) ) { m_aErrorOccurred = sal_True; - m_aErrorString = m_aQueryHelper->getErrorString(); + setError( m_aQueryHelper->getErrorResourceId() ); return( sal_False ); } @@ -742,7 +742,7 @@ if (xResEntry == NULL ) { m_aErrorOccurred = sal_True; - m_aErrorString = m_aQueryHelper->getErrorString(); + setError( m_aQueryHelper->getErrorResourceId() ); return sal_False; } switch ( nType ) @@ -774,7 +774,7 @@ if (xResEntry == NULL ) { m_aErrorOccurred = sal_True; - m_aErrorString = m_aQueryHelper->getErrorString(); + setError( m_aQueryHelper->getErrorResourceId() ); rValue.setNull(); return sal_False; } @@ -806,7 +806,7 @@ if (xResEntry == NULL ) { m_aErrorOccurred = sal_True; - m_aErrorString = m_aQueryHelper->getErrorString(); + setError( m_aQueryHelper->getErrorResourceId() ); return RowStates_Error; } return xResEntry->getRowStates(); @@ -820,7 +820,7 @@ if (xResEntry == NULL ) { m_aErrorOccurred = sal_True; - m_aErrorString = m_aQueryHelper->getErrorString(); + setError( m_aQueryHelper->getErrorResourceId() ); return sal_False; } return xResEntry->setRowStates(aState); @@ -836,7 +836,7 @@ args.arg1 = (void*)m_aQueryHelper; args.arg2 = (void*)&nDBRow; nsresult rv = xMProxy.StartProxy(&args,m_Product,m_Profile); - m_aErrorString = m_aQueryHelper->getErrorString(); + setError( m_aQueryHelper->getErrorResourceId() ); return NS_SUCCEEDED( rv ); } @@ -852,7 +852,7 @@ args.arg2 = (void*)&nNumber; nsresult rv = xMProxy.StartProxy(&args,m_Product,m_Profile); - m_aErrorString = m_aQueryHelper->getErrorString(); + setError( m_aQueryHelper->getErrorResourceId() ); NS_ENSURE_SUCCESS(rv,0); return nNumber; } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
