diff options
| author | Oliver Bolte <obo@openoffice.org> | 2004-11-16 13:47:14 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2004-11-16 13:47:14 +0000 |
| commit | eca473f430503016a129db07d9528ef556500e72 (patch) | |
| tree | 210393560f6d4c8324238b0abe0e73f73d6ad36c /extensions | |
| parent | 5524ec3579d2c6421c30c30646ada4da280cd42b (diff) | |
INTEGRATION: CWS docking4 (1.7.126); FILE MERGED
2004/10/05 11:16:48 cd 1.7.126.2: #i33338# Don't throw NoSuchElementException
2004/10/05 06:20:17 cd 1.7.126.1: #i33338# Support new DispatchInformationProvider interface
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/source/bibliography/framectr.hxx | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/extensions/source/bibliography/framectr.hxx b/extensions/source/bibliography/framectr.hxx index 33fa61206f12..368906cbdb4e 100644 --- a/extensions/source/bibliography/framectr.hxx +++ b/extensions/source/bibliography/framectr.hxx @@ -2,9 +2,9 @@ * * $RCSfile: framectr.hxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: kz $ $Date: 2004-02-25 15:30:46 $ + * last change: $Author: obo $ $Date: 2004-11-16 14:47:14 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -79,9 +79,12 @@ #ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_ #include <com/sun/star/lang/XServiceInfo.hpp> #endif +#ifndef _COM_SUN_STAR_FRAME_XDISPATCHINFORMATIONPROVIDER_HPP_ +#include <com/sun/star/frame/XDispatchInformationProvider.hpp> +#endif -#ifndef _CPPUHELPER_IMPLBASE4_HXX_ -#include <cppuhelper/implbase4.hxx> +#ifndef _CPPUHELPER_IMPLBASE5_HXX_ +#include <cppuhelper/implbase5.hxx> #endif #ifndef _SVARRAY_HXX @@ -109,11 +112,12 @@ public: typedef BibStatusDispatch* BibStatusDispatchPtr; SV_DECL_PTRARR_DEL( BibStatusDispatchArr, BibStatusDispatchPtr, 4, 4 ); -class BibFrameController_Impl : public cppu::WeakImplHelper4 < +class BibFrameController_Impl : public cppu::WeakImplHelper5 < ::com::sun::star::lang::XServiceInfo, ::com::sun::star::frame::XController, ::com::sun::star::frame::XDispatch, - ::com::sun::star::frame::XDispatchProvider + ::com::sun::star::frame::XDispatchProvider, + ::com::sun::star::frame::XDispatchInformationProvider > { friend class BibFrameCtrl_Impl; @@ -172,7 +176,10 @@ public: virtual void SAL_CALL addStatusListener(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xControl, const ::com::sun::star::util::URL& aURL) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeStatusListener(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xControl, const ::com::sun::star::util::URL& aURL) throw (::com::sun::star::uno::RuntimeException); -}; + // ::com::sun::star::frame::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 CommandGroup ) throw (::com::sun::star::uno::RuntimeException); + }; #endif |