User: obo Date: 06/03/29 04:32:58 Modified: /dba/dbaccess/source/core/dataaccess/ ModelImpl.hxx
Log: INTEGRATION: CWS dba203a (1.10.12); FILE MERGED 2006/03/16 09:51:58 fs 1.10.12.1: #i63162# hold the document weak File Changes: Directory: /dba/dbaccess/source/core/dataaccess/ ================================================ File [changed]: ModelImpl.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/ModelImpl.hxx?r1=1.10&r2=1.11 Delta lines: +3 -3 ------------------- --- ModelImpl.hxx 7 Feb 2006 10:18:28 -0000 1.10 +++ ModelImpl.hxx 29 Mar 2006 12:32:55 -0000 1.11 @@ -201,8 +201,8 @@ class ODatabaseModelImpl : public ::rtl::IReference { private: - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel> m_xTempModel; - ::com::sun::star::uno::WeakReference< ::com::sun::star::sdbc::XDataSource> m_xDataSource; + ::com::sun::star::uno::WeakReference< ::com::sun::star::frame::XModel > m_xModel; + ::com::sun::star::uno::WeakReference< ::com::sun::star::sdbc::XDataSource > m_xDataSource; DocumentStorageAccess* m_pStorageAccess; ::rtl::Reference< SharedMutex > m_xMutex; @@ -428,7 +428,7 @@ Only to be called when the model is being disposed */ - void modelIsDisposing( ResetModelAccess ) { m_xTempModel = NULL; } + void modelIsDisposing( ResetModelAccess ) { m_xModel = ::com::sun::star::uno::WeakReference< ::com::sun::star::frame::XModel >(); } DocumentStorageAccess* getDocumentStorageAccess(); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
