diff options
| -rw-r--r-- | framework/inc/helper/otasksaccess.hxx | 15 | ||||
| -rw-r--r-- | framework/inc/helper/otasksenumeration.hxx | 24 |
2 files changed, 25 insertions, 14 deletions
diff --git a/framework/inc/helper/otasksaccess.hxx b/framework/inc/helper/otasksaccess.hxx index ff05771ca754..5da80ada3f09 100644 --- a/framework/inc/helper/otasksaccess.hxx +++ b/framework/inc/helper/otasksaccess.hxx @@ -2,9 +2,9 @@ * * $RCSfile: otasksaccess.hxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:29:22 $ + * last change: $Author: as $ $Date: 2000-09-26 06:20:35 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -82,6 +82,10 @@ #include <macros/xinterface.hxx> #endif +#ifndef __FRAMEWORK_MACROS_XTYPEPROVIDER_HXX_ +#include <macros/xtypeprovider.hxx> +#endif + #ifndef __FRAMEWORK_MACROS_DEBUG_HXX_ #include <macros/debug.hxx> #endif @@ -139,6 +143,7 @@ namespace framework{ #define XENUMERATIONACCESS ::com::sun::star::container::XEnumerationAccess #define XTASK ::com::sun::star::frame::XTask #define MUTEX ::osl::Mutex +#define XTYPEPROVIDER ::com::sun::star::lang::XTypeProvider //_________________________________________________________________________________________________________________ // switches @@ -170,8 +175,8 @@ namespace framework{ @devstatus deprecated *//*-*************************************************************************************************************/ -//class OTasksAccess : DERIVE_FROM_XSPECIALDEBUGINTERFACE // => These macro will expand to nothing, if no testmode is set in debug.h! -class OTasksAccess : public XENUMERATIONACCESS , // => XElementAccess +class OTasksAccess : public XTYPEPROVIDER , + public XENUMERATIONACCESS , // => XElementAccess public OWEAKOBJECT { //------------------------------------------------------------------------------------------------------------- @@ -210,7 +215,7 @@ class OTasksAccess : public XENUMERATIONACCESS , // => XElementAc //--------------------------------------------------------------------------------------------------------- DECLARE_XINTERFACE -// DECLARE_XSPECIALDEBUGINTERFACE // => These macro will expand to nothing, if no testmode is set in debug.h! + DECLARE_XTYPEPROVIDER //--------------------------------------------------------------------------------------------------------- // XEnumerationAccess diff --git a/framework/inc/helper/otasksenumeration.hxx b/framework/inc/helper/otasksenumeration.hxx index 86c7b75bc0b6..1b071876e597 100644 --- a/framework/inc/helper/otasksenumeration.hxx +++ b/framework/inc/helper/otasksenumeration.hxx @@ -2,9 +2,9 @@ * * $RCSfile: otasksenumeration.hxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:29:22 $ + * last change: $Author: as $ $Date: 2000-09-26 06:20:35 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -78,6 +78,10 @@ #include <macros/xinterface.hxx> #endif +#ifndef __FRAMEWORK_MACROS_XTYPEPROVIDER_HXX_ +#include <macros/xtypeprovider.hxx> +#endif + #ifndef __FRAMEWORK_MACROS_DEBUG_HXX_ #include <macros/debug.hxx> #endif @@ -129,6 +133,7 @@ namespace framework{ #define XEVENTLISTENER ::com::sun::star::lang::XEventListener #define XFRAME ::com::sun::star::frame::XFrame #define XTASK ::com::sun::star::frame::XTask +#define XTYPEPROVIDER ::com::sun::star::lang::XTypeProvider //_________________________________________________________________________________________________________________ // exported const @@ -145,19 +150,20 @@ namespace framework{ You cant use this as a baseclass. Please use it as a dynamical object for return. @implements XInterface + XTypeProvider XEventListener XEnumeration - [ XDebugging, if TEST_TREE is defined! ] + @base OMutexMember OWeakObject - @devstatus deprecated + @devstatus ready to use *//*-*************************************************************************************************************/ -//class OTasksEnumeration : DERIVE_FROM_XSPECIALDEBUGINTERFACE // => These macro will expand to nothing, if no testmode is set in debug.h! -class OTasksEnumeration : public XEVENTLISTENER , - public XENUMERATION , - public OMutexMember , +class OTasksEnumeration : public XTYPEPROVIDER , + public XEVENTLISTENER , + public XENUMERATION , + public OMutexMember , public OWEAKOBJECT { //------------------------------------------------------------------------------------------------------------- @@ -190,7 +196,7 @@ class OTasksEnumeration : public XEVENTLISTENER , //--------------------------------------------------------------------------------------------------------- DECLARE_XINTERFACE -// DECLARE_XSPECIALDEBUGINTERFACE // => These macro will expand to nothing, if no testmode is set in debug.h! + DECLARE_XTYPEPROVIDER //--------------------------------------------------------------------------------------------------------- // XEventListener |