User: obo Date: 05/12/21 05:35:33 Modified: /dba/dbaccess/source/core/dataaccess/ datasource.hxx
Log: INTEGRATION: CWS dba202a (1.33.12); FILE MERGED 2005/11/28 10:50:54 fs 1.33.12.2: #126702# improve the previous fix: don't crash if components are destroyed in "wrong" order keep mutex alive as long as at least one of DataSource/DatabaseDocument/ModelImpl is alive 2005/11/25 13:37:23 fs 1.33.12.1: #126702# DatabaseDocument and DataSource share a common mutex instances now (held by ModelImpl) / DatabaseDocument::clearConnections more tolerant against re-entrance 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.33&r2=1.34 Delta lines: +9 -9 ------------------- --- datasource.hxx 24 Oct 2005 08:28:48 -0000 1.33 +++ datasource.hxx 21 Dec 2005 13:35:31 -0000 1.34 @@ -177,7 +177,7 @@ > ODatabaseSource_Base; -class ODatabaseSource :public ::comphelper::OBaseMutex +class ODatabaseSource :public ModelDependentComponent // must be first ,public OSubComponent ,public ::cppu::OPropertySetHelper ,public ::comphelper::OPropertyArrayUsageHelper < ODatabaseSource > @@ -193,7 +193,6 @@ typedef ::utl::SharedUNOComponent< ::com::sun::star::frame::XModel, ::utl::CloseableComponent > SharedModel; - ::rtl::Reference<ODatabaseModelImpl> m_pImpl; OBookmarkContainer m_aBookmarks; ::cppu::OInterfaceContainerHelper m_aFlushListeners; @@ -288,6 +287,10 @@ // XDocumentDataSource virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XOfficeDatabaseDocument > SAL_CALL getDatabaseDocument() throw (::com::sun::star::uno::RuntimeException); +protected: + // ModelDependentComponent overridables + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getThis(); + private: // helper /** open a connection for the current settings. this is the simple connection we get from the driver @@ -312,9 +315,6 @@ and ownership of the model is not taken. */ SharedModel impl_getModel( bool _bTakeOwnershipIfNewlyCreated ); - -// other stuff - void flushTables(); ::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]
