User: obo Date: 05/12/21 05:14:51 Modified: /dba/connectivity/source/drivers/ado/ ADatabaseMetaData.cxx
Log: INTEGRATION: CWS dba202a (1.18.28); FILE MERGED 2005/11/25 07:51:17 oj 1.18.28.1: #127363# new public method for late ctor 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&r2=1.19 Delta lines: +19 -13 --------------------- --- ADatabaseMetaData.cxx 23 Sep 2005 11:37:33 -0000 1.18 +++ ADatabaseMetaData.cxx 21 Dec 2005 13:14:47 -0000 1.19 @@ -974,7 +974,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(); @@ -989,7 +992,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]
