User: hr      
Date: 06/06/19 18:06:19

Modified:
 /dba/connectivity/source/commontools/
  dbtools2.cxx

Log:
 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

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&r2=1.16
Delta lines:  +31 -33
---------------------
--- dbtools2.cxx        14 Mar 2006 10:47:59 -0000      1.15
+++ dbtools2.cxx        20 Jun 2006 01:06:16 -0000      1.16
@@ -468,13 +468,11 @@
                                        {
                                                try
                                                {
-                                                       Reference< XResultSet > 
xResult = xMetaData->getPrimaryKeys(_aCatalog, _aSchema, _aTable);
-                                                       Reference< XRow > 
xRow(xResult,UNO_QUERY);
-                                                       if ( xRow.is() )
-                                                       {
-                                                               while( 
xResult->next() ) // there can be only one primary key
+                                                       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
                                                                {
-                                                                       
::rtl::OUString sKeyColumn = xRow->getString(4);
+                                ::rtl::OUString sKeyColumn = 
xPKeyRow->getString(4);
                                                                        if ( 
aMixCompare(_rName,sKeyColumn) )
                                                                        {
                                                                                
nField11 = ColumnValue::NO_NULLS;
@@ -482,9 +480,9 @@
                                                                        }
                                                                }
                                                        }
-                                               }
                                                catch(SQLException&)
                                                {
+                            OSL_ENSURE( false, "lcl_createSDBCXColumn: caught 
an exception!" );
                                                }
                                        }
 




---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to