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

INTEGRATION: CWS geordi2q14 (1.4.26); FILE MERGED

Browse source 
2004/01/29 12:07:55 hr 1.4.26.1: #111934#: merge CWS ooo111fix2
This commit is contained in:
Jens-Heiner Rechtien 2004-02-02 18:46:35 +00:00
parent 366eb91c43
commit 293233d47b
1 changed files with 2 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
UnoControls/source/base/registercontrols.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: registercontrols.cxx,v $
*
* $Revision: 1.4 $
* $Revision: 1.5 $
*
* last change: $Author: hr $ $Date: 2003-07-16 17:53:07 $
* last change: $Author: hr $ $Date: 2004-02-02 19:46:35 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -233,7 +233,6 @@ using namespace ::com::sun::star::registry ;
AS_DBG_OUT ( "\tCREATEFACTORY_SINGLE():\t[end]\n" )
//******************************************************************************************************************************
#if defined( MACOSX ) && ( __GNUC__ < 3 )
#define IF_NAME_CREATECOMPONENTFACTORY_ONEINSTANCE(CLASS) \
\
if ( CLASS::impl_getStaticImplementationName().equals( OUString::createFromAscii( pImplementationName ) ) ) \
@ -241,18 +240,8 @@ using namespace ::com::sun::star::registry ;
AS_DBG_OUT ( "\tIF_NAME_CREATECOMPONENTFACTORY_ONEINSTANCE():\timplementationname found\n" ) \
CREATEFACTORY_ONEINSTANCE ( CLASS ) \
}
#else /* MACOSX */
#define IF_NAME_CREATECOMPONENTFACTORY_ONEINSTANCE(CLASS) \
\
if ( CLASS::impl_getStaticImplementationName().equals( OUString::createFromAscii( pImplementationName ) ) ) \
{ \
AS_DBG_OUT ( "\tIF_NAME_CREATECOMPONENTFACTORY_ONEINSTANCE():\timplementationname found\n" ) \
CREATEFACTORY_ONEINSTANCE ( CLASS ) \
}
#endif /* MACOSX */
//******************************************************************************************************************************
#if defined( MACOSX ) && ( __GNUC__ < 3 )
#define IF_NAME_CREATECOMPONENTFACTORY_SINGLE(CLASS) \
\
if ( CLASS::impl_getStaticImplementationName().equals( OUString::createFromAscii( pImplementationName ) ) ) \
@ -260,15 +249,6 @@ using namespace ::com::sun::star::registry ;
AS_DBG_OUT ( "\tIF_NAME_CREATECOMPONENTFACTORY_SINGLE():\timplementationname found\n" ) \
CREATEFACTORY_SINGLE ( CLASS ) \
}
#else /* MACOSX */
#define IF_NAME_CREATECOMPONENTFACTORY_SINGLE(CLASS) \
\
if ( CLASS::impl_getStaticImplementationName().equals( OUString::createFromAscii( pImplementationName ) ) ) \
{ \
AS_DBG_OUT ( "\tIF_NAME_CREATECOMPONENTFACTORY_SINGLE():\timplementationname found\n" ) \
CREATEFACTORY_SINGLE ( CLASS ) \
}
#endif /* MACOSX */
//______________________________________________________________________________________________________________
// declare functions to create a new instance of service