--- UnoControls/inc/basecontrol.hxx +++ UnoControls/inc/basecontrol.hxx @@ -380,7 +380,7 @@ //____________________________________________________________________________________________________________ #define TRGB_COLORDATA(TRANSPARENCE,RED,GREEN,BLUE) \ - ((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)) + ((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)) //____________________________________________________________________________________________________________ // structs --- UnoControls/source/base/multiplexer.cxx +++ UnoControls/source/base/multiplexer.cxx @@ -98,12 +98,12 @@ #define MULTIPLEX( INTERFACE, METHOD, EVENTTYP, EVENT ) \ \ /* First get all interfaces from container with right type.*/ \ - OInterfaceContainerHelper* pContainer = m_aListenerHolder.getContainer( ::getCppuType((const Reference< INTERFACE## >*)0) ); \ + OInterfaceContainerHelper* pContainer = m_aListenerHolder.getContainer( ::getCppuType((const Reference< INTERFACE >*)0) ); \ /* Do the follow only, if elements in container exist.*/ \ if( pContainer != NULL ) \ { \ OInterfaceIteratorHelper aIterator( *pContainer ); \ - EVENTTYP aLocalEvent = EVENT##; \ + EVENTTYP aLocalEvent = EVENT; \ /* Remark: The control is the event source not the peer.*/ \ /* We must change the source of the event. */ \ aLocalEvent.Source = m_xControl ; \ @@ -112,10 +112,10 @@ { \ if( aIterator.hasMoreElements() ) \ { \ - INTERFACE## * pListener = (INTERFACE## *)aIterator.next(); \ + INTERFACE * pListener = (INTERFACE *)aIterator.next(); \ try \ { \ - pListener->METHOD##( aLocalEvent ); \ + pListener->METHOD( aLocalEvent ); \ } \ catch( RuntimeException& ) \ { \ --- UnoControls/source/base/registercontrols.cxx +++ UnoControls/source/base/registercontrols.cxx @@ -148,7 +148,7 @@ static Reference< XInterface > SAL_CALL CLASS##_createInstance ( const Reference< XMultiServiceFactory >& rServiceManager ) throw ( Exception ) \ { \ AS_DBG_OUT ( "\tCREATEINSTANCE():\tOK\n" ) \ - return Reference< XInterface >( *(OWeakObject*)(new CLASS##( rServiceManager )) ); \ + return Reference< XInterface >( *(OWeakObject*)(new CLASS( rServiceManager )) ); \ } //****************************************************************************************************************************** @@ -166,7 +166,7 @@ AS_DBG_OUT ( "\tCOMPONENT_INFO():\t\txkey is valid ...\n" ) \ /* Build new keyname */ \ sKeyName = OUString::createFromAscii( "/" ) ; \ - sKeyName += CLASS##::impl_getStaticImplementationName() ; \ + sKeyName += CLASS::impl_getStaticImplementationName() ; \ sKeyName += OUString::createFromAscii( "/UNO/SERVICES" ); \ \ /* Create new key with new name. */ \ @@ -177,7 +177,7 @@ { \ AS_DBG_OUT ( "\tCOMPONENT_INFO():\t\txNewkey is valid ...\n" ) \ /* Get information about supported services. */ \ - seqServiceNames = CLASS##::impl_getStaticSupportedServiceNames() ; \ + seqServiceNames = CLASS::impl_getStaticSupportedServiceNames() ; \ pArray = seqServiceNames.getArray() ; \ nLength = seqServiceNames.getLength() ; \ nCounter = 0 ; \ @@ -212,9 +212,9 @@ xFactory = Reference< XSingleServiceFactory > \ ( \ cppu::createOneInstanceFactory ( xServiceManager , \ - CLASS##::impl_getStaticImplementationName () , \ + CLASS::impl_getStaticImplementationName () , \ CLASS##_createInstance , \ - CLASS##::impl_getStaticSupportedServiceNames () ) \ + CLASS::impl_getStaticSupportedServiceNames () ) \ ) ; \ AS_DBG_OUT ( "\tCREATEFACTORY_ONEINSTANCE():\t[end]\n" ) @@ -226,9 +226,9 @@ xFactory = Reference< XSingleServiceFactory > \ ( \ cppu::createSingleFactory ( xServiceManager , \ - CLASS##::impl_getStaticImplementationName () , \ + CLASS::impl_getStaticImplementationName () , \ CLASS##_createInstance , \ - CLASS##::impl_getStaticSupportedServiceNames () ) \ + CLASS::impl_getStaticSupportedServiceNames () ) \ ) ; \ AS_DBG_OUT ( "\tCREATEFACTORY_SINGLE():\t[end]\n" ) @@ -244,10 +244,10 @@ #else /* MACOSX */ #define IF_NAME_CREATECOMPONENTFACTORY_ONEINSTANCE(CLASS) \ \ - if ( CLASS##::impl_getStaticImplementationName().equals( OUString::createFromAscii( pImplementationName ) ) ) \ + if ( CLASS::impl_getStaticImplementationName().equals( OUString::createFromAscii( pImplementationName ) ) ) \ { \ AS_DBG_OUT ( "\tIF_NAME_CREATECOMPONENTFACTORY_ONEINSTANCE():\timplementationname found\n" ) \ - CREATEFACTORY_ONEINSTANCE ( CLASS## ) \ + CREATEFACTORY_ONEINSTANCE ( CLASS ) \ } #endif /* MACOSX */ @@ -263,10 +263,10 @@ #else /* MACOSX */ #define IF_NAME_CREATECOMPONENTFACTORY_SINGLE(CLASS) \ \ - if ( CLASS##::impl_getStaticImplementationName().equals( OUString::createFromAscii( pImplementationName ) ) ) \ + if ( CLASS::impl_getStaticImplementationName().equals( OUString::createFromAscii( pImplementationName ) ) ) \ { \ AS_DBG_OUT ( "\tIF_NAME_CREATECOMPONENTFACTORY_SINGLE():\timplementationname found\n" ) \ - CREATEFACTORY_SINGLE ( CLASS## ) \ + CREATEFACTORY_SINGLE ( CLASS ) \ } #endif /* MACOSX */ --- basic/source/inc/macfix.hxx +++ basic/source/inc/macfix.hxx @@ -61,8 +61,10 @@ // Some compilers expect a '&' operator before the member function name. -#if defined(MAC) || defined(HPUX) || defined(MACOSX) || (defined(GCC) && __GNUC__ >= 3) +#if defined(MAC) || defined(HPUX) || defined(MACOSX) #define MEMBER(name) &##name +#elif (defined(GCC) && __GNUC__ >= 3) +#define MEMBER(name) &name #else #define MEMBER(name) name #endif --- chaos/source/store/cntstgnd.cxx +++ chaos/source/store/cntstgnd.cxx @@ -172,7 +172,7 @@ #ifdef MACOSX #define CNT_FSYS_ROOT_CACHE_URL STG_PROTOCOL_CACHE"file:///" #else -#define CNT_FSYS_ROOT_CACHE_URL STG_PROTOCOL_CACHE##"file:///" +#define CNT_FSYS_ROOT_CACHE_URL STG_PROTOCOL_CACHE"file:///" #endif #define STG_NEVER_DELETE 0x80000000 --- connectivity/inc/connectivity/sqlnode.hxx +++ connectivity/inc/connectivity/sqlnode.hxx @@ -404,7 +404,7 @@ } // Utility-Methoden zum Abfragen auf bestimmte Rules, Token oder Punctuation: - #define SQL_ISRULE(pParseNode, eRule) ((pParseNode)->isRule() && (pParseNode)->getRuleID() == OSQLParser::RuleID(OSQLParseNode::##eRule)) + #define SQL_ISRULE(pParseNode, eRule) ((pParseNode)->isRule() && (pParseNode)->getRuleID() == OSQLParser::RuleID(OSQLParseNode::eRule)) #define SQL_ISTOKEN(pParseNode, token) ((pParseNode)->isToken() && (pParseNode)->getTokenID() == SQL_TOKEN_##token) #define SQL_ISPUNCTUATION(pParseNode, aString) ((pParseNode)->getNodeType() == SQL_NODE_PUNCTUATION && !(pParseNode)->getTokenValue().compareToAscii(aString)) } --- dbaccess/source/inc/apitools.hxx +++ dbaccess/source/inc/apitools.hxx @@ -372,30 +372,30 @@ //---------------------------------------------------------------------------------- #define DECL_PROP1(varname, type, attrib1) \ - DECL_PROP_IMPL(varname, ::getCppuType((const type *)0)) ::com::sun::star::beans::PropertyAttribute::##attrib1) + DECL_PROP_IMPL(varname, ::getCppuType((const type *)0)) ::com::sun::star::beans::PropertyAttribute::attrib1) //---------------------------------------------------------------------------------- #define DECL_PROP1_BOOL(varname, attrib1) \ - DECL_PROP_IMPL(varname, ::getBooleanCppuType()) ::com::sun::star::beans::PropertyAttribute::##attrib1) + DECL_PROP_IMPL(varname, ::getBooleanCppuType()) ::com::sun::star::beans::PropertyAttribute::attrib1) //---------------------------------------------------------------------------------- #define DECL_PROP1_IFACE(varname, iface, attrib1) \ - DECL_PROP_IMPL(varname, ::getCppuType(static_cast< ::com::sun::star::uno::Reference< iface >* >(NULL))) ::com::sun::star::beans::PropertyAttribute::##attrib1) + DECL_PROP_IMPL(varname, ::getCppuType(static_cast< ::com::sun::star::uno::Reference< iface >* >(NULL))) ::com::sun::star::beans::PropertyAttribute::attrib1) //---------------------------------------------------------------------------------- #define DECL_PROP2_IFACE(varname, iface, attrib1, attrib2) \ - 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) + 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) //---------------------------------------------------------------------------------- #define DECL_PROP2(varname, type, attrib1, attrib2) \ - DECL_PROP_IMPL(varname, ::getCppuType((const type *)0)) ::com::sun::star::beans::PropertyAttribute::##attrib1 | ::com::sun::star::beans::PropertyAttribute::##attrib2) + DECL_PROP_IMPL(varname, ::getCppuType((const type *)0)) ::com::sun::star::beans::PropertyAttribute::attrib1 | ::com::sun::star::beans::PropertyAttribute::attrib2) //---------------------------------------------------------------------------------- #define DECL_PROP2_BOOL(varname, attrib1, attrib2) \ - DECL_PROP_IMPL(varname, ::getBooleanCppuType()) ::com::sun::star::beans::PropertyAttribute::##attrib1 | ::com::sun::star::beans::PropertyAttribute::##attrib2) + DECL_PROP_IMPL(varname, ::getBooleanCppuType()) ::com::sun::star::beans::PropertyAttribute::attrib1 | ::com::sun::star::beans::PropertyAttribute::attrib2) //---------------------------------------------------------------------------------- #define DECL_PROP3(varname, type, attrib1, attrib2, attrib3) \ - 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) + 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) //---------------------------------------------------------------------------------- #define DECL_PROP3_BOOL(varname, attrib1, attrib2, attrib3) \ - DECL_PROP_IMPL(varname, ::getBooleanCppuType()) ::com::sun::star::beans::PropertyAttribute::##attrib1 | ::com::sun::star::beans::PropertyAttribute::##attrib2 | ::com::sun::star::beans::PropertyAttribute::##attrib3) + DECL_PROP_IMPL(varname, ::getBooleanCppuType()) ::com::sun::star::beans::PropertyAttribute::attrib1 | ::com::sun::star::beans::PropertyAttribute::attrib2 | ::com::sun::star::beans::PropertyAttribute::attrib3) //---------------------------------------------------------------------------------- --- desktop/source/app/app.cxx +++ desktop/source/app/app.cxx @@ -269,7 +269,7 @@ #include #endif -#define DEFINE_CONST_UNICODE(CONSTASCII) UniString(RTL_CONSTASCII_USTRINGPARAM(CONSTASCII##)) +#define DEFINE_CONST_UNICODE(CONSTASCII) UniString(RTL_CONSTASCII_USTRINGPARAM(CONSTASCII)) #define U2S(STRING) ::rtl::OUStringToOString(STRING, RTL_TEXTENCODING_UTF8) using namespace vos; --- extensions/source/inimanager/iniregister.cxx +++ extensions/source/inimanager/iniregister.cxx @@ -135,7 +135,7 @@ static Reference< XInterface > SAL_CALL CLASS##_createInstance ( const Reference< XMultiServiceFactory >& rServiceManager ) throw ( Exception ) \ { \ AS_DBG_OUT ( "\tCREATEINSTANCE():\tOK\n" ) \ - return Reference< XInterface >( *new CLASS##( rServiceManager ) ); \ + return Reference< XInterface >( *new CLASS( rServiceManager ) ); \ } //****************************************************************************************************************************** @@ -153,7 +153,7 @@ AS_DBG_OUT ( "\tCOMPONENT_INFO():\t\txkey is valid ...\n" ) \ /* Build new keyname */ \ sKeyName = OUString::createFromAscii( "/" ) ; \ - sKeyName += CLASS##::impl_getStaticImplementationName() ; \ + sKeyName += CLASS::impl_getStaticImplementationName() ; \ sKeyName += OUString::createFromAscii( "/UNO/SERVICES" ); \ \ /* Create new key with new name. */ \ @@ -164,7 +164,7 @@ { \ AS_DBG_OUT ( "\tCOMPONENT_INFO():\t\txNewkey is valid ...\n" ) \ /* Get information about supported services. */ \ - seqServiceNames = CLASS##::impl_getStaticSupportedServiceNames() ; \ + seqServiceNames = CLASS::impl_getStaticSupportedServiceNames() ; \ pArray = seqServiceNames.getArray() ; \ nLength = seqServiceNames.getLength() ; \ nCounter = 0 ; \ @@ -199,9 +199,9 @@ xFactory = Reference< XSingleServiceFactory > \ ( \ cppu::createOneInstanceFactory ( xServiceManager , \ - CLASS##::impl_getStaticImplementationName () , \ + CLASS::impl_getStaticImplementationName () , \ CLASS##_createInstance , \ - CLASS##::impl_getStaticSupportedServiceNames () ) \ + CLASS::impl_getStaticSupportedServiceNames () ) \ ) ; \ AS_DBG_OUT ( "\tCREATEFACTORY_ONEINSTANCE():\t[end]\n" ) @@ -213,28 +213,28 @@ xFactory = Reference< XSingleServiceFactory > \ ( \ cppu::createSingleFactory ( xServiceManager , \ - CLASS##::impl_getStaticImplementationName () , \ + CLASS::impl_getStaticImplementationName () , \ CLASS##_createInstance , \ - CLASS##::impl_getStaticSupportedServiceNames () ) \ + CLASS::impl_getStaticSupportedServiceNames () ) \ ) ; \ AS_DBG_OUT ( "\tCREATEFACTORY_SINGLE():\t[end]\n" ) //****************************************************************************************************************************** #define IF_NAME_CREATECOMPONENTFACTORY_ONEINSTANCE(CLASS) \ \ - if ( CLASS##::impl_getStaticImplementationName().equals( OUString::createFromAscii( pImplementationName ) ) ) \ + if ( CLASS::impl_getStaticImplementationName().equals( OUString::createFromAscii( pImplementationName ) ) ) \ { \ AS_DBG_OUT ( "\tIF_NAME_CREATECOMPONENTFACTORY_ONEINSTANCE():\timplementationname found\n" ) \ - CREATEFACTORY_ONEINSTANCE ( CLASS## ) \ + CREATEFACTORY_ONEINSTANCE ( CLASS ) \ } //****************************************************************************************************************************** #define IF_NAME_CREATECOMPONENTFACTORY_SINGLE(CLASS) \ \ - if ( CLASS##::impl_getStaticImplementationName().equals( OUString::createFromAscii( pImplementationName ) ) ) \ + if ( CLASS::impl_getStaticImplementationName().equals( OUString::createFromAscii( pImplementationName ) ) ) \ { \ AS_DBG_OUT ( "\tIF_NAME_CREATECOMPONENTFACTORY_SINGLE():\timplementationname found\n" ) \ - CREATEFACTORY_SINGLE ( CLASS## ) \ + CREATEFACTORY_SINGLE ( CLASS ) \ } //______________________________________________________________________________________________________________ --- offmgr/source/offapp/app/appctor.cxx +++ offmgr/source/offapp/app/appctor.cxx @@ -110,7 +110,7 @@ #include "app.hxx" #include "appimp.hxx" -#define DEFINE_CONST_UNICODE(CONSTASCII) UniString(RTL_CONSTASCII_USTRINGPARAM(CONSTASCII##)) +#define DEFINE_CONST_UNICODE(CONSTASCII) UniString(RTL_CONSTASCII_USTRINGPARAM(CONSTASCII)) static SvxDialogDll* pSvxDLL = NULL; static BasicDLL* pBasic = NULL; --- rsc/source/parser/rscdb.cxx +++ rsc/source/parser/rscdb.cxx @@ -247,7 +247,7 @@ return NULL; #define ELSE_IF( a ) \ - else if( a##.GetId() == nId ) \ + else if( a.GetId() == nId ) \ return &a; \ if( aBool.GetId() == nId ) --- sal/osl/unx/system.h +++ sal/osl/unx/system.h @@ -460,14 +460,14 @@ #ifndef NORMALIZE_TIMESPEC # define NORMALIZE_TIMESPEC(timespec) \ - timespec##.tv_sec += timespec##.tv_nsec / 1000000000; \ - timespec##.tv_nsec %= 1000000000; + timespec.tv_sec += timespec.tv_nsec / 1000000000; \ + timespec.tv_nsec %= 1000000000; #endif #ifndef SET_TIMESPEC # define SET_TIMESPEC(timespec, sec, nsec) \ - timespec##.tv_sec = (sec); \ - timespec##.tv_nsec = (nsec); \ + timespec.tv_sec = (sec); \ + timespec.tv_nsec = (nsec); \ NORMALIZE_TIMESPEC(timespec); #endif --- sc/inc/miscuno.hxx +++ sc/inc/miscuno.hxx @@ -87,43 +87,43 @@ #define SC_SIMPLE_SERVICE_INFO( ClassName, ClassNameAscii, ServiceAscii ) \ -::rtl::OUString SAL_CALL ClassName##::getImplementationName() \ +::rtl::OUString SAL_CALL ClassName::getImplementationName() \ throw(::com::sun::star::uno::RuntimeException) \ { \ - return ::rtl::OUString::createFromAscii(ClassNameAscii##); \ + return ::rtl::OUString::createFromAscii(ClassNameAscii); \ } \ -sal_Bool SAL_CALL ClassName##::supportsService( const ::rtl::OUString& ServiceName ) \ +sal_Bool SAL_CALL ClassName::supportsService( const ::rtl::OUString& ServiceName ) \ throw(::com::sun::star::uno::RuntimeException) \ { \ return !ServiceName.compareToAscii(ServiceAscii); \ } \ ::com::sun::star::uno::Sequence< ::rtl::OUString > \ - SAL_CALL ClassName##::getSupportedServiceNames(void) \ + SAL_CALL ClassName::getSupportedServiceNames(void) \ throw(::com::sun::star::uno::RuntimeException) \ { \ ::com::sun::star::uno::Sequence< ::rtl::OUString > aRet(1); \ ::rtl::OUString* pArray = aRet.getArray(); \ - pArray[0] = ::rtl::OUString::createFromAscii(ServiceAscii##); \ + pArray[0] = ::rtl::OUString::createFromAscii(ServiceAscii); \ return aRet; \ } #define SC_IMPL_DUMMY_PROPERTY_LISTENER( ClassName ) \ - void SAL_CALL ClassName##::addPropertyChangeListener( const rtl::OUString&, \ + void SAL_CALL ClassName::addPropertyChangeListener( const rtl::OUString&, \ const uno::Reference&) \ throw(beans::UnknownPropertyException, \ lang::WrappedTargetException, uno::RuntimeException) \ { DBG_ERROR("not implemented"); } \ - void SAL_CALL ClassName##::removePropertyChangeListener( const rtl::OUString&, \ + void SAL_CALL ClassName::removePropertyChangeListener( const rtl::OUString&, \ const uno::Reference&) \ throw(beans::UnknownPropertyException, \ lang::WrappedTargetException, uno::RuntimeException) \ { DBG_ERROR("not implemented"); } \ - void SAL_CALL ClassName##::addVetoableChangeListener( const rtl::OUString&, \ + void SAL_CALL ClassName::addVetoableChangeListener( const rtl::OUString&, \ const uno::Reference&) \ throw(beans::UnknownPropertyException, \ lang::WrappedTargetException, uno::RuntimeException) \ { DBG_ERROR("not implemented"); } \ - void SAL_CALL ClassName##::removeVetoableChangeListener( const rtl::OUString&, \ + void SAL_CALL ClassName::removeVetoableChangeListener( const rtl::OUString&, \ const uno::Reference&) \ throw(beans::UnknownPropertyException, \ lang::WrappedTargetException, uno::RuntimeException) \ --- setup2/source/service/installer.cxx +++ setup2/source/service/installer.cxx @@ -126,7 +126,7 @@ using namespace ::com::sun::star::registry; using namespace ::cppu; -#define DEFINE_CONST_UNICODE(CONSTASCII) UniString(RTL_CONSTASCII_USTRINGPARAM(CONSTASCII##)) +#define DEFINE_CONST_UNICODE(CONSTASCII) UniString(RTL_CONSTASCII_USTRINGPARAM(CONSTASCII)) char const INSTALLER_INITFILENAME[] = "initialize.ini"; char const INSTALLER_SECTION_UNOCOMPONENTS[] = "UnoComponents"; --- sfx2/inc/sfxuno.hxx +++ sfx2/inc/sfxuno.hxx @@ -276,7 +276,7 @@ /* Attention: Don't use mutex or guard in this method!!! Is a method of XInterface. */ \ /* Ask for my own supported interfaces ... */ \ UNOANY aReturn ( ::cppu::queryInterface( rType, \ - IMPLINTERFACES## \ + IMPLINTERFACES \ ) \ ); \ /* If searched interface supported by this class ... */ \ @@ -297,113 +297,113 @@ #define SFX_IMPL_INTERFACE_1( INTERFACE1 ) \ SFX_IMPL_INTERFACE_0, \ - static_cast< INTERFACE1##* >( this ) + static_cast< INTERFACE1* >( this ) #define SFX_IMPL_INTERFACE_2( INTERFACE1, INTERFACE2 ) \ - SFX_IMPL_INTERFACE_1( INTERFACE1## ), \ - static_cast< INTERFACE2##* >( this ) + SFX_IMPL_INTERFACE_1( INTERFACE1 ), \ + static_cast< INTERFACE2* >( this ) #define SFX_IMPL_INTERFACE_3( INTERFACE1, INTERFACE2, INTERFACE3 ) \ - SFX_IMPL_INTERFACE_2( INTERFACE1##, INTERFACE2## ), \ - static_cast< INTERFACE3##* >( this ) + SFX_IMPL_INTERFACE_2( INTERFACE1, INTERFACE2 ), \ + static_cast< INTERFACE3* >( this ) #define SFX_IMPL_INTERFACE_4( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4 ) \ - SFX_IMPL_INTERFACE_3( INTERFACE1##, INTERFACE2##, INTERFACE3## ), \ - static_cast< INTERFACE4##* >( this ) + SFX_IMPL_INTERFACE_3( INTERFACE1, INTERFACE2, INTERFACE3 ), \ + static_cast< INTERFACE4* >( this ) #define SFX_IMPL_INTERFACE_5( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5 ) \ - SFX_IMPL_INTERFACE_4( INTERFACE1##, INTERFACE2##, INTERFACE3##, INTERFACE4## ), \ - static_cast< INTERFACE5##* >( this ) + SFX_IMPL_INTERFACE_4( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4 ), \ + static_cast< INTERFACE5* >( this ) #define SFX_IMPL_INTERFACE_6( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6 ) \ - SFX_IMPL_INTERFACE_5( INTERFACE1##, INTERFACE2##, INTERFACE3##, INTERFACE4##, INTERFACE5## ), \ - static_cast< INTERFACE6##* >( this ) + SFX_IMPL_INTERFACE_5( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5 ), \ + static_cast< INTERFACE6* >( this ) #define SFX_IMPL_INTERFACE_7( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7 ) \ - SFX_IMPL_INTERFACE_6( INTERFACE1##, INTERFACE2##, INTERFACE3##, INTERFACE4##, INTERFACE5##, INTERFACE6## ), \ - static_cast< INTERFACE7##* >( this ) + SFX_IMPL_INTERFACE_6( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6 ), \ + static_cast< INTERFACE7* >( this ) #define SFX_IMPL_INTERFACE_8( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8 ) \ - SFX_IMPL_INTERFACE_7( INTERFACE1##, INTERFACE2##, INTERFACE3##, INTERFACE4##, INTERFACE5##, INTERFACE6##, INTERFACE7## ), \ - static_cast< INTERFACE8##* >( this ) + SFX_IMPL_INTERFACE_7( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7 ), \ + static_cast< INTERFACE8* >( this ) #define SFX_IMPL_INTERFACE_9( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9 ) \ - SFX_IMPL_INTERFACE_8( INTERFACE1##, INTERFACE2##, INTERFACE3##, INTERFACE4##, INTERFACE5##, INTERFACE6##, INTERFACE7##, INTERFACE8## ), \ - static_cast< INTERFACE9##* >( this ) + SFX_IMPL_INTERFACE_8( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8 ), \ + static_cast< INTERFACE9* >( this ) #define SFX_IMPL_INTERFACE_10( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10 ) \ - SFX_IMPL_INTERFACE_9( INTERFACE1##, INTERFACE2##, INTERFACE3##, INTERFACE4##, INTERFACE5##, INTERFACE6##, INTERFACE7##, INTERFACE8##, INTERFACE9## ), \ - static_cast< INTERFACE10##* >( this ) + SFX_IMPL_INTERFACE_9( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9 ), \ + static_cast< INTERFACE10* >( this ) #define SFX_IMPL_INTERFACE_11( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10, INTERFACE11 ) \ - SFX_IMPL_INTERFACE_10( INTERFACE1##, INTERFACE2##, INTERFACE3##, INTERFACE4##, INTERFACE5##, INTERFACE6##, INTERFACE7##, INTERFACE8##, INTERFACE9##, INTERFACE10## ), \ - static_cast< INTERFACE11##* >( this ) + SFX_IMPL_INTERFACE_10( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10 ), \ + static_cast< INTERFACE11* >( this ) #define SFX_IMPL_INTERFACE_12( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10, INTERFACE11, INTERFACE12 ) \ - SFX_IMPL_INTERFACE_11( INTERFACE1##, INTERFACE2##, INTERFACE3##, INTERFACE4##, INTERFACE5##, INTERFACE6##, INTERFACE7##, INTERFACE8##, INTERFACE9##, INTERFACE10##, INTERFACE11## ), \ - static_cast< INTERFACE12##* >( this ) + SFX_IMPL_INTERFACE_11( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10, INTERFACE11 ), \ + static_cast< INTERFACE12* >( this ) #define SFX_IMPL_INTERFACE_13( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10, INTERFACE11, INTERFACE12, INTERFACE13 ) \ - SFX_IMPL_INTERFACE_12( INTERFACE1##, INTERFACE2##, INTERFACE3##, INTERFACE4##, INTERFACE5##, INTERFACE6##, INTERFACE7##, INTERFACE8##, INTERFACE9##, INTERFACE10##, INTERFACE11##, INTERFACE12## ), \ - static_cast< INTERFACE13##* >( this ) + SFX_IMPL_INTERFACE_12( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10, INTERFACE11, INTERFACE12 ), \ + static_cast< INTERFACE13* >( this ) /*_________________________________________________________________________________________________________________________*/ // Follow macros can used directly :-) // implementation of XInterface with 0 additional interface for queryInterface() #define SFX_IMPL_XINTERFACE_0( IMPLCLASS, BASECLASS ) \ - SFX_IMPL_XINTERFACE_BASE( IMPLCLASS##, BASECLASS##, SFX_IMPL_INTERFACE_0 ) + SFX_IMPL_XINTERFACE_BASE( IMPLCLASS, BASECLASS, SFX_IMPL_INTERFACE_0 ) // implementation of XInterface with 1 additional interface for queryInterface() #define SFX_IMPL_XINTERFACE_1( IMPLCLASS, BASECLASS, INTERFACE1 ) \ - SFX_IMPL_XINTERFACE_BASE( IMPLCLASS##, BASECLASS##, SFX_IMPL_INTERFACE_1( INTERFACE1## ) ) + SFX_IMPL_XINTERFACE_BASE( IMPLCLASS, BASECLASS, SFX_IMPL_INTERFACE_1( INTERFACE1 ) ) // implementation of XInterface with 2 additional interfaces for queryInterface() #define SFX_IMPL_XINTERFACE_2( IMPLCLASS, BASECLASS, INTERFACE1, INTERFACE2 ) \ - SFX_IMPL_XINTERFACE_BASE( IMPLCLASS##, BASECLASS##, SFX_IMPL_INTERFACE_2( INTERFACE1##, INTERFACE2## ) ) + SFX_IMPL_XINTERFACE_BASE( IMPLCLASS, BASECLASS, SFX_IMPL_INTERFACE_2( INTERFACE1, INTERFACE2 ) ) // implementation of XInterface with 3 additional interfaces for queryInterface() #define SFX_IMPL_XINTERFACE_3( IMPLCLASS, BASECLASS, INTERFACE1, INTERFACE2, INTERFACE3 ) \ - SFX_IMPL_XINTERFACE_BASE( IMPLCLASS##, BASECLASS##, SFX_IMPL_INTERFACE_3( INTERFACE1##, INTERFACE2##, INTERFACE3## ) ) + SFX_IMPL_XINTERFACE_BASE( IMPLCLASS, BASECLASS, SFX_IMPL_INTERFACE_3( INTERFACE1, INTERFACE2, INTERFACE3 ) ) // implementation of XInterface with 4 additional interfaces for queryInterface() #define SFX_IMPL_XINTERFACE_4( IMPLCLASS, BASECLASS, INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4 ) \ - SFX_IMPL_XINTERFACE_BASE( IMPLCLASS##, BASECLASS##, SFX_IMPL_INTERFACE_4( INTERFACE1##, INTERFACE2##, INTERFACE3##, INTERFACE4## ) ) + SFX_IMPL_XINTERFACE_BASE( IMPLCLASS, BASECLASS, SFX_IMPL_INTERFACE_4( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4 ) ) // implementation of XInterface with 5 additional interfaces for queryInterface() #define SFX_IMPL_XINTERFACE_5( IMPLCLASS, BASECLASS, INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5 ) \ - SFX_IMPL_XINTERFACE_BASE( IMPLCLASS##, BASECLASS##, SFX_IMPL_INTERFACE_5( INTERFACE1##, INTERFACE2##, INTERFACE3##, INTERFACE4##, INTERFACE5## ) ) + SFX_IMPL_XINTERFACE_BASE( IMPLCLASS, BASECLASS, SFX_IMPL_INTERFACE_5( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5 ) ) // implementation of XInterface with 6 additional interfaces for queryInterface() #define SFX_IMPL_XINTERFACE_6( IMPLCLASS, BASECLASS, INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6 ) \ - SFX_IMPL_XINTERFACE_BASE( IMPLCLASS##, BASECLASS##, SFX_IMPL_INTERFACE_6( INTERFACE1##, INTERFACE2##, INTERFACE3##, INTERFACE4##, INTERFACE5##, INTERFACE6## ) ) + SFX_IMPL_XINTERFACE_BASE( IMPLCLASS, BASECLASS, SFX_IMPL_INTERFACE_6( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6 ) ) // implementation of XInterface with 7 additional interfaces for queryInterface() #define SFX_IMPL_XINTERFACE_7( IMPLCLASS, BASECLASS, INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7 ) \ - SFX_IMPL_XINTERFACE_BASE( IMPLCLASS##, BASECLASS##, SFX_IMPL_INTERFACE_7( INTERFACE1##, INTERFACE2##, INTERFACE3##, INTERFACE4##, INTERFACE5##, INTERFACE6##, INTERFACE7## ) ) + SFX_IMPL_XINTERFACE_BASE( IMPLCLASS, BASECLASS, SFX_IMPL_INTERFACE_7( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7 ) ) // implementation of XInterface with 8 additional interfaces for queryInterface() #define SFX_IMPL_XINTERFACE_8( IMPLCLASS, BASECLASS, INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8 ) \ - SFX_IMPL_XINTERFACE_BASE( IMPLCLASS##, BASECLASS##, SFX_IMPL_INTERFACE_8( INTERFACE1##, INTERFACE2##, INTERFACE3##, INTERFACE4##, INTERFACE5##, INTERFACE6##, INTERFACE7##, INTERFACE8## ) ) + SFX_IMPL_XINTERFACE_BASE( IMPLCLASS, BASECLASS, SFX_IMPL_INTERFACE_8( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8 ) ) // implementation of XInterface with 9 additional interfaces for queryInterface() #define SFX_IMPL_XINTERFACE_9( IMPLCLASS, BASECLASS, INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9 ) \ - SFX_IMPL_XINTERFACE_BASE( IMPLCLASS##, BASECLASS##, SFX_IMPL_INTERFACE_9( INTERFACE1##, INTERFACE2##, INTERFACE3##, INTERFACE4##, INTERFACE5##, INTERFACE6##, INTERFACE7##, INTERFACE8##, INTERFACE9## ) ) + SFX_IMPL_XINTERFACE_BASE( IMPLCLASS, BASECLASS, SFX_IMPL_INTERFACE_9( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9 ) ) // implementation of XInterface with 10 additional interfaces for queryInterface() #define SFX_IMPL_XINTERFACE_10( IMPLCLASS, BASECLASS, INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10 ) \ - SFX_IMPL_XINTERFACE_BASE( IMPLCLASS##, BASECLASS##, SFX_IMPL_INTERFACE_10( INTERFACE1##, INTERFACE2##, INTERFACE3##, INTERFACE4##, INTERFACE5##, INTERFACE6##, INTERFACE7##, INTERFACE8##, INTERFACE9##, INTERFACE10## ) ) + SFX_IMPL_XINTERFACE_BASE( IMPLCLASS, BASECLASS, SFX_IMPL_INTERFACE_10( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10 ) ) // implementation of XInterface with 11 additional interfaces for queryInterface() #define SFX_IMPL_XINTERFACE_11( IMPLCLASS, BASECLASS, INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10, INTERFACE11 ) \ - SFX_IMPL_XINTERFACE_BASE( IMPLCLASS##, BASECLASS##, SFX_IMPL_INTERFACE_11( INTERFACE1##, INTERFACE2##, INTERFACE3##, INTERFACE4##, INTERFACE5##, INTERFACE6##, INTERFACE7##, INTERFACE8##, INTERFACE9##, INTERFACE10##, INTERFACE11## ) ) + SFX_IMPL_XINTERFACE_BASE( IMPLCLASS, BASECLASS, SFX_IMPL_INTERFACE_11( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10, INTERFACE11 ) ) // implementation of XInterface with 11 additional interfaces for queryInterface() #define SFX_IMPL_XINTERFACE_12( IMPLCLASS, BASECLASS, INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10, INTERFACE11, INTERFACE12 ) \ - SFX_IMPL_XINTERFACE_BASE( IMPLCLASS##, BASECLASS##, SFX_IMPL_INTERFACE_12( INTERFACE1##, INTERFACE2##, INTERFACE3##, INTERFACE4##, INTERFACE5##, INTERFACE6##, INTERFACE7##, INTERFACE8##, INTERFACE9##, INTERFACE10##, INTERFACE11##, INTERFACE12## ) ) + SFX_IMPL_XINTERFACE_BASE( IMPLCLASS, BASECLASS, SFX_IMPL_INTERFACE_12( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10, INTERFACE11, INTERFACE12 ) ) // implementation of XInterface with 11 additional interfaces for queryInterface() #define SFX_IMPL_XINTERFACE_13( IMPLCLASS, BASECLASS, INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10, INTERFACE11, INTERFACE12, INTERFACE13 ) \ - SFX_IMPL_XINTERFACE_BASE( IMPLCLASS##, BASECLASS##, SFX_IMPL_INTERFACE_13( INTERFACE1##, INTERFACE2##, INTERFACE3##, INTERFACE4##, INTERFACE5##, INTERFACE6##, INTERFACE7##, INTERFACE8##, INTERFACE9##, INTERFACE10##, INTERFACE11##, INTERFACE12##, INTERFACE13## ) ) + SFX_IMPL_XINTERFACE_BASE( IMPLCLASS, BASECLASS, SFX_IMPL_INTERFACE_13( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10, INTERFACE11, INTERFACE12, INTERFACE13 ) ) //************************************************************************************************************************ // implementation of XTypeProvider::getTypes() @@ -413,7 +413,7 @@ // DON'T USE FOLLOW MACROS DIRECTLY!!! #define SFX_IMPL_XTYPEPROVIDER_BASE( IMPLCLASS, IMPLTYPES ) \ \ - UNOSEQUENCE< sal_Int8 > SAL_CALL IMPLCLASS##::getImplementationId() throw( UNORUNTIMEEXCEPTION ) \ + UNOSEQUENCE< sal_Int8 > SAL_CALL IMPLCLASS::getImplementationId() throw( UNORUNTIMEEXCEPTION ) \ { \ /* Create one Id for all instances of this class. */ \ /* Use ethernet address to do this! (sal_True) */ \ @@ -437,7 +437,7 @@ return pID->getImplementationId(); \ } \ \ - UNOSEQUENCE< UNOTYPE > SAL_CALL IMPLCLASS##::getTypes() throw( UNORUNTIMEEXCEPTION ) \ + UNOSEQUENCE< UNOTYPE > SAL_CALL IMPLCLASS::getTypes() throw( UNORUNTIMEEXCEPTION ) \ { \ /* Optimize this method ! */ \ /* We initialize a static variable only one time. And we don't must use a mutex at every call! */ \ @@ -451,7 +451,7 @@ if ( pTypeCollection == NULL ) \ { \ /* Create a static typecollection ... */ \ - static UNOOTYPECOLLECTION aTypeCollection( IMPLTYPES## ); \ + static UNOOTYPECOLLECTION aTypeCollection( IMPLTYPES ); \ /* ... and set his address to static pointer! */ \ pTypeCollection = &aTypeCollection ; \ } \ @@ -464,114 +464,114 @@ #define SFX_IMPL_TYPE_1( TYPE1 ) \ SFX_IMPL_TYPE_0, \ - ::getCppuType(( const UNOREFERENCE< TYPE1## >*)NULL ) + ::getCppuType(( const UNOREFERENCE< TYPE1 >*)NULL ) #define SFX_IMPL_TYPE_2( TYPE1, TYPE2 ) \ - SFX_IMPL_TYPE_1( TYPE1## ), \ - ::getCppuType(( const UNOREFERENCE< TYPE2## >*)NULL ) + SFX_IMPL_TYPE_1( TYPE1 ), \ + ::getCppuType(( const UNOREFERENCE< TYPE2 >*)NULL ) #define SFX_IMPL_TYPE_3( TYPE1, TYPE2, TYPE3 ) \ - SFX_IMPL_TYPE_2( TYPE1##, TYPE2## ), \ - ::getCppuType(( const UNOREFERENCE< TYPE3## >*)NULL ) + SFX_IMPL_TYPE_2( TYPE1, TYPE2 ), \ + ::getCppuType(( const UNOREFERENCE< TYPE3 >*)NULL ) #define SFX_IMPL_TYPE_4( TYPE1, TYPE2, TYPE3, TYPE4 ) \ - SFX_IMPL_TYPE_3( TYPE1##, TYPE2##, TYPE3## ), \ - ::getCppuType(( const UNOREFERENCE< TYPE4## >*)NULL ) + SFX_IMPL_TYPE_3( TYPE1, TYPE2, TYPE3 ), \ + ::getCppuType(( const UNOREFERENCE< TYPE4 >*)NULL ) #define SFX_IMPL_TYPE_5( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5 ) \ - SFX_IMPL_TYPE_4( TYPE1##, TYPE2##, TYPE3##, TYPE4## ), \ - ::getCppuType(( const UNOREFERENCE< TYPE5## >*)NULL ) + SFX_IMPL_TYPE_4( TYPE1, TYPE2, TYPE3, TYPE4 ), \ + ::getCppuType(( const UNOREFERENCE< TYPE5 >*)NULL ) #define SFX_IMPL_TYPE_6( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6 ) \ - SFX_IMPL_TYPE_5( TYPE1##, TYPE2##, TYPE3##, TYPE4##, TYPE5## ), \ - ::getCppuType(( const UNOREFERENCE< TYPE6## >*)NULL ) + SFX_IMPL_TYPE_5( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5 ), \ + ::getCppuType(( const UNOREFERENCE< TYPE6 >*)NULL ) #define SFX_IMPL_TYPE_7( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7 ) \ - SFX_IMPL_TYPE_6( TYPE1##, TYPE2##, TYPE3##, TYPE4##, TYPE5##, TYPE6## ), \ - ::getCppuType(( const UNOREFERENCE< TYPE7## >*)NULL ) + SFX_IMPL_TYPE_6( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6 ), \ + ::getCppuType(( const UNOREFERENCE< TYPE7 >*)NULL ) #define SFX_IMPL_TYPE_8( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8 ) \ - SFX_IMPL_TYPE_7( TYPE1##, TYPE2##, TYPE3##, TYPE4##, TYPE5##, TYPE6##, TYPE7## ), \ - ::getCppuType(( const UNOREFERENCE< TYPE8## >*)NULL ) + SFX_IMPL_TYPE_7( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7 ), \ + ::getCppuType(( const UNOREFERENCE< TYPE8 >*)NULL ) #define SFX_IMPL_TYPE_9( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9 ) \ - SFX_IMPL_TYPE_8( TYPE1##, TYPE2##, TYPE3##, TYPE4##, TYPE5##, TYPE6##, TYPE7##, TYPE8## ), \ - ::getCppuType(( const UNOREFERENCE< TYPE9## >*)NULL ) + SFX_IMPL_TYPE_8( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8 ), \ + ::getCppuType(( const UNOREFERENCE< TYPE9 >*)NULL ) #define SFX_IMPL_TYPE_10( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10 ) \ - SFX_IMPL_TYPE_9( TYPE1##, TYPE2##, TYPE3##, TYPE4##, TYPE5##, TYPE6##, TYPE7##, TYPE8##, TYPE9## ), \ - ::getCppuType(( const UNOREFERENCE< TYPE10## >*)NULL ) + SFX_IMPL_TYPE_9( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9 ), \ + ::getCppuType(( const UNOREFERENCE< TYPE10 >*)NULL ) #define SFX_IMPL_TYPE_11( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10, TYPE11 ) \ - SFX_IMPL_TYPE_10( TYPE1##, TYPE2##, TYPE3##, TYPE4##, TYPE5##, TYPE6##, TYPE7##, TYPE8##, TYPE9##, TYPE10## ), \ - ::getCppuType(( const UNOREFERENCE< TYPE11## >*)NULL ) + SFX_IMPL_TYPE_10( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10 ), \ + ::getCppuType(( const UNOREFERENCE< TYPE11 >*)NULL ) #define SFX_IMPL_TYPE_12( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10, TYPE11, TYPE12 ) \ - SFX_IMPL_TYPE_11( TYPE1##, TYPE2##, TYPE3##, TYPE4##, TYPE5##, TYPE6##, TYPE7##, TYPE8##, TYPE9##, TYPE10##, TYPE11## ), \ - ::getCppuType(( const UNOREFERENCE< TYPE12## >*)NULL ) + SFX_IMPL_TYPE_11( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10, TYPE11 ), \ + ::getCppuType(( const UNOREFERENCE< TYPE12 >*)NULL ) #define SFX_IMPL_TYPE_13( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10, TYPE11, TYPE12, TYPE13 ) \ - SFX_IMPL_TYPE_12( TYPE1##, TYPE2##, TYPE3##, TYPE4##, TYPE5##, TYPE6##, TYPE7##, TYPE8##, TYPE9##, TYPE10##, TYPE11##, TYPE12## ), \ - ::getCppuType(( const UNOREFERENCE< TYPE13## >*)NULL ) + SFX_IMPL_TYPE_12( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10, TYPE11, TYPE12 ), \ + ::getCppuType(( const UNOREFERENCE< TYPE13 >*)NULL ) /*_________________________________________________________________________________________________________________________*/ // FOLLOW MACROS CAN USED DIRECTLY :-) // implementation of XInterface with 1 additional interface for queryInterface() #define SFX_IMPL_XTYPEPROVIDER_0( IMPLCLASS ) \ - SFX_IMPL_XTYPEPROVIDER_BASE( IMPLCLASS##, SFX_IMPL_TYPE_0 ) + SFX_IMPL_XTYPEPROVIDER_BASE( IMPLCLASS, SFX_IMPL_TYPE_0 ) // implementation of XInterface with 1 additional interface for queryInterface() #define SFX_IMPL_XTYPEPROVIDER_1( IMPLCLASS, TYPE1 ) \ - SFX_IMPL_XTYPEPROVIDER_BASE( IMPLCLASS##, SFX_IMPL_TYPE_1( TYPE1## ) ) + SFX_IMPL_XTYPEPROVIDER_BASE( IMPLCLASS, SFX_IMPL_TYPE_1( TYPE1 ) ) // implementation of XInterface with 2 additional interfaces for queryInterface() #define SFX_IMPL_XTYPEPROVIDER_2( IMPLCLASS, TYPE1, TYPE2 ) \ - SFX_IMPL_XTYPEPROVIDER_BASE( IMPLCLASS##, SFX_IMPL_TYPE_2( TYPE1##, TYPE2## ) ) + SFX_IMPL_XTYPEPROVIDER_BASE( IMPLCLASS, SFX_IMPL_TYPE_2( TYPE1, TYPE2 ) ) // implementation of XInterface with 3 additional interfaces for queryInterface() #define SFX_IMPL_XTYPEPROVIDER_3( IMPLCLASS, TYPE1, TYPE2, TYPE3 ) \ - SFX_IMPL_XTYPEPROVIDER_BASE( IMPLCLASS##, SFX_IMPL_TYPE_3( TYPE1##, TYPE2##, TYPE3## ) ) + SFX_IMPL_XTYPEPROVIDER_BASE( IMPLCLASS, SFX_IMPL_TYPE_3( TYPE1, TYPE2, TYPE3 ) ) // implementation of XInterface with 4 additional interfaces for queryInterface() #define SFX_IMPL_XTYPEPROVIDER_4( IMPLCLASS, TYPE1, TYPE2, TYPE3, TYPE4 ) \ - SFX_IMPL_XTYPEPROVIDER_BASE( IMPLCLASS##, SFX_IMPL_TYPE_4( TYPE1##, TYPE2##, TYPE3##, TYPE4## ) ) + SFX_IMPL_XTYPEPROVIDER_BASE( IMPLCLASS, SFX_IMPL_TYPE_4( TYPE1, TYPE2, TYPE3, TYPE4 ) ) // implementation of XInterface with 5 additional interfaces for queryInterface() #define SFX_IMPL_XTYPEPROVIDER_5( IMPLCLASS, TYPE1, TYPE2, TYPE3, TYPE4, TYPE5 ) \ - SFX_IMPL_XTYPEPROVIDER_BASE( IMPLCLASS##, SFX_IMPL_TYPE_5( TYPE1##, TYPE2##, TYPE3##, TYPE4##, TYPE5## ) ) + SFX_IMPL_XTYPEPROVIDER_BASE( IMPLCLASS, SFX_IMPL_TYPE_5( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5 ) ) // implementation of XInterface with 6 additional interfaces for queryInterface() #define SFX_IMPL_XTYPEPROVIDER_6( IMPLCLASS, TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6 ) \ - SFX_IMPL_XTYPEPROVIDER_BASE( IMPLCLASS##, SFX_IMPL_TYPE_6( TYPE1##, TYPE2##, TYPE3##, TYPE4##, TYPE5##, TYPE6## ) ) + SFX_IMPL_XTYPEPROVIDER_BASE( IMPLCLASS, SFX_IMPL_TYPE_6( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6 ) ) // implementation of XInterface with 7 additional interfaces for queryInterface() #define SFX_IMPL_XTYPEPROVIDER_7( IMPLCLASS, TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7 ) \ - SFX_IMPL_XTYPEPROVIDER_BASE( IMPLCLASS##, SFX_IMPL_TYPE_7( TYPE1##, TYPE2##, TYPE3##, TYPE4##, TYPE5##, TYPE6##, TYPE7## ) ) + SFX_IMPL_XTYPEPROVIDER_BASE( IMPLCLASS, SFX_IMPL_TYPE_7( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7 ) ) // implementation of XInterface with 8 additional interfaces for queryInterface() #define SFX_IMPL_XTYPEPROVIDER_8( IMPLCLASS, TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8 ) \ - SFX_IMPL_XTYPEPROVIDER_BASE( IMPLCLASS##, SFX_IMPL_TYPE_8( TYPE1##, TYPE2##, TYPE3##, TYPE4##, TYPE5##, TYPE6##, TYPE7##, TYPE8## ) ) + SFX_IMPL_XTYPEPROVIDER_BASE( IMPLCLASS, SFX_IMPL_TYPE_8( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8 ) ) // implementation of XInterface with 9 additional interfaces for queryInterface() #define SFX_IMPL_XTYPEPROVIDER_9( IMPLCLASS, TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9 ) \ - SFX_IMPL_XTYPEPROVIDER_BASE( IMPLCLASS##, SFX_IMPL_TYPE_9( TYPE1##, TYPE2##, TYPE3##, TYPE4##, TYPE5##, TYPE6##, TYPE7##, TYPE8##, TYPE9## ) ) + SFX_IMPL_XTYPEPROVIDER_BASE( IMPLCLASS, SFX_IMPL_TYPE_9( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9 ) ) // implementation of XInterface with 10 additional interfaces for queryInterface() #define SFX_IMPL_XTYPEPROVIDER_10( IMPLCLASS, TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10 ) \ - SFX_IMPL_XTYPEPROVIDER_BASE( IMPLCLASS##, SFX_IMPL_TYPE_10( TYPE1##, TYPE2##, TYPE3##, TYPE4##, TYPE5##, TYPE6##, TYPE7##, TYPE8##, TYPE9##, TYPE10## ) ) + SFX_IMPL_XTYPEPROVIDER_BASE( IMPLCLASS, SFX_IMPL_TYPE_10( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10 ) ) // implementation of XInterface with 11 additional interfaces for queryInterface() #define SFX_IMPL_XTYPEPROVIDER_11( IMPLCLASS, TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10, TYPE11 ) \ - SFX_IMPL_XTYPEPROVIDER_BASE( IMPLCLASS##, SFX_IMPL_TYPE_11( TYPE1##, TYPE2##, TYPE3##, TYPE4##, TYPE5##, TYPE6##, TYPE7##, TYPE8##, TYPE9##, TYPE10##, TYPE11## ) ) + SFX_IMPL_XTYPEPROVIDER_BASE( IMPLCLASS, SFX_IMPL_TYPE_11( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10, TYPE11 ) ) // implementation of XInterface with 11 additional interfaces for queryInterface() #define SFX_IMPL_XTYPEPROVIDER_12( IMPLCLASS, TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10, TYPE11, TYPE12 ) \ - SFX_IMPL_XTYPEPROVIDER_BASE( IMPLCLASS##, SFX_IMPL_TYPE_12( TYPE1##, TYPE2##, TYPE3##, TYPE4##, TYPE5##, TYPE6##, TYPE7##, TYPE8##, TYPE9##, TYPE10##, TYPE11##, TYPE12## ) ) + SFX_IMPL_XTYPEPROVIDER_BASE( IMPLCLASS, SFX_IMPL_TYPE_12( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10, TYPE11, TYPE12 ) ) // implementation of XInterface with 11 additional interfaces for queryInterface() #define SFX_IMPL_XTYPEPROVIDER_13( IMPLCLASS, TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10, TYPE11, TYPE12, TYPE13 ) \ - SFX_IMPL_XTYPEPROVIDER_BASE( IMPLCLASS##, SFX_IMPL_TYPE_13( TYPE1##, TYPE2##, TYPE3##, TYPE4##, TYPE5##, TYPE6##, TYPE7##, TYPE8##, TYPE9##, TYPE10##, TYPE11##, TYPE12##, TYPE13## ) ) + SFX_IMPL_XTYPEPROVIDER_BASE( IMPLCLASS, SFX_IMPL_TYPE_13( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10, TYPE11, TYPE12, TYPE13 ) ) //************************************************************************************************************************ // implementation of XServiceInfo::getImplementationName() @@ -584,13 +584,13 @@ #define SFX_IMPL_XSERVICEINFO( IMPLCLASS, IMPLSERVICENAME, IMPLNAME ) \ \ /* XServiceInfo */ \ - UNOOUSTRING SAL_CALL IMPLCLASS##::getImplementationName() throw( UNORUNTIMEEXCEPTION ) \ + UNOOUSTRING SAL_CALL IMPLCLASS::getImplementationName() throw( UNORUNTIMEEXCEPTION ) \ { \ return impl_getStaticImplementationName(); \ } \ \ /* XServiceInfo */ \ - sal_Bool SAL_CALL IMPLCLASS##::supportsService( const UNOOUSTRING& sServiceName ) throw( UNORUNTIMEEXCEPTION ) \ + sal_Bool SAL_CALL IMPLCLASS::supportsService( const UNOOUSTRING& sServiceName ) throw( UNORUNTIMEEXCEPTION ) \ { \ UNOSEQUENCE< UNOOUSTRING > seqServiceNames = getSupportedServiceNames(); \ const UNOOUSTRING* pArray = seqServiceNames.getConstArray(); \ @@ -605,30 +605,30 @@ } \ \ /* XServiceInfo */ \ - UNOSEQUENCE< UNOOUSTRING > SAL_CALL IMPLCLASS##::getSupportedServiceNames() throw( UNORUNTIMEEXCEPTION ) \ + UNOSEQUENCE< UNOOUSTRING > SAL_CALL IMPLCLASS::getSupportedServiceNames() throw( UNORUNTIMEEXCEPTION ) \ { \ return impl_getStaticSupportedServiceNames(); \ } \ \ /* Helper for XServiceInfo */ \ - UNOSEQUENCE< UNOOUSTRING > IMPLCLASS##::impl_getStaticSupportedServiceNames() \ + UNOSEQUENCE< UNOOUSTRING > IMPLCLASS::impl_getStaticSupportedServiceNames() \ { \ UNOMUTEXGUARD aGuard( UNOMUTEX::getGlobalMutex() ); \ UNOSEQUENCE< UNOOUSTRING > seqServiceNames( 1 ); \ - seqServiceNames.getArray() [0] = UNOOUSTRING::createFromAscii( IMPLSERVICENAME## ); \ + seqServiceNames.getArray() [0] = UNOOUSTRING::createFromAscii( IMPLSERVICENAME ); \ return seqServiceNames ; \ } \ \ /* Helper for XServiceInfo */ \ - UNOOUSTRING IMPLCLASS##::impl_getStaticImplementationName() \ + UNOOUSTRING IMPLCLASS::impl_getStaticImplementationName() \ { \ - return UNOOUSTRING::createFromAscii( IMPLNAME## ); \ + return UNOOUSTRING::createFromAscii( IMPLNAME ); \ } \ \ /* Helper for registry */ \ - UNOREFERENCE< UNOXINTERFACE > SAL_CALL IMPLCLASS##::impl_createInstance( const UNOREFERENCE< UNOXMULTISERVICEFACTORY >& xServiceManager ) throw( UNOEXCEPTION ) \ + UNOREFERENCE< UNOXINTERFACE > SAL_CALL IMPLCLASS::impl_createInstance( const UNOREFERENCE< UNOXMULTISERVICEFACTORY >& xServiceManager ) throw( UNOEXCEPTION ) \ { \ - return UNOREFERENCE< UNOXINTERFACE >( *new IMPLCLASS##( xServiceManager ) ); \ + return UNOREFERENCE< UNOXINTERFACE >( *new IMPLCLASS( xServiceManager ) ); \ } //************************************************************************************************************************ @@ -636,13 +636,13 @@ //************************************************************************************************************************ #define SFX_IMPL_SINGLEFACTORY( IMPLCLASS ) \ \ - UNOREFERENCE< UNOXSINGLESERVICEFACTORY > IMPLCLASS##::impl_createFactory( const UNOREFERENCE< UNOXMULTISERVICEFACTORY >& xServiceManager ) \ + UNOREFERENCE< UNOXSINGLESERVICEFACTORY > IMPLCLASS::impl_createFactory( const UNOREFERENCE< UNOXMULTISERVICEFACTORY >& xServiceManager ) \ { \ UNOREFERENCE< UNOXSINGLESERVICEFACTORY > xReturn ( \ cppu::createSingleFactory( xServiceManager , \ - IMPLCLASS##::impl_getStaticImplementationName() , \ - IMPLCLASS##::impl_createInstance , \ - IMPLCLASS##::impl_getStaticSupportedServiceNames() ) \ + IMPLCLASS::impl_getStaticImplementationName() , \ + IMPLCLASS::impl_createInstance , \ + IMPLCLASS::impl_getStaticSupportedServiceNames() ) \ ); \ return xReturn ; \ } @@ -652,13 +652,13 @@ //************************************************************************************************************************ #define SFX_IMPL_ONEINSTANCEFACTORY( IMPLCLASS ) \ \ - UNOREFERENCE< UNOXSINGLESERVICEFACTORY > IMPLCLASS##::impl_createFactory( const UNOREFERENCE< UNOXMULTISERVICEFACTORY >& xServiceManager ) \ + UNOREFERENCE< UNOXSINGLESERVICEFACTORY > IMPLCLASS::impl_createFactory( const UNOREFERENCE< UNOXMULTISERVICEFACTORY >& xServiceManager ) \ { \ UNOREFERENCE< UNOXSINGLESERVICEFACTORY > xReturn( \ cppu::createOneInstanceFactory( xServiceManager , \ - IMPLCLASS##::impl_getStaticImplementationName() , \ - IMPLCLASS##::impl_createInstance , \ - IMPLCLASS##::impl_getStaticSupportedServiceNames() ) \ + IMPLCLASS::impl_getStaticImplementationName() , \ + IMPLCLASS::impl_createInstance , \ + IMPLCLASS::impl_getStaticSupportedServiceNames() ) \ ); \ return xReturn ; \ } @@ -678,7 +678,7 @@ { \ /* Build new keyname */ \ sKeyName = UNOOUSTRING::createFromAscii( "/" ) ; \ - sKeyName += CLASS##::impl_getStaticImplementationName() ; \ + sKeyName += CLASS::impl_getStaticImplementationName() ; \ sKeyName += UNOOUSTRING::createFromAscii( "/UNO/SERVICES" ); \ \ /* Create new key with new name. */ \ @@ -688,7 +688,7 @@ if ( xNewKey.is () ) \ { \ /* Get information about supported services. */ \ - seqServiceNames = CLASS##::impl_getStaticSupportedServiceNames() ; \ + seqServiceNames = CLASS::impl_getStaticSupportedServiceNames() ; \ pArray = seqServiceNames.getArray() ; \ nLength = seqServiceNames.getLength() ; \ nCounter = 0 ; \ @@ -715,16 +715,16 @@ #define CREATEFACTORY(CLASS) \ \ /* Create right factory ... */ \ - xFactory = CLASS##::impl_createFactory( xServiceManager ); + xFactory = CLASS::impl_createFactory( xServiceManager ); //************************************************************************************************************************ // definition for "extern c component_getFactory()" //************************************************************************************************************************ #define IF_NAME_CREATECOMPONENTFACTORY(CLASS) \ \ - if ( CLASS##::impl_getStaticImplementationName().equals( UNOOUSTRING::createFromAscii( pImplementationName ) ) ) \ + if ( CLASS::impl_getStaticImplementationName().equals( UNOOUSTRING::createFromAscii( pImplementationName ) ) ) \ { \ - CREATEFACTORY ( CLASS## ) \ + CREATEFACTORY ( CLASS ) \ } #endif // _SFX_SFXUNO_HXX --- svx/source/form/fmctrler.cxx +++ svx/source/form/fmctrler.cxx @@ -661,7 +661,7 @@ #define DECL_PROP1(varname, type, attrib1) \ - DECL_PROP_CORE(varname, type) PropertyAttribute::##attrib1) + DECL_PROP_CORE(varname, type) PropertyAttribute::attrib1) //------------------------------------------------------------------------------ void FmXFormController::fillProperties( --- tools/inc/link.hxx +++ tools/inc/link.hxx @@ -83,7 +83,7 @@ long Class::Method( ArgType ArgName ) #define IMPL_STUB(Class, Method, ArgType) \ - long __EXPORT Class##::LinkStub##Method( void* pThis, void* pCaller) \ + long __EXPORT Class::LinkStub##Method( void* pThis, void* pCaller) \ { \ return ((Class*)pThis )->Method( (ArgType)pCaller ); \ } @@ -92,7 +92,7 @@ long __EXPORT Class::Method( Class* pThis, ArgType ArgName ) #define LINK( Inst, Class, Member ) \ - Link( (Class*)Inst, (PSTUB)&Class##::LinkStub##Member ) + Link( (Class*)Inst, (PSTUB)&Class::LinkStub##Member ) #define STATIC_LINK( Inst, Class, Member ) \ Link( (Class*)Inst, (PSTUB)&Class::Member ) --- vcl/source/gdi/opengl.cxx +++ vcl/source/gdi/opengl.cxx @@ -194,7 +194,7 @@ #define INIT_OGLFNC( FncName ) static OGLFnc##FncName pImplOpenGLFnc##FncName = NULL; #define GET_OGLFNC_GL( FncName ) \ -pImplOpenGLFnc##FncName = (OGLFnc##FncName##) mpOGL->GetOGLFnc( "gl" #FncName ); \ +pImplOpenGLFnc##FncName = (OGLFnc##FncName) mpOGL->GetOGLFnc( "gl" #FncName ); \ if( !pImplOpenGLFnc##FncName ) bRet = FALSE; // ---------- --- xmloff/source/chart/PropertyMap.hxx +++ xmloff/source/chart/PropertyMap.hxx @@ -132,9 +132,9 @@ #define XML_SCH_CONTEXT_SPECIAL_SYMBOL_IMAGE_NAME ( XML_SCH_CTF_START + 22 ) #define XML_SCH_CONTEXT_SPECIAL_SYMBOL_IMAGE ( XML_SCH_CTF_START + 23 ) -#define MAP_ENTRY( a, ns, nm, t ) { a, sizeof(a)-1, XML_NAMESPACE_##ns, xmloff::token::##nm, t } -#define MAP_CONTEXT( a, ns, nm, t, c ) { a, sizeof(a)-1, XML_NAMESPACE_##ns, xmloff::token::##nm, t, XML_SCH_CONTEXT_##c } -#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 } +#define MAP_ENTRY( a, ns, nm, t ) { a, sizeof(a)-1, XML_NAMESPACE_##ns, xmloff::token::nm, t } +#define MAP_CONTEXT( a, ns, nm, t, c ) { a, sizeof(a)-1, XML_NAMESPACE_##ns, xmloff::token::nm, t, XML_SCH_CONTEXT_##c } +#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 } #define MAP_ENTRY_END { 0,0,0,xmloff::token::XML_TOKEN_INVALID,0 } // ---------------------------------------------------------