diff options
| author | Noel Grandin <noel@peralex.com> | 2013-07-15 13:47:03 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-07-23 10:05:45 +0200 |
| commit | 9dbb8db06d7c5620fec586a87237b3e07dfd0fb3 (patch) | |
| tree | e4c036185e7913e35c074d7a47364b24552eb347 /framework | |
| parent | Convert GlobalSettings_Access to WeakImplHelper (diff) | |
| download | core-9dbb8db06d7c5620fec586a87237b3e07dfd0fb3.tar.gz core-9dbb8db06d7c5620fec586a87237b3e07dfd0fb3.zip | |
Convert the easy cases in framework to WeakImplHelper
Change-Id: I6547c4aee2aa4d15ad516a6a45002b81b7a8ac13
Diffstat (limited to 'framework')
44 files changed, 320 insertions, 689 deletions
diff --git a/framework/inc/helper/persistentwindowstate.hxx b/framework/inc/helper/persistentwindowstate.hxx index 60cc05d93f8a..fe8c76eff4b8 100644 --- a/framework/inc/helper/persistentwindowstate.hxx +++ b/framework/inc/helper/persistentwindowstate.hxx @@ -33,7 +33,7 @@ #include <com/sun/star/lang/XEventListener.hpp> #include <unotools/moduleoptions.hxx> -#include <cppuhelper/weak.hxx> +#include <cppuhelper/implbase2.hxx> namespace framework{ @@ -56,13 +56,12 @@ namespace framework{ @devstatus ready @threadsafe yes *//*-*************************************************************************************************************/ -class PersistentWindowState : // interfaces - public css::lang::XTypeProvider, - public css::lang::XInitialization, - public css::frame::XFrameActionListener, // => XEventListener - // baseclasses (order necessary for right initialization!) +class PersistentWindowState : // baseclasses (order necessary for right initialization!) private ThreadHelpBase, - public ::cppu::OWeakObject + // interfaces + public ::cppu::WeakImplHelper2< + css::lang::XInitialization, + css::frame::XFrameActionListener > // => XEventListener { //________________________________ // member @@ -89,11 +88,6 @@ class PersistentWindowState : // interfaces virtual ~PersistentWindowState( ); //____________________________ - // XInterface, XTypeProvider - FWK_DECLARE_XINTERFACE - FWK_DECLARE_XTYPEPROVIDER - - //____________________________ // XInitialization virtual void SAL_CALL initialize(const css::uno::Sequence< css::uno::Any >& lArguments) throw(css::uno::Exception , diff --git a/framework/inc/helper/statusindicator.hxx b/framework/inc/helper/statusindicator.hxx index 1f99c8e56ddb..4ba6c396d31a 100644 --- a/framework/inc/helper/statusindicator.hxx +++ b/framework/inc/helper/statusindicator.hxx @@ -36,7 +36,7 @@ //_______________________________________________ // include all others -#include <cppuhelper/weak.hxx> +#include <cppuhelper/implbase1.hxx> #include <cppuhelper/weakref.hxx> @@ -60,10 +60,8 @@ namespace framework{ @devstatus ready to use @threadsafe yes */ -class StatusIndicator : public css::lang::XTypeProvider - , public css::task::XStatusIndicator - , private ThreadHelpBase // Order of baseclasses is necessary for right initializaton! - , public ::cppu::OWeakObject // => XInterface +class StatusIndicator : private ThreadHelpBase // Order of baseclasses is necessary for right initializaton! + , public ::cppu::WeakImplHelper1< css::task::XStatusIndicator > { //------------------------------------------- // member @@ -101,11 +99,6 @@ class StatusIndicator : public css::lang::XTypeProvider public: //--------------------------------------- - // XInterface, XTypeProvider - FWK_DECLARE_XINTERFACE - FWK_DECLARE_XTYPEPROVIDER - - //--------------------------------------- // XStatusIndicator virtual void SAL_CALL start(const OUString& sText , sal_Int32 nRange) diff --git a/framework/inc/helper/statusindicatorfactory.hxx b/framework/inc/helper/statusindicatorfactory.hxx index b564f91b96fa..4a14365c0a67 100644 --- a/framework/inc/helper/statusindicatorfactory.hxx +++ b/framework/inc/helper/statusindicatorfactory.hxx @@ -55,7 +55,7 @@ //_______________________________________________ // include others #include <vcl/status.hxx> -#include <cppuhelper/weak.hxx> +#include <cppuhelper/implbase4.hxx> #include <osl/thread.hxx> @@ -154,13 +154,12 @@ typedef ::std::vector< IndicatorInfo > IndicatorStack; @devstatus ready to use @threadsafe yes */ -class StatusIndicatorFactory : public css::lang::XTypeProvider - , public css::lang::XServiceInfo - , public css::lang::XInitialization - , public css::task::XStatusIndicatorFactory - , public css::util::XUpdatable - , private ThreadHelpBase - , public ::cppu::OWeakObject // => XInterface +class StatusIndicatorFactory : private ThreadHelpBase + , public ::cppu::WeakImplHelper4< + css::lang::XServiceInfo + , css::lang::XInitialization + , css::task::XStatusIndicatorFactory + , css::util::XUpdatable > { //------------------------------------------- // member @@ -217,8 +216,6 @@ class StatusIndicatorFactory : public css::lang::XTypeProvider //--------------------------------------- // XInterface, XTypeProvider, XServiceInfo - FWK_DECLARE_XINTERFACE - FWK_DECLARE_XTYPEPROVIDER DECLARE_XSERVICEINFO //--------------------------------------- diff --git a/framework/inc/helper/tagwindowasmodified.hxx b/framework/inc/helper/tagwindowasmodified.hxx index 73dbfafae86a..c998137416d1 100644 --- a/framework/inc/helper/tagwindowasmodified.hxx +++ b/framework/inc/helper/tagwindowasmodified.hxx @@ -33,7 +33,7 @@ #include <com/sun/star/lang/XEventListener.hpp> #include <com/sun/star/frame/XFrameActionListener.hpp> -#include <cppuhelper/weak.hxx> +#include <cppuhelper/implbase3.hxx> namespace framework{ @@ -51,14 +51,13 @@ namespace framework{ @devstatus draft @threadsafe yes *//*-*************************************************************************************************************/ -class TagWindowAsModified : // interfaces - public css::lang::XTypeProvider, - public css::lang::XInitialization, - public css::frame::XFrameActionListener, // => XEventListener - public css::util::XModifyListener, // => XEventListener - // baseclasses (order necessary for right initialization!) +class TagWindowAsModified : // baseclasses (order necessary for right initialization!) private ThreadHelpBase, - public ::cppu::OWeakObject + // interfaces + public ::cppu::WeakImplHelper3< + css::lang::XInitialization, + css::frame::XFrameActionListener, // => XEventListener + css::util::XModifyListener > // => XEventListener { //________________________________ // member @@ -86,8 +85,6 @@ class TagWindowAsModified : // interfaces //____________________________ // XInterface, XTypeProvider - FWK_DECLARE_XINTERFACE - FWK_DECLARE_XTYPEPROVIDER //____________________________ // XInitialization diff --git a/framework/inc/helper/titlebarupdate.hxx b/framework/inc/helper/titlebarupdate.hxx index 7dfc262c641f..de3cb8b2cf63 100644 --- a/framework/inc/helper/titlebarupdate.hxx +++ b/framework/inc/helper/titlebarupdate.hxx @@ -21,33 +21,19 @@ #define __FRAMEWORK_HELPER_TITLEBARUPDATE_HXX_ #include <threadhelp/threadhelpbase.hxx> - #include <macros/debug.hxx> - #include <macros/xinterface.hxx> - #include <macros/xtypeprovider.hxx> - #include <general.h> - #include <com/sun/star/uno/XComponentContext.hpp> - #include <com/sun/star/lang/XInitialization.hpp> - #include <com/sun/star/frame/XFrame.hpp> - #include <com/sun/star/frame/XTitle.hpp> - #include <com/sun/star/frame/XFrameActionListener.hpp> - #include <com/sun/star/frame/XTitleChangeListener.hpp> - #include <com/sun/star/lang/XEventListener.hpp> - #include <unotools/moduleoptions.hxx> - -#include <cppuhelper/weak.hxx> - +#include <cppuhelper/implbase3.hxx> #include <rtl/ustrbuf.hxx> namespace framework{ @@ -58,14 +44,13 @@ namespace framework{ @devstatus draft @threadsafe yes *//*-*************************************************************************************************************/ -class TitleBarUpdate : // interfaces - public css::lang::XTypeProvider - , public css::lang::XInitialization - , public css::frame::XTitleChangeListener // => XEventListener - , public css::frame::XFrameActionListener // => XEventListener - // baseclasses (order necessary for right initialization!) - , private ThreadHelpBase - , public ::cppu::OWeakObject +class TitleBarUpdate : // baseclasses (order necessary for right initialization!) + private ThreadHelpBase + // interfaces + , public ::cppu::WeakImplHelper3< + css::lang::XInitialization + , css::frame::XTitleChangeListener // => XEventListener + , css::frame::XFrameActionListener > // => XEventListener { //________________________________ // structs, types @@ -105,8 +90,6 @@ class TitleBarUpdate : // interfaces //____________________________ // XInterface, XTypeProvider - FWK_DECLARE_XINTERFACE - FWK_DECLARE_XTYPEPROVIDER //____________________________ // XInitialization diff --git a/framework/inc/helper/uiconfigelementwrapperbase.hxx b/framework/inc/helper/uiconfigelementwrapperbase.hxx index dd223ad08a41..c5910ad1ac9f 100644 --- a/framework/inc/helper/uiconfigelementwrapperbase.hxx +++ b/framework/inc/helper/uiconfigelementwrapperbase.hxx @@ -37,23 +37,23 @@ #include <rtl/ustring.hxx> #include <cppuhelper/propshlp.hxx> -#include <cppuhelper/interfacecontainer.hxx> -#include <cppuhelper/weak.hxx> +#include <cppuhelper/implbase6.hxx> namespace framework { -class UIConfigElementWrapperBase : public ::com::sun::star::lang::XTypeProvider , - public ::com::sun::star::ui::XUIElement , - public ::com::sun::star::ui::XUIElementSettings , - public ::com::sun::star::lang::XInitialization , - public ::com::sun::star::lang::XComponent , - public ::com::sun::star::util::XUpdatable , - public ::com::sun::star::ui::XUIConfigurationListener , - protected ThreadHelpBase , +typedef ::cppu::WeakImplHelper6< + ::com::sun::star::ui::XUIElement, + ::com::sun::star::ui::XUIElementSettings, + ::com::sun::star::lang::XInitialization, + ::com::sun::star::lang::XComponent, + ::com::sun::star::util::XUpdatable, + ::com::sun::star::ui::XUIConfigurationListener > UIConfigElementWrapperBase_BASE; + +class UIConfigElementWrapperBase : protected ThreadHelpBase , public ::cppu::OBroadcastHelper , public ::cppu::OPropertySetHelper , - public ::cppu::OWeakObject + public UIConfigElementWrapperBase_BASE { //------------------------------------------------------------------------------------------------------------- // public methods @@ -63,13 +63,14 @@ class UIConfigElementWrapperBase : public ::com::sun::star::lang::XTypeProvider virtual ~UIConfigElementWrapperBase(); // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL acquire() throw(); - virtual void SAL_CALL release() throw(); + virtual void SAL_CALL acquire() throw () + { OWeakObject::acquire(); } + virtual void SAL_CALL release() throw () + { OWeakObject::release(); } + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& type) throw ( ::com::sun::star::uno::RuntimeException ); // XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException); // XComponent virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException) = 0; diff --git a/framework/inc/helper/uielementwrapperbase.hxx b/framework/inc/helper/uielementwrapperbase.hxx index 785c2849648e..244c24c0b418 100644 --- a/framework/inc/helper/uielementwrapperbase.hxx +++ b/framework/inc/helper/uielementwrapperbase.hxx @@ -33,21 +33,21 @@ #include <rtl/ustring.hxx> #include <cppuhelper/propshlp.hxx> -#include <cppuhelper/interfacecontainer.hxx> -#include <cppuhelper/weak.hxx> +#include <cppuhelper/implbase4.hxx> namespace framework { -class UIElementWrapperBase : public ::com::sun::star::lang::XTypeProvider , - public ::com::sun::star::ui::XUIElement , - public ::com::sun::star::lang::XInitialization , - public ::com::sun::star::lang::XComponent , - public ::com::sun::star::util::XUpdatable , - protected ThreadHelpBase , +typedef ::cppu::WeakImplHelper4< + ::com::sun::star::ui::XUIElement, + ::com::sun::star::lang::XInitialization, + ::com::sun::star::lang::XComponent, + ::com::sun::star::util::XUpdatable > UIElementWrapperBase_BASE; + +class UIElementWrapperBase : protected ThreadHelpBase , public ::cppu::OBroadcastHelper , public ::cppu::OPropertySetHelper , - public ::cppu::OWeakObject + public UIElementWrapperBase_BASE { //------------------------------------------------------------------------------------------------------------- // public methods @@ -56,14 +56,15 @@ class UIElementWrapperBase : public ::com::sun::star::lang::XTypeProvider UIElementWrapperBase( sal_Int16 nType ); virtual ~UIElementWrapperBase(); - // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL acquire() throw(); - virtual void SAL_CALL release() throw(); + // XInterface + virtual void SAL_CALL acquire() throw () + { OWeakObject::acquire(); } + virtual void SAL_CALL release() throw () + { OWeakObject::release(); } + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& type) throw ( ::com::sun::star::uno::RuntimeException ); // XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException); // XComponent virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException) = 0; diff --git a/framework/inc/helper/vclstatusindicator.hxx b/framework/inc/helper/vclstatusindicator.hxx index 62021bf39f23..4863b8be3169 100644 --- a/framework/inc/helper/vclstatusindicator.hxx +++ b/framework/inc/helper/vclstatusindicator.hxx @@ -29,7 +29,7 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/awt/XWindow.hpp> -#include <cppuhelper/weak.hxx> +#include <cppuhelper/implbase1.hxx> #include <vcl/status.hxx> @@ -38,9 +38,8 @@ namespace framework { //----------------------------------------------- // declaration -class VCLStatusIndicator : public css::task::XStatusIndicator - , private ThreadHelpBase // must be the first real base class! - , public ::cppu::OWeakObject +class VCLStatusIndicator : private ThreadHelpBase, // must be the first real base class! + public ::cppu::WeakImplHelper1< css::task::XStatusIndicator > { //------------------------------------------- // member @@ -73,8 +72,6 @@ class VCLStatusIndicator : public css::task::XStatusIndicator public: - FWK_DECLARE_XINTERFACE - /// ctor VCLStatusIndicator(const css::uno::Reference< css::awt::XWindow >& xParentWindow); diff --git a/framework/inc/interaction/quietinteraction.hxx b/framework/inc/interaction/quietinteraction.hxx index 01183013f324..b3b75d9bda45 100644 --- a/framework/inc/interaction/quietinteraction.hxx +++ b/framework/inc/interaction/quietinteraction.hxx @@ -28,7 +28,7 @@ #include <com/sun/star/task/XInteractionHandler.hpp> #include <com/sun/star/task/XInteractionRequest.hpp> -#include <cppuhelper/weak.hxx> +#include <cppuhelper/implbase1.hxx> namespace framework{ @@ -46,10 +46,9 @@ namespace framework{ @by Andreas Schlüns */ -class QuietInteraction : public css::lang::XTypeProvider - , public css::task::XInteractionHandler - , private ThreadHelpBase - , public ::cppu::OWeakObject +class QuietInteraction : private ThreadHelpBase + , public ::cppu::WeakImplHelper1< + css::task::XInteractionHandler > { //_____________________________________ // member @@ -63,8 +62,6 @@ class QuietInteraction : public css::lang::XTypeProvider public: // XInterface, XTypeProvider - FWK_DECLARE_XINTERFACE - FWK_DECLARE_XTYPEPROVIDER //_________________________________ /** diff --git a/framework/inc/jobs/job.hxx b/framework/inc/jobs/job.hxx index a9861caad220..e33aee621cce 100644 --- a/framework/inc/jobs/job.hxx +++ b/framework/inc/jobs/job.hxx @@ -38,7 +38,7 @@ #include <com/sun/star/util/XCloseListener.hpp> #include <com/sun/star/frame/DispatchResultEvent.hpp> -#include <cppuhelper/weak.hxx> +#include <cppuhelper/implbase3.hxx> #include <rtl/ustring.hxx> @@ -54,12 +54,11 @@ namespace framework{ synchronously or asynchronous, control it's lifetime and differe between jobs with and without configuration. */ -class Job : public css::lang::XTypeProvider - , public css::task::XJobListener - , public css::frame::XTerminateListener - , public css::util::XCloseListener - , private ThreadHelpBase - , public ::cppu::OWeakObject +class Job : private ThreadHelpBase + , public ::cppu::WeakImplHelper3< + css::task::XJobListener + , css::frame::XTerminateListener + , css::util::XCloseListener > { //___________________________________ // structs @@ -200,8 +199,6 @@ class Job : public css::lang::XTypeProvider public: - FWK_DECLARE_XINTERFACE - FWK_DECLARE_XTYPEPROVIDER // XJobListener virtual void SAL_CALL jobFinished( const css::uno::Reference< css::task::XAsyncJob >& xJob, diff --git a/framework/inc/jobs/jobdispatch.hxx b/framework/inc/jobs/jobdispatch.hxx index 950023034545..abe93cb209c6 100644 --- a/framework/inc/jobs/jobdispatch.hxx +++ b/framework/inc/jobs/jobdispatch.hxx @@ -45,7 +45,7 @@ #include <com/sun/star/lang/XInitialization.hpp> #include <unotools/configpaths.hxx> -#include <cppuhelper/weak.hxx> +#include <cppuhelper/implbase4.hxx> #include <rtl/ustring.hxx> @@ -63,13 +63,12 @@ namespace framework{ real job. We do it, control the life cycle of this internal wrapped job and inform any interested listener if it finish. */ -class JobDispatch : public css::lang::XTypeProvider - , public css::lang::XServiceInfo - , public css::lang::XInitialization - , public css::frame::XDispatchProvider - , public css::frame::XNotifyingDispatch // => XDispatch - , private ThreadHelpBase - , public ::cppu::OWeakObject +class JobDispatch : private ThreadHelpBase + , public ::cppu::WeakImplHelper4< + css::lang::XServiceInfo + , css::lang::XInitialization + , css::frame::XDispatchProvider + , css::frame::XNotifyingDispatch > // => XDispatch { //___________________________________ // member @@ -109,8 +108,6 @@ class JobDispatch : public css::lang::XTypeProvider public: // XInterface, XTypeProvider, XServiceInfo - FWK_DECLARE_XINTERFACE - FWK_DECLARE_XTYPEPROVIDER DECLARE_XSERVICEINFO // Xinitialization diff --git a/framework/inc/jobs/jobexecutor.hxx b/framework/inc/jobs/jobexecutor.hxx index a557470b52ee..b4984fb230f7 100644 --- a/framework/inc/jobs/jobexecutor.hxx +++ b/framework/inc/jobs/jobexecutor.hxx @@ -37,7 +37,7 @@ #include <com/sun/star/document/XEventListener.hpp> #include <com/sun/star/frame/XModuleManager2.hpp> -#include <cppuhelper/weak.hxx> +#include <cppuhelper/implbase4.hxx> #include <rtl/ustring.hxx> @@ -51,13 +51,12 @@ namespace framework{ inside the configuration and execute it. Of course it controls the liftime of such jobs too. */ -class JobExecutor : public css::lang::XTypeProvider - , public css::lang::XServiceInfo - , public css::task::XJobExecutor - , public css::container::XContainerListener // => lang.XEventListener - , public css::document::XEventListener - , private ThreadHelpBase - , public ::cppu::OWeakObject +class JobExecutor : private ThreadHelpBase + , public ::cppu::WeakImplHelper4< + css::lang::XServiceInfo + , css::task::XJobExecutor + , css::container::XContainerListener // => lang.XEventListener + , css::document::XEventListener > { //___________________________________ // member @@ -93,8 +92,6 @@ class JobExecutor : public css::lang::XTypeProvider public: // XInterface, XTypeProvider, XServiceInfo - FWK_DECLARE_XINTERFACE - FWK_DECLARE_XTYPEPROVIDER DECLARE_XSERVICEINFO // task.XJobExecutor diff --git a/framework/inc/recording/dispatchrecorder.hxx b/framework/inc/recording/dispatchrecorder.hxx index bfdfc4b2cc5e..60a3789ecbc7 100644 --- a/framework/inc/recording/dispatchrecorder.hxx +++ b/framework/inc/recording/dispatchrecorder.hxx @@ -43,7 +43,7 @@ #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/uno/RuntimeException.hpp> #include <com/sun/star/script/XTypeConverter.hpp> -#include <cppuhelper/weak.hxx> +#include <cppuhelper/implbase3.hxx> namespace framework{ @@ -51,11 +51,10 @@ typedef ::std::vector < com::sun::star::frame::DispatchStatement > DispatchState class DispatchRecorder : private ThreadHelpBase - , public css::lang::XTypeProvider - , public css::lang::XServiceInfo - , public css::frame::XDispatchRecorder - , public css::container::XIndexReplace - , public ::cppu::OWeakObject + , public ::cppu::WeakImplHelper3< + css::lang::XServiceInfo + , css::frame::XDispatchRecorder + , css::container::XIndexReplace > { // private member private: @@ -69,8 +68,6 @@ class DispatchRecorder ~DispatchRecorder(); // XInterface, XTypeProvider, XServiceInfo - FWK_DECLARE_XINTERFACE - FWK_DECLARE_XTYPEPROVIDER DECLARE_XSERVICEINFO // XDispatchRecorder @@ -80,15 +77,15 @@ class DispatchRecorder virtual void SAL_CALL endRecording () throw( css::uno::RuntimeException ); virtual OUString SAL_CALL getRecordedMacro () throw( css::uno::RuntimeException ); - virtual com::sun::star::uno::Type SAL_CALL getElementType() throw (::com::sun::star::uno::RuntimeException); + virtual com::sun::star::uno::Type SAL_CALL getElementType() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasElements() throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL hasElements() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getCount() throw (::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getCount() throw (::com::sun::star::uno::RuntimeException); - virtual com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32) throw (com::sun::star::uno::RuntimeException, com::sun::star::lang::WrappedTargetException, com::sun::star::lang::IndexOutOfBoundsException); + virtual com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32) throw (com::sun::star::uno::RuntimeException, com::sun::star::lang::WrappedTargetException, com::sun::star::lang::IndexOutOfBoundsException); - virtual void SAL_CALL replaceByIndex(sal_Int32, const com::sun::star::uno::Any&) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL replaceByIndex(sal_Int32, const com::sun::star::uno::Any&) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // private functions private: diff --git a/framework/inc/recording/dispatchrecordersupplier.hxx b/framework/inc/recording/dispatchrecordersupplier.hxx index ddd17796fe0c..b254e1dd1fae 100644 --- a/framework/inc/recording/dispatchrecordersupplier.hxx +++ b/framework/inc/recording/dispatchrecordersupplier.hxx @@ -35,7 +35,7 @@ #include <com/sun/star/util/URL.hpp> #include <com/sun/star/beans/PropertyValue.hpp> -#include <cppuhelper/weak.hxx> +#include <cppuhelper/implbase2.hxx> namespace framework{ @@ -46,14 +46,13 @@ namespace framework{ @threadsafe yes */ -class DispatchRecorderSupplier : // interfaces - public css::lang::XTypeProvider , - public css::lang::XServiceInfo , - public css::frame::XDispatchRecorderSupplier , - // baseclasses +class DispatchRecorderSupplier : // baseclasses // Order is necessary for right initialization! private ThreadHelpBase , - public ::cppu::OWeakObject + // interfaces + public ::cppu::WeakImplHelper2< + css::lang::XServiceInfo , + css::frame::XDispatchRecorderSupplier > { //___________________________________________ // member @@ -82,8 +81,6 @@ class DispatchRecorderSupplier : // interfaces //_______________________________________ // XInterface, XTypeProvider, XServiceInfo - FWK_DECLARE_XINTERFACE - FWK_DECLARE_XTYPEPROVIDER DECLARE_XSERVICEINFO //_______________________________________ diff --git a/framework/inc/services/autorecovery.hxx b/framework/inc/services/autorecovery.hxx index 51359c0ca391..7bfb0c2b69e5 100644 --- a/framework/inc/services/autorecovery.hxx +++ b/framework/inc/services/autorecovery.hxx @@ -44,9 +44,8 @@ #include <comphelper/mediadescriptor.hxx> #include <vcl/timer.hxx> #include <vcl/evntpost.hxx> -#include <cppuhelper/interfacecontainer.hxx> +#include <cppuhelper/implbase5.hxx> #include <cppuhelper/propshlp.hxx> -#include <cppuhelper/weak.hxx> //_______________________________________________ // definition @@ -116,17 +115,19 @@ struct DispatchParams of documents - including features of an EmergencySave in case a GPF occures. */ -class AutoRecovery : public css::lang::XTypeProvider - , public css::lang::XServiceInfo - , public css::frame::XDispatch - , public css::document::XEventListener // => css.lang.XEventListener - , public css::util::XChangesListener // => css.lang.XEventListener - , public css::util::XModifyListener // => css.lang.XEventListener - // attention! Must be the first base class to guarentee right initialize lock ... - , private ThreadHelpBase +typedef ::cppu::WeakImplHelper5< + css::lang::XServiceInfo, + css::frame::XDispatch, + css::document::XEventListener, // => css.lang.XEventListener + css::util::XChangesListener, // => css.lang.XEventListener + css::util::XModifyListener > // => css.lang.XEventListener + AutoRecovery_BASE; + +class AutoRecovery : // attention! Must be the first base class to guarentee right initialize lock ... + private ThreadHelpBase , public ::cppu::OBroadcastHelper , public ::cppu::OPropertySetHelper // => XPropertySet, XFastPropertySet, XMultiPropertySet - , public ::cppu::OWeakObject + , public AutoRecovery_BASE { //___________________________________________ // types @@ -442,11 +443,19 @@ class AutoRecovery : public css::lang::XTypeProvider AutoRecovery(const css::uno::Reference< css::uno::XComponentContext >& xContext); virtual ~AutoRecovery( ); - // XInterface, XTypeProvider, XServiceInfo - FWK_DECLARE_XINTERFACE - FWK_DECLARE_XTYPEPROVIDER + // XServiceInfo DECLARE_XSERVICEINFO + // XInterface + virtual void SAL_CALL acquire() throw () + { OWeakObject::acquire(); } + virtual void SAL_CALL release() throw () + { OWeakObject::release(); } + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& type) throw ( ::com::sun::star::uno::RuntimeException ); + + // XTypeProvider + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException); + //--------------------------------------- // css.frame.XDispatch virtual void SAL_CALL dispatch(const css::util::URL& aURL , diff --git a/framework/inc/services/desktop.hxx b/framework/inc/services/desktop.hxx index 0e31c5e7ba77..546596ae9b7e 100644 --- a/framework/inc/services/desktop.hxx +++ b/framework/inc/services/desktop.hxx @@ -58,8 +58,7 @@ #include <unotools/cmdoptions.hxx> #include <cppuhelper/propshlp.hxx> -#include <cppuhelper/interfacecontainer.hxx> -#include <cppuhelper/weak.hxx> +#include <cppuhelper/implbase6.hxx> #include <comphelper/numberedcollection.hxx> @@ -103,21 +102,22 @@ enum ELoadState @devstatus ready to use @threadsafe yes *//*-*************************************************************************************************************/ -class Desktop : // interfaces - public css::lang::XTypeProvider , - public css::lang::XServiceInfo , - public css::frame::XDesktop2 , - public css::frame::XTasksSupplier , - public css::frame::XDispatchResultListener , // => XEventListener - public css::task::XInteractionHandler , - public css::frame::XUntitledNumbers , - // base classes +typedef ::cppu::WeakImplHelper6< + css::lang::XServiceInfo , + css::frame::XDesktop2 , + css::frame::XTasksSupplier , + css::frame::XDispatchResultListener , // => XEventListener + css::task::XInteractionHandler , + css::frame::XUntitledNumbers > Desktop_BASE; + +class Desktop : // base classes // Order is necessary for right initialization! private ThreadHelpBase , private TransactionBase , public ::cppu::OBroadcastHelper , public ::cppu::OPropertySetHelper , - public ::cppu::OWeakObject + // interfaces + public Desktop_BASE { // internal used types, const etcpp. private: @@ -133,11 +133,19 @@ class Desktop : // interfaces Desktop( const css::uno::Reference< css::uno::XComponentContext >& xContext ); virtual ~Desktop( ); - // XInterface, XTypeProvider, XServiceInfo - FWK_DECLARE_XINTERFACE - FWK_DECLARE_XTYPEPROVIDER + // XServiceInfo DECLARE_XSERVICEINFO + // XInterface + virtual void SAL_CALL acquire() throw () + { OWeakObject::acquire(); } + virtual void SAL_CALL release() throw () + { OWeakObject::release(); } + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& type) throw ( ::com::sun::star::uno::RuntimeException ); + + // XTypeProvider + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException); + //--------------------------------------------------------------------- /** @interface XDesktop diff --git a/framework/inc/services/license.hxx b/framework/inc/services/license.hxx index 85f3d51ee635..87e070ab5912 100644 --- a/framework/inc/services/license.hxx +++ b/framework/inc/services/license.hxx @@ -43,20 +43,18 @@ #include <com/sun/star/util/XCloseable.hpp> #include <com/sun/star/util/CloseVetoException.hpp> +#include <cppuhelper/implbase3.hxx> #include <cppuhelper/propshlp.hxx> -#include <cppuhelper/interfacecontainer.hxx> -#include <cppuhelper/weak.hxx> namespace framework { - class License : public css::lang::XTypeProvider , - public css::lang::XServiceInfo , - public css::task::XJob , - public css::util::XCloseable , - // base classes + class License : // base classes // Order is necessary for right initialization! private ThreadHelpBase , // Struct for right initalization of mutex member! Must be first of baseclasses. - public ::cppu::OWeakObject // => XWeak, XInterface + public cppu::WeakImplHelper3< + css::lang::XServiceInfo, + css::task::XJob, + css::util::XCloseable> // => XWeak, XInterface { private: css::uno::Reference< css::uno::XComponentContext > m_xContext; @@ -66,8 +64,6 @@ namespace framework virtual ~License(); /** declaration of XInterface, XTypeProvider, XServiceInfo */ - FWK_DECLARE_XINTERFACE - FWK_DECLARE_XTYPEPROVIDER DECLARE_XSERVICEINFO virtual css::uno::Any SAL_CALL execute(const css::uno::Sequence<css::beans::NamedValue>& args) diff --git a/framework/inc/services/pathsettings.hxx b/framework/inc/services/pathsettings.hxx index d90721e97831..827ce95d774d 100644 --- a/framework/inc/services/pathsettings.hxx +++ b/framework/inc/services/pathsettings.hxx @@ -36,8 +36,7 @@ #include <com/sun/star/util/XPathSettings.hpp> #include <cppuhelper/propshlp.hxx> -#include <cppuhelper/interfacecontainer.hxx> -#include <cppuhelper/weak.hxx> +#include <cppuhelper/implbase3.hxx> #include <unotools/configitem.hxx> #include <comphelper/sequenceasvector.hxx> @@ -48,16 +47,18 @@ namespace framework { -class PathSettings : public css::lang::XTypeProvider , - public css::lang::XServiceInfo , - public css::util::XChangesListener , // => XEventListener - public css::util::XPathSettings , // => XPropertySet - // base classes +typedef ::cppu::WeakImplHelper3< + css::lang::XServiceInfo, + css::util::XChangesListener, // => XEventListener + css::util::XPathSettings> // => XPropertySet + PathSettings_BASE; + +class PathSettings : // base classes // Order is necessary for right initialization! private ThreadHelpBase , public ::cppu::OBroadcastHelper , public ::cppu::OPropertySetHelper , // => XPropertySet / XFastPropertySet / XMultiPropertySet - public ::cppu::OWeakObject // => XWeak, XInterface + public PathSettings_BASE { struct PathInfo { @@ -162,10 +163,18 @@ class PathSettings : public css::lang::XTypeProvider , virtual ~PathSettings(); /** declaration of XInterface, XTypeProvider, XServiceInfo */ - FWK_DECLARE_XINTERFACE - FWK_DECLARE_XTYPEPROVIDER DECLARE_XSERVICEINFO + // XInterface + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& type) throw ( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL acquire() throw () + { OWeakObject::acquire(); } + virtual void SAL_CALL release() throw () + { OWeakObject::release(); } + + // XTypeProvider + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException); + // css::util::XChangesListener virtual void SAL_CALL changesOccurred(const css::util::ChangesEvent& aEvent) throw (css::uno::RuntimeException); diff --git a/framework/inc/services/sessionlistener.hxx b/framework/inc/services/sessionlistener.hxx index 32bd460e4e42..3a15b31b834a 100644 --- a/framework/inc/services/sessionlistener.hxx +++ b/framework/inc/services/sessionlistener.hxx @@ -41,8 +41,7 @@ #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/uno/Any.hxx> -#include <cppuhelper/weak.hxx> -#include <cppuhelper/interfacecontainer.h> +#include <cppuhelper/implbase4.hxx> namespace framework{ @@ -67,16 +66,16 @@ namespace framework{ </ul> */ -class SessionListener : // interfaces - public css::lang::XTypeProvider, - public css::lang::XInitialization, - public css::frame::XSessionManagerListener2, - public css::frame::XStatusListener, - public css::lang::XServiceInfo, +class SessionListener : // baseclasses (order important for initialization!) // Struct for right initalization of mutex member! Must be the first one of baseclasses! private ThreadHelpBase, - public ::cppu::OWeakObject + // interfaces + public cppu::WeakImplHelper4< + css::lang::XInitialization, + css::frame::XSessionManagerListener2, + css::frame::XStatusListener, + css::lang::XServiceInfo> { //------------------------------------------- // member @@ -109,8 +108,6 @@ class SessionListener : // interfaces //--------------------------------------- // XInterface, XTypeProvider, XServiceInfo - FWK_DECLARE_XINTERFACE - FWK_DECLARE_XTYPEPROVIDER DECLARE_XSERVICEINFO //--------------------------------------- diff --git a/framework/inc/services/taskcreatorsrv.hxx b/framework/inc/services/taskcreatorsrv.hxx index 184b12a07a7c..9286d71ee966 100644 --- a/framework/inc/services/taskcreatorsrv.hxx +++ b/framework/inc/services/taskcreatorsrv.hxx @@ -35,7 +35,7 @@ #include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/awt/Rectangle.hpp> -#include <cppuhelper/weak.hxx> +#include <cppuhelper/implbase2.hxx> #include <comphelper/sequenceashashmap.hxx> //_______________________________________________ @@ -82,12 +82,11 @@ namespace framework /** * TODO document me */ -class TaskCreatorService : public css::lang::XTypeProvider - , public css::lang::XServiceInfo - , public css::lang::XSingleServiceFactory - // attention! Must be the first base class to guarentee right initialize lock ... - , private ThreadHelpBase - , public ::cppu::OWeakObject +class TaskCreatorService : // attention! Must be the first base class to guarentee right initialize lock ... + private ThreadHelpBase, + public ::cppu::WeakImplHelper2< + css::lang::XServiceInfo, + css::lang::XSingleServiceFactory> { //___________________________________________ // member @@ -109,8 +108,6 @@ class TaskCreatorService : public css::lang::XTypeProvider virtual ~TaskCreatorService( ); // XInterface, XTypeProvider, XServiceInfo - FWK_DECLARE_XINTERFACE - FWK_DECLARE_XTYPEPROVIDER DECLARE_XSERVICEINFO // XSingleServiceFactory diff --git a/framework/inc/uielement/constitemcontainer.hxx b/framework/inc/uielement/constitemcontainer.hxx index 2742a63a4f5a..aa40cb10fd5f 100644 --- a/framework/inc/uielement/constitemcontainer.hxx +++ b/framework/inc/uielement/constitemcontainer.hxx @@ -34,7 +34,7 @@ #include <com/sun/star/lang/XUnoTunnel.hpp> #include <rtl/ustring.hxx> -#include <cppuhelper/weak.hxx> +#include <cppuhelper/implbase4.hxx> #include <cppuhelper/propshlp.hxx> #include <vector> @@ -45,12 +45,11 @@ namespace framework class RootItemContainer; class ItemContainer; -class FWI_DLLPUBLIC ConstItemContainer : public ::com::sun::star::lang::XTypeProvider , - public com::sun::star::container::XIndexAccess , - public ::com::sun::star::lang::XUnoTunnel , - public ::com::sun::star::beans::XFastPropertySet, - public ::com::sun::star::beans::XPropertySet , - public ::cppu::OWeakObject +class FWI_DLLPUBLIC ConstItemContainer : public ::cppu::WeakImplHelper4< + css::container::XIndexAccess, + css::lang::XUnoTunnel , + css::beans::XFastPropertySet, + css::beans::XPropertySet > { friend class RootItemContainer; friend class ItemContainer; @@ -61,12 +60,6 @@ class FWI_DLLPUBLIC ConstItemContainer : public ::com::sun::star::lang::XType ConstItemContainer( const com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess >& rSourceContainer, sal_Bool bFastCopy = sal_False ); virtual ~ConstItemContainer(); - //--------------------------------------------------------------------------------------------------------- - // XInterface, XTypeProvider - //--------------------------------------------------------------------------------------------------------- - FWK_DECLARE_XINTERFACE - FWK_DECLARE_XTYPEPROVIDER - // XUnoTunnel static const ::com::sun::star::uno::Sequence< sal_Int8 >& GetUnoTunnelId() throw(); static ConstItemContainer* GetImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ) throw(); diff --git a/framework/inc/uielement/rootitemcontainer.hxx b/framework/inc/uielement/rootitemcontainer.hxx index e4c489b98269..2c5d95465715 100644 --- a/framework/inc/uielement/rootitemcontainer.hxx +++ b/framework/inc/uielement/rootitemcontainer.hxx @@ -34,9 +34,8 @@ #include <com/sun/star/lang/XUnoTunnel.hpp> #include <rtl/ustring.hxx> -#include <cppuhelper/weak.hxx> +#include <cppuhelper/implbase3.hxx> #include <cppuhelper/propshlp.hxx> -#include <cppuhelper/interfacecontainer.hxx> #include <vector> #include <fwidllapi.h> @@ -44,14 +43,16 @@ namespace framework { class ConstItemContainer; -class RootItemContainer : public ::com::sun::star::lang::XTypeProvider , - public ::com::sun::star::container::XIndexContainer , - public ::com::sun::star::lang::XSingleComponentFactory , - public ::com::sun::star::lang::XUnoTunnel , - protected ThreadHelpBase , + +typedef ::cppu::WeakImplHelper3< + css::container::XIndexContainer, + css::lang::XSingleComponentFactory, + css::lang::XUnoTunnel > RootItemContainer_BASE; + +class RootItemContainer : protected ThreadHelpBase , public ::cppu::OBroadcastHelper , public ::cppu::OPropertySetHelper , - public ::cppu::OWeakObject + public RootItemContainer_BASE { friend class ConstItemContainer; @@ -61,10 +62,15 @@ class RootItemContainer : public ::com::sun::star::lang::XTypeProvider virtual FWI_DLLPUBLIC ~RootItemContainer(); //--------------------------------------------------------------------------------------------------------- - // XInterface, XTypeProvider - //--------------------------------------------------------------------------------------------------------- - FWK_DECLARE_XINTERFACE - FWK_DECLARE_XTYPEPROVIDER + // XInterface + virtual void SAL_CALL acquire() throw () + { OWeakObject::acquire(); } + virtual void SAL_CALL release() throw () + { OWeakObject::release(); } + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& type) throw ( ::com::sun::star::uno::RuntimeException ); + + // XTypeProvider + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException); // XUnoTunnel static FWI_DLLPUBLIC const ::com::sun::star::uno::Sequence< sal_Int8 >& GetUnoTunnelId() throw(); diff --git a/framework/source/fwi/uielement/constitemcontainer.cxx b/framework/source/fwi/uielement/constitemcontainer.cxx index e3a2defc1dda..4d471325ede8 100644 --- a/framework/source/fwi/uielement/constitemcontainer.cxx +++ b/framework/source/fwi/uielement/constitemcontainer.cxx @@ -114,29 +114,7 @@ sal_Bool OPropertySetHelperInfo_Impl::hasPropertyByName( const OUString & Proper return pR != NULL; } -//***************************************************************************************************************** -// XInterface, XTypeProvider -//***************************************************************************************************************** -DEFINE_XINTERFACE_6 ( ConstItemContainer , - OWeakObject , - DIRECT_INTERFACE( ::com::sun::star::lang::XTypeProvider ), - DIRECT_INTERFACE( ::com::sun::star::container::XElementAccess ), - DIRECT_INTERFACE( ::com::sun::star::container::XIndexAccess ), - DIRECT_INTERFACE( ::com::sun::star::beans::XFastPropertySet ), - DIRECT_INTERFACE( ::com::sun::star::beans::XPropertySet ), - DIRECT_INTERFACE( ::com::sun::star::lang::XUnoTunnel ) - ) - -DEFINE_XTYPEPROVIDER_6 ( ConstItemContainer , - ::com::sun::star::lang::XTypeProvider , - ::com::sun::star::container::XIndexAccess , - ::com::sun::star::container::XElementAccess , - ::com::sun::star::beans::XFastPropertySet , - ::com::sun::star::beans::XPropertySet , - ::com::sun::star::lang::XUnoTunnel - ) - -ConstItemContainer::ConstItemContainer() : ::cppu::OWeakObject() +ConstItemContainer::ConstItemContainer() { } diff --git a/framework/source/fwi/uielement/rootitemcontainer.cxx b/framework/source/fwi/uielement/rootitemcontainer.cxx index 047abd88bc29..021b79f58f96 100644 --- a/framework/source/fwi/uielement/rootitemcontainer.cxx +++ b/framework/source/fwi/uielement/rootitemcontainer.cxx @@ -20,6 +20,7 @@ #include <string.h> #include <comphelper/servicehelper.hxx> +#include <comphelper/sequence.hxx> #include <uielement/rootitemcontainer.hxx> #include <uielement/itemcontainer.hxx> #include <uielement/constitemcontainer.hxx> @@ -44,41 +45,10 @@ const char PROPNAME_UINAME[] = "UIName"; namespace framework { -//***************************************************************************************************************** -// XInterface, XTypeProvider -//***************************************************************************************************************** -DEFINE_XINTERFACE_10 ( RootItemContainer , - OWeakObject , - DIRECT_INTERFACE( ::com::sun::star::lang::XTypeProvider ), - DIRECT_INTERFACE( ::com::sun::star::container::XIndexContainer ), - DIRECT_INTERFACE( ::com::sun::star::lang::XUnoTunnel ), - DIRECT_INTERFACE( ::com::sun::star::lang::XSingleComponentFactory ), - DIRECT_INTERFACE( ::com::sun::star::beans::XMultiPropertySet ), - DIRECT_INTERFACE( ::com::sun::star::beans::XFastPropertySet ), - DIRECT_INTERFACE( ::com::sun::star::beans::XPropertySet ), - DERIVED_INTERFACE( ::com::sun::star::container::XIndexReplace, com::sun::star::container::XIndexContainer ), - DERIVED_INTERFACE( ::com::sun::star::container::XIndexAccess, com::sun::star::container::XIndexReplace ), - DERIVED_INTERFACE( ::com::sun::star::container::XElementAccess, ::com::sun::star::container::XIndexAccess ) - ) - -DEFINE_XTYPEPROVIDER_10 ( RootItemContainer , - ::com::sun::star::lang::XTypeProvider , - ::com::sun::star::container::XIndexContainer , - ::com::sun::star::container::XIndexReplace , - ::com::sun::star::container::XIndexAccess , - ::com::sun::star::container::XElementAccess , - ::com::sun::star::beans::XMultiPropertySet , - ::com::sun::star::beans::XFastPropertySet , - ::com::sun::star::beans::XPropertySet , - ::com::sun::star::lang::XUnoTunnel , - ::com::sun::star::lang::XSingleComponentFactory - ) - RootItemContainer::RootItemContainer() : ThreadHelpBase ( ) , ::cppu::OBroadcastHelperVar< ::cppu::OMultiTypeInterfaceContainerHelper, ::cppu::OMultiTypeInterfaceContainerHelper::keyType >( m_aLock.getShareableOslMutex() ) , ::cppu::OPropertySetHelper ( *(static_cast< ::cppu::OBroadcastHelper* >(this)) ) - , ::cppu::OWeakObject() { } @@ -86,7 +56,6 @@ RootItemContainer::RootItemContainer( const Reference< XIndexAccess >& rSourceCo : ThreadHelpBase ( ) , ::cppu::OBroadcastHelperVar< ::cppu::OMultiTypeInterfaceContainerHelper, ::cppu::OMultiTypeInterfaceContainerHelper::keyType >( m_aLock.getShareableOslMutex() ) , ::cppu::OPropertySetHelper ( *(static_cast< ::cppu::OBroadcastHelper* >(this)) ) - , ::cppu::OWeakObject() { // We also have to copy the UIName property try @@ -140,6 +109,22 @@ RootItemContainer::~RootItemContainer() { } +Any SAL_CALL RootItemContainer::queryInterface( const Type& _rType ) throw(RuntimeException) +{ + Any aRet = RootItemContainer_BASE::queryInterface( _rType ); + if ( !aRet.hasValue() ) + aRet = OPropertySetHelper::queryInterface( _rType ); + return aRet; +} +//------------------------------------------------------------------------------ +Sequence< Type > SAL_CALL RootItemContainer::getTypes( ) throw(RuntimeException) +{ + return comphelper::concatSequences( + RootItemContainer_BASE::getTypes(), + ::cppu::OPropertySetHelper::getTypes() + ); +} + Reference< XIndexAccess > RootItemContainer::deepCopyContainer( const Reference< XIndexAccess >& rSubContainer ) { Reference< XIndexAccess > xReturn; diff --git a/framework/source/helper/persistentwindowstate.cxx b/framework/source/helper/persistentwindowstate.cxx index d46b21a21fac..d0c0f63edc97 100644 --- a/framework/source/helper/persistentwindowstate.cxx +++ b/framework/source/helper/persistentwindowstate.cxx @@ -45,22 +45,6 @@ namespace framework{ //***************************************************************************************************************** -// XInterface, XTypeProvider - -DEFINE_XINTERFACE_4(PersistentWindowState , - OWeakObject , - DIRECT_INTERFACE (css::lang::XTypeProvider ), - DIRECT_INTERFACE (css::lang::XInitialization ), - DIRECT_INTERFACE (css::frame::XFrameActionListener ), - DERIVED_INTERFACE(css::lang::XEventListener,css::frame::XFrameActionListener)) - -DEFINE_XTYPEPROVIDER_4(PersistentWindowState , - css::lang::XTypeProvider , - css::lang::XInitialization , - css::frame::XFrameActionListener, - css::lang::XEventListener ) - -//***************************************************************************************************************** PersistentWindowState::PersistentWindowState(const css::uno::Reference< css::uno::XComponentContext >& xContext) : ThreadHelpBase (&Application::GetSolarMutex()) , m_xContext (xContext ) diff --git a/framework/source/helper/statusindicator.cxx b/framework/source/helper/statusindicator.cxx index 02df7c03973c..c7f588a8b13f 100644 --- a/framework/source/helper/statusindicator.cxx +++ b/framework/source/helper/statusindicator.cxx @@ -29,22 +29,8 @@ namespace framework{ //*********************************************** -// XInterface -DEFINE_XINTERFACE_2(StatusIndicator , - OWeakObject , - DIRECT_INTERFACE(css::lang::XTypeProvider ), - DIRECT_INTERFACE(css::task::XStatusIndicator)) - -//*********************************************** -// XInterface -DEFINE_XTYPEPROVIDER_2(StatusIndicator , - css::lang::XTypeProvider , - css::task::XStatusIndicator) - -//*********************************************** StatusIndicator::StatusIndicator(StatusIndicatorFactory* pFactory) : ThreadHelpBase ( ) - , ::cppu::OWeakObject( ) , m_xFactory (pFactory) { } diff --git a/framework/source/helper/statusindicatorfactory.cxx b/framework/source/helper/statusindicatorfactory.cxx index b91833f1f2c4..e544213249c7 100644 --- a/framework/source/helper/statusindicatorfactory.cxx +++ b/framework/source/helper/statusindicatorfactory.cxx @@ -54,20 +54,6 @@ sal_Int32 StatusIndicatorFactory::m_nInReschedule = 0; /// static counter for r const char PROGRESS_RESOURCE[] = "private:resource/progressbar/progressbar"; //----------------------------------------------- -DEFINE_XINTERFACE_5(StatusIndicatorFactory , - OWeakObject , - DIRECT_INTERFACE(css::lang::XTypeProvider ), - DIRECT_INTERFACE(css::lang::XServiceInfo ), - DIRECT_INTERFACE(css::lang::XInitialization ), - DIRECT_INTERFACE(css::task::XStatusIndicatorFactory), - DIRECT_INTERFACE(css::util::XUpdatable )) - -DEFINE_XTYPEPROVIDER_5(StatusIndicatorFactory , - css::lang::XTypeProvider , - css::lang::XServiceInfo , - css::lang::XInitialization , - css::task::XStatusIndicatorFactory, - css::util::XUpdatable ) DEFINE_XSERVICEINFO_MULTISERVICE_2(StatusIndicatorFactory , ::cppu::OWeakObject , @@ -87,7 +73,6 @@ DEFINE_INIT_SERVICE(StatusIndicatorFactory, //----------------------------------------------- StatusIndicatorFactory::StatusIndicatorFactory(const css::uno::Reference< css::uno::XComponentContext >& xContext) : ThreadHelpBase ( ) - , ::cppu::OWeakObject ( ) , m_xContext (xContext ) , m_pWakeUp (0 ) , m_bAllowReschedule (sal_False) diff --git a/framework/source/helper/tagwindowasmodified.cxx b/framework/source/helper/tagwindowasmodified.cxx index 6cd5a2faaee6..12090d2cb8aa 100644 --- a/framework/source/helper/tagwindowasmodified.cxx +++ b/framework/source/helper/tagwindowasmodified.cxx @@ -43,22 +43,6 @@ namespace framework{ //***************************************************************************************************************** -// XInterface, XTypeProvider - -DEFINE_XINTERFACE_4(TagWindowAsModified , - OWeakObject , - DIRECT_INTERFACE (css::lang::XTypeProvider ), - DIRECT_INTERFACE (css::lang::XInitialization ), - DIRECT_INTERFACE (css::util::XModifyListener ), - DERIVED_INTERFACE(css::lang::XEventListener, css::util::XModifyListener)) - -DEFINE_XTYPEPROVIDER_4(TagWindowAsModified , - css::lang::XTypeProvider , - css::lang::XInitialization , - css::util::XModifyListener , - css::lang::XEventListener ) - -//***************************************************************************************************************** TagWindowAsModified::TagWindowAsModified() : ThreadHelpBase (&Application::GetSolarMutex()) { diff --git a/framework/source/helper/titlebarupdate.cxx b/framework/source/helper/titlebarupdate.cxx index f5506a1978a3..a3e929a0fbe4 100644 --- a/framework/source/helper/titlebarupdate.cxx +++ b/framework/source/helper/titlebarupdate.cxx @@ -54,24 +54,6 @@ static const ::sal_Int32 DEFAULT_ICON_ID = 0; //***************************************************************************************************************** -// XInterface, XTypeProvider - -DEFINE_XINTERFACE_5(TitleBarUpdate , - OWeakObject , - DIRECT_INTERFACE (css::lang::XTypeProvider ), - DIRECT_INTERFACE (css::lang::XInitialization ), - DIRECT_INTERFACE (css::frame::XFrameActionListener ), - DIRECT_INTERFACE (css::frame::XTitleChangeListener ), - DERIVED_INTERFACE(css::lang::XEventListener,css::frame::XFrameActionListener)) - -DEFINE_XTYPEPROVIDER_5(TitleBarUpdate , - css::lang::XTypeProvider , - css::lang::XInitialization , - css::frame::XFrameActionListener, - css::frame::XTitleChangeListener, - css::lang::XEventListener ) - -//***************************************************************************************************************** TitleBarUpdate::TitleBarUpdate(const css::uno::Reference< css::uno::XComponentContext >& xContext) : ThreadHelpBase (&Application::GetSolarMutex()) , m_xContext (xContext ) diff --git a/framework/source/helper/uiconfigelementwrapperbase.cxx b/framework/source/helper/uiconfigelementwrapperbase.cxx index abac6649ee39..9774f655b735 100644 --- a/framework/source/helper/uiconfigelementwrapperbase.cxx +++ b/framework/source/helper/uiconfigelementwrapperbase.cxx @@ -31,6 +31,7 @@ #include <vcl/svapp.hxx> #include <rtl/logfile.hxx> +#include <comphelper/sequence.hxx> const int UIELEMENT_PROPHANDLE_CONFIGSOURCE = 1; const int UIELEMENT_PROPHANDLE_FRAME = 2; @@ -59,41 +60,10 @@ using namespace ::com::sun::star::ui; namespace framework { -//***************************************************************************************************************** -// XInterface, XTypeProvider -//***************************************************************************************************************** -DEFINE_XINTERFACE_10 ( UIConfigElementWrapperBase , - OWeakObject , - DIRECT_INTERFACE( ::com::sun::star::lang::XTypeProvider ), - DIRECT_INTERFACE( ::com::sun::star::ui::XUIElement ), - DIRECT_INTERFACE( ::com::sun::star::ui::XUIElementSettings ), - DIRECT_INTERFACE( ::com::sun::star::beans::XMultiPropertySet ), - DIRECT_INTERFACE( ::com::sun::star::beans::XFastPropertySet ), - DIRECT_INTERFACE( ::com::sun::star::beans::XPropertySet ), - DIRECT_INTERFACE( ::com::sun::star::lang::XInitialization ), - DIRECT_INTERFACE( ::com::sun::star::lang::XComponent ), - DIRECT_INTERFACE( ::com::sun::star::util::XUpdatable ), - DIRECT_INTERFACE( ::com::sun::star::ui::XUIConfigurationListener ) - ) - -DEFINE_XTYPEPROVIDER_10 ( UIConfigElementWrapperBase , - ::com::sun::star::lang::XTypeProvider , - ::com::sun::star::ui::XUIElement , - ::com::sun::star::ui::XUIElementSettings , - ::com::sun::star::beans::XMultiPropertySet , - ::com::sun::star::beans::XFastPropertySet , - ::com::sun::star::beans::XPropertySet , - ::com::sun::star::lang::XInitialization , - ::com::sun::star::lang::XComponent , - ::com::sun::star::util::XUpdatable , - ::com::sun::star::ui::XUIConfigurationListener - ) - UIConfigElementWrapperBase::UIConfigElementWrapperBase( sal_Int16 nType ) : ThreadHelpBase ( &Application::GetSolarMutex() ) , ::cppu::OBroadcastHelperVar< ::cppu::OMultiTypeInterfaceContainerHelper, ::cppu::OMultiTypeInterfaceContainerHelper::keyType >( m_aLock.getShareableOslMutex() ) , ::cppu::OPropertySetHelper ( *(static_cast< ::cppu::OBroadcastHelper* >(this)) ) - , ::cppu::OWeakObject ( ) , m_nType ( nType ) , m_bPersistent ( sal_True ) , m_bInitialized ( sal_False ) @@ -109,6 +79,22 @@ UIConfigElementWrapperBase::~UIConfigElementWrapperBase() { } +Any SAL_CALL UIConfigElementWrapperBase::queryInterface( const Type& _rType ) throw(RuntimeException) +{ + Any aRet = UIConfigElementWrapperBase_BASE::queryInterface( _rType ); + if ( !aRet.hasValue() ) + aRet = OPropertySetHelper::queryInterface( _rType ); + return aRet; +} + +Sequence< Type > SAL_CALL UIConfigElementWrapperBase::getTypes( ) throw(RuntimeException) +{ + return comphelper::concatSequences( + UIConfigElementWrapperBase_BASE::getTypes(), + ::cppu::OPropertySetHelper::getTypes() + ); +} + // XComponent void SAL_CALL UIConfigElementWrapperBase::addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) { diff --git a/framework/source/helper/uielementwrapperbase.cxx b/framework/source/helper/uielementwrapperbase.cxx index 071448d37e7f..1463de1dd479 100644 --- a/framework/source/helper/uielementwrapperbase.cxx +++ b/framework/source/helper/uielementwrapperbase.cxx @@ -28,6 +28,7 @@ #include <vcl/svapp.hxx> #include <rtl/logfile.hxx> +#include <comphelper/sequence.hxx> const int UIELEMENT_PROPHANDLE_RESOURCEURL = 1; const int UIELEMENT_PROPHANDLE_TYPE = 2; @@ -44,37 +45,10 @@ using namespace ::com::sun::star::frame; namespace framework { -//***************************************************************************************************************** -// XInterface, XTypeProvider -//***************************************************************************************************************** -DEFINE_XINTERFACE_8 ( UIElementWrapperBase , - OWeakObject , - DIRECT_INTERFACE( ::com::sun::star::lang::XTypeProvider ), - DIRECT_INTERFACE( ::com::sun::star::ui::XUIElement ), - DIRECT_INTERFACE( ::com::sun::star::beans::XMultiPropertySet ), - DIRECT_INTERFACE( ::com::sun::star::beans::XFastPropertySet ), - DIRECT_INTERFACE( ::com::sun::star::beans::XPropertySet ), - DIRECT_INTERFACE( ::com::sun::star::lang::XInitialization ), - DIRECT_INTERFACE( ::com::sun::star::util::XUpdatable ), - DIRECT_INTERFACE( ::com::sun::star::lang::XComponent ) - ) - -DEFINE_XTYPEPROVIDER_8 ( UIElementWrapperBase , - ::com::sun::star::lang::XTypeProvider , - ::com::sun::star::ui::XUIElement , - ::com::sun::star::beans::XMultiPropertySet , - ::com::sun::star::beans::XFastPropertySet , - ::com::sun::star::beans::XPropertySet , - ::com::sun::star::lang::XInitialization , - ::com::sun::star::util::XUpdatable , - ::com::sun::star::lang::XComponent - ) - UIElementWrapperBase::UIElementWrapperBase( sal_Int16 nType ) : ThreadHelpBase ( &Application::GetSolarMutex() ) , ::cppu::OBroadcastHelperVar< ::cppu::OMultiTypeInterfaceContainerHelper, ::cppu::OMultiTypeInterfaceContainerHelper::keyType >( m_aLock.getShareableOslMutex() ) , ::cppu::OPropertySetHelper ( *(static_cast< ::cppu::OBroadcastHelper* >(this)) ) - , ::cppu::OWeakObject ( ) , m_aListenerContainer ( m_aLock.getShareableOslMutex() ) , m_nType ( nType ) , m_bInitialized ( sal_False ) @@ -86,6 +60,22 @@ UIElementWrapperBase::~UIElementWrapperBase() { } +Any SAL_CALL UIElementWrapperBase::queryInterface( const Type& _rType ) throw(RuntimeException) +{ + Any aRet = UIElementWrapperBase_BASE::queryInterface( _rType ); + if ( !aRet.hasValue() ) + aRet = OPropertySetHelper::queryInterface( _rType ); + return aRet; +} + +Sequence< Type > SAL_CALL UIElementWrapperBase::getTypes( ) throw(RuntimeException) +{ + return comphelper::concatSequences( + UIElementWrapperBase_BASE::getTypes(), + ::cppu::OPropertySetHelper::getTypes() + ); +} + void SAL_CALL UIElementWrapperBase::addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) { m_aListenerContainer.addInterface( ::getCppuType( ( const css::uno::Reference< css::lang::XEventListener >* ) NULL ), xListener ); diff --git a/framework/source/helper/vclstatusindicator.cxx b/framework/source/helper/vclstatusindicator.cxx index 90348340bc77..3eab4850b382 100644 --- a/framework/source/helper/vclstatusindicator.cxx +++ b/framework/source/helper/vclstatusindicator.cxx @@ -30,14 +30,8 @@ namespace framework { //----------------------------------------------- -DEFINE_XINTERFACE_1(VCLStatusIndicator , - OWeakObject , - DIRECT_INTERFACE(css::task::XStatusIndicator)) - -//----------------------------------------------- VCLStatusIndicator::VCLStatusIndicator(const css::uno::Reference< css::awt::XWindow >& xParentWindow) : ThreadHelpBase (&Application::GetSolarMutex()) - , ::cppu::OWeakObject( ) , m_xParentWindow (xParentWindow ) , m_pStatusBar (0 ) , m_nRange (0 ) diff --git a/framework/source/interaction/quietinteraction.cxx b/framework/source/interaction/quietinteraction.cxx index 388805bd1b7d..c3dfcc57713d 100644 --- a/framework/source/interaction/quietinteraction.cxx +++ b/framework/source/interaction/quietinteraction.cxx @@ -42,20 +42,10 @@ namespace framework{ -DEFINE_XINTERFACE_2( QuietInteraction , - OWeakObject , - DIRECT_INTERFACE(css::lang::XTypeProvider ) , - DIRECT_INTERFACE(css::task::XInteractionHandler) ) - -DEFINE_XTYPEPROVIDER_2( QuietInteraction , - css::lang::XTypeProvider , - css::task::XInteractionHandler ) - //_________________________________________________________________________________________________________________ QuietInteraction::QuietInteraction() : ThreadHelpBase ( &Application::GetSolarMutex() ) - , ::cppu::OWeakObject( ) , m_aRequest ( ) { } diff --git a/framework/source/jobs/job.cxx b/framework/source/jobs/job.cxx index 0629df3553b9..036d031c5e00 100644 --- a/framework/source/jobs/job.cxx +++ b/framework/source/jobs/job.cxx @@ -36,21 +36,6 @@ namespace framework{ -DEFINE_XINTERFACE_4( Job , - OWeakObject , - DIRECT_INTERFACE(css::lang::XTypeProvider ), - DIRECT_INTERFACE(css::task::XJobListener ), - DIRECT_INTERFACE(css::frame::XTerminateListener), - DIRECT_INTERFACE(css::util::XCloseListener ) - ) - -DEFINE_XTYPEPROVIDER_4( Job , - css::lang::XTypeProvider , - css::task::XJobListener , - css::frame::XTerminateListener, - css::util::XCloseListener - ) - //________________________________ /** @short standard ctor @@ -68,7 +53,6 @@ DEFINE_XTYPEPROVIDER_4( Job , Job::Job( /*IN*/ const css::uno::Reference< css::uno::XComponentContext >& xContext , /*IN*/ const css::uno::Reference< css::frame::XFrame >& xFrame ) : ThreadHelpBase (&Application::GetSolarMutex()) - , ::cppu::OWeakObject ( ) , m_aJobCfg (xContext ) , m_xContext (xContext ) , m_xFrame (xFrame ) @@ -98,7 +82,6 @@ Job::Job( /*IN*/ const css::uno::Reference< css::uno::XComponentContext >& xCont Job::Job( /*IN*/ const css::uno::Reference< css::uno::XComponentContext >& xContext , /*IN*/ const css::uno::Reference< css::frame::XModel >& xModel ) : ThreadHelpBase (&Application::GetSolarMutex()) - , ::cppu::OWeakObject ( ) , m_aJobCfg (xContext ) , m_xContext (xContext ) , m_xModel (xModel ) diff --git a/framework/source/jobs/jobdispatch.cxx b/framework/source/jobs/jobdispatch.cxx index adc4690fb97e..6267b6479b1e 100644 --- a/framework/source/jobs/jobdispatch.cxx +++ b/framework/source/jobs/jobdispatch.cxx @@ -36,25 +36,6 @@ namespace framework{ -DEFINE_XINTERFACE_6( JobDispatch , - OWeakObject , - DIRECT_INTERFACE(css::lang::XTypeProvider ), - DIRECT_INTERFACE(css::frame::XDispatchProvider ), - DIRECT_INTERFACE(css::lang::XInitialization ), - DIRECT_INTERFACE(css::lang::XServiceInfo), - DIRECT_INTERFACE(css::frame::XNotifyingDispatch), - DIRECT_INTERFACE(css::frame::XDispatch ) - ) - -DEFINE_XTYPEPROVIDER_6( JobDispatch , - css::lang::XTypeProvider , - css::frame::XDispatchProvider , - css::frame::XNotifyingDispatch, - css::lang::XInitialization, - css::lang::XServiceInfo, - css::frame::XDispatch - ) - DEFINE_XSERVICEINFO_MULTISERVICE_2( JobDispatch , ::cppu::OWeakObject , SERVICENAME_PROTOCOLHANDLER , @@ -81,7 +62,6 @@ DEFINE_INIT_SERVICE( JobDispatch, */ JobDispatch::JobDispatch( /*IN*/ const css::uno::Reference< css::uno::XComponentContext >& xContext ) : ThreadHelpBase(&Application::GetSolarMutex()) - , OWeakObject ( ) , m_xContext (xContext ) { } diff --git a/framework/source/jobs/jobexecutor.cxx b/framework/source/jobs/jobexecutor.cxx index 03eb209abda2..8e769183cd63 100644 --- a/framework/source/jobs/jobexecutor.cxx +++ b/framework/source/jobs/jobexecutor.cxx @@ -42,25 +42,6 @@ namespace framework{ -DEFINE_XINTERFACE_6( JobExecutor , - OWeakObject , - DIRECT_INTERFACE(css::lang::XTypeProvider ), - DIRECT_INTERFACE(css::lang::XServiceInfo ), - DIRECT_INTERFACE(css::task::XJobExecutor ), - DIRECT_INTERFACE(css::container::XContainerListener ), - DIRECT_INTERFACE(css::document::XEventListener ), - DERIVED_INTERFACE(css::lang::XEventListener,css::document::XEventListener) - ) - -DEFINE_XTYPEPROVIDER_6( JobExecutor , - css::lang::XTypeProvider , - css::lang::XServiceInfo , - css::task::XJobExecutor , - css::container::XContainerListener, - css::document::XEventListener , - css::lang::XEventListener - ) - DEFINE_XSERVICEINFO_ONEINSTANCESERVICE_2( JobExecutor , ::cppu::OWeakObject , "com.sun.star.task.JobExecutor", @@ -113,7 +94,6 @@ DEFINE_INIT_SERVICE( JobExecutor, */ JobExecutor::JobExecutor( /*IN*/ const css::uno::Reference< css::uno::XComponentContext >& xContext ) : ThreadHelpBase (&Application::GetSolarMutex() ) - , ::cppu::OWeakObject ( ) , m_xContext (xContext ) , m_xModuleManager ( ) , m_aConfig (xContext, OUString::createFromAscii(JobData::EVENTCFG_ROOT) ) diff --git a/framework/source/recording/dispatchrecorder.cxx b/framework/source/recording/dispatchrecorder.cxx index a50407799871..420ad32a14b5 100644 --- a/framework/source/recording/dispatchrecorder.cxx +++ b/framework/source/recording/dispatchrecorder.cxx @@ -37,24 +37,6 @@ namespace framework{ //***************************************************************************************************************** // XInterface, XTypeProvider, XServiceInfo //***************************************************************************************************************** -DEFINE_XINTERFACE_6( - DispatchRecorder, - OWeakObject, - DIRECT_INTERFACE(css::lang::XTypeProvider), - DIRECT_INTERFACE(css::lang::XServiceInfo), - DIRECT_INTERFACE(css::frame::XDispatchRecorder), - DIRECT_INTERFACE(css::container::XIndexReplace), - DIRECT_INTERFACE(css::container::XIndexAccess), - DIRECT_INTERFACE(css::container::XElementAccess)) - -DEFINE_XTYPEPROVIDER_6( - DispatchRecorder, - css::lang::XTypeProvider, - css::lang::XServiceInfo, - css::frame::XDispatchRecorder, - css::container::XIndexReplace, - css::container::XIndexAccess, - css::container::XElementAccess) DEFINE_XSERVICEINFO_MULTISERVICE_2( DispatchRecorder, @@ -121,7 +103,6 @@ Sequence< Any > make_seq_out_of_struct( //*********************************************************************** DispatchRecorder::DispatchRecorder( const css::uno::Reference< css::uno::XComponentContext >& xContext ) : ThreadHelpBase ( &Application::GetSolarMutex() ) - , ::cppu::OWeakObject( ) , m_xConverter( css::script::Converter::create(xContext) ) { } diff --git a/framework/source/recording/dispatchrecordersupplier.cxx b/framework/source/recording/dispatchrecordersupplier.cxx index 7102c48c3cbc..9817639fca7a 100644 --- a/framework/source/recording/dispatchrecordersupplier.cxx +++ b/framework/source/recording/dispatchrecordersupplier.cxx @@ -31,18 +31,6 @@ namespace framework{ //***************************************************************************************************************** // XInterface, XTypeProvider //***************************************************************************************************************** -DEFINE_XINTERFACE_3( - DispatchRecorderSupplier, - OWeakObject, - DIRECT_INTERFACE(css::lang::XTypeProvider), - DIRECT_INTERFACE(css::lang::XServiceInfo), - DIRECT_INTERFACE(css::frame::XDispatchRecorderSupplier)) - -DEFINE_XTYPEPROVIDER_3( - DispatchRecorderSupplier, - css::lang::XTypeProvider, - css::lang::XServiceInfo, - css::frame::XDispatchRecorderSupplier) DEFINE_XSERVICEINFO_MULTISERVICE( DispatchRecorderSupplier, @@ -71,7 +59,6 @@ DispatchRecorderSupplier::DispatchRecorderSupplier( const css::uno::Reference< c // init baseclasses first! // Attention: Don't change order of initialization! : ThreadHelpBase ( &Application::GetSolarMutex() ) - , ::cppu::OWeakObject( ) // init member , m_xDispatchRecorder( NULL ) , m_xFactory ( xFactory ) diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx index 1cc901a19fb7..be50d2ba2421 100644 --- a/framework/source/services/autorecovery.cxx +++ b/framework/source/services/autorecovery.cxx @@ -393,29 +393,6 @@ void DispatchParams::forget() }; //----------------------------------------------- -DEFINE_XINTERFACE_10(AutoRecovery , - OWeakObject , - DIRECT_INTERFACE (css::lang::XTypeProvider ), - DIRECT_INTERFACE (css::lang::XServiceInfo ), - DIRECT_INTERFACE (css::frame::XDispatch ), - DIRECT_INTERFACE (css::beans::XMultiPropertySet ), - DIRECT_INTERFACE (css::beans::XFastPropertySet ), - DIRECT_INTERFACE (css::beans::XPropertySet ), - DIRECT_INTERFACE (css::document::XEventListener ), - DIRECT_INTERFACE (css::util::XChangesListener ), - DIRECT_INTERFACE (css::util::XModifyListener ), - DERIVED_INTERFACE(css::lang::XEventListener, css::document::XEventListener)) - -//----------------------------------------------- -DEFINE_XTYPEPROVIDER_6(AutoRecovery , - css::lang::XTypeProvider , - css::lang::XServiceInfo , - css::frame::XDispatch , - css::beans::XMultiPropertySet, - css::beans::XFastPropertySet , - css::beans::XPropertySet ) - -//----------------------------------------------- DEFINE_XSERVICEINFO_ONEINSTANCESERVICE_2(AutoRecovery , ::cppu::OWeakObject , "com.sun.star.frame.AutoRecovery", @@ -447,7 +424,6 @@ AutoRecovery::AutoRecovery(const css::uno::Reference< css::uno::XComponentContex : ThreadHelpBase (&Application::GetSolarMutex() ) , ::cppu::OBroadcastHelper ( m_aLock.getShareableOslMutex() ) , ::cppu::OPropertySetHelper( *(static_cast< ::cppu::OBroadcastHelper* >(this)) ) - , ::cppu::OWeakObject ( ) , m_xContext (xContext ) , m_bListenForDocEvents (sal_False ) , m_bListenForConfigChanges (sal_False ) @@ -473,6 +449,22 @@ AutoRecovery::~AutoRecovery() implts_stopTimer(); } +Any SAL_CALL AutoRecovery::queryInterface( const css::uno::Type& _rType ) throw(css::uno::RuntimeException) +{ + Any aRet = AutoRecovery_BASE::queryInterface( _rType ); + if ( !aRet.hasValue() ) + aRet = OPropertySetHelper::queryInterface( _rType ); + return aRet; +} + +Sequence< css::uno::Type > SAL_CALL AutoRecovery::getTypes( ) throw(css::uno::RuntimeException) +{ + return comphelper::concatSequences( + AutoRecovery_BASE::getTypes(), + ::cppu::OPropertySetHelper::getTypes() + ); +} + //----------------------------------------------- void SAL_CALL AutoRecovery::dispatch(const css::util::URL& aURL , const css::uno::Sequence< css::beans::PropertyValue >& lArguments) diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx index 7f55504cbe08..f9da2de0e469 100644 --- a/framework/source/services/desktop.cxx +++ b/framework/source/services/desktop.cxx @@ -78,44 +78,6 @@ namespace framework{ //***************************************************************************************************************** // XInterface, XTypeProvider, XServiceInfo //***************************************************************************************************************** -DEFINE_XINTERFACE_16 ( Desktop , - OWeakObject , - DIRECT_INTERFACE( css::lang::XTypeProvider ), - DIRECT_INTERFACE( css::lang::XServiceInfo ), - DIRECT_INTERFACE( css::frame::XDesktop2 ), - DIRECT_INTERFACE( css::frame::XDesktop ), - DIRECT_INTERFACE( css::frame::XComponentLoader ), - DIRECT_INTERFACE( css::frame::XTasksSupplier ), - DIRECT_INTERFACE( css::frame::XDispatchProvider ), - DIRECT_INTERFACE( css::frame::XDispatchProviderInterception), - DIRECT_INTERFACE( css::frame::XFramesSupplier ), - DIRECT_INTERFACE( css::frame::XFrame ), - DIRECT_INTERFACE( css::lang::XComponent ), - DIRECT_INTERFACE( css::frame::XDispatchResultListener ), - DIRECT_INTERFACE( css::lang::XEventListener ), - DIRECT_INTERFACE( css::task::XInteractionHandler ), - DIRECT_INTERFACE( css::beans::XPropertySet ), - DIRECT_INTERFACE( css::frame::XUntitledNumbers ) - ) - -DEFINE_XTYPEPROVIDER_16 ( Desktop , - css::lang::XTypeProvider , - css::lang::XServiceInfo , - css::frame::XDesktop2 , - css::frame::XDesktop , - css::frame::XComponentLoader , - css::frame::XTasksSupplier , - css::frame::XDispatchProvider , - css::frame::XDispatchProviderInterception , - css::frame::XFramesSupplier , - css::frame::XFrame , - css::lang::XComponent , - css::frame::XDispatchResultListener , - css::lang::XEventListener , - css::task::XInteractionHandler , - css::beans::XPropertySet , - css::frame::XUntitledNumbers - ) DEFINE_XSERVICEINFO_ONEINSTANCESERVICE_2( Desktop , ::cppu::OWeakObject , @@ -204,7 +166,6 @@ Desktop::Desktop( const css::uno::Reference< css::uno::XComponentContext >& xCon , TransactionBase ( ) , ::cppu::OBroadcastHelperVar< ::cppu::OMultiTypeInterfaceContainerHelper, ::cppu::OMultiTypeInterfaceContainerHelper::keyType > ( m_aLock.getShareableOslMutex() ) , ::cppu::OPropertySetHelper ( *(static_cast< ::cppu::OBroadcastHelper* >(this)) ) - , ::cppu::OWeakObject ( ) // Init member #ifdef ENABLE_ASSERTIONS , m_bIsTerminated ( sal_False ) // see dispose() for further information! @@ -257,6 +218,22 @@ Desktop::~Desktop() LOG_ASSERT2( m_aTransactionManager.getWorkingMode()!=E_CLOSE , "Desktop::~Desktop()", "Who forgot to dispose this service?" ) } +css::uno::Any SAL_CALL Desktop::queryInterface( const css::uno::Type& _rType ) throw(css::uno::RuntimeException) +{ + css::uno::Any aRet = Desktop_BASE::queryInterface( _rType ); + if ( !aRet.hasValue() ) + aRet = OPropertySetHelper::queryInterface( _rType ); + return aRet; +} + +css::uno::Sequence< css::uno::Type > SAL_CALL Desktop::getTypes( ) throw(css::uno::RuntimeException) +{ + return comphelper::concatSequences( + Desktop_BASE::getTypes(), + ::cppu::OPropertySetHelper::getTypes() + ); +} + //============================================================================= sal_Bool SAL_CALL Desktop::terminate() throw( css::uno::RuntimeException ) diff --git a/framework/source/services/license.cxx b/framework/source/services/license.cxx index 514f9dd11217..76f0d7ec9611 100644 --- a/framework/source/services/license.cxx +++ b/framework/source/services/license.cxx @@ -84,7 +84,6 @@ License::License( const Reference< XComponentContext >& rxContext ) // we must garant right initialization and a valid value of this! First initialize // baseclasses and then members. And we need the mutex for other baseclasses !!! : ThreadHelpBase ( &Application::GetSolarMutex() ) - , OWeakObject ( ) // Init member , m_xContext ( rxContext ) , m_bTerminate ( sal_False ) @@ -102,21 +101,6 @@ License::~License() // XInterface, XTypeProvider, XServiceInfo //***************************************************************************************************************** -DEFINE_XINTERFACE_4 ( License , - OWeakObject , - DIRECT_INTERFACE(XTypeProvider ), - DIRECT_INTERFACE(XServiceInfo ), - DIRECT_INTERFACE(XJob ), - DIRECT_INTERFACE(XCloseable ) - ) - -DEFINE_XTYPEPROVIDER_4 ( License , - XTypeProvider , - XServiceInfo , - XJob , - XCloseable - ) - DEFINE_XSERVICEINFO_MULTISERVICE_2 ( License, OWeakObject , SERVICENAME_LICENSE , diff --git a/framework/source/services/pathsettings.cxx b/framework/source/services/pathsettings.cxx index 45d028709548..7ef4594c19ec 100644 --- a/framework/source/services/pathsettings.cxx +++ b/framework/source/services/pathsettings.cxx @@ -82,29 +82,6 @@ namespace framework //----------------------------------------------------------------------------- // XInterface, XTypeProvider, XServiceInfo -DEFINE_XINTERFACE_8 ( PathSettings , - OWeakObject , - DIRECT_INTERFACE ( css::lang::XTypeProvider ), - DIRECT_INTERFACE ( css::lang::XServiceInfo ), - DERIVED_INTERFACE( css::lang::XEventListener, css::util::XChangesListener), - DIRECT_INTERFACE ( css::util::XChangesListener ), - DIRECT_INTERFACE ( css::util::XPathSettings ), - DERIVED_INTERFACE( css::beans::XPropertySet, css::util::XPathSettings), - DIRECT_INTERFACE ( css::beans::XFastPropertySet ), - DIRECT_INTERFACE ( css::beans::XMultiPropertySet ) - ) - -DEFINE_XTYPEPROVIDER_8 ( PathSettings , - css::lang::XTypeProvider , - css::lang::XServiceInfo , - css::lang::XEventListener , - css::util::XChangesListener , - css::util::XPathSettings , - css::beans::XPropertySet , - css::beans::XFastPropertySet , - css::beans::XMultiPropertySet - ) - DEFINE_XSERVICEINFO_ONEINSTANCESERVICE_2( PathSettings , ::cppu::OWeakObject , SERVICENAME_PATHSETTINGS , @@ -133,7 +110,6 @@ PathSettings::PathSettings( const css::uno::Reference< css::uno::XComponentConte : ThreadHelpBase() , ::cppu::OBroadcastHelperVar< ::cppu::OMultiTypeInterfaceContainerHelper, ::cppu::OMultiTypeInterfaceContainerHelper::keyType >(m_aLock.getShareableOslMutex()) , ::cppu::OPropertySetHelper(*(static_cast< ::cppu::OBroadcastHelper* >(this))) - , ::cppu::OWeakObject() // Init member , m_xContext (xContext) , m_pPropHelp(0 ) @@ -152,6 +128,26 @@ PathSettings::~PathSettings() delete m_pPropHelp; } +//------------------------------------------------------------------ +css::uno::Any SAL_CALL PathSettings::queryInterface( const css::uno::Type& _rType ) + throw(css::uno::RuntimeException) +{ + css::uno::Any aRet = PathSettings_BASE::queryInterface( _rType ); + if ( !aRet.hasValue() ) + aRet = OPropertySetHelper::queryInterface( _rType ); + return aRet; +} + +//------------------------------------------------------------------------------ +css::uno::Sequence< css::uno::Type > SAL_CALL PathSettings::getTypes( ) + throw(css::uno::RuntimeException) +{ + return comphelper::concatSequences( + PathSettings_BASE::getTypes(), + ::cppu::OPropertySetHelper::getTypes() + ); +} + //----------------------------------------------------------------------------- void SAL_CALL PathSettings::changesOccurred(const css::util::ChangesEvent& aEvent) throw (css::uno::RuntimeException) diff --git a/framework/source/services/sessionlistener.cxx b/framework/source/services/sessionlistener.cxx index 05f01b5bf293..ff9335c2117d 100644 --- a/framework/source/services/sessionlistener.cxx +++ b/framework/source/services/sessionlistener.cxx @@ -69,24 +69,6 @@ namespace framework{ //*********************************************** // XInterface, XTypeProvider, XServiceInfo -DEFINE_XINTERFACE_6( - SessionListener, - OWeakObject, - DIRECT_INTERFACE(css::lang::XTypeProvider), - DIRECT_INTERFACE(css::lang::XInitialization), - DIRECT_INTERFACE(css::frame::XSessionManagerListener), - DIRECT_INTERFACE(css::frame::XSessionManagerListener2), - DIRECT_INTERFACE(css::frame::XStatusListener), - DIRECT_INTERFACE(css::lang::XServiceInfo)) - -DEFINE_XTYPEPROVIDER_5( - SessionListener, - css::lang::XTypeProvider, - css::lang::XInitialization, - css::frame::XSessionManagerListener2, - css::frame::XStatusListener, - css::lang::XServiceInfo) - DEFINE_XSERVICEINFO_ONEINSTANCESERVICE_2( SessionListener, cppu::OWeakObject, @@ -102,7 +84,6 @@ DEFINE_INIT_SERVICE(SessionListener, SessionListener::SessionListener(const css::uno::Reference< css::uno::XComponentContext >& rxContext ) : ThreadHelpBase (&Application::GetSolarMutex()) - , OWeakObject ( ) , m_xContext (rxContext ) , m_bRestored( sal_False ) , m_bSessionStoreRequested( sal_False ) diff --git a/framework/source/services/taskcreatorsrv.cxx b/framework/source/services/taskcreatorsrv.cxx index 4889ff281b84..b8942958cfde 100644 --- a/framework/source/services/taskcreatorsrv.cxx +++ b/framework/source/services/taskcreatorsrv.cxx @@ -49,19 +49,6 @@ namespace framework { //----------------------------------------------- -DEFINE_XINTERFACE_3(TaskCreatorService , - OWeakObject , - DIRECT_INTERFACE(css::lang::XTypeProvider ), - DIRECT_INTERFACE(css::lang::XServiceInfo ), - DIRECT_INTERFACE(css::lang::XSingleServiceFactory)) - -//----------------------------------------------- -DEFINE_XTYPEPROVIDER_3(TaskCreatorService , - css::lang::XTypeProvider , - css::lang::XServiceInfo , - css::lang::XSingleServiceFactory) - -//----------------------------------------------- DEFINE_XSERVICEINFO_ONEINSTANCESERVICE_2(TaskCreatorService , ::cppu::OWeakObject , "com.sun.star.frame.TaskCreator", @@ -82,7 +69,6 @@ DEFINE_INIT_SERVICE( //----------------------------------------------- TaskCreatorService::TaskCreatorService(const css::uno::Reference< css::uno::XComponentContext >& xContext) : ThreadHelpBase (&Application::GetSolarMutex()) - , ::cppu::OWeakObject( ) , m_xContext (xContext ) { } |