summaryrefslogtreecommitdiff
path: root/UnoControls/source/base
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2004-02-02 18:46:35 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2004-02-02 18:46:35 +0000
commit293233d47b8e43dc2fb29b87a094ea9ae8577edb (patch)
tree0142553735d277e686a0794df0e65ffecc8edafd /UnoControls/source/base
parent366eb91c4316b25ac7cae10841e8447011939529 (diff)
INTEGRATION: CWS geordi2q14 (1.4.26); FILE MERGED
2004/01/29 12:07:55 hr 1.4.26.1: #111934#: merge CWS ooo111fix2
Diffstat (limited to 'UnoControls/source/base')
-rw-r--r--UnoControls/source/base/registercontrols.cxx24
1 files changed, 2 insertions, 22 deletions
diff --git a/UnoControls/source/base/registercontrols.cxx b/UnoControls/source/base/registercontrols.cxx
index 6aa2ecc0aa4d..621cf15f467f 100644
--- a/UnoControls/source/base/registercontrols.cxx
+++ b/UnoControls/source/base/registercontrols.cxx
@@ -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,26 +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 ) ) ) \
- { \
- 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 ) ) ) \
@@ -268,7 +249,6 @@ using namespace ::com::sun::star::registry ;
AS_DBG_OUT ( "\tIF_NAME_CREATECOMPONENTFACTORY_SINGLE():\timplementationname found\n" ) \
CREATEFACTORY_SINGLE ( CLASS ) \
}
-#endif /* MACOSX */
//______________________________________________________________________________________________________________
// declare functions to create a new instance of service