User: kz      
Date: 2006/11/06 06:35:00

Modified:
   dba/connectivity/source/drivers/ado/AResultSetMetaData.cxx

Log:
 INTEGRATION: CWS dba21fini (1.11.26); FILE MERGED
 2006/10/27 08:14:33 oj 1.11.26.1: #142400# check recordset

File Changes:

Directory: /dba/connectivity/source/drivers/ado/
================================================

File [changed]: AResultSetMetaData.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/ado/AResultSetMetaData.cxx?r1=1.11&r2=1.12
Delta lines:  +13 -2
--------------------
--- AResultSetMetaData.cxx      17 Sep 2006 02:15:19 -0000      1.11
+++ AResultSetMetaData.cxx      6 Nov 2006 14:34:57 -0000       1.12
@@ -60,9 +60,17 @@
 using namespace com::sun::star::beans;
 using namespace com::sun::star::sdbc;
 
+OResultSetMetaData::OResultSetMetaData( ADORecordset* _pRecordSet)
+                                       :       m_pRecordSet(_pRecordSet),
+                                               m_nColCount(-1)
+{
+       if ( m_pRecordSet )
+               m_pRecordSet->AddRef();
+}
 // -------------------------------------------------------------------------
 OResultSetMetaData::~OResultSetMetaData()
 {
+       if ( m_pRecordSet )
        m_pRecordSet->Release();
 }
 // -------------------------------------------------------------------------
@@ -84,8 +92,11 @@
 
 sal_Int32 SAL_CALL OResultSetMetaData::getColumnCount(  ) throw(SQLException, 
RuntimeException)
 {
-       if(m_nColCount != -1)
+       if(m_nColCount != -1 )
                return m_nColCount;
+
+       if ( !m_pRecordSet )
+               return 0;
 
        ADOFields* pFields      = NULL;
        m_pRecordSet->get_Fields(&pFields);




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

Reply via email to