Tag: cws_src680_dba204c User: fs Date: 2006/07/21 04:02:16 Modified: dba/dbaccess/source/core/api/preparedstatement.cxx dba/dbaccess/source/core/api/querydescriptor.cxx dba/dbaccess/source/core/api/resultset.cxx
Log: during #i67635#: don't delete m_pColumns in ::disposing, but in the dtor only File Changes: Directory: /dba/dbaccess/source/core/api/ ========================================= File [changed]: preparedstatement.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/api/preparedstatement.cxx?r1=1.13&r2=1.13.28.1 Delta lines: +5 -9 ------------------- --- preparedstatement.cxx 20 Jun 2006 02:39:29 -0000 1.13 +++ preparedstatement.cxx 21 Jul 2006 11:02:13 -0000 1.13.28.1 @@ -4,9 +4,9 @@ * * $RCSfile: preparedstatement.cxx,v $ * - * $Revision: 1.13 $ + * $Revision: 1.13.28.1 $ * - * last change: $Author: hr $ $Date: 2006/06/20 02:39:29 $ + * last change: $Author: fs $ $Date: 2006/07/21 11:02:13 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -92,12 +92,8 @@ OPreparedStatement::~OPreparedStatement() { DBG_DTOR(OPreparedStatement, NULL); - if ( m_pColumns ) - { - m_pColumns->acquire(); m_pColumns->disposing(); delete m_pColumns; - } } // com::sun::star::lang::XTypeProvider File [changed]: querydescriptor.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/api/querydescriptor.cxx?r1=1.28&r2=1.28.8.1 Delta lines: +5 -10 -------------------- --- querydescriptor.cxx 10 Jul 2006 15:06:42 -0000 1.28 +++ querydescriptor.cxx 21 Jul 2006 11:02:13 -0000 1.28.8.1 @@ -4,9 +4,9 @@ * * $RCSfile: querydescriptor.cxx,v $ * - * $Revision: 1.28 $ + * $Revision: 1.28.8.1 $ * - * last change: $Author: obo $ $Date: 2006/07/10 15:06:42 $ + * last change: $Author: fs $ $Date: 2006/07/21 11:02:13 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -200,13 +200,8 @@ //-------------------------------------------------------------------------- OQueryDescriptor_Base::~OQueryDescriptor_Base() { - if ( m_pColumns ) - { - m_pColumns->acquire(); m_pColumns->disposing(); delete m_pColumns; - } - DBG_DTOR(OQueryDescriptor_Base,NULL); } // ----------------------------------------------------------------------------- File [changed]: resultset.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/api/resultset.cxx?r1=1.16&r2=1.16.28.1 Delta lines: +5 -9 ------------------- --- resultset.cxx 20 Jun 2006 02:41:05 -0000 1.16 +++ resultset.cxx 21 Jul 2006 11:02:13 -0000 1.16.28.1 @@ -4,9 +4,9 @@ * * $RCSfile: resultset.cxx,v $ * - * $Revision: 1.16 $ + * $Revision: 1.16.28.1 $ * - * last change: $Author: hr $ $Date: 2006/06/20 02:41:05 $ + * last change: $Author: fs $ $Date: 2006/07/21 11:02:13 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -137,12 +137,8 @@ OResultSet::~OResultSet() { DBG_DTOR(OResultSet, NULL); - if ( m_pColumns ) - { - m_pColumns->acquire(); m_pColumns->disposing(); delete m_pColumns; - } } // com::sun::star::lang::XTypeProvider --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
