Tag: cws_src680_oj14 User: oj Date: 2006/12/21 04:30:24 Modified: dba/dbaccess/inc/genericcontroller.hxx dba/dbaccess/inc/singledoccontroller.hxx
Log: impl selectionSupplier File Changes: Directory: /dba/dbaccess/inc/ ============================= File [changed]: genericcontroller.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/inc/genericcontroller.hxx?r1=1.1.2.8&r2=1.1.2.9 Delta lines: +17 -5 -------------------- --- genericcontroller.hxx 13 Nov 2006 13:23:55 -0000 1.1.2.8 +++ genericcontroller.hxx 21 Dec 2006 12:30:21 -0000 1.1.2.9 @@ -4,9 +4,9 @@ * * $RCSfile: genericcontroller.hxx,v $ * - * $Revision: 1.1.2.8 $ + * $Revision: 1.1.2.9 $ * - * last change: $Author: oj $ $Date: 2006/11/13 13:23:55 $ + * last change: $Author: oj $ $Date: 2006/12/21 12:30:21 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -66,11 +66,14 @@ #ifndef _COM_SUN_STAR_LANG_XINITIALIZATION_HPP_ #include <com/sun/star/lang/XInitialization.hpp> #endif +#ifndef _COM_SUN_STAR_VIEW_XSELECTIONSUPPLIER_HPP_ +#include <com/sun/star/view/XSelectionSupplier.hpp> +#endif #ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_ #include <com/sun/star/lang/XServiceInfo.hpp> #endif -#ifndef _CPPUHELPER_COMPBASE7_HXX_ -#include <cppuhelper/compbase7.hxx> +#ifndef _CPPUHELPER_COMPBASE8_HXX_ +#include <cppuhelper/compbase8.hxx> #endif #ifndef _CPPUHELPER_COMPBASE1_HXX_ #include <cppuhelper/compbase1.hxx> @@ -122,13 +125,14 @@ typedef ::comphelper::OBaseMutex OGenericUnoController_MBASE; - typedef ::cppu::WeakComponentImplHelper7 < ::com::sun::star::frame::XDispatch + typedef ::cppu::WeakComponentImplHelper8 < ::com::sun::star::frame::XDispatch , ::com::sun::star::frame::XDispatchProviderInterceptor , ::com::sun::star::util::XModifyListener , ::com::sun::star::frame::XFrameActionListener , ::com::sun::star::lang::XInitialization , ::com::sun::star::lang::XServiceInfo , ::com::sun::star::frame::XDispatchInformationProvider + , ::com::sun::star::view::XSelectionSupplier > OGenericUnoController_COMPBASE; typedef ::cppu::ImplHelper1 < ::com::sun::star::frame::XController @@ -278,6 +282,8 @@ Dispatch m_arrStatusListener; // all our listeners where we dispatch status changes OAsyncronousLink m_aAsyncInvalidateAll; OAsyncronousLink m_aAsyncCloseTask; // called when a task shoud be closed + ::cppu::OInterfaceContainerHelper + m_aSelectionListeners; ::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer > m_xUrlTransformer; // needed sometimes ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceFactory; @@ -523,6 +529,12 @@ // XDispatchInformationProvider virtual ::com::sun::star::uno::Sequence< ::sal_Int16 > SAL_CALL getSupportedCommandGroups() throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::frame::DispatchInformation > SAL_CALL getConfigurableDispatchInformation( ::sal_Int16 ) throw (::com::sun::star::uno::RuntimeException); + + // XSelectionSupplier + virtual ::sal_Bool SAL_CALL select( const ::com::sun::star::uno::Any& xSelection ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getSelection( ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addSelectionChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeSelectionChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); }; } File [changed]: singledoccontroller.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/inc/singledoccontroller.hxx?r1=1.1.2.4&r2=1.1.2.5 Delta lines: +2 -19 -------------------- --- singledoccontroller.hxx 13 Nov 2006 13:23:55 -0000 1.1.2.4 +++ singledoccontroller.hxx 21 Dec 2006 12:30:21 -0000 1.1.2.5 @@ -4,9 +4,9 @@ * * $RCSfile: singledoccontroller.hxx,v $ * - * $Revision: 1.1.2.4 $ + * $Revision: 1.1.2.5 $ * - * last change: $Author: oj $ $Date: 2006/11/13 13:23:55 $ + * last change: $Author: oj $ $Date: 2006/12/21 12:30:21 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -85,15 +85,10 @@ //==================================================================== class OSingleDocumentController; typedef OGenericUnoController OSingleDocumentController_CBASE; - typedef ::comphelper::OPropertyContainer OSingleDocumentController_PBASE; - typedef ::comphelper::OPropertyArrayUsageHelper < OSingleDocumentController - > OSingleDocumentController_PABASE; struct OSingleDocumentControllerImpl; class DBACCESS_DLLPUBLIC OSingleDocumentController :public OSingleDocumentController_CBASE - ,public OSingleDocumentController_PBASE - ,public OSingleDocumentController_PABASE ,public IEnvironment { friend class OConnectionChangeBroadcaster; @@ -213,21 +208,9 @@ virtual sal_Bool Construct(Window* pParent); protected: - // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL acquire( ) throw (); - virtual void SAL_CALL release( ) throw (); - // XTypeProvider virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException); - - // OPropertyArrayUsageHelper - virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const; - - // XPropertySet - virtual com::sun::star::uno::Reference<com::sun::star::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(com::sun::star::uno::RuntimeException); - virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); // 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]
