User: obo Date: 2006/07/10 08:14:48 Modified: dba/dbaccess/source/core/inc/querycontainer.hxx
Log: INTEGRATION: CWS qiq (1.13.4); FILE MERGED 2006/05/31 11:09:10 fs 1.13.4.3: #i51143# XContainerApproveListener return XVeto now, instead of throwing 2006/05/24 14:54:20 fs 1.13.4.2: #i51143# be an XContainerApproveListener at the command definition container, to prevent somebody inserting a command definition with a name conflicting with a table (in case tables and queries share the same namespace) 2006/05/24 09:09:44 fs 1.13.4.1: #i51143# overwrite approveNewObject File Changes: Directory: /dba/dbaccess/source/core/inc/ ========================================= File [changed]: querycontainer.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/inc/querycontainer.hxx?r1=1.13&r2=1.14 Delta lines: +23 -11 --------------------- --- querycontainer.hxx 4 May 2006 08:38:37 -0000 1.13 +++ querycontainer.hxx 10 Jul 2006 15:14:45 -0000 1.14 @@ -36,8 +36,8 @@ #ifndef _DBA_CORE_QUERYCONTAINER_HXX_ #define _DBA_CORE_QUERYCONTAINER_HXX_ -#ifndef _CPPUHELPER_IMPLBASE4_HXX_ -#include <cppuhelper/implbase4.hxx> +#ifndef _CPPUHELPER_IMPLBASE5_HXX_ +#include <cppuhelper/implbase5.hxx> #endif #ifndef _COMPHELPER_STLTYPES_HXX_ #include <comphelper/stl_types.hxx> @@ -45,6 +45,8 @@ #ifndef _CPPUHELPER_INTERFACECONTAINER_HXX_ #include <cppuhelper/interfacecontainer.hxx> #endif + +/** === begin UNO includes == **/ #ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_ #include <com/sun/star/beans/XPropertySet.hpp> #endif @@ -93,31 +95,35 @@ #ifndef _COM_SUN_STAR_BEANS_XPROPERTYCHANGELISTENER_HPP_ #include <com/sun/star/beans/XPropertyChangeListener.hpp> #endif +#ifndef _COM_SUN_STAR_CONTAINER_XCONTAINERAPPROVELISTENER_HPP_ +#include <com/sun/star/container/XContainerApproveListener.hpp> +#endif +/** === end UNO includes === **/ + #ifndef _DBA_CORE_DEFINITIONCONTAINER_HXX_ #include "definitioncontainer.hxx" #endif #ifndef _DBASHARED_APITOOLS_HXX_ #include "apitools.hxx" #endif -#ifndef DBA_CONTAINERLISTENER_HXX -#include "ContainerListener.hxx" -#endif //........................................................................ namespace dbaccess { //........................................................................ - typedef ::cppu::ImplHelper4< ::com::sun::star::container::XContainerListener, - ::com::sun::star::sdbcx::XDataDescriptorFactory, - ::com::sun::star::sdbcx::XAppend, - ::com::sun::star::sdbcx::XDrop> OQueryContainer_Base; + typedef ::cppu::ImplHelper5 < ::com::sun::star::container::XContainerListener + , ::com::sun::star::container::XContainerApproveListener + , ::com::sun::star::sdbcx::XDataDescriptorFactory + , ::com::sun::star::sdbcx::XAppend + , ::com::sun::star::sdbcx::XDrop + > OQueryContainer_Base; //========================================================================== //= OQueryContainer //========================================================================== class OQueryContainer; - typedef OContainerListener<OQueryContainer> OCommandsListener; + class OContainerListener; class OQuery; class IWarningsContainer; class OQueryContainer : public ODefinitionContainer @@ -133,7 +139,8 @@ enum AGGREGATE_ACTION { NONE, INSERTING, FLUSHING }; AGGREGATE_ACTION m_eDoingCurrently; - OCommandsListener* m_pCommandsListener; + OContainerListener* m_pCommandsListener; + // ------------------------------------------------------------------------ /** a class which automatically resets m_eDoingCurrently in it's destructor */ @@ -181,6 +188,11 @@ virtual void SAL_CALL elementInserted( const ::com::sun::star::container::ContainerEvent& Event ) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL elementRemoved( const ::com::sun::star::container::ContainerEvent& Event ) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL elementReplaced( const ::com::sun::star::container::ContainerEvent& Event ) throw(::com::sun::star::uno::RuntimeException); + + // XContainerApproveListener + virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XVeto > SAL_CALL approveInsertElement( const ::com::sun::star::container::ContainerEvent& Event ) throw (::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XVeto > SAL_CALL approveReplaceElement( const ::com::sun::star::container::ContainerEvent& Event ) throw (::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XVeto > SAL_CALL approveRemoveElement( const ::com::sun::star::container::ContainerEvent& Event ) throw (::com::sun::star::lang::WrappedTargetException, ::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); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
