User: ihi Date: 2006/08/04 06:56:33 Modified: dba/dbaccess/source/core/dataaccess/ComponentDefinition.hxx
Log: INTEGRATION: CWS dba204c (1.6.4); FILE MERGED 2006/07/21 11:03:38 fs 1.6.4.1: #i67635# make m_pColumns an ::sdt::auto_ptr, again Holding it as ImplementationReference is bad, since this would |acquire| it, but it delegates all |acquire| and |release| calls to its parent (ourself) Holding it as auto_ptr doesn't hurt: If we're in the dtor, then nobody can have a reference to the columns, since this would have been delegated to ourself, which means we could not be in the dtor. File Changes: Directory: /dba/dbaccess/source/core/dataaccess/ ================================================ File [changed]: ComponentDefinition.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/ComponentDefinition.hxx?r1=1.6&r2=1.7 Delta lines: +2 -7 ------------------- --- ComponentDefinition.hxx 13 Jul 2006 15:20:27 -0000 1.6 +++ ComponentDefinition.hxx 4 Aug 2006 13:56:31 -0000 1.7 @@ -69,9 +69,6 @@ #ifndef _DBA_COREAPI_COLUMN_HXX_ #include <column.hxx> #endif -#ifndef _COMPHELPER_IMPLEMENTATIONREFERENCE_HXX -#include <comphelper/implementationreference.hxx> -#endif #include <memory> //........................................................................ @@ -119,8 +116,6 @@ }; -typedef ::comphelper::ImplementationReference< OColumns,::com::sun::star::container::XNameAccess > TColumnsHelper; - //========================================================================= //= OComponentDefinition - a database "document" which describes a query //========================================================================= @@ -134,7 +129,7 @@ OComponentDefinition(); protected: - TColumnsHelper m_pColumns; + ::std::auto_ptr< OColumns > m_pColumns; sal_Bool m_bTable; virtual ~OComponentDefinition(); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
