User: vg Date: 05/03/10 08:33:37 Modified: /dba/dbaccess/source/core/dataaccess/ databasecontext.hxx
Log: INTEGRATION: CWS dba24 (1.11.2); FILE MERGED 2005/02/18 12:25:26 oj 1.11.2.2: #i42460# changes for the separation of datasource and database document(model) 2005/02/04 14:16:15 oj 1.11.2.1: #i42056# remember password if said so 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.11&r2=1.12 Delta lines: +26 -8 -------------------- --- databasecontext.hxx 21 Jan 2005 17:03:15 -0000 1.11 +++ databasecontext.hxx 10 Mar 2005 16:33:35 -0000 1.12 @@ -71,6 +71,9 @@ #ifndef _COM_SUN_STAR_UNO_XNAMINGSERVICE_HPP_ #include <com/sun/star/uno/XNamingService.hpp> #endif +#ifndef _COM_SUN_STAR_LANG_XUNOTUNNEL_HPP_ +#include <com/sun/star/lang/XUnoTunnel.hpp> +#endif #ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_ #include <com/sun/star/lang/XServiceInfo.hpp> #endif @@ -83,8 +86,8 @@ #ifndef _COM_SUN_STAR_CONTAINER_XCONTAINER_HPP_ #include <com/sun/star/container/XContainer.hpp> #endif -#ifndef _CPPUHELPER_COMPBASE7_HXX_ -#include <cppuhelper/compbase7.hxx> +#ifndef _CPPUHELPER_COMPBASE8_HXX_ +#include <cppuhelper/compbase8.hxx> #endif #ifndef _COMPHELPER_STLTYPES_HXX_ #include <comphelper/stl_types.hxx> @@ -104,6 +107,10 @@ #ifndef _COM_SUN_STAR_LANG_XSINGLESERVICEFACTORY_HPP_ #include <com/sun/star/lang/XSingleServiceFactory.hpp> #endif +#ifndef _DBA_COREDATAACCESS_MODELIMPL_HXX_ +#include "ModelImpl.hxx" +#endif +#include <boost/shared_ptr.hpp> // needed for registration namespace com { namespace sun { namespace star { @@ -125,17 +132,17 @@ ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > ODatabaseContext_CreateInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&); -typedef ::cppu::WeakComponentImplHelper7 < ::com::sun::star::lang::XServiceInfo +typedef ::cppu::WeakComponentImplHelper8 < ::com::sun::star::lang::XServiceInfo , ::com::sun::star::container::XEnumerationAccess , ::com::sun::star::container::XNameAccess , ::com::sun::star::uno::XNamingService , ::com::sun::star::lang::XEventListener , ::com::sun::star::container::XContainer , ::com::sun::star::lang::XSingleServiceFactory + , ::com::sun::star::lang::XUnoTunnel > DatabaseAccessContext_Base; -class ODatabaseContext - :public DatabaseAccessContext_Base +class ODatabaseContext : public DatabaseAccessContext_Base { private: /** loads the given object from the given URL @@ -152,12 +159,17 @@ */ bool getURLForRegisteredObject( const ::rtl::OUString& _rRegisteredName, ::rtl::OUString& _rURL ); + /** sets all properties which were transient at the data source. e.g. password + @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); + protected: ::osl::Mutex m_aMutex; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceManager; - typedef ::std::pair< ::com::sun::star::uno::WeakReferenceHelper,::com::sun::star::uno::WeakReferenceHelper > ObjectCacheType; - DECLARE_STL_USTRINGACCESS_MAP( ObjectCacheType, ObjectCache ); + DECLARE_STL_USTRINGACCESS_MAP( ODatabaseModelImpl*, ObjectCache ); ObjectCache m_aDatabaseObjects; DECLARE_STL_USTRINGACCESS_MAP( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >, PropertyCache ); @@ -217,7 +229,13 @@ virtual void SAL_CALL addContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) throw(::com::sun::star::uno::RuntimeException); - void registerPrivate(const ::rtl::OUString& _sName, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xObject); + // com::sun::star::lang::XUnoTunnel + virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException); + static ::com::sun::star::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId(); + + void registerPrivate(const ::rtl::OUString& _sName + ,const ::rtl::Reference<ODatabaseModelImpl>& _pModelImpl); + void deregisterPrivate(const ::rtl::OUString& _sName); void nameChangePrivate(const ::rtl::OUString& _sOldName, const ::rtl::OUString& _sNewName); }; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
