User: kz Date: 2008-06-25 13:19:41+0000 Modified: dba/reportdesign/source/ui/inc/ReportController.hxx
Log: INTEGRATION: CWS dba30d (1.7.24); FILE MERGED 2008/06/11 20:05:16 fs 1.7.24.1: XSelectionSupplier not implemented by the base class anymore File Changes: Directory: /dba/reportdesign/source/ui/inc/ =========================================== File [changed]: ReportController.hxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/inc/ReportController.hxx?r1=1.8&r2=1.9 Delta lines: +14 -11 --------------------- --- ReportController.hxx 2008-06-16 13:40:58+0000 1.8 +++ ReportController.hxx 2008-06-25 13:19:38+0000 1.9 @@ -30,11 +30,9 @@ #ifndef RPTUI_REPORTCONTROLLER_HXX #define RPTUI_REPORTCONTROLLER_HXX -#ifndef rptui_SINGLEDOCCONTROLLER_HXX #include <dbaccess/singledoccontroller.hxx> -#endif -#include <cppuhelper/implbase2.hxx> #include <com/sun/star/uno/XComponentContext.hpp> +#include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/sdbc/XConnection.hpp> #include <com/sun/star/sdbc/XRowSet.hpp> @@ -50,7 +48,8 @@ #include <com/sun/star/report/XReportControlModel.hpp> #include <com/sun/star/report/XReportEngine.hpp> #include <com/sun/star/report/XSection.hpp> - +#include <com/sun/star/view/XSelectionSupplier.hpp> +#include <cppuhelper/implbase3.hxx> #include <comphelper/uno3.hxx> #include <svtools/transfer.hxx> #include <svtools/lstner.hxx> @@ -62,7 +61,6 @@ #include <boost/shared_ptr.hpp> - class TransferableHelper; class TransferableClipboardListener; class VclWindowEvent; @@ -75,8 +73,9 @@ class OSectionView; typedef ::dbaui::OSingleDocumentController OReportController_BASE; - typedef ::cppu::ImplHelper2 < ::com::sun::star::container::XContainerListener, - ::com::sun::star::beans::XPropertyChangeListener + typedef ::cppu::ImplHelper3 < ::com::sun::star::container::XContainerListener + , ::com::sun::star::beans::XPropertyChangeListener + , ::com::sun::star::view::XSelectionSupplier > OReportController_Listener; class OReportController : public OReportController_BASE @@ -85,6 +84,8 @@ { private: OModuleClient m_aModuleClient; + ::cppu::OInterfaceContainerHelper + m_aSelectionListeners; ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue> m_aCollapsedSections; ODesignView* m_pMyOwnView; // we want to avoid casts @@ -341,6 +342,12 @@ // XPropertyChangeListener virtual void SAL_CALL propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) 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); + // ::com::sun::star::frame::XController virtual sal_Bool SAL_CALL attachModel(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > & xModel) throw( ::com::sun::star::uno::RuntimeException ); virtual ::com::sun::star::uno::Any SAL_CALL getViewData(void) throw( ::com::sun::star::uno::RuntimeException ); @@ -354,10 +361,6 @@ // ::com::sun::star::frame::XController virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > SAL_CALL getModel(void) 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); - // XTitle virtual ::rtl::OUString SAL_CALL getTitle( ) throw (::com::sun::star::uno::RuntimeException); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
