User: obo Date: 06/03/29 04:34:34 Modified: /dba/dbaccess/source/core/dataaccess/ datasource.hxx
Log: INTEGRATION: CWS dba203a (1.34.44); FILE MERGED 2006/03/16 09:54:10 fs 1.34.44.1: #i63162# no SharedModel anymore File Changes: Directory: /dba/dbaccess/source/core/dataaccess/ ================================================ File [changed]: datasource.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/datasource.hxx?r1=1.34&r2=1.35 Delta lines: +0 -19 -------------------- --- datasource.hxx 21 Dec 2005 13:35:31 -0000 1.34 +++ datasource.hxx 29 Mar 2006 12:34:32 -0000 1.35 @@ -141,13 +141,9 @@ #ifndef _COM_SUN_STAR_SDB_XDOCUMENTDATASOURCE_HPP_ #include <com/sun/star/sdb/XDocumentDataSource.hpp> #endif -#include <boost/shared_ptr.hpp> #ifndef _DBA_COREDATAACCESS_MODELIMPL_HXX_ #include "ModelImpl.hxx" #endif -#ifndef UNOTOOLS_INC_SHAREDUNOCOMPONENT_HXX -#include <unotools/sharedunocomponent.hxx> -#endif //........................................................................ namespace dbaccess @@ -190,9 +186,6 @@ ODatabaseSource_CreateInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&); private: - typedef ::utl::SharedUNOComponent< ::com::sun::star::frame::XModel, ::utl::CloseableComponent > - SharedModel; - OBookmarkContainer m_aBookmarks; ::cppu::OInterfaceContainerHelper m_aFlushListeners; @@ -303,18 +296,6 @@ ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > buildIsolatedConnection( const rtl::OUString& user, const rtl::OUString& password ); - - /** retrieves the model we belong to - - If the model does not yet exist, it is created (->OModelImpl::createNewModel_deliverOwnership). - Using the SharedModel implies that when <arg>_bTakeOwnershipIfNewlyCreated</arg> is <TRUE/>, then when the - returned SharedModel dies (and has not been shared with other SharedModels in the meantime), - then a close attempt for the XModel is made. - - If there already exists a model, <arg>_bTakeOwnershipIfNewlyCreated</arg> is ignored, - and ownership of the model is not taken. - */ - SharedModel impl_getModel( bool _bTakeOwnershipIfNewlyCreated ); ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnection( const ::rtl::OUString& user, const ::rtl::OUString& password , sal_Bool _bIsolated) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL connectWithCompletion( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& handler , sal_Bool _bIsolated) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
