User: ihi     
Date: 2006/08/04 06:56:08

Modified:
   dba/dbaccess/source/core/api/resultset.cxx

Log:
 INTEGRATION: CWS dba204c (1.16.28); FILE MERGED
 2006/08/01 13:56:39 fs 1.16.28.2: #i10000#
 2006/07/21 11:02:13 fs 1.16.28.1: during #i67635#: don't delete m_pColumns in 
::disposing, but in the dtor only

File Changes:

Directory: /dba/dbaccess/source/core/api/
=========================================

File [changed]: resultset.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/api/resultset.cxx?r1=1.16&r2=1.17
Delta lines:  +5 -7
-------------------
--- resultset.cxx       20 Jun 2006 02:41:05 -0000      1.16
+++ resultset.cxx       4 Aug 2006 13:56:06 -0000       1.17
@@ -136,13 +136,11 @@
 //--------------------------------------------------------------------------
 OResultSet::~OResultSet()
 {
-       DBG_DTOR(OResultSet, NULL);
-       if ( m_pColumns )
-       {
                m_pColumns->acquire();
                m_pColumns->disposing();
                delete m_pColumns;
-       }
+
+    DBG_DTOR(OResultSet, NULL);
 }
 
 // com::sun::star::lang::XTypeProvider




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

Reply via email to