Tag: cws_src680_warnings01 User: sb Date: 06/01/25 12:48:07 Modified: /dba/connectivity/source/drivers/ado/ ADatabaseMetaData.cxx
Log: RESYNC: (1.18-1.19); FILE MERGED File Changes: Directory: /dba/connectivity/source/drivers/ado/ ================================================ File [changed]: ADatabaseMetaData.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/ado/ADatabaseMetaData.cxx?r1=1.18.20.1&r2=1.18.20.2 Delta lines: +22 -16 --------------------- --- ADatabaseMetaData.cxx 22 Dec 2005 11:44:33 -0000 1.18.20.1 +++ ADatabaseMetaData.cxx 25 Jan 2006 20:48:04 -0000 1.18.20.2 @@ -977,7 +977,10 @@ OLEVariant vtEmpty; vtEmpty.setNoArg(); m_pADOConnection->OpenSchema(adSchemaDBInfoKeywords,vtEmpty,vtEmpty,&pRecordset); + OSL_ENSURE(pRecordset,"getSQLKeywords: no resultset!"); ADOS::ThrowException(*m_pADOConnection,*this); + if ( pRecordset ) + { WpADORecordset aRecordset(pRecordset); aRecordset.MoveFirst(); @@ -992,7 +995,10 @@ aRecordset.MoveNext(); } aRecordset.Close(); + if ( aRet.getLength() ) return aRet.copy(0,aRet.lastIndexOf(',')); + } + return ::rtl::OUString(); } // ------------------------------------------------------------------------- ::rtl::OUString SAL_CALL ODatabaseMetaData::getSearchStringEscape( ) throw(SQLException, RuntimeException) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
