Tag: cws_src680_dba30 User: oj Date: 06/04/19 23:46:03 Modified: /dba/dbaccess/source/core/dataaccess/ datasource.hxx
Log: RESYNC: (1.34-1.35); FILE MERGED 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.29.12.5&r2=1.29.12.6 Delta lines: +0 -16 -------------------- --- datasource.hxx 21 Mar 2006 18:24:29 -0000 1.29.12.5 +++ datasource.hxx 20 Apr 2006 06:46:00 -0000 1.29.12.6 @@ -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 @@ -304,18 +300,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]
