CWS-TOOLING: integrate CWS cmcfixes57
2009-04-16 14:44:54 +0200 cmc r270885 : #i101062# add in uui fix and stray ^M fixes 2009-04-16 10:57:50 +0200 cmc r270872 : #i101127# remove && || warnings 2009-04-15 17:04:23 +0200 cmc r270857 : #i101112# remove trivial new gcc warnings 2009-04-15 17:01:01 +0200 cmc r270856 : #i101111# remove trivial new warnings 2009-04-15 16:56:53 +0200 cmc r270854 : #i101110# make methods consts 2009-04-15 16:52:37 +0200 cmc r270853 : #i100225# fix visibility of component_getImplementationEnvironment and friends 2009-04-15 16:49:16 +0200 cmc r270852 : #i101109# ? : promotion rules
This commit is contained in:
parent
9fef999ff0
commit
cfea5619a8
1 changed files with 3 additions and 3 deletions
|
@ -386,20 +386,20 @@ BOOST_PP_REPEAT_FROM_TO(1, COMPHELPER_SERVICEDECL_COMPONENT_HELPER_MAX_ARGS,
|
|||
#define COMPHELPER_SERVICEDECL_make_exports(varargs_ ) \
|
||||
extern "C" \
|
||||
{ \
|
||||
void SAL_CALL component_getImplementationEnvironment( const sal_Char** ppEnvTypeName, \
|
||||
SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char** ppEnvTypeName, \
|
||||
uno_Environment** /*ppEnv*/ ) \
|
||||
{ \
|
||||
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; \
|
||||
} \
|
||||
\
|
||||
sal_Bool SAL_CALL component_writeInfo( ::com::sun::star::lang::XMultiServiceFactory* pServiceManager, \
|
||||
SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( ::com::sun::star::lang::XMultiServiceFactory* pServiceManager, \
|
||||
::com::sun::star::registry::XRegistryKey* pRegistryKey ) \
|
||||
{ \
|
||||
return component_writeInfoHelper( pServiceManager, pRegistryKey, \
|
||||
BOOST_PP_SEQ_ENUM(varargs_) ); \
|
||||
} \
|
||||
\
|
||||
void* SAL_CALL component_getFactory( sal_Char const* pImplName, \
|
||||
SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( sal_Char const* pImplName, \
|
||||
::com::sun::star::lang::XMultiServiceFactory* pServiceManager, \
|
||||
::com::sun::star::registry::XRegistryKey* pRegistryKey ) \
|
||||
{ \
|
||||
|
|
Loading…
Reference in a new issue