diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 00:06:16 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 00:06:16 +0000 |
| commit | 9fa0d82d62721367c6545df6da47e91e7f2e6a42 (patch) | |
| tree | 12bf4c2934933c21f5b136cf8b0c609c9fea88eb /connectivity/source/commontools | |
| parent | e73b122037bb2509445a928e1d12a5b2194590e5 (diff) | |
INTEGRATION: CWS warnings01 (1.14.30); FILE MERGED
2006/04/07 20:15:29 sb 1.14.30.2: RESYNC: (1.14-1.15); FILE MERGED
2005/11/16 12:58:46 fs 1.14.30.1: #i57457# warning free code
Diffstat (limited to 'connectivity/source/commontools')
| -rw-r--r-- | connectivity/source/commontools/dbtools2.cxx | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/connectivity/source/commontools/dbtools2.cxx b/connectivity/source/commontools/dbtools2.cxx index 7393c192d490..650fde611a99 100644 --- a/connectivity/source/commontools/dbtools2.cxx +++ b/connectivity/source/commontools/dbtools2.cxx @@ -4,9 +4,9 @@ * * $RCSfile: dbtools2.cxx,v $ * - * $Revision: 1.15 $ + * $Revision: 1.16 $ * - * last change: $Author: vg $ $Date: 2006-03-14 10:47:59 $ + * last change: $Author: hr $ $Date: 2006-06-20 01:06:16 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -468,23 +468,21 @@ namespace { 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 = xPKeyRow->getString(4); + if ( aMixCompare(_rName,sKeyColumn) ) { - ::rtl::OUString sKeyColumn = xRow->getString(4); - if ( aMixCompare(_rName,sKeyColumn) ) - { - nField11 = ColumnValue::NO_NULLS; - break; - } + nField11 = ColumnValue::NO_NULLS; + break; } } } catch(SQLException&) { + OSL_ENSURE( false, "lcl_createSDBCXColumn: caught an exception!" ); } } |