User: obo Date: 06/03/29 04:19:11 Modified: /dba/connectivity/source/drivers/mozab/mozillasrc/ MQuery.cxx
Log: INTEGRATION: CWS dba203a (1.15.76); FILE MERGED 2006/03/17 15:37:58 fs 1.15.76.1: #i60163# localized error messages 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&r2=1.16 Delta lines: +10 -10 --------------------- --- MQuery.cxx 8 Sep 2005 06:29:32 -0000 1.15 +++ MQuery.cxx 29 Mar 2006 12:19:08 -0000 1.16 @@ -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 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]
