strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS warnings01 (1.6.32); FILE MERGED

Browse source 
2005/10/28 14:48:13 cd 1.6.32.1: #i55991# Warning free code changes for gcc
This commit is contained in:
Jens-Heiner Rechtien 2006-06-19 09:57:34 +00:00
parent 0adbf4a144
commit a6a602a3dc
2 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
framework/inc/macros/xinterface.hxx
View file

@ -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();

6
framework/inc/macros/xtypeprovider.hxx
View file

@ -4,9 +4,9 @@
*
* $RCSfile: xtypeprovider.hxx,v $
*
* $Revision: 1.6 $
* $Revision: 1.7 $
*
* last change: $Author: rt $ $Date: 2005-09-09 00:25:05 $
* last change: $Author: hr $ $Date: 2006-06-19 10:57:34 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@ -343,7 +343,7 @@ ________________________________________________________________________________
// public
// declaration of XTypeProvider
//*****************************************************************************************************************
#define DECLARE_XTYPEPROVIDER \
#define FWK_DECLARE_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 );