User: obo Date: 2006/07/13 08:20:12 Modified: dba/dbaccess/source/core/dataaccess/ComponentDefinition.cxx
Log: INTEGRATION: CWS dba204a (1.6.8); FILE MERGED 2006/07/13 07:10:06 fs 1.6.8.3: RESYNC: (1.6-1.7); FILE MERGED 2006/07/06 07:41:12 oj 1.6.8.2: unused variable removed 2006/07/06 06:12:52 oj 1.6.8.1: #i66629# listen at documentmodelimpl and not any longer at the ds File Changes: Directory: /dba/dbaccess/source/core/dataaccess/ ================================================ File [changed]: ComponentDefinition.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/ComponentDefinition.cxx?r1=1.7&r2=1.8 Delta lines: +17 -4 -------------------- --- ComponentDefinition.cxx 10 Jul 2006 15:07:52 -0000 1.7 +++ ComponentDefinition.cxx 13 Jul 2006 15:20:10 -0000 1.8 @@ -82,6 +82,16 @@ namespace dbaccess { //........................................................................ +DBG_NAME(OComponentDefinition_Impl) +OComponentDefinition_Impl::OComponentDefinition_Impl() +{ + DBG_CTOR(OComponentDefinition_Impl,NULL); +} +// ----------------------------------------------------------------------------- +OComponentDefinition_Impl::~OComponentDefinition_Impl() +{ + DBG_DTOR(OComponentDefinition_Impl,NULL); +} //========================================================================== //= OComponentDefinition //========================================================================== @@ -183,8 +193,11 @@ void SAL_CALL OComponentDefinition::disposing() { OContentHelper::disposing(); - if ( m_pColumns.get() ) + if ( m_pColumns.is() ) + { m_pColumns->disposing(); + m_pColumns.reset(); + } } // ----------------------------------------------------------------------------- IPropertyArrayHelper& OComponentDefinition::getInfoHelper() @@ -210,7 +223,7 @@ ::osl::MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OContentHelper::rBHelper.bDisposed); - if ( !m_pColumns.get() ) + if ( !m_pColumns.is() ) { ::std::vector< ::rtl::OUString> aNames; @@ -222,10 +235,10 @@ for ( ; aIter != aEnd; ++aIter ) aNames.push_back( aIter->first ); - m_pColumns.reset(new OColumns(*this, m_aMutex, sal_True, aNames, this,NULL,sal_True,sal_False,sal_False)); + m_pColumns = TColumnsHelper( new OColumns( *this, m_aMutex, sal_True, aNames, this, NULL, sal_True, sal_False, sal_False ) ) ); m_pColumns->setParent(*this); } - return m_pColumns.get(); + return m_pColumns.getRef(); } // ----------------------------------------------------------------------------- OColumn* OComponentDefinition::createColumn(const ::rtl::OUString& _rName) const --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
