User: obo Date: 2006/07/13 08:20:29 Modified: dba/dbaccess/source/core/dataaccess/ComponentDefinition.hxx
Log: INTEGRATION: CWS dba204a (1.4.6); FILE MERGED 2006/07/13 07:10:28 fs 1.4.6.2: RESYNC: (1.4-1.5); FILE MERGED 2006/07/06 06:12:52 oj 1.4.6.1: #i66629# listen at documentmodelimpl and not any longer at the ds 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.5&r2=1.6 Delta lines: +13 -4 -------------------- --- ComponentDefinition.hxx 10 Jul 2006 15:08:03 -0000 1.5 +++ ComponentDefinition.hxx 13 Jul 2006 15:20:27 -0000 1.6 @@ -69,6 +69,10 @@ #ifndef _DBA_COREAPI_COLUMN_HXX_ #include <column.hxx> #endif +#ifndef _COMPHELPER_IMPLEMENTATIONREFERENCE_HXX +#include <comphelper/implementationreference.hxx> +#endif + #include <memory> //........................................................................ namespace dbaccess @@ -95,6 +99,9 @@ ::rtl::OUString m_sCatalogName; public: + OComponentDefinition_Impl(); + virtual ~OComponentDefinition_Impl(); + inline size_t size() const { return m_aColumns.size(); } inline const_iterator begin() const { return m_aColumns.begin(); } @@ -106,11 +113,14 @@ inline void insert( const ::rtl::OUString& _rName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxColumn ) { - OSL_PRECOND( m_aColumns.find( _rName ) == m_aColumns.end(), "OComponentDefinition_Impl::insert: there's already an element wihh this name!" ); + OSL_PRECOND( m_aColumns.find( _rName ) == m_aColumns.end(), "OComponentDefinition_Impl::insert: there's already an element with this name!" ); m_aColumns.insert( Columns::value_type( _rName, _rxColumn ) ); } }; + +typedef ::comphelper::ImplementationReference< OColumns,::com::sun::star::container::XNameAccess > TColumnsHelper; + //========================================================================= //= OComponentDefinition - a database "document" which describes a query //========================================================================= @@ -124,8 +134,7 @@ OComponentDefinition(); protected: - ::std::auto_ptr<OColumns> m_pColumns; - + TColumnsHelper m_pColumns; sal_Bool m_bTable; virtual ~OComponentDefinition(); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
