diff options
| author | Oliver Bolte <obo@openoffice.org> | 2006-07-14 06:10:17 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2006-07-14 06:10:17 +0000 |
| commit | 767022363139a3cd70008a7a3a04f37b98592322 (patch) | |
| tree | a3805ef95f2506690dd15cbb0617359bd19bea06 /scripting | |
| parent | 96c62fa6185a7ff638fcebec4191d538c9bfb850 (diff) | |
INTEGRATION: CWS ab28 (1.4.28); FILE MERGED
2006/07/12 08:39:25 ab 1.4.28.1: #i66948# XDialogProvider2 support
Diffstat (limited to 'scripting')
| -rw-r--r-- | scripting/source/dlgprov/dlgprov.hxx | 31 |
1 files changed, 25 insertions, 6 deletions
diff --git a/scripting/source/dlgprov/dlgprov.hxx b/scripting/source/dlgprov/dlgprov.hxx index a4c503929923..f58c21c7fa6d 100644 --- a/scripting/source/dlgprov/dlgprov.hxx +++ b/scripting/source/dlgprov/dlgprov.hxx @@ -4,9 +4,9 @@ * * $RCSfile: dlgprov.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: rt $ $Date: 2005-09-09 02:25:26 $ + * last change: $Author: obo $ $Date: 2006-07-14 07:10:17 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -42,8 +42,8 @@ #ifndef _COM_SUN_STAR_AWT_XDIALOG_HPP_ #include <com/sun/star/awt/XDialog.hpp> #endif -#ifndef _COM_SUN_STAR_AWT_XDIALOGPROVIDER_HPP_ -#include <com/sun/star/awt/XDialogProvider.hpp> +#ifndef _COM_SUN_STAR_AWT_XDIALOGPROVIDER2_HPP_ +#include <com/sun/star/awt/XDialogProvider2.hpp> #endif #ifndef _COM_SUN_STAR_FRAME_XMODEL_HPP_ #include <com/sun/star/frame/XModel.hpp> @@ -60,6 +60,9 @@ #ifndef _COM_SUN_STAR_UNO_XCOMPONENTCONTEXT_HPP_ #include <com/sun/star/uno/XComponentContext.hpp> #endif +#ifndef _COM_SUN_STAR_BEANS_XINTROSPECTION_HPP_ +#include <com/sun/star/beans/XIntrospectionAccess.hpp> +#endif #ifndef _CPPUHELPER_IMPLBASE3_HXX_ #include <cppuhelper/implbase3.hxx> @@ -88,7 +91,7 @@ namespace dlgprov typedef ::cppu::WeakImplHelper3< ::com::sun::star::lang::XServiceInfo, ::com::sun::star::lang::XInitialization, - ::com::sun::star::awt::XDialogProvider > DialogProviderImpl_BASE; + ::com::sun::star::awt::XDialogProvider2 > DialogProviderImpl_BASE; class DialogProviderImpl : public DialogProviderImpl_BASE @@ -104,7 +107,17 @@ namespace dlgprov ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > createDialogControl( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& rxDialogModel ); - void attachDialogEvents( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& rxDialogControl ); + void attachDialogEvents( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDialog >& rxDialog, + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxHandler, + const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XIntrospectionAccess >& rxIntrospectionAccess ); + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XIntrospectionAccess > inspectHandler( + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxHandler ); + + // XDialogProvider / XDialogProvider2 impl method + virtual ::com::sun::star::uno::Reference < ::com::sun::star::awt::XDialog > SAL_CALL createDialogImpl( + const ::rtl::OUString& URL, + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xHandler ) + throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); public: DialogProviderImpl( @@ -127,6 +140,12 @@ namespace dlgprov virtual ::com::sun::star::uno::Reference < ::com::sun::star::awt::XDialog > SAL_CALL createDialog( const ::rtl::OUString& URL ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); + + // XDialogProvider2 + virtual ::com::sun::star::uno::Reference < ::com::sun::star::awt::XDialog > SAL_CALL createDialogWithHandler( + const ::rtl::OUString& URL, + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xHandler ) + throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); }; //......................................................................... |