User: kz Date: 2006/11/06 06:35:13 Modified: dba/connectivity/source/drivers/ado/adoimp.cxx
Log: INTEGRATION: CWS dba21fini (1.15.26); FILE MERGED 2006/10/27 08:14:34 oj 1.15.26.1: #142400# check recordset File Changes: Directory: /dba/connectivity/source/drivers/ado/ ================================================ File [changed]: adoimp.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/ado/adoimp.cxx?r1=1.15&r2=1.16 Delta lines: +4 -1 ------------------- --- adoimp.cxx 17 Sep 2006 02:17:56 -0000 1.15 +++ adoimp.cxx 6 Nov 2006 14:35:10 -0000 1.16 @@ -339,9 +339,12 @@ // ----------------------------------------------------------------------------- WpADOField ADOS::getField(ADORecordset* _pRecordSet,sal_Int32 _nColumnIndex) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { + if ( !_pRecordSet ) + return WpADOField(); + ADOFields* pFields = NULL; _pRecordSet->get_Fields(&pFields); - WpOLEAppendCollection<ADOFields, ADOField, WpADOField> aFields(pFields); \ + WpOLEAppendCollection<ADOFields, ADOField, WpADOField> aFields(pFields); if(_nColumnIndex <= 0 || _nColumnIndex > aFields.GetItemCount()) ::dbtools::throwInvalidIndexException(NULL); WpADOField aField(aFields.GetItem(_nColumnIndex-1)); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
