INTEGRATION: CWS ooo11rc2 (1.3.4); FILE MERGED

2003/07/14 15:43:14 fa 1.3.4.1: Conditionalize OS X + gcc 2.95 hacks for gcc 2.95 only.

http://www.openoffice.org/project/www/issues/show_bug.cgi?id=16696

Dan
fa@ooo
This commit is contained in:
Jens-Heiner Rechtien
2003-07-16 16:53:07 +00:00
parent 1d70f64dda
commit e32e46cded

View File

@@ -2,9 +2,9 @@
* *
* $RCSfile: registercontrols.cxx,v $ * $RCSfile: registercontrols.cxx,v $
* *
* $Revision: 1.3 $ * $Revision: 1.4 $
* *
* last change: $Author: vg $ $Date: 2003-06-12 10:43:48 $ * last change: $Author: hr $ $Date: 2003-07-16 17:53:07 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@@ -233,7 +233,7 @@ using namespace ::com::sun::star::registry ;
AS_DBG_OUT ( "\tCREATEFACTORY_SINGLE():\t[end]\n" ) AS_DBG_OUT ( "\tCREATEFACTORY_SINGLE():\t[end]\n" )
//****************************************************************************************************************************** //******************************************************************************************************************************
#ifdef MACOSX #if defined( MACOSX ) && ( __GNUC__ < 3 )
#define IF_NAME_CREATECOMPONENTFACTORY_ONEINSTANCE(CLASS) \ #define IF_NAME_CREATECOMPONENTFACTORY_ONEINSTANCE(CLASS) \
\ \
if ( CLASS::impl_getStaticImplementationName().equals( OUString::createFromAscii( pImplementationName ) ) ) \ if ( CLASS::impl_getStaticImplementationName().equals( OUString::createFromAscii( pImplementationName ) ) ) \
@@ -252,7 +252,7 @@ using namespace ::com::sun::star::registry ;
#endif /* MACOSX */ #endif /* MACOSX */
//****************************************************************************************************************************** //******************************************************************************************************************************
#ifdef MACOSX #if defined( MACOSX ) && ( __GNUC__ < 3 )
#define IF_NAME_CREATECOMPONENTFACTORY_SINGLE(CLASS) \ #define IF_NAME_CREATECOMPONENTFACTORY_SINGLE(CLASS) \
\ \
if ( CLASS::impl_getStaticImplementationName().equals( OUString::createFromAscii( pImplementationName ) ) ) \ if ( CLASS::impl_getStaticImplementationName().equals( OUString::createFromAscii( pImplementationName ) ) ) \