summaryrefslogtreecommitdiff
path: root/UnoControls/source/base
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2003-06-12 09:43:48 +0000
committerVladimir Glazounov <vg@openoffice.org>2003-06-12 09:43:48 +0000
commitd9820883de70ea565e8e9aac3489fa20b1f08b83 (patch)
tree312eb0e1bf48e430012deac51967b7f2bfa31643 /UnoControls/source/base
parent86127a42eb3454d496bfed4f0a7f579c32a7fee7 (diff)
INTEGRATION: CWS mh11rc (1.2.72); FILE MERGED
2003/06/06 13:06:44 mh 1.2.72.1: join: from cws_srx644_ooo11beta2
Diffstat (limited to 'UnoControls/source/base')
-rw-r--r--UnoControls/source/base/registercontrols.cxx30
1 files changed, 15 insertions, 15 deletions
diff --git a/UnoControls/source/base/registercontrols.cxx b/UnoControls/source/base/registercontrols.cxx
index 61b222231ab1..5b03146d78c7 100644
--- a/UnoControls/source/base/registercontrols.cxx
+++ b/UnoControls/source/base/registercontrols.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: registercontrols.cxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: as $ $Date: 2000-10-12 10:31:28 $
+ * last change: $Author: vg $ $Date: 2003-06-12 10:43:48 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -148,7 +148,7 @@ using namespace ::com::sun::star::registry ;
static Reference< XInterface > SAL_CALL CLASS##_createInstance ( const Reference< XMultiServiceFactory >& rServiceManager ) throw ( Exception ) \
{ \
AS_DBG_OUT ( "\tCREATEINSTANCE():\tOK\n" ) \
- return Reference< XInterface >( *(OWeakObject*)(new CLASS##( rServiceManager )) ); \
+ return Reference< XInterface >( *(OWeakObject*)(new CLASS( rServiceManager )) ); \
}
//******************************************************************************************************************************
@@ -166,7 +166,7 @@ using namespace ::com::sun::star::registry ;
AS_DBG_OUT ( "\tCOMPONENT_INFO():\t\txkey is valid ...\n" ) \
/* Build new keyname */ \
sKeyName = OUString::createFromAscii( "/" ) ; \
- sKeyName += CLASS##::impl_getStaticImplementationName() ; \
+ sKeyName += CLASS::impl_getStaticImplementationName() ; \
sKeyName += OUString::createFromAscii( "/UNO/SERVICES" ); \
\
/* Create new key with new name. */ \
@@ -177,7 +177,7 @@ using namespace ::com::sun::star::registry ;
{ \
AS_DBG_OUT ( "\tCOMPONENT_INFO():\t\txNewkey is valid ...\n" ) \
/* Get information about supported services. */ \
- seqServiceNames = CLASS##::impl_getStaticSupportedServiceNames() ; \
+ seqServiceNames = CLASS::impl_getStaticSupportedServiceNames() ; \
pArray = seqServiceNames.getArray() ; \
nLength = seqServiceNames.getLength() ; \
nCounter = 0 ; \
@@ -212,9 +212,9 @@ using namespace ::com::sun::star::registry ;
xFactory = Reference< XSingleServiceFactory > \
( \
cppu::createOneInstanceFactory ( xServiceManager , \
- CLASS##::impl_getStaticImplementationName () , \
+ CLASS::impl_getStaticImplementationName () , \
CLASS##_createInstance , \
- CLASS##::impl_getStaticSupportedServiceNames () ) \
+ CLASS::impl_getStaticSupportedServiceNames () ) \
) ; \
AS_DBG_OUT ( "\tCREATEFACTORY_ONEINSTANCE():\t[end]\n" )
@@ -226,9 +226,9 @@ using namespace ::com::sun::star::registry ;
xFactory = Reference< XSingleServiceFactory > \
( \
cppu::createSingleFactory ( xServiceManager , \
- CLASS##::impl_getStaticImplementationName () , \
+ CLASS::impl_getStaticImplementationName () , \
CLASS##_createInstance , \
- CLASS##::impl_getStaticSupportedServiceNames () ) \
+ CLASS::impl_getStaticSupportedServiceNames () ) \
) ; \
AS_DBG_OUT ( "\tCREATEFACTORY_SINGLE():\t[end]\n" )
@@ -236,7 +236,7 @@ using namespace ::com::sun::star::registry ;
#ifdef MACOSX
#define IF_NAME_CREATECOMPONENTFACTORY_ONEINSTANCE(CLASS) \
\
- if ( CLASS##::impl_getStaticImplementationName().equals( OUString::createFromAscii( pImplementationName ) ) ) \
+ if ( CLASS::impl_getStaticImplementationName().equals( OUString::createFromAscii( pImplementationName ) ) ) \
{ \
AS_DBG_OUT ( "\tIF_NAME_CREATECOMPONENTFACTORY_ONEINSTANCE():\timplementationname found\n" ) \
CREATEFACTORY_ONEINSTANCE ( CLASS ) \
@@ -244,10 +244,10 @@ using namespace ::com::sun::star::registry ;
#else /* MACOSX */
#define IF_NAME_CREATECOMPONENTFACTORY_ONEINSTANCE(CLASS) \
\
- if ( CLASS##::impl_getStaticImplementationName().equals( OUString::createFromAscii( pImplementationName ) ) ) \
+ if ( CLASS::impl_getStaticImplementationName().equals( OUString::createFromAscii( pImplementationName ) ) ) \
{ \
AS_DBG_OUT ( "\tIF_NAME_CREATECOMPONENTFACTORY_ONEINSTANCE():\timplementationname found\n" ) \
- CREATEFACTORY_ONEINSTANCE ( CLASS## ) \
+ CREATEFACTORY_ONEINSTANCE ( CLASS ) \
}
#endif /* MACOSX */
@@ -255,7 +255,7 @@ using namespace ::com::sun::star::registry ;
#ifdef MACOSX
#define IF_NAME_CREATECOMPONENTFACTORY_SINGLE(CLASS) \
\
- if ( CLASS##::impl_getStaticImplementationName().equals( OUString::createFromAscii( pImplementationName ) ) ) \
+ if ( CLASS::impl_getStaticImplementationName().equals( OUString::createFromAscii( pImplementationName ) ) ) \
{ \
AS_DBG_OUT ( "\tIF_NAME_CREATECOMPONENTFACTORY_SINGLE():\timplementationname found\n" ) \
CREATEFACTORY_SINGLE ( CLASS ) \
@@ -263,10 +263,10 @@ using namespace ::com::sun::star::registry ;
#else /* MACOSX */
#define IF_NAME_CREATECOMPONENTFACTORY_SINGLE(CLASS) \
\
- if ( CLASS##::impl_getStaticImplementationName().equals( OUString::createFromAscii( pImplementationName ) ) ) \
+ if ( CLASS::impl_getStaticImplementationName().equals( OUString::createFromAscii( pImplementationName ) ) ) \
{ \
AS_DBG_OUT ( "\tIF_NAME_CREATECOMPONENTFACTORY_SINGLE():\timplementationname found\n" ) \
- CREATEFACTORY_SINGLE ( CLASS## ) \
+ CREATEFACTORY_SINGLE ( CLASS ) \
}
#endif /* MACOSX */