diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 09:57:34 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 09:57:34 +0000 |
| commit | a6a602a3dcd01f7fa78a7204ed0159ecc271e9cb (patch) | |
| tree | 3eb58f9a77f69a2e3babc3f9d0a1894f2942c698 /framework/inc/macros/xinterface.hxx | |
| parent | 0adbf4a1444d701fce8c1c669b5fc1ffc4af25f8 (diff) | |
INTEGRATION: CWS warnings01 (1.6.32); FILE MERGED
2005/10/28 14:48:13 cd 1.6.32.1: #i55991# Warning free code changes for gcc
Diffstat (limited to 'framework/inc/macros/xinterface.hxx')
| -rw-r--r-- | framework/inc/macros/xinterface.hxx | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/framework/inc/macros/xinterface.hxx b/framework/inc/macros/xinterface.hxx index 14c1d65ab54a..16f415653c23 100644 --- a/framework/inc/macros/xinterface.hxx +++ b/framework/inc/macros/xinterface.hxx @@ -4,9 +4,9 @@ * * $RCSfile: xinterface.hxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: rt $ $Date: 2005-09-09 00:24:36 $ + * last change: $Author: hr $ $Date: 2006-06-19 10:57:18 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -192,11 +192,13 @@ ________________________________________________________________________________ // private // help macros to replace INTERFACES in queryInterface() [see before] //***************************************************************************************************************** -//#ifdef ENABLE_SERVICEDEBUG -// #define PRIVATE_DEFINE_INTERFACE_1( INTERFACE1 ) \ -// static_cast< XSPECIALDEBUGINTERFACE##* >( this ), \ -// INTERFACE1 -//#else +/* +#ifdef ENABLE_SERVICEDEBUG + #define PRIVATE_DEFINE_INTERFACE_1( INTERFACE1 ) \ + static_cast< XSPECIALDEBUGINTERFACE##* >( this ), \ + INTERFACE1 +#else +*/ #define PRIVATE_DEFINE_INTERFACE_1( INTERFACE1 ) \ INTERFACE1 //#endif // #ifdef ENABLE_SERVICEDEBUG @@ -259,7 +261,7 @@ ________________________________________________________________________________ // public // declaration of XInterface //***************************************************************************************************************** -#define DECLARE_XINTERFACE \ +#define FWK_DECLARE_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(); |