From e29c541f66a8ac21c0b1a030dab4c1ea0782fadd Mon Sep 17 00:00:00 2001 From: Oliver Bolte Date: Tue, 16 Nov 2004 13:49:12 +0000 Subject: INTEGRATION: CWS docking4 (1.4.60); FILE MERGED 2004/10/05 10:56:56 as 1.4.60.1: #i33338# remove NoSuchElementException, remove duplicate items --- framework/inc/dispatch/closedispatcher.hxx | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) (limited to 'framework/inc/dispatch') diff --git a/framework/inc/dispatch/closedispatcher.hxx b/framework/inc/dispatch/closedispatcher.hxx index f303e0ad821a..63d50a3ac10e 100644 --- a/framework/inc/dispatch/closedispatcher.hxx +++ b/framework/inc/dispatch/closedispatcher.hxx @@ -2,9 +2,9 @@ * * $RCSfile: closedispatcher.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: kz $ $Date: 2004-06-10 13:19:11 $ + * last change: $Author: obo $ $Date: 2004-11-16 14:49:12 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -112,6 +112,10 @@ #include #endif +#ifndef _COM_SUN_STAR_FRAME_XDISPATCHINFORMATIONPROVIDER_HPP_ +#include +#endif + #ifndef _COM_SUN_STAR_UTIL_URL_HPP_ #include #endif @@ -156,8 +160,9 @@ namespace framework{ be used. */ class CloseDispatcher : public css::lang::XTypeProvider - , public css::frame::XNotifyingDispatch // => XDispatch - , public css::frame::XStatusListener // => XEventListener + , public css::frame::XNotifyingDispatch // => XDispatch + , public css::frame::XStatusListener // => XEventListener + , public css::frame::XDispatchInformationProvider // baseclasses ... order is neccessary for right initialization! , private ThreadHelpBase , public ::cppu::OWeakObject @@ -266,6 +271,11 @@ class CloseDispatcher : public css::lang::XTypeProvider virtual void SAL_CALL removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xListener , const css::util::URL& aURL ) throw(css::uno::RuntimeException); + //--------------------------------------- + // XDispatchInformationProvider + virtual css::uno::Sequence< sal_Int16 > SAL_CALL getSupportedCommandGroups ( ) throw (css::uno::RuntimeException); + virtual css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL getConfigurableDispatchInformation( sal_Int16 nCommandGroup ) throw (css::uno::RuntimeException); + //--------------------------------------- // XStatusListener virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& aState ) throw(css::uno::RuntimeException); -- cgit