View | Details | Raw Unified | Return to issue 13400
Collapse All | Expand All

(-)file_not_specified_in_diff (-185 / +187 lines)
Line  Link Here
0
-- UnoControls/inc/basecontrol.hxx
0
++ UnoControls/inc/basecontrol.hxx
Lines 380-386 Link Here
380
//____________________________________________________________________________________________________________
380
//____________________________________________________________________________________________________________
381
381
382
#define TRGB_COLORDATA(TRANSPARENCE,RED,GREEN,BLUE)	\
382
#define TRGB_COLORDATA(TRANSPARENCE,RED,GREEN,BLUE)	\
383
		((sal_Int32)(((sal_uInt32)((sal_uInt8)(BLUE##))))|(((sal_uInt32)((sal_uInt8)(GREEN##)))<<8)|(((sal_uInt32)((sal_uInt8)(RED##)))<<16)|(((sal_uInt32)((sal_uInt8)(TRANSPARENCE##)))<<24))
383
		((sal_Int32)(((sal_uInt32)((sal_uInt8)(BLUE))))|(((sal_uInt32)((sal_uInt8)(GREEN)))<<8)|(((sal_uInt32)((sal_uInt8)(RED)))<<16)|(((sal_uInt32)((sal_uInt8)(TRANSPARENCE)))<<24))
384
384
385
//____________________________________________________________________________________________________________
385
//____________________________________________________________________________________________________________
386
//	structs
386
//	structs
387
-- UnoControls/source/base/multiplexer.cxx
387
++ UnoControls/source/base/multiplexer.cxx
Lines 98-109 Link Here
98
#define MULTIPLEX( INTERFACE, METHOD, EVENTTYP, EVENT )																				\
98
#define MULTIPLEX( INTERFACE, METHOD, EVENTTYP, EVENT )																				\
99
																																	\
99
																																	\
100
	/* First get all interfaces from container with right type.*/																	\
100
	/* First get all interfaces from container with right type.*/																	\
101
	OInterfaceContainerHelper* pContainer = m_aListenerHolder.getContainer( ::getCppuType((const Reference< INTERFACE## >*)0) );	\
101
	OInterfaceContainerHelper* pContainer = m_aListenerHolder.getContainer( ::getCppuType((const Reference< INTERFACE >*)0) );	\
102
	/* Do the follow only, if elements in container exist.*/																		\
102
	/* Do the follow only, if elements in container exist.*/																		\
103
	if( pContainer != NULL )																										\
103
	if( pContainer != NULL )																										\
104
	{																																\
104
	{																																\
105
		OInterfaceIteratorHelper aIterator( *pContainer );																			\
105
		OInterfaceIteratorHelper aIterator( *pContainer );																			\
106
		EVENTTYP aLocalEvent = EVENT##;																								\
106
		EVENTTYP aLocalEvent = EVENT;																								\
107
		/* Remark: The control is the event source not the peer.*/																	\
107
		/* Remark: The control is the event source not the peer.*/																	\
108
		/*         We must change the source of the event.		*/																	\
108
		/*         We must change the source of the event.		*/																	\
109
		aLocalEvent.Source = m_xControl ;																							\
109
		aLocalEvent.Source = m_xControl ;																							\
Lines 112-121 Link Here
112
		{																															\
112
		{																															\
113
			if( aIterator.hasMoreElements() )																						\
113
			if( aIterator.hasMoreElements() )																						\
114
			{																														\
114
			{																														\
115
				INTERFACE## * pListener = (INTERFACE## *)aIterator.next();															\
115
				INTERFACE * pListener = (INTERFACE *)aIterator.next();															\
116
				try																													\
116
				try																													\
117
				{																													\
117
				{																													\
118
					pListener->METHOD##( aLocalEvent );																				\
118
					pListener->METHOD( aLocalEvent );																				\
119
				}																													\
119
				}																													\
120
				catch( RuntimeException& )																							\
120
				catch( RuntimeException& )																							\
121
				{																													\
121
				{																													\
122
-- UnoControls/source/base/registercontrols.cxx
122
++ UnoControls/source/base/registercontrols.cxx
Lines 148-154 Link Here
148
	static Reference< XInterface > SAL_CALL CLASS##_createInstance ( const Reference< XMultiServiceFactory >& rServiceManager ) throw ( Exception )	\
148
	static Reference< XInterface > SAL_CALL CLASS##_createInstance ( const Reference< XMultiServiceFactory >& rServiceManager ) throw ( Exception )	\
149
	{																																		\
149
	{																																		\
150
		AS_DBG_OUT ( "\tCREATEINSTANCE():\tOK\n" )																							\
150
		AS_DBG_OUT ( "\tCREATEINSTANCE():\tOK\n" )																							\
151
		return Reference< XInterface >( *(OWeakObject*)(new CLASS##( rServiceManager )) );													\
151
		return Reference< XInterface >( *(OWeakObject*)(new CLASS( rServiceManager )) );													\
152
	}
152
	}
153
153
154
//******************************************************************************************************************************
154
//******************************************************************************************************************************
Lines 166-172 Link Here
166
			AS_DBG_OUT ( "\tCOMPONENT_INFO():\t\txkey is valid ...\n" )													\
166
			AS_DBG_OUT ( "\tCOMPONENT_INFO():\t\txkey is valid ...\n" )													\
167
			/* Build new keyname */																						\
167
			/* Build new keyname */																						\
168
			sKeyName	 =	OUString::createFromAscii( "/" )			;		                   						\
168
			sKeyName	 =	OUString::createFromAscii( "/" )			;		                   						\
169
			sKeyName	+=	CLASS##::impl_getStaticImplementationName()	;   	                						\
169
			sKeyName	+=	CLASS::impl_getStaticImplementationName()	;   	                						\
170
			sKeyName	+=	OUString::createFromAscii( "/UNO/SERVICES" );       	            						\
170
			sKeyName	+=	OUString::createFromAscii( "/UNO/SERVICES" );       	            						\
171
																														\
171
																														\
172
			/* Create new key with new name. */																			\
172
			/* Create new key with new name. */																			\
Lines 177-183 Link Here
177
			{                                                                                       					\
177
			{                                                                                       					\
178
				AS_DBG_OUT ( "\tCOMPONENT_INFO():\t\txNewkey is valid ...\n" )											\
178
				AS_DBG_OUT ( "\tCOMPONENT_INFO():\t\txNewkey is valid ...\n" )											\
179
				/* Get information about supported services. */															\
179
				/* Get information about supported services. */															\
180
				seqServiceNames	=	CLASS##::impl_getStaticSupportedServiceNames()	;           						\
180
				seqServiceNames	=	CLASS::impl_getStaticSupportedServiceNames()	;           						\
181
				pArray			=	seqServiceNames.getArray()						;           						\
181
				pArray			=	seqServiceNames.getArray()						;           						\
182
				nLength			=	seqServiceNames.getLength()						;           						\
182
				nLength			=	seqServiceNames.getLength()						;           						\
183
				nCounter		=	0												;           						\
183
				nCounter		=	0												;           						\
Lines 212-220 Link Here
212
	xFactory = Reference< XSingleServiceFactory >																		\
212
	xFactory = Reference< XSingleServiceFactory >																		\
213
					(																									\
213
					(																									\
214
						cppu::createOneInstanceFactory	(	xServiceManager										,		\
214
						cppu::createOneInstanceFactory	(	xServiceManager										,		\
215
															CLASS##::impl_getStaticImplementationName		()	,		\
215
															CLASS::impl_getStaticImplementationName		()	,		\
216
															CLASS##_createInstance								,		\
216
															CLASS##_createInstance								,		\
217
															CLASS##::impl_getStaticSupportedServiceNames	()	)		\
217
															CLASS::impl_getStaticSupportedServiceNames	()	)		\
218
					) ;																									\
218
					) ;																									\
219
	AS_DBG_OUT ( "\tCREATEFACTORY_ONEINSTANCE():\t[end]\n" )
219
	AS_DBG_OUT ( "\tCREATEFACTORY_ONEINSTANCE():\t[end]\n" )
220
220
Lines 226-234 Link Here
226
	xFactory = Reference< XSingleServiceFactory >																		\
226
	xFactory = Reference< XSingleServiceFactory >																		\
227
					(																									\
227
					(																									\
228
						cppu::createSingleFactory	(	xServiceManager										,			\
228
						cppu::createSingleFactory	(	xServiceManager										,			\
229
														CLASS##::impl_getStaticImplementationName		()	,			\
229
														CLASS::impl_getStaticImplementationName		()	,			\
230
														CLASS##_createInstance								,			\
230
														CLASS##_createInstance								,			\
231
														CLASS##::impl_getStaticSupportedServiceNames	()	)			\
231
														CLASS::impl_getStaticSupportedServiceNames	()	)			\
232
					) ;																									\
232
					) ;																									\
233
	AS_DBG_OUT ( "\tCREATEFACTORY_SINGLE():\t[end]\n" )
233
	AS_DBG_OUT ( "\tCREATEFACTORY_SINGLE():\t[end]\n" )
234
234
Lines 244-253 Link Here
244
#else /* MACOSX */
244
#else /* MACOSX */
245
#define	IF_NAME_CREATECOMPONENTFACTORY_ONEINSTANCE(CLASS)																\
245
#define	IF_NAME_CREATECOMPONENTFACTORY_ONEINSTANCE(CLASS)																\
246
																														\
246
																														\
247
	if ( CLASS##::impl_getStaticImplementationName().equals( OUString::createFromAscii( pImplementationName ) ) )		\
247
	if ( CLASS::impl_getStaticImplementationName().equals( OUString::createFromAscii( pImplementationName ) ) )		\
248
	{																													\
248
	{																													\
249
		AS_DBG_OUT ( "\tIF_NAME_CREATECOMPONENTFACTORY_ONEINSTANCE():\timplementationname found\n" )					\
249
		AS_DBG_OUT ( "\tIF_NAME_CREATECOMPONENTFACTORY_ONEINSTANCE():\timplementationname found\n" )					\
250
		CREATEFACTORY_ONEINSTANCE ( CLASS## )																			\
250
		CREATEFACTORY_ONEINSTANCE ( CLASS )																			\
251
	}
251
	}
252
#endif /* MACOSX */
252
#endif /* MACOSX */
253
253
Lines 263-272 Link Here
263
#else  /* MACOSX */
263
#else  /* MACOSX */
264
#define	IF_NAME_CREATECOMPONENTFACTORY_SINGLE(CLASS)																	\
264
#define	IF_NAME_CREATECOMPONENTFACTORY_SINGLE(CLASS)																	\
265
																														\
265
																														\
266
	if ( CLASS##::impl_getStaticImplementationName().equals( OUString::createFromAscii( pImplementationName ) ) )		\
266
	if ( CLASS::impl_getStaticImplementationName().equals( OUString::createFromAscii( pImplementationName ) ) )		\
267
	{																													\
267
	{																													\
268
		AS_DBG_OUT ( "\tIF_NAME_CREATECOMPONENTFACTORY_SINGLE():\timplementationname found\n" )							\
268
		AS_DBG_OUT ( "\tIF_NAME_CREATECOMPONENTFACTORY_SINGLE():\timplementationname found\n" )							\
269
		CREATEFACTORY_SINGLE ( CLASS## )																				\
269
		CREATEFACTORY_SINGLE ( CLASS )																				\
270
	}
270
	}
271
#endif  /* MACOSX */
271
#endif  /* MACOSX */
272
272
273
-- basic/source/inc/macfix.hxx
273
++ basic/source/inc/macfix.hxx
Lines 61-68 Link Here
61
61
62
// Some compilers expect a '&' operator before the member function name.
62
// Some compilers expect a '&' operator before the member function name.
63
63
64
#if defined(MAC) || defined(HPUX) || defined(MACOSX) || (defined(GCC) && __GNUC__ >= 3)
64
#if defined(MAC) || defined(HPUX) || defined(MACOSX)
65
#define MEMBER(name) &##name
65
#define MEMBER(name) &##name
66
#elif (defined(GCC) && __GNUC__ >= 3)
67
#define MEMBER(name) &name
66
#else
68
#else
67
#define MEMBER(name) name
69
#define MEMBER(name) name
68
#endif
70
#endif
69
-- chaos/source/store/cntstgnd.cxx
71
++ chaos/source/store/cntstgnd.cxx
Lines 172-178 Link Here
172
#ifdef MACOSX
172
#ifdef MACOSX
173
#define CNT_FSYS_ROOT_CACHE_URL STG_PROTOCOL_CACHE"file:///"
173
#define CNT_FSYS_ROOT_CACHE_URL STG_PROTOCOL_CACHE"file:///"
174
#else
174
#else
175
#define CNT_FSYS_ROOT_CACHE_URL STG_PROTOCOL_CACHE##"file:///"
175
#define CNT_FSYS_ROOT_CACHE_URL STG_PROTOCOL_CACHE"file:///"
176
#endif
176
#endif
177
177
178
#define STG_NEVER_DELETE 0x80000000
178
#define STG_NEVER_DELETE 0x80000000
179
-- connectivity/inc/connectivity/sqlnode.hxx
179
++ connectivity/inc/connectivity/sqlnode.hxx
Lines 404-410 Link Here
404
	}	
404
	}	
405
405
406
	// Utility-Methoden zum Abfragen auf bestimmte Rules, Token oder Punctuation:
406
	// Utility-Methoden zum Abfragen auf bestimmte Rules, Token oder Punctuation:
407
	#define SQL_ISRULE(pParseNode, eRule) 	((pParseNode)->isRule() && (pParseNode)->getRuleID() == OSQLParser::RuleID(OSQLParseNode::##eRule))
407
	#define SQL_ISRULE(pParseNode, eRule) 	((pParseNode)->isRule() && (pParseNode)->getRuleID() == OSQLParser::RuleID(OSQLParseNode::eRule))
408
	#define SQL_ISTOKEN(pParseNode, token) ((pParseNode)->isToken() && (pParseNode)->getTokenID() == SQL_TOKEN_##token)
408
	#define SQL_ISTOKEN(pParseNode, token) ((pParseNode)->isToken() && (pParseNode)->getTokenID() == SQL_TOKEN_##token)
409
	#define SQL_ISPUNCTUATION(pParseNode, aString) ((pParseNode)->getNodeType() == SQL_NODE_PUNCTUATION && !(pParseNode)->getTokenValue().compareToAscii(aString))
409
	#define SQL_ISPUNCTUATION(pParseNode, aString) ((pParseNode)->getNodeType() == SQL_NODE_PUNCTUATION && !(pParseNode)->getTokenValue().compareToAscii(aString))
410
}
410
}
411
-- dbaccess/source/inc/apitools.hxx
411
++ dbaccess/source/inc/apitools.hxx
Lines 372-401 Link Here
372
372
373
//----------------------------------------------------------------------------------
373
//----------------------------------------------------------------------------------
374
#define DECL_PROP1(varname, type, attrib1)	\
374
#define DECL_PROP1(varname, type, attrib1)	\
375
	DECL_PROP_IMPL(varname, ::getCppuType((const type *)0)) ::com::sun::star::beans::PropertyAttribute::##attrib1)
375
	DECL_PROP_IMPL(varname, ::getCppuType((const type *)0)) ::com::sun::star::beans::PropertyAttribute::attrib1)
376
//----------------------------------------------------------------------------------
376
//----------------------------------------------------------------------------------
377
#define DECL_PROP1_BOOL(varname, attrib1)	\
377
#define DECL_PROP1_BOOL(varname, attrib1)	\
378
	DECL_PROP_IMPL(varname, ::getBooleanCppuType()) ::com::sun::star::beans::PropertyAttribute::##attrib1)
378
	DECL_PROP_IMPL(varname, ::getBooleanCppuType()) ::com::sun::star::beans::PropertyAttribute::attrib1)
379
//----------------------------------------------------------------------------------
379
//----------------------------------------------------------------------------------
380
#define DECL_PROP1_IFACE(varname, iface, attrib1)	\
380
#define DECL_PROP1_IFACE(varname, iface, attrib1)	\
381
	DECL_PROP_IMPL(varname, ::getCppuType(static_cast< ::com::sun::star::uno::Reference< iface >* >(NULL))) ::com::sun::star::beans::PropertyAttribute::##attrib1)
381
	DECL_PROP_IMPL(varname, ::getCppuType(static_cast< ::com::sun::star::uno::Reference< iface >* >(NULL))) ::com::sun::star::beans::PropertyAttribute::attrib1)
382
//----------------------------------------------------------------------------------
382
//----------------------------------------------------------------------------------
383
#define DECL_PROP2_IFACE(varname, iface, attrib1, attrib2)	\
383
#define DECL_PROP2_IFACE(varname, iface, attrib1, attrib2)	\
384
	DECL_PROP_IMPL(varname, ::getCppuType(static_cast< ::com::sun::star::uno::Reference< iface >* >(NULL))) ::com::sun::star::beans::PropertyAttribute::##attrib1 | ::com::sun::star::beans::PropertyAttribute::##attrib2)
384
	DECL_PROP_IMPL(varname, ::getCppuType(static_cast< ::com::sun::star::uno::Reference< iface >* >(NULL))) ::com::sun::star::beans::PropertyAttribute::attrib1 | ::com::sun::star::beans::PropertyAttribute::attrib2)
385
385
386
//----------------------------------------------------------------------------------
386
//----------------------------------------------------------------------------------
387
#define DECL_PROP2(varname, type, attrib1, attrib2)	\
387
#define DECL_PROP2(varname, type, attrib1, attrib2)	\
388
	DECL_PROP_IMPL(varname, ::getCppuType((const type *)0)) ::com::sun::star::beans::PropertyAttribute::##attrib1 | ::com::sun::star::beans::PropertyAttribute::##attrib2)
388
	DECL_PROP_IMPL(varname, ::getCppuType((const type *)0)) ::com::sun::star::beans::PropertyAttribute::attrib1 | ::com::sun::star::beans::PropertyAttribute::attrib2)
389
//----------------------------------------------------------------------------------
389
//----------------------------------------------------------------------------------
390
#define DECL_PROP2_BOOL(varname, attrib1, attrib2)	\
390
#define DECL_PROP2_BOOL(varname, attrib1, attrib2)	\
391
	DECL_PROP_IMPL(varname, ::getBooleanCppuType()) ::com::sun::star::beans::PropertyAttribute::##attrib1 | ::com::sun::star::beans::PropertyAttribute::##attrib2)
391
	DECL_PROP_IMPL(varname, ::getBooleanCppuType()) ::com::sun::star::beans::PropertyAttribute::attrib1 | ::com::sun::star::beans::PropertyAttribute::attrib2)
392
392
393
//----------------------------------------------------------------------------------
393
//----------------------------------------------------------------------------------
394
#define DECL_PROP3(varname, type, attrib1, attrib2, attrib3)	\
394
#define DECL_PROP3(varname, type, attrib1, attrib2, attrib3)	\
395
	DECL_PROP_IMPL(varname, ::getCppuType((const type *)0)) ::com::sun::star::beans::PropertyAttribute::##attrib1 | ::com::sun::star::beans::PropertyAttribute::##attrib2 | ::com::sun::star::beans::PropertyAttribute::##attrib3)
395
	DECL_PROP_IMPL(varname, ::getCppuType((const type *)0)) ::com::sun::star::beans::PropertyAttribute::attrib1 | ::com::sun::star::beans::PropertyAttribute::attrib2 | ::com::sun::star::beans::PropertyAttribute::attrib3)
396
//----------------------------------------------------------------------------------
396
//----------------------------------------------------------------------------------
397
#define DECL_PROP3_BOOL(varname, attrib1, attrib2, attrib3)	\
397
#define DECL_PROP3_BOOL(varname, attrib1, attrib2, attrib3)	\
398
	DECL_PROP_IMPL(varname, ::getBooleanCppuType()) ::com::sun::star::beans::PropertyAttribute::##attrib1 | ::com::sun::star::beans::PropertyAttribute::##attrib2 | ::com::sun::star::beans::PropertyAttribute::##attrib3)
398
	DECL_PROP_IMPL(varname, ::getBooleanCppuType()) ::com::sun::star::beans::PropertyAttribute::attrib1 | ::com::sun::star::beans::PropertyAttribute::attrib2 | ::com::sun::star::beans::PropertyAttribute::attrib3)
399
399
400
400
401
//----------------------------------------------------------------------------------
401
//----------------------------------------------------------------------------------
402
-- desktop/source/app/app.cxx
402
++ desktop/source/app/app.cxx
Lines 269-275 Link Here
269
#include <vos/profile.hxx>
269
#include <vos/profile.hxx>
270
#endif
270
#endif
271
271
272
#define DEFINE_CONST_UNICODE(CONSTASCII)        UniString(RTL_CONSTASCII_USTRINGPARAM(CONSTASCII##))
272
#define DEFINE_CONST_UNICODE(CONSTASCII)        UniString(RTL_CONSTASCII_USTRINGPARAM(CONSTASCII))
273
#define U2S(STRING)								::rtl::OUStringToOString(STRING, RTL_TEXTENCODING_UTF8)
273
#define U2S(STRING)								::rtl::OUStringToOString(STRING, RTL_TEXTENCODING_UTF8)
274
274
275
using namespace vos;
275
using namespace vos;
276
-- extensions/source/inimanager/iniregister.cxx
276
++ extensions/source/inimanager/iniregister.cxx
Lines 135-141 Link Here
135
	static Reference< XInterface > SAL_CALL CLASS##_createInstance ( const Reference< XMultiServiceFactory >& rServiceManager ) throw ( Exception )	\
135
	static Reference< XInterface > SAL_CALL CLASS##_createInstance ( const Reference< XMultiServiceFactory >& rServiceManager ) throw ( Exception )	\
136
	{																																		\
136
	{																																		\
137
		AS_DBG_OUT ( "\tCREATEINSTANCE():\tOK\n" )																							\
137
		AS_DBG_OUT ( "\tCREATEINSTANCE():\tOK\n" )																							\
138
		return Reference< XInterface >( *new CLASS##( rServiceManager ) );																	\
138
		return Reference< XInterface >( *new CLASS( rServiceManager ) );																	\
139
	}
139
	}
140
140
141
//******************************************************************************************************************************
141
//******************************************************************************************************************************
Lines 153-159 Link Here
153
			AS_DBG_OUT ( "\tCOMPONENT_INFO():\t\txkey is valid ...\n" )													\
153
			AS_DBG_OUT ( "\tCOMPONENT_INFO():\t\txkey is valid ...\n" )													\
154
			/* Build new keyname */																						\
154
			/* Build new keyname */																						\
155
			sKeyName	 =	OUString::createFromAscii( "/" )			;		                   						\
155
			sKeyName	 =	OUString::createFromAscii( "/" )			;		                   						\
156
			sKeyName	+=	CLASS##::impl_getStaticImplementationName()	;   	                						\
156
			sKeyName	+=	CLASS::impl_getStaticImplementationName()	;   	                						\
157
			sKeyName	+=	OUString::createFromAscii( "/UNO/SERVICES" );       	            						\
157
			sKeyName	+=	OUString::createFromAscii( "/UNO/SERVICES" );       	            						\
158
																														\
158
																														\
159
			/* Create new key with new name. */																			\
159
			/* Create new key with new name. */																			\
Lines 164-170 Link Here
164
			{                                                                                       					\
164
			{                                                                                       					\
165
				AS_DBG_OUT ( "\tCOMPONENT_INFO():\t\txNewkey is valid ...\n" )											\
165
				AS_DBG_OUT ( "\tCOMPONENT_INFO():\t\txNewkey is valid ...\n" )											\
166
				/* Get information about supported services. */															\
166
				/* Get information about supported services. */															\
167
				seqServiceNames	=	CLASS##::impl_getStaticSupportedServiceNames()	;           						\
167
				seqServiceNames	=	CLASS::impl_getStaticSupportedServiceNames()	;           						\
168
				pArray			=	seqServiceNames.getArray()						;           						\
168
				pArray			=	seqServiceNames.getArray()						;           						\
169
				nLength			=	seqServiceNames.getLength()						;           						\
169
				nLength			=	seqServiceNames.getLength()						;           						\
170
				nCounter		=	0												;           						\
170
				nCounter		=	0												;           						\
Lines 199-207 Link Here
199
	xFactory = Reference< XSingleServiceFactory >																		\
199
	xFactory = Reference< XSingleServiceFactory >																		\
200
					(																									\
200
					(																									\
201
						cppu::createOneInstanceFactory	(	xServiceManager										,		\
201
						cppu::createOneInstanceFactory	(	xServiceManager										,		\
202
															CLASS##::impl_getStaticImplementationName		()	,		\
202
															CLASS::impl_getStaticImplementationName		()	,		\
203
															CLASS##_createInstance								,		\
203
															CLASS##_createInstance								,		\
204
															CLASS##::impl_getStaticSupportedServiceNames	()	)		\
204
															CLASS::impl_getStaticSupportedServiceNames	()	)		\
205
					) ;																									\
205
					) ;																									\
206
	AS_DBG_OUT ( "\tCREATEFACTORY_ONEINSTANCE():\t[end]\n" )
206
	AS_DBG_OUT ( "\tCREATEFACTORY_ONEINSTANCE():\t[end]\n" )
207
207
Lines 213-240 Link Here
213
	xFactory = Reference< XSingleServiceFactory >																		\
213
	xFactory = Reference< XSingleServiceFactory >																		\
214
					(																									\
214
					(																									\
215
						cppu::createSingleFactory	(	xServiceManager										,			\
215
						cppu::createSingleFactory	(	xServiceManager										,			\
216
														CLASS##::impl_getStaticImplementationName		()	,			\
216
														CLASS::impl_getStaticImplementationName		()	,			\
217
														CLASS##_createInstance								,			\
217
														CLASS##_createInstance								,			\
218
														CLASS##::impl_getStaticSupportedServiceNames	()	)			\
218
														CLASS::impl_getStaticSupportedServiceNames	()	)			\
219
					) ;																									\
219
					) ;																									\
220
	AS_DBG_OUT ( "\tCREATEFACTORY_SINGLE():\t[end]\n" )
220
	AS_DBG_OUT ( "\tCREATEFACTORY_SINGLE():\t[end]\n" )
221
221
222
//******************************************************************************************************************************
222
//******************************************************************************************************************************
223
#define	IF_NAME_CREATECOMPONENTFACTORY_ONEINSTANCE(CLASS)																\
223
#define	IF_NAME_CREATECOMPONENTFACTORY_ONEINSTANCE(CLASS)																\
224
																														\
224
																														\
225
	if ( CLASS##::impl_getStaticImplementationName().equals( OUString::createFromAscii( pImplementationName ) ) )		\
225
	if ( CLASS::impl_getStaticImplementationName().equals( OUString::createFromAscii( pImplementationName ) ) )		\
226
	{																													\
226
	{																													\
227
		AS_DBG_OUT ( "\tIF_NAME_CREATECOMPONENTFACTORY_ONEINSTANCE():\timplementationname found\n" )					\
227
		AS_DBG_OUT ( "\tIF_NAME_CREATECOMPONENTFACTORY_ONEINSTANCE():\timplementationname found\n" )					\
228
		CREATEFACTORY_ONEINSTANCE ( CLASS## )																			\
228
		CREATEFACTORY_ONEINSTANCE ( CLASS )																			\
229
	}
229
	}
230
230
231
//******************************************************************************************************************************
231
//******************************************************************************************************************************
232
#define	IF_NAME_CREATECOMPONENTFACTORY_SINGLE(CLASS)																	\
232
#define	IF_NAME_CREATECOMPONENTFACTORY_SINGLE(CLASS)																	\
233
																														\
233
																														\
234
	if ( CLASS##::impl_getStaticImplementationName().equals( OUString::createFromAscii( pImplementationName ) ) )		\
234
	if ( CLASS::impl_getStaticImplementationName().equals( OUString::createFromAscii( pImplementationName ) ) )		\
235
	{																													\
235
	{																													\
236
		AS_DBG_OUT ( "\tIF_NAME_CREATECOMPONENTFACTORY_SINGLE():\timplementationname found\n" )							\
236
		AS_DBG_OUT ( "\tIF_NAME_CREATECOMPONENTFACTORY_SINGLE():\timplementationname found\n" )							\
237
		CREATEFACTORY_SINGLE ( CLASS## )																				\
237
		CREATEFACTORY_SINGLE ( CLASS )																				\
238
	}
238
	}
239
239
240
//______________________________________________________________________________________________________________
240
//______________________________________________________________________________________________________________
241
-- offmgr/source/offapp/app/appctor.cxx
241
++ offmgr/source/offapp/app/appctor.cxx
Lines 110-116 Link Here
110
#include "app.hxx"
110
#include "app.hxx"
111
#include "appimp.hxx"
111
#include "appimp.hxx"
112
112
113
#define DEFINE_CONST_UNICODE(CONSTASCII)        UniString(RTL_CONSTASCII_USTRINGPARAM(CONSTASCII##))
113
#define DEFINE_CONST_UNICODE(CONSTASCII)        UniString(RTL_CONSTASCII_USTRINGPARAM(CONSTASCII))
114
114
115
static SvxDialogDll*   pSvxDLL  = NULL;
115
static SvxDialogDll*   pSvxDLL  = NULL;
116
static BasicDLL*       pBasic   = NULL;
116
static BasicDLL*       pBasic   = NULL;
117
-- rsc/source/parser/rscdb.cxx
117
++ rsc/source/parser/rscdb.cxx
Lines 247-253 Link Here
247
		return NULL;
247
		return NULL;
248
248
249
#define ELSE_IF( a )				\
249
#define ELSE_IF( a )				\
250
	else if( a##.GetId() == nId )	\
250
	else if( a.GetId() == nId )	\
251
		return &a;					\
251
		return &a;					\
252
252
253
	if( aBool.GetId() == nId )
253
	if( aBool.GetId() == nId )
254
-- sal/osl/unx/system.h
254
++ sal/osl/unx/system.h
Lines 460-473 Link Here
460
460
461
#ifndef NORMALIZE_TIMESPEC
461
#ifndef NORMALIZE_TIMESPEC
462
#	define NORMALIZE_TIMESPEC(timespec) \
462
#	define NORMALIZE_TIMESPEC(timespec) \
463
  		timespec##.tv_sec  += timespec##.tv_nsec / 1000000000; \
463
  		timespec.tv_sec  += timespec.tv_nsec / 1000000000; \
464
  		timespec##.tv_nsec %= 1000000000; 
464
  		timespec.tv_nsec %= 1000000000; 
465
#endif
465
#endif
466
466
467
#ifndef SET_TIMESPEC
467
#ifndef SET_TIMESPEC
468
#	define SET_TIMESPEC(timespec, sec, nsec) \
468
#	define SET_TIMESPEC(timespec, sec, nsec) \
469
  		timespec##.tv_sec  = (sec);  \
469
  		timespec.tv_sec  = (sec);  \
470
  		timespec##.tv_nsec = (nsec); \
470
  		timespec.tv_nsec = (nsec); \
471
		NORMALIZE_TIMESPEC(timespec);
471
		NORMALIZE_TIMESPEC(timespec);
472
#endif
472
#endif
473
473
474
-- sc/inc/miscuno.hxx
474
++ sc/inc/miscuno.hxx
Lines 87-129 Link Here
87
87
88
88
89
#define SC_SIMPLE_SERVICE_INFO( ClassName, ClassNameAscii, ServiceAscii )			 \
89
#define SC_SIMPLE_SERVICE_INFO( ClassName, ClassNameAscii, ServiceAscii )			 \
90
::rtl::OUString SAL_CALL ClassName##::getImplementationName()						 \
90
::rtl::OUString SAL_CALL ClassName::getImplementationName()						 \
91
	throw(::com::sun::star::uno::RuntimeException)									 \
91
	throw(::com::sun::star::uno::RuntimeException)									 \
92
{																					 \
92
{																					 \
93
	return ::rtl::OUString::createFromAscii(ClassNameAscii##);						 \
93
	return ::rtl::OUString::createFromAscii(ClassNameAscii);						 \
94
}																					 \
94
}																					 \
95
sal_Bool SAL_CALL ClassName##::supportsService( const ::rtl::OUString& ServiceName ) \
95
sal_Bool SAL_CALL ClassName::supportsService( const ::rtl::OUString& ServiceName ) \
96
	throw(::com::sun::star::uno::RuntimeException)									 \
96
	throw(::com::sun::star::uno::RuntimeException)									 \
97
{																					 \
97
{																					 \
98
	return !ServiceName.compareToAscii(ServiceAscii);								 \
98
	return !ServiceName.compareToAscii(ServiceAscii);								 \
99
}																					 \
99
}																					 \
100
::com::sun::star::uno::Sequence< ::rtl::OUString >									 \
100
::com::sun::star::uno::Sequence< ::rtl::OUString >									 \
101
	SAL_CALL ClassName##::getSupportedServiceNames(void)							 \
101
	SAL_CALL ClassName::getSupportedServiceNames(void)							 \
102
	throw(::com::sun::star::uno::RuntimeException)									 \
102
	throw(::com::sun::star::uno::RuntimeException)									 \
103
{																					 \
103
{																					 \
104
	::com::sun::star::uno::Sequence< ::rtl::OUString > aRet(1);						 \
104
	::com::sun::star::uno::Sequence< ::rtl::OUString > aRet(1);						 \
105
	::rtl::OUString* pArray = aRet.getArray();										 \
105
	::rtl::OUString* pArray = aRet.getArray();										 \
106
	pArray[0] = ::rtl::OUString::createFromAscii(ServiceAscii##);					 \
106
	pArray[0] = ::rtl::OUString::createFromAscii(ServiceAscii);					 \
107
	return aRet;																	 \
107
	return aRet;																	 \
108
}
108
}
109
109
110
#define SC_IMPL_DUMMY_PROPERTY_LISTENER( ClassName )								\
110
#define SC_IMPL_DUMMY_PROPERTY_LISTENER( ClassName )								\
111
	void SAL_CALL ClassName##::addPropertyChangeListener( const rtl::OUString&,		\
111
	void SAL_CALL ClassName::addPropertyChangeListener( const rtl::OUString&,		\
112
							const uno::Reference<beans::XPropertyChangeListener>&)	\
112
							const uno::Reference<beans::XPropertyChangeListener>&)	\
113
							throw(beans::UnknownPropertyException,					\
113
							throw(beans::UnknownPropertyException,					\
114
							lang::WrappedTargetException, uno::RuntimeException)	\
114
							lang::WrappedTargetException, uno::RuntimeException)	\
115
	{ DBG_ERROR("not implemented"); }												\
115
	{ DBG_ERROR("not implemented"); }												\
116
	void SAL_CALL ClassName##::removePropertyChangeListener( const rtl::OUString&,	\
116
	void SAL_CALL ClassName::removePropertyChangeListener( const rtl::OUString&,	\
117
							const uno::Reference<beans::XPropertyChangeListener>&)	\
117
							const uno::Reference<beans::XPropertyChangeListener>&)	\
118
							throw(beans::UnknownPropertyException,					\
118
							throw(beans::UnknownPropertyException,					\
119
							lang::WrappedTargetException, uno::RuntimeException)	\
119
							lang::WrappedTargetException, uno::RuntimeException)	\
120
	{ DBG_ERROR("not implemented"); }												\
120
	{ DBG_ERROR("not implemented"); }												\
121
	void SAL_CALL ClassName##::addVetoableChangeListener( const rtl::OUString&,		\
121
	void SAL_CALL ClassName::addVetoableChangeListener( const rtl::OUString&,		\
122
							const uno::Reference<beans::XVetoableChangeListener>&)	\
122
							const uno::Reference<beans::XVetoableChangeListener>&)	\
123
							throw(beans::UnknownPropertyException,					\
123
							throw(beans::UnknownPropertyException,					\
124
							lang::WrappedTargetException, uno::RuntimeException)	\
124
							lang::WrappedTargetException, uno::RuntimeException)	\
125
	{ DBG_ERROR("not implemented"); }												\
125
	{ DBG_ERROR("not implemented"); }												\
126
	void SAL_CALL ClassName##::removeVetoableChangeListener( const rtl::OUString&,	\
126
	void SAL_CALL ClassName::removeVetoableChangeListener( const rtl::OUString&,	\
127
							const uno::Reference<beans::XVetoableChangeListener>&)	\
127
							const uno::Reference<beans::XVetoableChangeListener>&)	\
128
							throw(beans::UnknownPropertyException,					\
128
							throw(beans::UnknownPropertyException,					\
129
							lang::WrappedTargetException, uno::RuntimeException)	\
129
							lang::WrappedTargetException, uno::RuntimeException)	\
130
-- setup2/source/service/installer.cxx
130
++ setup2/source/service/installer.cxx
Lines 126-132 Link Here
126
using namespace ::com::sun::star::registry;
126
using namespace ::com::sun::star::registry;
127
using namespace ::cppu;
127
using namespace ::cppu;
128
128
129
#define DEFINE_CONST_UNICODE(CONSTASCII)        UniString(RTL_CONSTASCII_USTRINGPARAM(CONSTASCII##))
129
#define DEFINE_CONST_UNICODE(CONSTASCII)        UniString(RTL_CONSTASCII_USTRINGPARAM(CONSTASCII))
130
130
131
char const INSTALLER_INITFILENAME[]				= "initialize.ini";
131
char const INSTALLER_INITFILENAME[]				= "initialize.ini";
132
char const INSTALLER_SECTION_UNOCOMPONENTS[]	= "UnoComponents";
132
char const INSTALLER_SECTION_UNOCOMPONENTS[]	= "UnoComponents";
133
-- sfx2/inc/sfxuno.hxx
133
++ sfx2/inc/sfxuno.hxx
Lines 276-282 Link Here
276
		/* Attention: Don't use mutex or guard in this method!!! Is a method of XInterface.	*/														\
276
		/* Attention: Don't use mutex or guard in this method!!! Is a method of XInterface.	*/														\
277
		/* Ask for my own supported interfaces ...											*/														\
277
		/* Ask for my own supported interfaces ...											*/														\
278
		UNOANY aReturn	( ::cppu::queryInterface(	rType,																							\
278
		UNOANY aReturn	( ::cppu::queryInterface(	rType,																							\
279
													IMPLINTERFACES##																				\
279
													IMPLINTERFACES																				\
280
												)																									\
280
												)																									\
281
						);																															\
281
						);																															\
282
		/* If searched interface supported by this class ... */																						\
282
		/* If searched interface supported by this class ... */																						\
Lines 297-409 Link Here
297
297
298
#define	SFX_IMPL_INTERFACE_1( INTERFACE1 )																											\
298
#define	SFX_IMPL_INTERFACE_1( INTERFACE1 )																											\
299
	SFX_IMPL_INTERFACE_0,																															\
299
	SFX_IMPL_INTERFACE_0,																															\
300
	static_cast< INTERFACE1##* >( this )
300
	static_cast< INTERFACE1* >( this )
301
301
302
#define	SFX_IMPL_INTERFACE_2( INTERFACE1, INTERFACE2 )																								\
302
#define	SFX_IMPL_INTERFACE_2( INTERFACE1, INTERFACE2 )																								\
303
	SFX_IMPL_INTERFACE_1( INTERFACE1## ),																											\
303
	SFX_IMPL_INTERFACE_1( INTERFACE1 ),																											\
304
	static_cast< INTERFACE2##* >( this )
304
	static_cast< INTERFACE2* >( this )
305
305
306
#define	SFX_IMPL_INTERFACE_3( INTERFACE1, INTERFACE2, INTERFACE3 )																					\
306
#define	SFX_IMPL_INTERFACE_3( INTERFACE1, INTERFACE2, INTERFACE3 )																					\
307
	SFX_IMPL_INTERFACE_2( INTERFACE1##, INTERFACE2## ),																								\
307
	SFX_IMPL_INTERFACE_2( INTERFACE1, INTERFACE2 ),																								\
308
	static_cast< INTERFACE3##* >( this )
308
	static_cast< INTERFACE3* >( this )
309
309
310
#define	SFX_IMPL_INTERFACE_4( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4 )																		\
310
#define	SFX_IMPL_INTERFACE_4( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4 )																		\
311
	SFX_IMPL_INTERFACE_3( INTERFACE1##, INTERFACE2##, INTERFACE3## ),																				\
311
	SFX_IMPL_INTERFACE_3( INTERFACE1, INTERFACE2, INTERFACE3 ),																				\
312
	static_cast< INTERFACE4##* >( this )
312
	static_cast< INTERFACE4* >( this )
313
313
314
#define	SFX_IMPL_INTERFACE_5( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5 )															\
314
#define	SFX_IMPL_INTERFACE_5( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5 )															\
315
	SFX_IMPL_INTERFACE_4( INTERFACE1##, INTERFACE2##, INTERFACE3##, INTERFACE4## ),																	\
315
	SFX_IMPL_INTERFACE_4( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4 ),																	\
316
	static_cast< INTERFACE5##* >( this )
316
	static_cast< INTERFACE5* >( this )
317
317
318
#define	SFX_IMPL_INTERFACE_6( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6 )												\
318
#define	SFX_IMPL_INTERFACE_6( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6 )												\
319
	SFX_IMPL_INTERFACE_5( INTERFACE1##, INTERFACE2##, INTERFACE3##, INTERFACE4##, INTERFACE5## ),													\
319
	SFX_IMPL_INTERFACE_5( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5 ),													\
320
	static_cast< INTERFACE6##* >( this )
320
	static_cast< INTERFACE6* >( this )
321
321
322
#define	SFX_IMPL_INTERFACE_7( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7 )																\
322
#define	SFX_IMPL_INTERFACE_7( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7 )																\
323
	SFX_IMPL_INTERFACE_6( INTERFACE1##, INTERFACE2##, INTERFACE3##, INTERFACE4##, INTERFACE5##, INTERFACE6## ),																	\
323
	SFX_IMPL_INTERFACE_6( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6 ),																	\
324
	static_cast< INTERFACE7##* >( this )
324
	static_cast< INTERFACE7* >( this )
325
325
326
#define	SFX_IMPL_INTERFACE_8( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8 )													\
326
#define	SFX_IMPL_INTERFACE_8( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8 )													\
327
	SFX_IMPL_INTERFACE_7( INTERFACE1##, INTERFACE2##, INTERFACE3##, INTERFACE4##, INTERFACE5##, INTERFACE6##, INTERFACE7## ),													\
327
	SFX_IMPL_INTERFACE_7( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7 ),													\
328
	static_cast< INTERFACE8##* >( this )
328
	static_cast< INTERFACE8* >( this )
329
329
330
#define	SFX_IMPL_INTERFACE_9( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9 )										\
330
#define	SFX_IMPL_INTERFACE_9( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9 )										\
331
	SFX_IMPL_INTERFACE_8( INTERFACE1##, INTERFACE2##, INTERFACE3##, INTERFACE4##, INTERFACE5##, INTERFACE6##, INTERFACE7##, INTERFACE8## ),										\
331
	SFX_IMPL_INTERFACE_8( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8 ),										\
332
	static_cast< INTERFACE9##* >( this )
332
	static_cast< INTERFACE9* >( this )
333
333
334
#define	SFX_IMPL_INTERFACE_10( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10 )						\
334
#define	SFX_IMPL_INTERFACE_10( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10 )						\
335
	SFX_IMPL_INTERFACE_9( INTERFACE1##, INTERFACE2##, INTERFACE3##, INTERFACE4##, INTERFACE5##, INTERFACE6##, INTERFACE7##, INTERFACE8##, INTERFACE9## ),						\
335
	SFX_IMPL_INTERFACE_9( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9 ),						\
336
	static_cast< INTERFACE10##* >( this )
336
	static_cast< INTERFACE10* >( this )
337
337
338
#define	SFX_IMPL_INTERFACE_11( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10, INTERFACE11 )			\
338
#define	SFX_IMPL_INTERFACE_11( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10, INTERFACE11 )			\
339
	SFX_IMPL_INTERFACE_10( INTERFACE1##, INTERFACE2##, INTERFACE3##, INTERFACE4##, INTERFACE5##, INTERFACE6##, INTERFACE7##, INTERFACE8##, INTERFACE9##, INTERFACE10## ),		\
339
	SFX_IMPL_INTERFACE_10( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10 ),		\
340
	static_cast< INTERFACE11##* >( this )
340
	static_cast< INTERFACE11* >( this )
341
341
342
#define	SFX_IMPL_INTERFACE_12( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10, INTERFACE11, INTERFACE12 )			\
342
#define	SFX_IMPL_INTERFACE_12( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10, INTERFACE11, INTERFACE12 )			\
343
	SFX_IMPL_INTERFACE_11( INTERFACE1##, INTERFACE2##, INTERFACE3##, INTERFACE4##, INTERFACE5##, INTERFACE6##, INTERFACE7##, INTERFACE8##, INTERFACE9##, INTERFACE10##, INTERFACE11## ),		\
343
	SFX_IMPL_INTERFACE_11( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10, INTERFACE11 ),		\
344
	static_cast< INTERFACE12##* >( this )
344
	static_cast< INTERFACE12* >( this )
345
345
346
#define	SFX_IMPL_INTERFACE_13( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10, INTERFACE11, INTERFACE12, INTERFACE13 )			\
346
#define	SFX_IMPL_INTERFACE_13( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10, INTERFACE11, INTERFACE12, INTERFACE13 )			\
347
	SFX_IMPL_INTERFACE_12( INTERFACE1##, INTERFACE2##, INTERFACE3##, INTERFACE4##, INTERFACE5##, INTERFACE6##, INTERFACE7##, INTERFACE8##, INTERFACE9##, INTERFACE10##, INTERFACE11##, INTERFACE12## ),		\
347
	SFX_IMPL_INTERFACE_12( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10, INTERFACE11, INTERFACE12 ),		\
348
	static_cast< INTERFACE13##* >( this )
348
	static_cast< INTERFACE13* >( this )
349
/*_________________________________________________________________________________________________________________________*/
349
/*_________________________________________________________________________________________________________________________*/
350
350
351
// Follow macros can used directly :-)
351
// Follow macros can used directly :-)
352
//	implementation of XInterface with 0 additional interface for queryInterface()
352
//	implementation of XInterface with 0 additional interface for queryInterface()
353
#define SFX_IMPL_XINTERFACE_0( IMPLCLASS, BASECLASS )																								\
353
#define SFX_IMPL_XINTERFACE_0( IMPLCLASS, BASECLASS )																								\
354
	SFX_IMPL_XINTERFACE_BASE( IMPLCLASS##, BASECLASS##, SFX_IMPL_INTERFACE_0 )
354
	SFX_IMPL_XINTERFACE_BASE( IMPLCLASS, BASECLASS, SFX_IMPL_INTERFACE_0 )
355
355
356
//	implementation of XInterface with 1 additional interface for queryInterface()
356
//	implementation of XInterface with 1 additional interface for queryInterface()
357
#define SFX_IMPL_XINTERFACE_1( IMPLCLASS, BASECLASS, INTERFACE1 )																					\
357
#define SFX_IMPL_XINTERFACE_1( IMPLCLASS, BASECLASS, INTERFACE1 )																					\
358
	SFX_IMPL_XINTERFACE_BASE( IMPLCLASS##, BASECLASS##, SFX_IMPL_INTERFACE_1( INTERFACE1## ) )
358
	SFX_IMPL_XINTERFACE_BASE( IMPLCLASS, BASECLASS, SFX_IMPL_INTERFACE_1( INTERFACE1 ) )
359
359
360
//	implementation of XInterface with 2 additional interfaces for queryInterface()
360
//	implementation of XInterface with 2 additional interfaces for queryInterface()
361
#define SFX_IMPL_XINTERFACE_2( IMPLCLASS, BASECLASS, INTERFACE1, INTERFACE2 )																		\
361
#define SFX_IMPL_XINTERFACE_2( IMPLCLASS, BASECLASS, INTERFACE1, INTERFACE2 )																		\
362
	SFX_IMPL_XINTERFACE_BASE( IMPLCLASS##, BASECLASS##, SFX_IMPL_INTERFACE_2( INTERFACE1##, INTERFACE2## ) )
362
	SFX_IMPL_XINTERFACE_BASE( IMPLCLASS, BASECLASS, SFX_IMPL_INTERFACE_2( INTERFACE1, INTERFACE2 ) )
363
363
364
//	implementation of XInterface with 3 additional interfaces for queryInterface()
364
//	implementation of XInterface with 3 additional interfaces for queryInterface()
365
#define SFX_IMPL_XINTERFACE_3( IMPLCLASS, BASECLASS, INTERFACE1, INTERFACE2, INTERFACE3 )															\
365
#define SFX_IMPL_XINTERFACE_3( IMPLCLASS, BASECLASS, INTERFACE1, INTERFACE2, INTERFACE3 )															\
366
	SFX_IMPL_XINTERFACE_BASE( IMPLCLASS##, BASECLASS##, SFX_IMPL_INTERFACE_3( INTERFACE1##, INTERFACE2##, INTERFACE3## ) )
366
	SFX_IMPL_XINTERFACE_BASE( IMPLCLASS, BASECLASS, SFX_IMPL_INTERFACE_3( INTERFACE1, INTERFACE2, INTERFACE3 ) )
367
367
368
//	implementation of XInterface with 4 additional interfaces for queryInterface()
368
//	implementation of XInterface with 4 additional interfaces for queryInterface()
369
#define SFX_IMPL_XINTERFACE_4( IMPLCLASS, BASECLASS, INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4 )												\
369
#define SFX_IMPL_XINTERFACE_4( IMPLCLASS, BASECLASS, INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4 )												\
370
	SFX_IMPL_XINTERFACE_BASE( IMPLCLASS##, BASECLASS##, SFX_IMPL_INTERFACE_4( INTERFACE1##, INTERFACE2##, INTERFACE3##, INTERFACE4## ) )
370
	SFX_IMPL_XINTERFACE_BASE( IMPLCLASS, BASECLASS, SFX_IMPL_INTERFACE_4( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4 ) )
371
371
372
//	implementation of XInterface with 5 additional interfaces for queryInterface()
372
//	implementation of XInterface with 5 additional interfaces for queryInterface()
373
#define SFX_IMPL_XINTERFACE_5( IMPLCLASS, BASECLASS, INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5 )																																\
373
#define SFX_IMPL_XINTERFACE_5( IMPLCLASS, BASECLASS, INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5 )																																\
374
	SFX_IMPL_XINTERFACE_BASE( IMPLCLASS##, BASECLASS##, SFX_IMPL_INTERFACE_5( INTERFACE1##, INTERFACE2##, INTERFACE3##, INTERFACE4##, INTERFACE5## ) )
374
	SFX_IMPL_XINTERFACE_BASE( IMPLCLASS, BASECLASS, SFX_IMPL_INTERFACE_5( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5 ) )
375
375
376
//	implementation of XInterface with 6 additional interfaces for queryInterface()
376
//	implementation of XInterface with 6 additional interfaces for queryInterface()
377
#define SFX_IMPL_XINTERFACE_6( IMPLCLASS, BASECLASS, INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6 )																													\
377
#define SFX_IMPL_XINTERFACE_6( IMPLCLASS, BASECLASS, INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6 )																													\
378
	SFX_IMPL_XINTERFACE_BASE( IMPLCLASS##, BASECLASS##, SFX_IMPL_INTERFACE_6( INTERFACE1##, INTERFACE2##, INTERFACE3##, INTERFACE4##, INTERFACE5##, INTERFACE6## ) )
378
	SFX_IMPL_XINTERFACE_BASE( IMPLCLASS, BASECLASS, SFX_IMPL_INTERFACE_6( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6 ) )
379
379
380
//	implementation of XInterface with 7 additional interfaces for queryInterface()
380
//	implementation of XInterface with 7 additional interfaces for queryInterface()
381
#define SFX_IMPL_XINTERFACE_7( IMPLCLASS, BASECLASS, INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7 )																										\
381
#define SFX_IMPL_XINTERFACE_7( IMPLCLASS, BASECLASS, INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7 )																										\
382
	SFX_IMPL_XINTERFACE_BASE( IMPLCLASS##, BASECLASS##, SFX_IMPL_INTERFACE_7( INTERFACE1##, INTERFACE2##, INTERFACE3##, INTERFACE4##, INTERFACE5##, INTERFACE6##, INTERFACE7## ) )
382
	SFX_IMPL_XINTERFACE_BASE( IMPLCLASS, BASECLASS, SFX_IMPL_INTERFACE_7( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7 ) )
383
383
384
//	implementation of XInterface with 8 additional interfaces for queryInterface()
384
//	implementation of XInterface with 8 additional interfaces for queryInterface()
385
#define SFX_IMPL_XINTERFACE_8( IMPLCLASS, BASECLASS, INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8 )																							\
385
#define SFX_IMPL_XINTERFACE_8( IMPLCLASS, BASECLASS, INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8 )																							\
386
	SFX_IMPL_XINTERFACE_BASE( IMPLCLASS##, BASECLASS##, SFX_IMPL_INTERFACE_8( INTERFACE1##, INTERFACE2##, INTERFACE3##, INTERFACE4##, INTERFACE5##, INTERFACE6##, INTERFACE7##, INTERFACE8## ) )
386
	SFX_IMPL_XINTERFACE_BASE( IMPLCLASS, BASECLASS, SFX_IMPL_INTERFACE_8( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8 ) )
387
387
388
//	implementation of XInterface with 9 additional interfaces for queryInterface()
388
//	implementation of XInterface with 9 additional interfaces for queryInterface()
389
#define SFX_IMPL_XINTERFACE_9( IMPLCLASS, BASECLASS, INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9 )																				\
389
#define SFX_IMPL_XINTERFACE_9( IMPLCLASS, BASECLASS, INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9 )																				\
390
	SFX_IMPL_XINTERFACE_BASE( IMPLCLASS##, BASECLASS##, SFX_IMPL_INTERFACE_9( INTERFACE1##, INTERFACE2##, INTERFACE3##, INTERFACE4##, INTERFACE5##, INTERFACE6##, INTERFACE7##, INTERFACE8##, INTERFACE9## ) )
390
	SFX_IMPL_XINTERFACE_BASE( IMPLCLASS, BASECLASS, SFX_IMPL_INTERFACE_9( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9 ) )
391
391
392
//	implementation of XInterface with 10 additional interfaces for queryInterface()
392
//	implementation of XInterface with 10 additional interfaces for queryInterface()
393
#define SFX_IMPL_XINTERFACE_10( IMPLCLASS, BASECLASS, INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10 )																	\
393
#define SFX_IMPL_XINTERFACE_10( IMPLCLASS, BASECLASS, INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10 )																	\
394
	SFX_IMPL_XINTERFACE_BASE( IMPLCLASS##, BASECLASS##, SFX_IMPL_INTERFACE_10( INTERFACE1##, INTERFACE2##, INTERFACE3##, INTERFACE4##, INTERFACE5##, INTERFACE6##, INTERFACE7##, INTERFACE8##, INTERFACE9##, INTERFACE10## ) )
394
	SFX_IMPL_XINTERFACE_BASE( IMPLCLASS, BASECLASS, SFX_IMPL_INTERFACE_10( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10 ) )
395
395
396
//	implementation of XInterface with 11 additional interfaces for queryInterface()
396
//	implementation of XInterface with 11 additional interfaces for queryInterface()
397
#define SFX_IMPL_XINTERFACE_11( IMPLCLASS, BASECLASS, INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10, INTERFACE11 )													\
397
#define SFX_IMPL_XINTERFACE_11( IMPLCLASS, BASECLASS, INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10, INTERFACE11 )													\
398
	SFX_IMPL_XINTERFACE_BASE( IMPLCLASS##, BASECLASS##, SFX_IMPL_INTERFACE_11( INTERFACE1##, INTERFACE2##, INTERFACE3##, INTERFACE4##, INTERFACE5##, INTERFACE6##, INTERFACE7##, INTERFACE8##, INTERFACE9##, INTERFACE10##, INTERFACE11## ) )
398
	SFX_IMPL_XINTERFACE_BASE( IMPLCLASS, BASECLASS, SFX_IMPL_INTERFACE_11( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10, INTERFACE11 ) )
399
399
400
//	implementation of XInterface with 11 additional interfaces for queryInterface()
400
//	implementation of XInterface with 11 additional interfaces for queryInterface()
401
#define SFX_IMPL_XINTERFACE_12( IMPLCLASS, BASECLASS, INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10, INTERFACE11, INTERFACE12 )													\
401
#define SFX_IMPL_XINTERFACE_12( IMPLCLASS, BASECLASS, INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10, INTERFACE11, INTERFACE12 )													\
402
	SFX_IMPL_XINTERFACE_BASE( IMPLCLASS##, BASECLASS##, SFX_IMPL_INTERFACE_12( INTERFACE1##, INTERFACE2##, INTERFACE3##, INTERFACE4##, INTERFACE5##, INTERFACE6##, INTERFACE7##, INTERFACE8##, INTERFACE9##, INTERFACE10##, INTERFACE11##, INTERFACE12## ) )
402
	SFX_IMPL_XINTERFACE_BASE( IMPLCLASS, BASECLASS, SFX_IMPL_INTERFACE_12( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10, INTERFACE11, INTERFACE12 ) )
403
403
404
//	implementation of XInterface with 11 additional interfaces for queryInterface()
404
//	implementation of XInterface with 11 additional interfaces for queryInterface()
405
#define SFX_IMPL_XINTERFACE_13( IMPLCLASS, BASECLASS, INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10, INTERFACE11, INTERFACE12, INTERFACE13 )													\
405
#define SFX_IMPL_XINTERFACE_13( IMPLCLASS, BASECLASS, INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10, INTERFACE11, INTERFACE12, INTERFACE13 )													\
406
	SFX_IMPL_XINTERFACE_BASE( IMPLCLASS##, BASECLASS##, SFX_IMPL_INTERFACE_13( INTERFACE1##, INTERFACE2##, INTERFACE3##, INTERFACE4##, INTERFACE5##, INTERFACE6##, INTERFACE7##, INTERFACE8##, INTERFACE9##, INTERFACE10##, INTERFACE11##, INTERFACE12##, INTERFACE13## ) )
406
	SFX_IMPL_XINTERFACE_BASE( IMPLCLASS, BASECLASS, SFX_IMPL_INTERFACE_13( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10, INTERFACE11, INTERFACE12, INTERFACE13 ) )
407
407
408
//************************************************************************************************************************
408
//************************************************************************************************************************
409
//	implementation of 	XTypeProvider::getTypes()
409
//	implementation of 	XTypeProvider::getTypes()
Lines 413-419 Link Here
413
// DON'T USE FOLLOW MACROS DIRECTLY!!!
413
// DON'T USE FOLLOW MACROS DIRECTLY!!!
414
#define SFX_IMPL_XTYPEPROVIDER_BASE( IMPLCLASS, IMPLTYPES )																							\
414
#define SFX_IMPL_XTYPEPROVIDER_BASE( IMPLCLASS, IMPLTYPES )																							\
415
																																					\
415
																																					\
416
	UNOSEQUENCE< sal_Int8 > SAL_CALL IMPLCLASS##::getImplementationId() throw( UNORUNTIMEEXCEPTION )												\
416
	UNOSEQUENCE< sal_Int8 > SAL_CALL IMPLCLASS::getImplementationId() throw( UNORUNTIMEEXCEPTION )												\
417
	{																																				\
417
	{																																				\
418
		/* Create one Id for all instances of this class.												*/											\
418
		/* Create one Id for all instances of this class.												*/											\
419
		/* Use ethernet address to do this! (sal_True)													*/											\
419
		/* Use ethernet address to do this! (sal_True)													*/											\
Lines 437-443 Link Here
437
		return pID->getImplementationId();																											\
437
		return pID->getImplementationId();																											\
438
	}																																				\
438
	}																																				\
439
																																					\
439
																																					\
440
	UNOSEQUENCE< UNOTYPE > SAL_CALL IMPLCLASS##::getTypes() throw( UNORUNTIMEEXCEPTION )															\
440
	UNOSEQUENCE< UNOTYPE > SAL_CALL IMPLCLASS::getTypes() throw( UNORUNTIMEEXCEPTION )															\
441
	{																																				\
441
	{																																				\
442
		/* Optimize this method !																					*/								\
442
		/* Optimize this method !																					*/								\
443
		/* We initialize a static variable only one time. And we don't must use a mutex at every call!				*/								\
443
		/* We initialize a static variable only one time. And we don't must use a mutex at every call!				*/								\
Lines 451-457 Link Here
451
			if ( pTypeCollection == NULL )																											\
451
			if ( pTypeCollection == NULL )																											\
452
			{																																		\
452
			{																																		\
453
				/* Create a static typecollection ... */																							\
453
				/* Create a static typecollection ... */																							\
454
				static UNOOTYPECOLLECTION aTypeCollection(	IMPLTYPES## );																			\
454
				static UNOOTYPECOLLECTION aTypeCollection(	IMPLTYPES );																			\
455
				/* ... and set his address to static pointer! */																					\
455
				/* ... and set his address to static pointer! */																					\
456
				pTypeCollection = &aTypeCollection ;																								\
456
				pTypeCollection = &aTypeCollection ;																								\
457
			}																																		\
457
			}																																		\
Lines 464-577 Link Here
464
464
465
#define	SFX_IMPL_TYPE_1( TYPE1 )																													\
465
#define	SFX_IMPL_TYPE_1( TYPE1 )																													\
466
	SFX_IMPL_TYPE_0,																																\
466
	SFX_IMPL_TYPE_0,																																\
467
	::getCppuType(( const UNOREFERENCE< TYPE1## >*)NULL )
467
	::getCppuType(( const UNOREFERENCE< TYPE1 >*)NULL )
468
468
469
#define	SFX_IMPL_TYPE_2( TYPE1, TYPE2 )																												\
469
#define	SFX_IMPL_TYPE_2( TYPE1, TYPE2 )																												\
470
	SFX_IMPL_TYPE_1( TYPE1## ),																														\
470
	SFX_IMPL_TYPE_1( TYPE1 ),																														\
471
	::getCppuType(( const UNOREFERENCE< TYPE2## >*)NULL )
471
	::getCppuType(( const UNOREFERENCE< TYPE2 >*)NULL )
472
472
473
#define	SFX_IMPL_TYPE_3( TYPE1, TYPE2, TYPE3 )																										\
473
#define	SFX_IMPL_TYPE_3( TYPE1, TYPE2, TYPE3 )																										\
474
	SFX_IMPL_TYPE_2( TYPE1##, TYPE2## ),																											\
474
	SFX_IMPL_TYPE_2( TYPE1, TYPE2 ),																											\
475
	::getCppuType(( const UNOREFERENCE< TYPE3## >*)NULL )
475
	::getCppuType(( const UNOREFERENCE< TYPE3 >*)NULL )
476
476
477
#define	SFX_IMPL_TYPE_4( TYPE1, TYPE2, TYPE3, TYPE4 )																								\
477
#define	SFX_IMPL_TYPE_4( TYPE1, TYPE2, TYPE3, TYPE4 )																								\
478
	SFX_IMPL_TYPE_3( TYPE1##, TYPE2##, TYPE3## ),																									\
478
	SFX_IMPL_TYPE_3( TYPE1, TYPE2, TYPE3 ),																									\
479
	::getCppuType(( const UNOREFERENCE< TYPE4## >*)NULL )
479
	::getCppuType(( const UNOREFERENCE< TYPE4 >*)NULL )
480
480
481
#define	SFX_IMPL_TYPE_5( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5 )																						\
481
#define	SFX_IMPL_TYPE_5( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5 )																						\
482
	SFX_IMPL_TYPE_4( TYPE1##, TYPE2##, TYPE3##, TYPE4## ),																							\
482
	SFX_IMPL_TYPE_4( TYPE1, TYPE2, TYPE3, TYPE4 ),																							\
483
	::getCppuType(( const UNOREFERENCE< TYPE5## >*)NULL )
483
	::getCppuType(( const UNOREFERENCE< TYPE5 >*)NULL )
484
484
485
#define	SFX_IMPL_TYPE_6( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6 )																					\
485
#define	SFX_IMPL_TYPE_6( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6 )																					\
486
	SFX_IMPL_TYPE_5( TYPE1##, TYPE2##, TYPE3##, TYPE4##, TYPE5## ),																					\
486
	SFX_IMPL_TYPE_5( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5 ),																					\
487
	::getCppuType(( const UNOREFERENCE< TYPE6## >*)NULL )
487
	::getCppuType(( const UNOREFERENCE< TYPE6 >*)NULL )
488
488
489
#define	SFX_IMPL_TYPE_7( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7 )																			\
489
#define	SFX_IMPL_TYPE_7( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7 )																			\
490
	SFX_IMPL_TYPE_6( TYPE1##, TYPE2##, TYPE3##, TYPE4##, TYPE5##, TYPE6## ),																		\
490
	SFX_IMPL_TYPE_6( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6 ),																		\
491
	::getCppuType(( const UNOREFERENCE< TYPE7## >*)NULL )
491
	::getCppuType(( const UNOREFERENCE< TYPE7 >*)NULL )
492
492
493
#define	SFX_IMPL_TYPE_8( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8 )																	\
493
#define	SFX_IMPL_TYPE_8( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8 )																	\
494
	SFX_IMPL_TYPE_7( TYPE1##, TYPE2##, TYPE3##, TYPE4##, TYPE5##, TYPE6##, TYPE7## ),																\
494
	SFX_IMPL_TYPE_7( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7 ),																\
495
	::getCppuType(( const UNOREFERENCE< TYPE8## >*)NULL )
495
	::getCppuType(( const UNOREFERENCE< TYPE8 >*)NULL )
496
496
497
#define	SFX_IMPL_TYPE_9( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9 )															\
497
#define	SFX_IMPL_TYPE_9( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9 )															\
498
	SFX_IMPL_TYPE_8( TYPE1##, TYPE2##, TYPE3##, TYPE4##, TYPE5##, TYPE6##, TYPE7##, TYPE8## ),														\
498
	SFX_IMPL_TYPE_8( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8 ),														\
499
	::getCppuType(( const UNOREFERENCE< TYPE9## >*)NULL )
499
	::getCppuType(( const UNOREFERENCE< TYPE9 >*)NULL )
500
500
501
#define	SFX_IMPL_TYPE_10( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10 )													\
501
#define	SFX_IMPL_TYPE_10( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10 )													\
502
	SFX_IMPL_TYPE_9( TYPE1##, TYPE2##, TYPE3##, TYPE4##, TYPE5##, TYPE6##, TYPE7##, TYPE8##, TYPE9## ),												\
502
	SFX_IMPL_TYPE_9( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9 ),												\
503
	::getCppuType(( const UNOREFERENCE< TYPE10## >*)NULL )
503
	::getCppuType(( const UNOREFERENCE< TYPE10 >*)NULL )
504
504
505
#define	SFX_IMPL_TYPE_11( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10, TYPE11 )											\
505
#define	SFX_IMPL_TYPE_11( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10, TYPE11 )											\
506
	SFX_IMPL_TYPE_10( TYPE1##, TYPE2##, TYPE3##, TYPE4##, TYPE5##, TYPE6##, TYPE7##, TYPE8##, TYPE9##, TYPE10## ),									\
506
	SFX_IMPL_TYPE_10( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10 ),									\
507
	::getCppuType(( const UNOREFERENCE< TYPE11## >*)NULL )
507
	::getCppuType(( const UNOREFERENCE< TYPE11 >*)NULL )
508
508
509
#define	SFX_IMPL_TYPE_12( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10, TYPE11, TYPE12 )											\
509
#define	SFX_IMPL_TYPE_12( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10, TYPE11, TYPE12 )											\
510
	SFX_IMPL_TYPE_11( TYPE1##, TYPE2##, TYPE3##, TYPE4##, TYPE5##, TYPE6##, TYPE7##, TYPE8##, TYPE9##, TYPE10##, TYPE11## ),									\
510
	SFX_IMPL_TYPE_11( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10, TYPE11 ),									\
511
	::getCppuType(( const UNOREFERENCE< TYPE12## >*)NULL )
511
	::getCppuType(( const UNOREFERENCE< TYPE12 >*)NULL )
512
512
513
#define	SFX_IMPL_TYPE_13( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10, TYPE11, TYPE12, TYPE13 )											\
513
#define	SFX_IMPL_TYPE_13( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10, TYPE11, TYPE12, TYPE13 )											\
514
	SFX_IMPL_TYPE_12( TYPE1##, TYPE2##, TYPE3##, TYPE4##, TYPE5##, TYPE6##, TYPE7##, TYPE8##, TYPE9##, TYPE10##, TYPE11##, TYPE12## ),									\
514
	SFX_IMPL_TYPE_12( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10, TYPE11, TYPE12 ),									\
515
	::getCppuType(( const UNOREFERENCE< TYPE13## >*)NULL )
515
	::getCppuType(( const UNOREFERENCE< TYPE13 >*)NULL )
516
/*_________________________________________________________________________________________________________________________*/
516
/*_________________________________________________________________________________________________________________________*/
517
517
518
// FOLLOW MACROS CAN USED DIRECTLY :-)
518
// FOLLOW MACROS CAN USED DIRECTLY :-)
519
519
520
//	implementation of XInterface with 1 additional interface for queryInterface()
520
//	implementation of XInterface with 1 additional interface for queryInterface()
521
#define SFX_IMPL_XTYPEPROVIDER_0( IMPLCLASS )																										\
521
#define SFX_IMPL_XTYPEPROVIDER_0( IMPLCLASS )																										\
522
	SFX_IMPL_XTYPEPROVIDER_BASE( IMPLCLASS##, SFX_IMPL_TYPE_0 )
522
	SFX_IMPL_XTYPEPROVIDER_BASE( IMPLCLASS, SFX_IMPL_TYPE_0 )
523
523
524
//	implementation of XInterface with 1 additional interface for queryInterface()
524
//	implementation of XInterface with 1 additional interface for queryInterface()
525
#define SFX_IMPL_XTYPEPROVIDER_1( IMPLCLASS, TYPE1 )																								\
525
#define SFX_IMPL_XTYPEPROVIDER_1( IMPLCLASS, TYPE1 )																								\
526
	SFX_IMPL_XTYPEPROVIDER_BASE( IMPLCLASS##, SFX_IMPL_TYPE_1( TYPE1## ) )
526
	SFX_IMPL_XTYPEPROVIDER_BASE( IMPLCLASS, SFX_IMPL_TYPE_1( TYPE1 ) )
527
527
528
//	implementation of XInterface with 2 additional interfaces for queryInterface()
528
//	implementation of XInterface with 2 additional interfaces for queryInterface()
529
#define SFX_IMPL_XTYPEPROVIDER_2( IMPLCLASS, TYPE1, TYPE2 )																							\
529
#define SFX_IMPL_XTYPEPROVIDER_2( IMPLCLASS, TYPE1, TYPE2 )																							\
530
	SFX_IMPL_XTYPEPROVIDER_BASE( IMPLCLASS##, SFX_IMPL_TYPE_2( TYPE1##, TYPE2## ) )
530
	SFX_IMPL_XTYPEPROVIDER_BASE( IMPLCLASS, SFX_IMPL_TYPE_2( TYPE1, TYPE2 ) )
531
531
532
//	implementation of XInterface with 3 additional interfaces for queryInterface()
532
//	implementation of XInterface with 3 additional interfaces for queryInterface()
533
#define SFX_IMPL_XTYPEPROVIDER_3( IMPLCLASS, TYPE1, TYPE2, TYPE3 )																					\
533
#define SFX_IMPL_XTYPEPROVIDER_3( IMPLCLASS, TYPE1, TYPE2, TYPE3 )																					\
534
	SFX_IMPL_XTYPEPROVIDER_BASE( IMPLCLASS##, SFX_IMPL_TYPE_3( TYPE1##, TYPE2##, TYPE3## ) )
534
	SFX_IMPL_XTYPEPROVIDER_BASE( IMPLCLASS, SFX_IMPL_TYPE_3( TYPE1, TYPE2, TYPE3 ) )
535
535
536
//	implementation of XInterface with 4 additional interfaces for queryInterface()
536
//	implementation of XInterface with 4 additional interfaces for queryInterface()
537
#define SFX_IMPL_XTYPEPROVIDER_4( IMPLCLASS, TYPE1, TYPE2, TYPE3, TYPE4 )																			\
537
#define SFX_IMPL_XTYPEPROVIDER_4( IMPLCLASS, TYPE1, TYPE2, TYPE3, TYPE4 )																			\
538
	SFX_IMPL_XTYPEPROVIDER_BASE( IMPLCLASS##, SFX_IMPL_TYPE_4( TYPE1##, TYPE2##, TYPE3##, TYPE4## ) )
538
	SFX_IMPL_XTYPEPROVIDER_BASE( IMPLCLASS, SFX_IMPL_TYPE_4( TYPE1, TYPE2, TYPE3, TYPE4 ) )
539
539
540
//	implementation of XInterface with 5 additional interfaces for queryInterface()
540
//	implementation of XInterface with 5 additional interfaces for queryInterface()
541
#define SFX_IMPL_XTYPEPROVIDER_5( IMPLCLASS, TYPE1, TYPE2, TYPE3, TYPE4, TYPE5 )																	\
541
#define SFX_IMPL_XTYPEPROVIDER_5( IMPLCLASS, TYPE1, TYPE2, TYPE3, TYPE4, TYPE5 )																	\
542
	SFX_IMPL_XTYPEPROVIDER_BASE( IMPLCLASS##, SFX_IMPL_TYPE_5( TYPE1##, TYPE2##, TYPE3##, TYPE4##, TYPE5## ) )
542
	SFX_IMPL_XTYPEPROVIDER_BASE( IMPLCLASS, SFX_IMPL_TYPE_5( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5 ) )
543
543
544
//	implementation of XInterface with 6 additional interfaces for queryInterface()
544
//	implementation of XInterface with 6 additional interfaces for queryInterface()
545
#define SFX_IMPL_XTYPEPROVIDER_6( IMPLCLASS, TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6 )																\
545
#define SFX_IMPL_XTYPEPROVIDER_6( IMPLCLASS, TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6 )																\
546
	SFX_IMPL_XTYPEPROVIDER_BASE( IMPLCLASS##, SFX_IMPL_TYPE_6( TYPE1##, TYPE2##, TYPE3##, TYPE4##, TYPE5##, TYPE6## ) )
546
	SFX_IMPL_XTYPEPROVIDER_BASE( IMPLCLASS, SFX_IMPL_TYPE_6( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6 ) )
547
547
548
//	implementation of XInterface with 7 additional interfaces for queryInterface()
548
//	implementation of XInterface with 7 additional interfaces for queryInterface()
549
#define SFX_IMPL_XTYPEPROVIDER_7( IMPLCLASS, TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7 )														\
549
#define SFX_IMPL_XTYPEPROVIDER_7( IMPLCLASS, TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7 )														\
550
	SFX_IMPL_XTYPEPROVIDER_BASE( IMPLCLASS##, SFX_IMPL_TYPE_7( TYPE1##, TYPE2##, TYPE3##, TYPE4##, TYPE5##, TYPE6##, TYPE7## ) )
550
	SFX_IMPL_XTYPEPROVIDER_BASE( IMPLCLASS, SFX_IMPL_TYPE_7( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7 ) )
551
551
552
//	implementation of XInterface with 8 additional interfaces for queryInterface()
552
//	implementation of XInterface with 8 additional interfaces for queryInterface()
553
#define SFX_IMPL_XTYPEPROVIDER_8( IMPLCLASS, TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8 )												\
553
#define SFX_IMPL_XTYPEPROVIDER_8( IMPLCLASS, TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8 )												\
554
	SFX_IMPL_XTYPEPROVIDER_BASE( IMPLCLASS##, SFX_IMPL_TYPE_8( TYPE1##, TYPE2##, TYPE3##, TYPE4##, TYPE5##, TYPE6##, TYPE7##, TYPE8## ) )
554
	SFX_IMPL_XTYPEPROVIDER_BASE( IMPLCLASS, SFX_IMPL_TYPE_8( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8 ) )
555
555
556
//	implementation of XInterface with 9 additional interfaces for queryInterface()
556
//	implementation of XInterface with 9 additional interfaces for queryInterface()
557
#define SFX_IMPL_XTYPEPROVIDER_9( IMPLCLASS, TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9 )																\
557
#define SFX_IMPL_XTYPEPROVIDER_9( IMPLCLASS, TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9 )																\
558
	SFX_IMPL_XTYPEPROVIDER_BASE( IMPLCLASS##, SFX_IMPL_TYPE_9( TYPE1##, TYPE2##, TYPE3##, TYPE4##, TYPE5##, TYPE6##, TYPE7##, TYPE8##, TYPE9## ) )
558
	SFX_IMPL_XTYPEPROVIDER_BASE( IMPLCLASS, SFX_IMPL_TYPE_9( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9 ) )
559
559
560
//	implementation of XInterface with 10 additional interfaces for queryInterface()
560
//	implementation of XInterface with 10 additional interfaces for queryInterface()
561
#define SFX_IMPL_XTYPEPROVIDER_10( IMPLCLASS, TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10 )														\
561
#define SFX_IMPL_XTYPEPROVIDER_10( IMPLCLASS, TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10 )														\
562
	SFX_IMPL_XTYPEPROVIDER_BASE( IMPLCLASS##, SFX_IMPL_TYPE_10( TYPE1##, TYPE2##, TYPE3##, TYPE4##, TYPE5##, TYPE6##, TYPE7##, TYPE8##, TYPE9##, TYPE10## ) )
562
	SFX_IMPL_XTYPEPROVIDER_BASE( IMPLCLASS, SFX_IMPL_TYPE_10( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10 ) )
563
563
564
//	implementation of XInterface with 11 additional interfaces for queryInterface()
564
//	implementation of XInterface with 11 additional interfaces for queryInterface()
565
#define SFX_IMPL_XTYPEPROVIDER_11( IMPLCLASS, TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10, TYPE11 )												\
565
#define SFX_IMPL_XTYPEPROVIDER_11( IMPLCLASS, TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10, TYPE11 )												\
566
	SFX_IMPL_XTYPEPROVIDER_BASE( IMPLCLASS##, SFX_IMPL_TYPE_11( TYPE1##, TYPE2##, TYPE3##, TYPE4##, TYPE5##, TYPE6##, TYPE7##, TYPE8##, TYPE9##, TYPE10##, TYPE11## ) )
566
	SFX_IMPL_XTYPEPROVIDER_BASE( IMPLCLASS, SFX_IMPL_TYPE_11( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10, TYPE11 ) )
567
567
568
//	implementation of XInterface with 11 additional interfaces for queryInterface()
568
//	implementation of XInterface with 11 additional interfaces for queryInterface()
569
#define SFX_IMPL_XTYPEPROVIDER_12( IMPLCLASS, TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10, TYPE11, TYPE12 )												\
569
#define SFX_IMPL_XTYPEPROVIDER_12( IMPLCLASS, TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10, TYPE11, TYPE12 )												\
570
	SFX_IMPL_XTYPEPROVIDER_BASE( IMPLCLASS##, SFX_IMPL_TYPE_12( TYPE1##, TYPE2##, TYPE3##, TYPE4##, TYPE5##, TYPE6##, TYPE7##, TYPE8##, TYPE9##, TYPE10##, TYPE11##, TYPE12## ) )
570
	SFX_IMPL_XTYPEPROVIDER_BASE( IMPLCLASS, SFX_IMPL_TYPE_12( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10, TYPE11, TYPE12 ) )
571
571
572
//	implementation of XInterface with 11 additional interfaces for queryInterface()
572
//	implementation of XInterface with 11 additional interfaces for queryInterface()
573
#define SFX_IMPL_XTYPEPROVIDER_13( IMPLCLASS, TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10, TYPE11, TYPE12, TYPE13 )												\
573
#define SFX_IMPL_XTYPEPROVIDER_13( IMPLCLASS, TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10, TYPE11, TYPE12, TYPE13 )												\
574
	SFX_IMPL_XTYPEPROVIDER_BASE( IMPLCLASS##, SFX_IMPL_TYPE_13( TYPE1##, TYPE2##, TYPE3##, TYPE4##, TYPE5##, TYPE6##, TYPE7##, TYPE8##, TYPE9##, TYPE10##, TYPE11##, TYPE12##, TYPE13## ) )
574
	SFX_IMPL_XTYPEPROVIDER_BASE( IMPLCLASS, SFX_IMPL_TYPE_13( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10, TYPE11, TYPE12, TYPE13 ) )
575
575
576
//************************************************************************************************************************
576
//************************************************************************************************************************
577
//	implementation of	XServiceInfo::getImplementationName()
577
//	implementation of	XServiceInfo::getImplementationName()
Lines 584-596 Link Here
584
#define SFX_IMPL_XSERVICEINFO( IMPLCLASS, IMPLSERVICENAME, IMPLNAME )																				\
584
#define SFX_IMPL_XSERVICEINFO( IMPLCLASS, IMPLSERVICENAME, IMPLNAME )																				\
585
																																					\
585
																																					\
586
	/* XServiceInfo */																																\
586
	/* XServiceInfo */																																\
587
	UNOOUSTRING SAL_CALL IMPLCLASS##::getImplementationName() throw( UNORUNTIMEEXCEPTION )															\
587
	UNOOUSTRING SAL_CALL IMPLCLASS::getImplementationName() throw( UNORUNTIMEEXCEPTION )															\
588
	{																																				\
588
	{																																				\
589
		return impl_getStaticImplementationName();																									\
589
		return impl_getStaticImplementationName();																									\
590
	}																																				\
590
	}																																				\
591
																																					\
591
																																					\
592
	/* XServiceInfo */																																\
592
	/* XServiceInfo */																																\
593
	sal_Bool SAL_CALL IMPLCLASS##::supportsService( const UNOOUSTRING& sServiceName ) throw( UNORUNTIMEEXCEPTION )									\
593
	sal_Bool SAL_CALL IMPLCLASS::supportsService( const UNOOUSTRING& sServiceName ) throw( UNORUNTIMEEXCEPTION )									\
594
	{																																				\
594
	{																																				\
595
    	UNOSEQUENCE< UNOOUSTRING >	seqServiceNames	=	getSupportedServiceNames();																	\
595
    	UNOSEQUENCE< UNOOUSTRING >	seqServiceNames	=	getSupportedServiceNames();																	\
596
    	const UNOOUSTRING*			pArray			=	seqServiceNames.getConstArray();															\
596
    	const UNOOUSTRING*			pArray			=	seqServiceNames.getConstArray();															\
Lines 605-634 Link Here
605
	}																																				\
605
	}																																				\
606
																																					\
606
																																					\
607
	/* XServiceInfo */																																\
607
	/* XServiceInfo */																																\
608
	UNOSEQUENCE< UNOOUSTRING > SAL_CALL IMPLCLASS##::getSupportedServiceNames() throw( UNORUNTIMEEXCEPTION )										\
608
	UNOSEQUENCE< UNOOUSTRING > SAL_CALL IMPLCLASS::getSupportedServiceNames() throw( UNORUNTIMEEXCEPTION )										\
609
	{																																				\
609
	{																																				\
610
		return impl_getStaticSupportedServiceNames();																								\
610
		return impl_getStaticSupportedServiceNames();																								\
611
	}																																				\
611
	}																																				\
612
																																					\
612
																																					\
613
	/* Helper for XServiceInfo */																													\
613
	/* Helper for XServiceInfo */																													\
614
	UNOSEQUENCE< UNOOUSTRING > IMPLCLASS##::impl_getStaticSupportedServiceNames()																	\
614
	UNOSEQUENCE< UNOOUSTRING > IMPLCLASS::impl_getStaticSupportedServiceNames()																	\
615
	{																																				\
615
	{																																				\
616
		UNOMUTEXGUARD aGuard( UNOMUTEX::getGlobalMutex() );																							\
616
		UNOMUTEXGUARD aGuard( UNOMUTEX::getGlobalMutex() );																							\
617
    	UNOSEQUENCE< UNOOUSTRING > seqServiceNames( 1 );																							\
617
    	UNOSEQUENCE< UNOOUSTRING > seqServiceNames( 1 );																							\
618
    	seqServiceNames.getArray() [0] = UNOOUSTRING::createFromAscii( IMPLSERVICENAME## );															\
618
    	seqServiceNames.getArray() [0] = UNOOUSTRING::createFromAscii( IMPLSERVICENAME );															\
619
    	return seqServiceNames ;																													\
619
    	return seqServiceNames ;																													\
620
	}																																				\
620
	}																																				\
621
																																					\
621
																																					\
622
	/* Helper for XServiceInfo */																													\
622
	/* Helper for XServiceInfo */																													\
623
	UNOOUSTRING IMPLCLASS##::impl_getStaticImplementationName()																						\
623
	UNOOUSTRING IMPLCLASS::impl_getStaticImplementationName()																						\
624
	{																																				\
624
	{																																				\
625
		return UNOOUSTRING::createFromAscii( IMPLNAME## );																							\
625
		return UNOOUSTRING::createFromAscii( IMPLNAME );																							\
626
	}																																				\
626
	}																																				\
627
																																					\
627
																																					\
628
	/* Helper for registry */																														\
628
	/* Helper for registry */																														\
629
	UNOREFERENCE< UNOXINTERFACE > SAL_CALL IMPLCLASS##::impl_createInstance( const UNOREFERENCE< UNOXMULTISERVICEFACTORY >& xServiceManager ) throw( UNOEXCEPTION )		\
629
	UNOREFERENCE< UNOXINTERFACE > SAL_CALL IMPLCLASS::impl_createInstance( const UNOREFERENCE< UNOXMULTISERVICEFACTORY >& xServiceManager ) throw( UNOEXCEPTION )		\
630
	{																																				\
630
	{																																				\
631
		return UNOREFERENCE< UNOXINTERFACE >( *new IMPLCLASS##( xServiceManager ) );																\
631
		return UNOREFERENCE< UNOXINTERFACE >( *new IMPLCLASS( xServiceManager ) );																\
632
	}
632
	}
633
633
634
//************************************************************************************************************************
634
//************************************************************************************************************************
Lines 636-648 Link Here
636
//************************************************************************************************************************
636
//************************************************************************************************************************
637
#define SFX_IMPL_SINGLEFACTORY( IMPLCLASS )																											\
637
#define SFX_IMPL_SINGLEFACTORY( IMPLCLASS )																											\
638
																																					\
638
																																					\
639
	UNOREFERENCE< UNOXSINGLESERVICEFACTORY > IMPLCLASS##::impl_createFactory( const UNOREFERENCE< UNOXMULTISERVICEFACTORY >& xServiceManager )		\
639
	UNOREFERENCE< UNOXSINGLESERVICEFACTORY > IMPLCLASS::impl_createFactory( const UNOREFERENCE< UNOXMULTISERVICEFACTORY >& xServiceManager )		\
640
	{																																				\
640
	{																																				\
641
		UNOREFERENCE< UNOXSINGLESERVICEFACTORY > xReturn	(																						\
641
		UNOREFERENCE< UNOXSINGLESERVICEFACTORY > xReturn	(																						\
642
													cppu::createSingleFactory(	xServiceManager										,				\
642
													cppu::createSingleFactory(	xServiceManager										,				\
643
																				IMPLCLASS##::impl_getStaticImplementationName()		,				\
643
																				IMPLCLASS::impl_getStaticImplementationName()		,				\
644
																				IMPLCLASS##::impl_createInstance					,				\
644
																				IMPLCLASS::impl_createInstance					,				\
645
																				IMPLCLASS##::impl_getStaticSupportedServiceNames()	)				\
645
																				IMPLCLASS::impl_getStaticSupportedServiceNames()	)				\
646
															);																						\
646
															);																						\
647
		return xReturn ;																															\
647
		return xReturn ;																															\
648
	}
648
	}
Lines 652-664 Link Here
652
//************************************************************************************************************************
652
//************************************************************************************************************************
653
#define SFX_IMPL_ONEINSTANCEFACTORY( IMPLCLASS )																									\
653
#define SFX_IMPL_ONEINSTANCEFACTORY( IMPLCLASS )																									\
654
																																					\
654
																																					\
655
	UNOREFERENCE< UNOXSINGLESERVICEFACTORY > IMPLCLASS##::impl_createFactory( const UNOREFERENCE< UNOXMULTISERVICEFACTORY >& xServiceManager )		\
655
	UNOREFERENCE< UNOXSINGLESERVICEFACTORY > IMPLCLASS::impl_createFactory( const UNOREFERENCE< UNOXMULTISERVICEFACTORY >& xServiceManager )		\
656
	{																																				\
656
	{																																				\
657
		UNOREFERENCE< UNOXSINGLESERVICEFACTORY > xReturn(																							\
657
		UNOREFERENCE< UNOXSINGLESERVICEFACTORY > xReturn(																							\
658
													cppu::createOneInstanceFactory(	xServiceManager										,			\
658
													cppu::createOneInstanceFactory(	xServiceManager										,			\
659
																					IMPLCLASS##::impl_getStaticImplementationName()		,			\
659
																					IMPLCLASS::impl_getStaticImplementationName()		,			\
660
																					IMPLCLASS##::impl_createInstance					,			\
660
																					IMPLCLASS::impl_createInstance					,			\
661
																					IMPLCLASS##::impl_getStaticSupportedServiceNames()	)			\
661
																					IMPLCLASS::impl_getStaticSupportedServiceNames()	)			\
662
														);																							\
662
														);																							\
663
		return xReturn ;																															\
663
		return xReturn ;																															\
664
	}
664
	}
Lines 678-684 Link Here
678
		{                                                                                           					\
678
		{                                                                                           					\
679
			/* Build new keyname */																						\
679
			/* Build new keyname */																						\
680
			sKeyName	 =	UNOOUSTRING::createFromAscii( "/" )			;		                   						\
680
			sKeyName	 =	UNOOUSTRING::createFromAscii( "/" )			;		                   						\
681
			sKeyName	+=	CLASS##::impl_getStaticImplementationName()	;   	                						\
681
			sKeyName	+=	CLASS::impl_getStaticImplementationName()	;   	                						\
682
			sKeyName	+=	UNOOUSTRING::createFromAscii( "/UNO/SERVICES" );       	            						\
682
			sKeyName	+=	UNOOUSTRING::createFromAscii( "/UNO/SERVICES" );       	            						\
683
																														\
683
																														\
684
			/* Create new key with new name. */																			\
684
			/* Create new key with new name. */																			\
Lines 688-694 Link Here
688
			if ( xNewKey.is () )                                                                    					\
688
			if ( xNewKey.is () )                                                                    					\
689
			{                                                                                       					\
689
			{                                                                                       					\
690
				/* Get information about supported services. */															\
690
				/* Get information about supported services. */															\
691
				seqServiceNames	=	CLASS##::impl_getStaticSupportedServiceNames()	;           						\
691
				seqServiceNames	=	CLASS::impl_getStaticSupportedServiceNames()	;           						\
692
				pArray			=	seqServiceNames.getArray()						;           						\
692
				pArray			=	seqServiceNames.getArray()						;           						\
693
				nLength			=	seqServiceNames.getLength()						;           						\
693
				nLength			=	seqServiceNames.getLength()						;           						\
694
				nCounter		=	0												;           						\
694
				nCounter		=	0												;           						\
Lines 715-730 Link Here
715
#define	CREATEFACTORY(CLASS)																							\
715
#define	CREATEFACTORY(CLASS)																							\
716
																														\
716
																														\
717
	/* Create right factory ... */																						\
717
	/* Create right factory ... */																						\
718
	xFactory = CLASS##::impl_createFactory( xServiceManager );
718
	xFactory = CLASS::impl_createFactory( xServiceManager );
719
719
720
//************************************************************************************************************************
720
//************************************************************************************************************************
721
//	definition for "extern c component_getFactory()"
721
//	definition for "extern c component_getFactory()"
722
//************************************************************************************************************************
722
//************************************************************************************************************************
723
#define	IF_NAME_CREATECOMPONENTFACTORY(CLASS)																			\
723
#define	IF_NAME_CREATECOMPONENTFACTORY(CLASS)																			\
724
																														\
724
																														\
725
	if ( CLASS##::impl_getStaticImplementationName().equals( UNOOUSTRING::createFromAscii( pImplementationName ) ) )	\
725
	if ( CLASS::impl_getStaticImplementationName().equals( UNOOUSTRING::createFromAscii( pImplementationName ) ) )	\
726
	{																													\
726
	{																													\
727
		CREATEFACTORY ( CLASS## )																						\
727
		CREATEFACTORY ( CLASS )																						\
728
	}
728
	}
729
729
730
#endif // _SFX_SFXUNO_HXX
730
#endif // _SFX_SFXUNO_HXX
731
-- svx/source/form/fmctrler.cxx
731
++ svx/source/form/fmctrler.cxx
Lines 661-667 Link Here
661
661
662
662
663
#define DECL_PROP1(varname, type, attrib1)  \
663
#define DECL_PROP1(varname, type, attrib1)  \
664
    DECL_PROP_CORE(varname, type) PropertyAttribute::##attrib1)
664
    DECL_PROP_CORE(varname, type) PropertyAttribute::attrib1)
665
665
666
//------------------------------------------------------------------------------
666
//------------------------------------------------------------------------------
667
void FmXFormController::fillProperties(
667
void FmXFormController::fillProperties(
668
-- tools/inc/link.hxx
668
++ tools/inc/link.hxx
Lines 83-89 Link Here
83
    long Class::Method( ArgType ArgName )
83
    long Class::Method( ArgType ArgName )
84
84
85
#define IMPL_STUB(Class, Method, ArgType) \
85
#define IMPL_STUB(Class, Method, ArgType) \
86
    long __EXPORT Class##::LinkStub##Method( void* pThis, void* pCaller) \
86
    long __EXPORT Class::LinkStub##Method( void* pThis, void* pCaller) \
87
    { \
87
    { \
88
        return ((Class*)pThis )->Method( (ArgType)pCaller ); \
88
        return ((Class*)pThis )->Method( (ArgType)pCaller ); \
89
    }
89
    }
Lines 92-98 Link Here
92
    long __EXPORT Class::Method( Class* pThis, ArgType ArgName )
92
    long __EXPORT Class::Method( Class* pThis, ArgType ArgName )
93
93
94
#define LINK( Inst, Class, Member ) \
94
#define LINK( Inst, Class, Member ) \
95
    Link( (Class*)Inst, (PSTUB)&Class##::LinkStub##Member )
95
    Link( (Class*)Inst, (PSTUB)&Class::LinkStub##Member )
96
96
97
#define STATIC_LINK( Inst, Class, Member ) \
97
#define STATIC_LINK( Inst, Class, Member ) \
98
    Link( (Class*)Inst, (PSTUB)&Class::Member )
98
    Link( (Class*)Inst, (PSTUB)&Class::Member )
99
-- vcl/source/gdi/opengl.cxx
99
++ vcl/source/gdi/opengl.cxx
Lines 194-200 Link Here
194
194
195
#define INIT_OGLFNC( FncName ) static OGLFnc##FncName pImplOpenGLFnc##FncName = NULL;
195
#define INIT_OGLFNC( FncName ) static OGLFnc##FncName pImplOpenGLFnc##FncName = NULL;
196
#define GET_OGLFNC_GL( FncName )													\
196
#define GET_OGLFNC_GL( FncName )													\
197
pImplOpenGLFnc##FncName = (OGLFnc##FncName##) mpOGL->GetOGLFnc( "gl" #FncName );    \
197
pImplOpenGLFnc##FncName = (OGLFnc##FncName) mpOGL->GetOGLFnc( "gl" #FncName );    \
198
if( !pImplOpenGLFnc##FncName ) bRet = FALSE;
198
if( !pImplOpenGLFnc##FncName ) bRet = FALSE;
199
199
200
// ----------
200
// ----------
201
-- xmloff/source/chart/PropertyMap.hxx
201
++ xmloff/source/chart/PropertyMap.hxx
Lines 132-140 Link Here
132
#define XML_SCH_CONTEXT_SPECIAL_SYMBOL_IMAGE_NAME   ( XML_SCH_CTF_START + 22 )
132
#define XML_SCH_CONTEXT_SPECIAL_SYMBOL_IMAGE_NAME   ( XML_SCH_CTF_START + 22 )
133
#define XML_SCH_CONTEXT_SPECIAL_SYMBOL_IMAGE        ( XML_SCH_CTF_START + 23 )
133
#define XML_SCH_CONTEXT_SPECIAL_SYMBOL_IMAGE        ( XML_SCH_CTF_START + 23 )
134
134
135
#define MAP_ENTRY( a, ns, nm, t ) { a, sizeof(a)-1, XML_NAMESPACE_##ns, xmloff::token::##nm, t }
135
#define MAP_ENTRY( a, ns, nm, t ) { a, sizeof(a)-1, XML_NAMESPACE_##ns, xmloff::token::nm, t }
136
#define MAP_CONTEXT( a, ns, nm, t, c ) { a, sizeof(a)-1, XML_NAMESPACE_##ns, xmloff::token::##nm, t, XML_SCH_CONTEXT_##c }
136
#define MAP_CONTEXT( a, ns, nm, t, c ) { a, sizeof(a)-1, XML_NAMESPACE_##ns, xmloff::token::nm, t, XML_SCH_CONTEXT_##c }
137
#define MAP_SPECIAL( a, ns, nm, t, c ) { a, sizeof(a)-1, XML_NAMESPACE_##ns, xmloff::token::##nm, t | MID_FLAG_SPECIAL_ITEM, XML_SCH_CONTEXT_SPECIAL_##c }
137
#define MAP_SPECIAL( a, ns, nm, t, c ) { a, sizeof(a)-1, XML_NAMESPACE_##ns, xmloff::token::nm, t | MID_FLAG_SPECIAL_ITEM, XML_SCH_CONTEXT_SPECIAL_##c }
138
#define MAP_ENTRY_END { 0,0,0,xmloff::token::XML_TOKEN_INVALID,0 }
138
#define MAP_ENTRY_END { 0,0,0,xmloff::token::XML_TOKEN_INVALID,0 }
139
139
140
// ---------------------------------------------------------
140
// ---------------------------------------------------------

Return to issue 13400