User: kz Date: 2008-03-06 17:58:03+0000 Modified: dba/dbaccess/source/core/dataaccess/databasecontext.hxx
Log: INTEGRATION: CWS odbmacros2 (1.14.236); FILE MERGED 2008/02/19 08:32:36 fs 1.14.236.3: #i86178# also remember the 'AuthenticationFailedpassword' when remembering transient data source properties 2008/02/04 13:07:05 fs 1.14.236.2: RESYNC: (1.14-1.15); FILE MERGED 2007/12/19 09:50:29 fs 1.14.236.1: #i49133# add a ThisDatabaseDocument variable to the newly created BasicManager of a database document File Changes: Directory: /dba/dbaccess/source/core/dataaccess/ ================================================ File [changed]: databasecontext.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/databasecontext.hxx?r1=1.15&r2=1.16 Delta lines: +14 -2 -------------------- --- databasecontext.hxx 2008-01-30 08:33:21+0000 1.15 +++ databasecontext.hxx 2008-03-06 17:58:00+0000 1.16 @@ -84,6 +84,10 @@ #ifndef _DBA_COREDATAACCESS_MODELIMPL_HXX_ #include "ModelImpl.hxx" #endif +#ifndef BASICMANAGERREPOSITORY_HXX +#include <basic/basicmanagerrepository.hxx> +#endif + #include <boost/shared_ptr.hpp> // needed for registration @@ -115,7 +119,8 @@ , ::com::sun::star::lang::XUnoTunnel > DatabaseAccessContext_Base; -class ODatabaseContext : public DatabaseAccessContext_Base +class ODatabaseContext :public DatabaseAccessContext_Base + ,public ::basic::BasicManagerCreationListener { private: /** loads the given object from the given URL @@ -136,7 +141,7 @@ @param _sURL The file URL of the data source @param _xObject The data source itself. */ - void setTransientProperties(const ::rtl::OUString& _sURL, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xObject); + void setTransientProperties(const ::rtl::OUString& _sURL, ODatabaseModelImpl& _rDataSourceModel ); protected: ::osl::Mutex m_aMutex; @@ -208,6 +213,13 @@ void deregisterPrivate(const ::rtl::OUString& _sName); void nameChangePrivate(const ::rtl::OUString& _sOldName, const ::rtl::OUString& _sNewName); void storeTransientProperties( ODatabaseModelImpl& _rModelImpl); + +private: + // BasicManagerCreationListener + virtual void onBasicManagerCreated( + const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& _rxForDocument, + BasicManager& _rBasicManager + ); }; //........................................................................ --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
