Tag: cws_dev300_dba30d User: fs Date: 2008-06-11 20:24:04+0000 Modified: dba/dbaccess/inc/genericcontroller.hxx
Log: during #i80943#: don't implement XSelectionSupplier (empty) if only a few derived classes need it File Changes: Directory: /dba/dbaccess/inc/ ============================= File [changed]: genericcontroller.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/inc/genericcontroller.hxx?r1=1.10.28.3&r2=1.10.28.4 Delta lines: +4 -14 -------------------- --- genericcontroller.hxx 2008-06-10 06:39:58+0000 1.10.28.3 +++ genericcontroller.hxx 2008-06-11 20:24:02+0000 1.10.28.4 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: genericcontroller.hxx,v $ - * $Revision: 1.10.28.3 $ + * $Revision: 1.10.28.4 $ * * This file is part of OpenOffice.org. * @@ -54,7 +54,6 @@ #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/util/XModifyListener.hpp> #include <com/sun/star/util/XURLTransformer.hpp> -#include <com/sun/star/view/XSelectionSupplier.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/awt/XUserInputInterception.hpp> /** === end UNO includes === **/ @@ -63,7 +62,7 @@ #include <comphelper/namedvaluecollection.hxx> #include <comphelper/stl_types.hxx> #include <connectivity/dbexception.hxx> -#include <cppuhelper/compbase12.hxx> +#include <cppuhelper/compbase11.hxx> #include <cppuhelper/interfacecontainer.h> #include <boost/optional.hpp> @@ -184,10 +183,9 @@ typedef ::comphelper::OBaseMutex OGenericUnoController_MBASE; - typedef ::cppu::WeakComponentImplHelper12 < ::com::sun::star::frame::XDispatch + typedef ::cppu::WeakComponentImplHelper11 < ::com::sun::star::frame::XDispatch , ::com::sun::star::frame::XDispatchProviderInterceptor , ::com::sun::star::util::XModifyListener - , ::com::sun::star::view::XSelectionSupplier , ::com::sun::star::frame::XFrameActionListener , ::com::sun::star::lang::XInitialization , ::com::sun::star::lang::XServiceInfo @@ -234,8 +232,6 @@ FeaturePairDeque m_aFeaturesToInvalidate; - ::cppu::OInterfaceContainerHelper - m_aSelectionListeners; ::osl::Mutex m_aFeatureMutex; // locked when features are append to or remove from deque StateCache m_aStateCache; // save the current status of feature state Dispatch m_arrStatusListener; // all our listeners where we dispatch status changes @@ -497,12 +493,6 @@ // lang::XInitialization virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw(::com::sun::star::uno::Exception, ::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); - // XServiceInfo virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException) = 0; virtual sal_Bool SAL_CALL supportsService(const ::rtl::OUString& ServiceName) throw(::com::sun::star::uno::RuntimeException); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
