diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-06-17 14:41:31 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-06-17 14:41:31 +0000 |
| commit | a6a076fbaaf612cf3b749a55688ec918b1dd31ab (patch) | |
| tree | 5f94974d3548aed68dc19544a7bac87e0b78afe9 /shell/source/cmdmail/cmdmailsuppl.hxx | |
| parent | 94ea888cd5028359c6f550e06bc724a73cd505af (diff) | |
INTEGRATION: CWS defaultmailer (1.1.172); FILE MERGED
2004/06/08 10:32:21 obr 1.1.172.1: #i21321#,#i28378#,103347 cmdmail is now unix only and auto-detects the command line profile to use
Diffstat (limited to 'shell/source/cmdmail/cmdmailsuppl.hxx')
| -rw-r--r-- | shell/source/cmdmail/cmdmailsuppl.hxx | 38 |
1 files changed, 13 insertions, 25 deletions
diff --git a/shell/source/cmdmail/cmdmailsuppl.hxx b/shell/source/cmdmail/cmdmailsuppl.hxx index 961fbd007789..cdfe4770cf44 100644 --- a/shell/source/cmdmail/cmdmailsuppl.hxx +++ b/shell/source/cmdmail/cmdmailsuppl.hxx @@ -2,9 +2,9 @@ * * $RCSfile: cmdmailsuppl.hxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: obr $ $Date: 2001-06-26 08:49:26 $ + * last change: $Author: rt $ $Date: 2004-06-17 15:41:31 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -66,8 +66,8 @@ // includes of other projects //---------------------------------------------------------- -#ifndef _CPPUHELPER_COMPLBASE4_HXX_ -#include <cppuhelper/compbase4.hxx> +#ifndef _CPPUHELPER_IMPLBASE3_HXX_ +#include <cppuhelper/implbase3.hxx> #endif #ifndef _OSL_MUTEX_HXX_ @@ -78,6 +78,10 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #endif +#ifndef _COM_SUN_STAR_UNO_XCOMPONENTCONTEXT_HPP_ +#include <com/sun/star/uno/XComponentContext.hpp> +#endif + #ifndef _COM_SUN_STAR_SYS_SHELL_XSYSTEMSHELLEXECUTE_HPP_ #include <com/sun/star/system/XSimpleMailClient.hpp> #endif @@ -90,26 +94,17 @@ // class declaration //---------------------------------------------------------- -class CmdMailSupplBase -{ -protected: - osl::Mutex m_aMutex; -}; - class CmdMailSuppl : - public CmdMailSupplBase, - public cppu::WeakComponentImplHelper4< - com::sun::star::system::XSimpleMailClientSupplier, - com::sun::star::system::XSimpleMailClient, - com::sun::star::lang::XEventListener, - com::sun::star::lang::XServiceInfo > + public cppu::WeakImplHelper3< + com::sun::star::system::XSimpleMailClientSupplier, + com::sun::star::system::XSimpleMailClient, + com::sun::star::lang::XServiceInfo > { - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceManager; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xConfigurationProvider; public: - CmdMailSuppl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager ); + CmdMailSuppl( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext ); //------------------------------------------------ // XSimpleMailClientSupplier @@ -129,13 +124,6 @@ public: throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); //------------------------------------------------ - // XEventListener - //------------------------------------------------ - - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& aEvent ) - throw(::com::sun::star::uno::RuntimeException); - - //------------------------------------------------ // XServiceInfo //------------------------------------------------ |