User: obo Date: 2006/07/13 08:21:21 Modified: dba/dbaccess/source/core/dataaccess/databasecontext.hxx
Log: INTEGRATION: CWS dba204a (1.13.128); FILE MERGED 2006/07/06 06:12:53 oj 1.13.128.1: #i66629# listen at documentmodelimpl and not any longer at the ds 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.13&r2=1.14 Delta lines: +4 -7 ------------------- --- databasecontext.hxx 8 Sep 2005 11:59:16 -0000 1.13 +++ databasecontext.hxx 13 Jul 2006 15:21:18 -0000 1.14 @@ -60,8 +60,8 @@ #ifndef _COM_SUN_STAR_CONTAINER_XCONTAINER_HPP_ #include <com/sun/star/container/XContainer.hpp> #endif -#ifndef _CPPUHELPER_COMPBASE8_HXX_ -#include <cppuhelper/compbase8.hxx> +#ifndef _CPPUHELPER_COMPBASE7_HXX_ +#include <cppuhelper/compbase7.hxx> #endif #ifndef _COMPHELPER_STLTYPES_HXX_ #include <comphelper/stl_types.hxx> @@ -106,11 +106,10 @@ ::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::WeakComponentImplHelper8 < ::com::sun::star::lang::XServiceInfo +typedef ::cppu::WeakComponentImplHelper7 < ::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 @@ -196,9 +195,6 @@ virtual void SAL_CALL registerObject( const ::rtl::OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Object ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL revokeObject( const ::rtl::OUString& Name ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); -// ::com::sun::star::lang::XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException); - // ::com::sun::star::container::XContainer 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); @@ -211,6 +207,7 @@ ,const ::rtl::Reference<ODatabaseModelImpl>& _pModelImpl); void deregisterPrivate(const ::rtl::OUString& _sName); void nameChangePrivate(const ::rtl::OUString& _sOldName, const ::rtl::OUString& _sNewName); + void storeTransientProperties( ODatabaseModelImpl& _rModelImpl); }; //........................................................................ --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
