Tag: cws_src680_codecleanup01 User: mt Date: 05/10/05 13:13:14 Modified: /dba/connectivity/source/drivers/file/ FResultSet.cxx
Log: RESYNC: (1.92-1.94); FILE MERGED File Changes: Directory: /dba/connectivity/source/drivers/file/ ================================================= File [changed]: FResultSet.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/file/FResultSet.cxx?r1=1.92.56.1&r2=1.92.56.2 Delta lines: +25 -55 --------------------- --- FResultSet.cxx 26 Jul 2005 12:37:17 -0000 1.92.56.1 +++ FResultSet.cxx 5 Oct 2005 20:13:11 -0000 1.92.56.2 @@ -1,22 +1,20 @@ /************************************************************************* * + * OpenOffice.org - a multi-platform office productivity suite + * * $RCSfile$ * * $Revision$ * * last change: $Author$ $Date$ * - * The Contents of this file are made available subject to the terms of - * either of the following licenses - * - * - GNU Lesser General Public License Version 2.1 - * - Sun Industry Standards Source License Version 1.1 + * The Contents of this file are made available subject to + * the terms of GNU Lesser General Public License Version 2.1. * - * Sun Microsystems Inc., October, 2000 * * GNU Lesser General Public License Version 2.1 * ============================================= - * Copyright 2000 by Sun Microsystems, Inc. + * Copyright 2005 by Sun Microsystems, Inc. * 901 San Antonio Road, Palo Alto, CA 94303, USA * * This library is free software; you can redistribute it and/or @@ -33,30 +31,6 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, * MA 02111-1307 USA * - * - * Sun Industry Standards Source License Version 1.1 - * ================================================= - * The contents of this file are subject to the Sun Industry Standards - * Source License Version 1.1 (the "License"); You may not use this file - * except in compliance with the License. You may obtain a copy of the - * License at http://www.openoffice.org/license.html. - * - * Software provided under this License is provided on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, - * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, - * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. - * See the License for the specific provisions governing your rights and - * obligations concerning the Software. - * - * The Initial Developer of the Original Code is: Sun Microsystems, Inc. - * - * Copyright: 2000 by Sun Microsystems, Inc. - * - * All Rights Reserved. - * - * Contributor(s): _______________________________________ - * - * ************************************************************************/ #include <limits> // included here to prevent problems if compiling with C52 @@ -224,6 +198,9 @@ m_xParamColumns = NULL; m_xColsIdx = NULL; + Reference<XComponent> xComp = m_pTable; + if ( xComp.is() ) + xComp->removeEventListener(this); if(m_pTable) { m_pTable->release(); @@ -481,14 +458,7 @@ void SAL_CALL OResultSet::close( ) throw(SQLException, RuntimeException) { -// { -// ::osl::MutexGuard aGuard( m_aMutex ); -// checkDisposed(OResultSet_BASE::rBHelper.bDisposed); -// -// } -// dispose(); - ::osl::MutexGuard aGuard( m_aMutex ); - clear(); + dispose(); } // ------------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
