Tag: cws_src680_qiq User: fs Date: 2006/06/27 06:58:22 Modified: dba/connectivity/source/commontools/dbtools2.cxx
Log: RESYNC: (1.15-1.16); FILE MERGED File Changes: Directory: /dba/connectivity/source/commontools/ ================================================ File [changed]: dbtools2.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/commontools/dbtools2.cxx?r1=1.15.38.3&r2=1.15.38.4 Delta lines: +8 -10 -------------------- --- dbtools2.cxx 16 Jun 2006 11:32:29 -0000 1.15.38.3 +++ dbtools2.cxx 27 Jun 2006 13:58:19 -0000 1.15.38.4 @@ -467,13 +467,11 @@ { try { - Reference< XResultSet > xResult = xMetaData->getPrimaryKeys(_aCatalog, _aSchema, _aTable); - Reference< XRow > xRow(xResult,UNO_QUERY); - if ( xRow.is() ) + Reference< XResultSet > xPKeys = xMetaData->getPrimaryKeys( _aCatalog, _aSchema, _aTable ); + Reference< XRow > xPKeyRow( xPKeys, UNO_QUERY_THROW ); + while( xPKeys->next() ) // there can be only one primary key { - while( xResult->next() ) // there can be only one primary key - { - ::rtl::OUString sKeyColumn = xRow->getString(4); + ::rtl::OUString sKeyColumn = xPKeyRow->getString(4); if ( aMixCompare(_rName,sKeyColumn) ) { nField11 = ColumnValue::NO_NULLS; @@ -481,9 +479,9 @@ } } } - } catch(SQLException&) { + OSL_ENSURE( false, "lcl_createSDBCXColumn: caught an exception!" ); } } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
