diff options
29 files changed, 239 insertions, 204 deletions
diff --git a/cppu/Library_cppu.mk b/cppu/Library_cppu.mk index 6115bb244b22..9b2c28343436 100644 --- a/cppu/Library_cppu.mk +++ b/cppu/Library_cppu.mk @@ -42,6 +42,10 @@ $(eval $(call gb_Library_add_api,cppu,\ offapi \ )) +$(eval $(call gb_Library_add_defs,cppu,\ + -DCPPU_DLLIMPLEMENTATION \ +)) + $(eval $(call gb_Library_add_linked_libs,cppu,\ sal \ $(gb_STDLIBS) \ diff --git a/cppu/Library_purpenvhelper.mk b/cppu/Library_purpenvhelper.mk index 5e71e6da9f67..afa837344757 100644 --- a/cppu/Library_purpenvhelper.mk +++ b/cppu/Library_purpenvhelper.mk @@ -34,6 +34,10 @@ $(eval $(call gb_Library_set_include,purpenvhelper,\ -I$(realpath $(SRCDIR)/cppu/inc) \ )) +$(eval $(call gb_Library_add_defs,purpenvhelper,\ + -DPURPENV_DLLIMPLEMENTATION \ +)) + $(eval $(call gb_Library_add_api,purpenvhelper,\ udkapi \ offapi \ diff --git a/cppu/Package_inc.mk b/cppu/Package_inc.mk index e1b76db2af5c..85dd86a3a6a9 100644 --- a/cppu/Package_inc.mk +++ b/cppu/Package_inc.mk @@ -37,6 +37,7 @@ $(eval $(call gb_Package_add_file,cppu_inc,inc/com/sun/star/uno/Sequence.h,com/s $(eval $(call gb_Package_add_file,cppu_inc,inc/com/sun/star/uno/Sequence.hxx,com/sun/star/uno/Sequence.hxx)) $(eval $(call gb_Package_add_file,cppu_inc,inc/com/sun/star/uno/Type.h,com/sun/star/uno/Type.h)) $(eval $(call gb_Package_add_file,cppu_inc,inc/com/sun/star/uno/Type.hxx,com/sun/star/uno/Type.hxx)) +$(eval $(call gb_Package_add_file,cppu_inc,inc/cppu/cppudllapi.h,cppu/cppudllapi.h)) $(eval $(call gb_Package_add_file,cppu_inc,inc/cppu/EnvDcp.hxx,cppu/EnvDcp.hxx)) $(eval $(call gb_Package_add_file,cppu_inc,inc/cppu/Enterable.hxx,cppu/Enterable.hxx)) $(eval $(call gb_Package_add_file,cppu_inc,inc/cppu/EnvGuards.hxx,cppu/EnvGuards.hxx)) diff --git a/cppu/inc/cppu/cppudllapi.h b/cppu/inc/cppu/cppudllapi.h new file mode 100644 index 000000000000..ee37e1b1c399 --- /dev/null +++ b/cppu/inc/cppu/cppudllapi.h @@ -0,0 +1,21 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +#ifndef INCLUDED_CPPUDLLAPI_H +#define INCLUDED_CPPUDLLAPI_H + +#include "sal/types.h" + +#if defined(CPPU_DLLIMPLEMENTATION) +#define CPPU_DLLPUBLIC SAL_DLLPUBLIC_EXPORT +#else +#define CPPU_DLLPUBLIC SAL_DLLPUBLIC_IMPORT +#endif + +#if defined(PURPENV_DLLIMPLEMENTATION) +#define PURPENV_DLLPUBLIC SAL_DLLPUBLIC_EXPORT +#else +#define PURPENV_DLLPUBLIC SAL_DLLPUBLIC_IMPORT +#endif + +#endif /* INCLUDED_CPPUDLLAPI_H */ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppu/inc/cppu/helper/purpenv/Environment.hxx b/cppu/inc/cppu/helper/purpenv/Environment.hxx index 25c9de8e8a6e..6b9c7b95405c 100644 --- a/cppu/inc/cppu/helper/purpenv/Environment.hxx +++ b/cppu/inc/cppu/helper/purpenv/Environment.hxx @@ -29,6 +29,7 @@ #ifndef INCLUDED_cppu_helper_purpenv_Environment_hxx #define INCLUDED_cppu_helper_purpenv_Environment_hxx +#include <cppu/cppudllapi.h> #include "uno/environment.h" #include "cppu/Enterable.hxx" @@ -40,7 +41,8 @@ namespace cppu { namespace helper { namespace purpenv { @since UDK 3.2.7 */ -void Environment_initWithEnterable(uno_Environment * pEnvironment, cppu::Enterable * pEnterable); +PURPENV_DLLPUBLIC void Environment_initWithEnterable( + uno_Environment * pEnvironment, cppu::Enterable * pEnterable); }}} diff --git a/cppu/inc/cppu/helper/purpenv/Mapping.hxx b/cppu/inc/cppu/helper/purpenv/Mapping.hxx index 6bdcd207987f..9d81ba2da68b 100644 --- a/cppu/inc/cppu/helper/purpenv/Mapping.hxx +++ b/cppu/inc/cppu/helper/purpenv/Mapping.hxx @@ -31,6 +31,7 @@ #include "com/sun/star/uno/Any.h" +#include <cppu/cppudllapi.h> #include "uno/environment.h" #include "uno/mapping.h" @@ -57,7 +58,7 @@ typedef void ProbeFun( -void createMapping(uno_Mapping ** ppMapping, +PURPENV_DLLPUBLIC void createMapping(uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo, ProbeFun * probeFun = NULL, diff --git a/cppu/inc/typelib/typedescription.h b/cppu/inc/typelib/typedescription.h index a88894c723a7..333fc1c01dfd 100644 --- a/cppu/inc/typelib/typedescription.h +++ b/cppu/inc/typelib/typedescription.h @@ -28,7 +28,7 @@ #ifndef _TYPELIB_TYPEDESCRIPTION_H_ #define _TYPELIB_TYPEDESCRIPTION_H_ -#include <sal/types.h> +#include <cppu/cppudllapi.h> #include <typelib/uik.h> #include <typelib/typeclass.h> #include <rtl/ustring.h> @@ -574,7 +574,7 @@ typedef struct _typelib_Union_Init @param nMembers number of union members @param pMembers init members */ -void SAL_CALL typelib_typedescription_newUnion( +CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_newUnion( typelib_TypeDescription ** ppRet, rtl_uString * pTypeName, typelib_TypeDescriptionReference * pDiscriminantTypeRef, @@ -593,7 +593,7 @@ void SAL_CALL typelib_typedescription_newUnion( @param ppEnumNames names of enum values @param pEnumValues enum values */ -void SAL_CALL typelib_typedescription_newEnum( +CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_newEnum( typelib_TypeDescription ** ppRet, rtl_uString * pTypeName, sal_Int32 nDefaultValue, @@ -609,7 +609,7 @@ void SAL_CALL typelib_typedescription_newEnum( @param nDimensions number of dimensions @param pDimensions dimensions */ -void SAL_CALL typelib_typedescription_newArray( +CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_newArray( typelib_TypeDescription ** ppRet, typelib_TypeDescriptionReference * pElementTypeRef, sal_Int32 nDimensions, @@ -631,7 +631,7 @@ void SAL_CALL typelib_typedescription_newArray( @param nMembers number of members if struct, exception @param pMember array of members if struct, exception */ -void SAL_CALL typelib_typedescription_new( +CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_new( typelib_TypeDescription ** ppRet, typelib_TypeClass eTypeClass, rtl_uString * pTypeName, @@ -650,7 +650,7 @@ void SAL_CALL typelib_typedescription_new( @since UDK 3.2.0 */ -void SAL_CALL typelib_typedescription_newStruct( +CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_newStruct( typelib_TypeDescription ** ppRet, rtl_uString * pTypeName, typelib_TypeDescriptionReference * pType, @@ -674,7 +674,7 @@ void SAL_CALL typelib_typedescription_newStruct( @deprecated use typelib_typedescription_newMIInterface instead */ -void SAL_CALL typelib_typedescription_newInterface( +CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_newInterface( typelib_InterfaceTypeDescription ** ppRet, rtl_uString * pTypeName, sal_uInt32 nUik1, sal_uInt16 nUik2, sal_uInt16 nUik3, sal_uInt32 nUik4, sal_uInt32 nUik5, @@ -699,7 +699,7 @@ void SAL_CALL typelib_typedescription_newInterface( @since UDK 3.2.0 */ -void SAL_CALL typelib_typedescription_newMIInterface( +CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_newMIInterface( typelib_InterfaceTypeDescription ** ppRet, rtl_uString * pTypeName, sal_uInt32 nUik1, sal_uInt16 nUik2, sal_uInt16 nUik3, sal_uInt32 nUik4, sal_uInt32 nUik5, @@ -722,7 +722,7 @@ void SAL_CALL typelib_typedescription_newMIInterface( @param nExceptions number of exceptions @param ppExceptionNames type names of exceptions */ -void SAL_CALL typelib_typedescription_newInterfaceMethod( +CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_newInterfaceMethod( typelib_InterfaceMethodTypeDescription ** ppRet, sal_Int32 nAbsolutePosition, sal_Bool bOneWay, @@ -748,7 +748,7 @@ void SAL_CALL typelib_typedescription_newInterfaceMethod( @deprecated use typelib_typedescription_newExtendedInterfaceAttribute instead */ -void SAL_CALL typelib_typedescription_newInterfaceAttribute( +CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_newInterfaceAttribute( typelib_InterfaceAttributeTypeDescription ** ppRet, sal_Int32 nAbsolutePosition, rtl_uString * pAttributeName, @@ -774,7 +774,7 @@ void SAL_CALL typelib_typedescription_newInterfaceAttribute( @since UDK 3.2.0 */ -void SAL_CALL typelib_typedescription_newExtendedInterfaceAttribute( +CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_newExtendedInterfaceAttribute( typelib_InterfaceAttributeTypeDescription ** ppRet, sal_Int32 nAbsolutePosition, rtl_uString * pAttributeName, @@ -789,7 +789,7 @@ void SAL_CALL typelib_typedescription_newExtendedInterfaceAttribute( @param pDesc type description */ -void SAL_CALL typelib_typedescription_acquire( +CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_acquire( typelib_TypeDescription * pDesc ) SAL_THROW_EXTERN_C(); @@ -798,7 +798,7 @@ void SAL_CALL typelib_typedescription_acquire( @param pDesc type description */ -void SAL_CALL typelib_typedescription_release( +CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_release( typelib_TypeDescription * pDesc ) SAL_THROW_EXTERN_C(); @@ -807,7 +807,7 @@ void SAL_CALL typelib_typedescription_release( @param ppNewDescription inout description to be registered; */ -void SAL_CALL typelib_typedescription_register( +CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_register( typelib_TypeDescription ** ppNewDescription ) SAL_THROW_EXTERN_C(); @@ -817,7 +817,7 @@ void SAL_CALL typelib_typedescription_register( @param p2 another type description @return true, if type descriptions are equal */ -sal_Bool SAL_CALL typelib_typedescription_equals( +CPPU_DLLPUBLIC sal_Bool SAL_CALL typelib_typedescription_equals( const typelib_TypeDescription * p1, const typelib_TypeDescription * p2 ) SAL_THROW_EXTERN_C(); @@ -826,7 +826,7 @@ sal_Bool SAL_CALL typelib_typedescription_equals( @param ppRet inout type description; *ppRet is 0, if type description was not found @param pName name demanded type description */ -void SAL_CALL typelib_typedescription_getByName( +CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_getByName( typelib_TypeDescription ** ppRet, rtl_uString * pName ) SAL_THROW_EXTERN_C(); @@ -834,7 +834,7 @@ void SAL_CALL typelib_typedescription_getByName( @param nNewSize new size of cache */ -void SAL_CALL typelib_setCacheSize( +CPPU_DLLPUBLIC void SAL_CALL typelib_setCacheSize( sal_Int32 nNewSize ) SAL_THROW_EXTERN_C(); @@ -853,7 +853,7 @@ typedef void (SAL_CALL * typelib_typedescription_Callback)( @param pContext callback context @param pCallback callback function */ -void SAL_CALL typelib_typedescription_registerCallback( +CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_registerCallback( void * pContext, typelib_typedescription_Callback pCallback ) SAL_THROW_EXTERN_C(); @@ -862,7 +862,7 @@ void SAL_CALL typelib_typedescription_registerCallback( @param pContext callback context @param pCallback registered callback function */ -void SAL_CALL typelib_typedescription_revokeCallback( +CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_revokeCallback( void * pContext, typelib_typedescription_Callback pCallback ) SAL_THROW_EXTERN_C(); @@ -923,7 +923,7 @@ void SAL_CALL typelib_typedescription_revokeCallback( @param eTypeClass type class of type @param pTypeName name of type */ -void SAL_CALL typelib_typedescriptionreference_new( +CPPU_DLLPUBLIC void SAL_CALL typelib_typedescriptionreference_new( typelib_TypeDescriptionReference ** ppTDR, typelib_TypeClass eTypeClass, rtl_uString * pTypeName ) @@ -936,7 +936,7 @@ void SAL_CALL typelib_typedescriptionreference_new( @param eTypeClass type class of type @param pTypeName ascii name of type */ -void SAL_CALL typelib_typedescriptionreference_newByAsciiName( +CPPU_DLLPUBLIC void SAL_CALL typelib_typedescriptionreference_newByAsciiName( typelib_TypeDescriptionReference ** ppTDR, typelib_TypeClass eTypeClass, const sal_Char * pTypeName ) @@ -946,7 +946,7 @@ void SAL_CALL typelib_typedescriptionreference_newByAsciiName( @param pRef type description reference */ -void SAL_CALL typelib_typedescriptionreference_acquire( +CPPU_DLLPUBLIC void SAL_CALL typelib_typedescriptionreference_acquire( typelib_TypeDescriptionReference * pRef ) SAL_THROW_EXTERN_C(); @@ -955,7 +955,7 @@ void SAL_CALL typelib_typedescriptionreference_acquire( @param pRef type description reference */ -void SAL_CALL typelib_typedescriptionreference_release( +CPPU_DLLPUBLIC void SAL_CALL typelib_typedescriptionreference_release( typelib_TypeDescriptionReference * pRef ) SAL_THROW_EXTERN_C(); @@ -964,7 +964,7 @@ void SAL_CALL typelib_typedescriptionreference_release( @param ppRet inout type description */ -void SAL_CALL typelib_typedescriptionreference_getDescription( +CPPU_DLLPUBLIC void SAL_CALL typelib_typedescriptionreference_getDescription( typelib_TypeDescription ** ppRet, typelib_TypeDescriptionReference * pRef ) SAL_THROW_EXTERN_C(); @@ -974,7 +974,7 @@ void SAL_CALL typelib_typedescriptionreference_getDescription( @param p2 another type description reference @return true, if type description references are equal */ -sal_Bool SAL_CALL typelib_typedescriptionreference_equals( +CPPU_DLLPUBLIC sal_Bool SAL_CALL typelib_typedescriptionreference_equals( const typelib_TypeDescriptionReference * p1, const typelib_TypeDescriptionReference * p2 ) SAL_THROW_EXTERN_C(); @@ -983,7 +983,7 @@ sal_Bool SAL_CALL typelib_typedescriptionreference_equals( @param ppDest destination type @param pSource source type */ -void SAL_CALL typelib_typedescriptionreference_assign( +CPPU_DLLPUBLIC void SAL_CALL typelib_typedescriptionreference_assign( typelib_TypeDescriptionReference ** ppDest, typelib_TypeDescriptionReference * pSource ) SAL_THROW_EXTERN_C(); @@ -994,7 +994,7 @@ void SAL_CALL typelib_typedescriptionreference_assign( @param pAssignable type description of value to be assigned @param pFrom type description of value */ -sal_Bool SAL_CALL typelib_typedescription_isAssignableFrom( +CPPU_DLLPUBLIC sal_Bool SAL_CALL typelib_typedescription_isAssignableFrom( typelib_TypeDescription * pAssignable, typelib_TypeDescription * pFrom ) SAL_THROW_EXTERN_C(); @@ -1005,7 +1005,7 @@ sal_Bool SAL_CALL typelib_typedescription_isAssignableFrom( @param pAssignable type of value to be assigned @param pFrom type of value */ -sal_Bool SAL_CALL typelib_typedescriptionreference_isAssignableFrom( +CPPU_DLLPUBLIC sal_Bool SAL_CALL typelib_typedescriptionreference_isAssignableFrom( typelib_TypeDescriptionReference * pAssignable, typelib_TypeDescriptionReference * pFrom ) SAL_THROW_EXTERN_C(); @@ -1019,7 +1019,7 @@ sal_Bool SAL_CALL typelib_typedescriptionreference_isAssignableFrom( @param eTypeClass type class of basic type @return pointer to type reference pointer */ -typelib_TypeDescriptionReference ** SAL_CALL typelib_static_type_getByTypeClass( +CPPU_DLLPUBLIC typelib_TypeDescriptionReference ** SAL_CALL typelib_static_type_getByTypeClass( typelib_TypeClass eTypeClass ) SAL_THROW_EXTERN_C(); @@ -1029,7 +1029,7 @@ typelib_TypeDescriptionReference ** SAL_CALL typelib_static_type_getByTypeClass( @param eTypeClass type class of type @param pTypeName ascii name of type */ -void SAL_CALL typelib_static_type_init( +CPPU_DLLPUBLIC void SAL_CALL typelib_static_type_init( typelib_TypeDescriptionReference ** ppRef, typelib_TypeClass eTypeClass, const sal_Char * pTypeName ) SAL_THROW_EXTERN_C(); @@ -1039,7 +1039,7 @@ void SAL_CALL typelib_static_type_init( @param ppRef pointer to type reference pointer @param pElementType element type of sequence */ -void SAL_CALL typelib_static_sequence_type_init( +CPPU_DLLPUBLIC void SAL_CALL typelib_static_sequence_type_init( typelib_TypeDescriptionReference ** ppRef, typelib_TypeDescriptionReference * pElementType ) SAL_THROW_EXTERN_C (); @@ -1051,7 +1051,7 @@ void SAL_CALL typelib_static_sequence_type_init( @param nDimensions number of dimensions @param ... additional sal_Int32 parameter for each dimension */ -void SAL_CALL typelib_static_array_type_init( +CPPU_DLLPUBLIC void SAL_CALL typelib_static_array_type_init( typelib_TypeDescriptionReference ** ppRef, typelib_TypeDescriptionReference * pElementType, sal_Int32 nDimensions, ... ) @@ -1070,7 +1070,7 @@ void SAL_CALL typelib_static_array_type_init( @param nMembers number of members @param ppMembers member types */ -void SAL_CALL typelib_static_compound_type_init( +CPPU_DLLPUBLIC void SAL_CALL typelib_static_compound_type_init( typelib_TypeDescriptionReference ** ppRef, typelib_TypeClass eTypeClass, const sal_Char * pTypeName, typelib_TypeDescriptionReference * pBaseType, @@ -1092,7 +1092,7 @@ void SAL_CALL typelib_static_compound_type_init( @since UDK 3.2.0 */ -void SAL_CALL typelib_static_struct_type_init( +CPPU_DLLPUBLIC void SAL_CALL typelib_static_struct_type_init( typelib_TypeDescriptionReference ** ppRef, const sal_Char * pTypeName, typelib_TypeDescriptionReference * pBaseType, sal_Int32 nMembers, typelib_TypeDescriptionReference ** ppMembers, @@ -1105,7 +1105,7 @@ void SAL_CALL typelib_static_struct_type_init( @param pTypeName name of interface @param pBaseType base type */ -void SAL_CALL typelib_static_interface_type_init( +CPPU_DLLPUBLIC void SAL_CALL typelib_static_interface_type_init( typelib_TypeDescriptionReference ** ppRef, const sal_Char * pTypeName, typelib_TypeDescriptionReference * pBaseType ) @@ -1121,7 +1121,7 @@ void SAL_CALL typelib_static_interface_type_init( @since UDK 3.2.0 */ -void SAL_CALL typelib_static_mi_interface_type_init( +CPPU_DLLPUBLIC void SAL_CALL typelib_static_mi_interface_type_init( typelib_TypeDescriptionReference ** ppRef, const sal_Char * pTypeName, sal_Int32 nBaseTypes, @@ -1134,7 +1134,7 @@ void SAL_CALL typelib_static_mi_interface_type_init( @param pTypeName name of enum @param nDefaultEnumValue default enum value */ -void SAL_CALL typelib_static_enum_type_init( +CPPU_DLLPUBLIC void SAL_CALL typelib_static_enum_type_init( typelib_TypeDescriptionReference ** ppRef, const sal_Char * pTypeName, sal_Int32 nDefaultValue ) @@ -1148,7 +1148,7 @@ void SAL_CALL typelib_static_enum_type_init( @param ppTypeDescr [inout] type description to be completed (may be exchanged!) @return true, if type description is complete */ -sal_Bool SAL_CALL typelib_typedescription_complete( +CPPU_DLLPUBLIC sal_Bool SAL_CALL typelib_typedescription_complete( typelib_TypeDescription ** ppTypeDescr ) SAL_THROW_EXTERN_C(); diff --git a/cppu/inc/uno/EnvDcp.h b/cppu/inc/uno/EnvDcp.h index a2471815c179..61dc0984dbf3 100644 --- a/cppu/inc/uno/EnvDcp.h +++ b/cppu/inc/uno/EnvDcp.h @@ -29,6 +29,7 @@ #ifndef INCLUDED_uno_EnvDcp_h #define INCLUDED_uno_EnvDcp_h +#include <cppu/cppudllapi.h> #include "rtl/ustring.h" #ifdef __cplusplus @@ -43,7 +44,7 @@ extern "C" @param ppEnvTypeName the OBI type @since UDK 3.2.7 */ -void uno_EnvDcp_getTypeName(rtl_uString const * pEnvDcp, rtl_uString ** ppEnvTypeName); +CPPU_DLLPUBLIC void uno_EnvDcp_getTypeName(rtl_uString const * pEnvDcp, rtl_uString ** ppEnvTypeName); /** Get the purpose part of an environment descriptor. @@ -53,7 +54,7 @@ void uno_EnvDcp_getTypeName(rtl_uString const * pEnvDcp, rtl_uString ** ppEnvTyp @param ppEnvPurpose the purpose @since UDK 3.2.7 */ -void uno_EnvDcp_getPurpose (rtl_uString const * pEnvDcp, rtl_uString ** ppEnvPurpose); +CPPU_DLLPUBLIC void uno_EnvDcp_getPurpose (rtl_uString const * pEnvDcp, rtl_uString ** ppEnvPurpose); #ifdef __cplusplus diff --git a/cppu/inc/uno/any2.h b/cppu/inc/uno/any2.h index dbf64181002e..c40915107896 100644 --- a/cppu/inc/uno/any2.h +++ b/cppu/inc/uno/any2.h @@ -28,7 +28,7 @@ #ifndef _UNO_ANY2_H_ #define _UNO_ANY2_H_ -#include <sal/types.h> +#include <cppu/cppudllapi.h> #include <uno/data.h> #ifdef __cplusplus @@ -76,7 +76,7 @@ typedef struct _uno_Any @param release function called each time an interface needs to be released; defaults (0) to uno */ -void SAL_CALL uno_any_assign( +CPPU_DLLPUBLIC void SAL_CALL uno_any_assign( uno_Any * pDest, void * pSource, struct _typelib_TypeDescription * pTypeDescr, uno_AcquireFunc acquire, uno_ReleaseFunc release ) @@ -92,7 +92,7 @@ void SAL_CALL uno_any_assign( @param release function called each time an interface needs to be released; defaults (0) to uno */ -void SAL_CALL uno_type_any_assign( +CPPU_DLLPUBLIC void SAL_CALL uno_type_any_assign( uno_Any * pDest, void * pSource, struct _typelib_TypeDescriptionReference * pType, uno_AcquireFunc acquire, uno_ReleaseFunc release ) @@ -106,7 +106,7 @@ void SAL_CALL uno_type_any_assign( @param acquire function called each time an interface needs to be acquired; defaults (0) to uno */ -void SAL_CALL uno_any_construct( +CPPU_DLLPUBLIC void SAL_CALL uno_any_construct( uno_Any * pDest, void * pSource, struct _typelib_TypeDescription * pTypeDescr, uno_AcquireFunc acquire ) @@ -119,7 +119,7 @@ void SAL_CALL uno_any_construct( @param acquire function called each time an interface needs to be acquired; defaults (0) to uno */ -void SAL_CALL uno_type_any_construct( +CPPU_DLLPUBLIC void SAL_CALL uno_type_any_construct( uno_Any * pDest, void * pSource, struct _typelib_TypeDescriptionReference * pType, uno_AcquireFunc acquire ) @@ -132,7 +132,7 @@ void SAL_CALL uno_type_any_construct( @param pTypeDescr type description of value; defaults (0) to void @param mapping mapping to convert/ map interfaces */ -void SAL_CALL uno_any_constructAndConvert( +CPPU_DLLPUBLIC void SAL_CALL uno_any_constructAndConvert( uno_Any * pDest, void * pSource, struct _typelib_TypeDescription * pTypeDescr, struct _uno_Mapping * mapping ) @@ -144,7 +144,7 @@ void SAL_CALL uno_any_constructAndConvert( @param pType type of value; defaults (0) to void @param mapping mapping to convert/ map interfaces */ -void SAL_CALL uno_type_any_constructAndConvert( +CPPU_DLLPUBLIC void SAL_CALL uno_type_any_constructAndConvert( uno_Any * pDest, void * pSource, struct _typelib_TypeDescriptionReference * pType, struct _uno_Mapping * mapping ) @@ -156,7 +156,7 @@ void SAL_CALL uno_type_any_constructAndConvert( @param release function called each time an interface needs to be released; defaults (0) to uno */ -void SAL_CALL uno_any_destruct( +CPPU_DLLPUBLIC void SAL_CALL uno_any_destruct( uno_Any * pValue, uno_ReleaseFunc release ) SAL_THROW_EXTERN_C(); @@ -166,7 +166,7 @@ void SAL_CALL uno_any_destruct( @param release function called each time an interface needs to be released; defaults (0) to uno */ -void SAL_CALL uno_any_clear( +CPPU_DLLPUBLIC void SAL_CALL uno_any_clear( uno_Any * pValue, uno_ReleaseFunc release ) SAL_THROW_EXTERN_C(); diff --git a/cppu/inc/uno/current_context.h b/cppu/inc/uno/current_context.h index 7abd2771df07..27c22ff74d70 100644 --- a/cppu/inc/uno/current_context.h +++ b/cppu/inc/uno/current_context.h @@ -28,6 +28,7 @@ #ifndef _UNO_CURRENT_CONTEXT_H_ #define _UNO_CURRENT_CONTEXT_H_ +#include <cppu/cppudllapi.h> #include <rtl/ustring.h> #ifdef __cplusplus @@ -45,7 +46,7 @@ extern "C" @param pEnvContext context of returned interface's environment (commonly 0) @return true, if context ref was transferred (even if null ref) */ -sal_Bool SAL_CALL uno_getCurrentContext( +CPPU_DLLPUBLIC sal_Bool SAL_CALL uno_getCurrentContext( void ** ppCurrentContext, rtl_uString * pEnvDcp, void * pEnvContext ) SAL_THROW_EXTERN_C(); @@ -57,7 +58,7 @@ sal_Bool SAL_CALL uno_getCurrentContext( @param pEnvContext context of interface's environment (commonly 0) @return true, if context ref was transferred (even if null ref) */ -sal_Bool SAL_CALL uno_setCurrentContext( +CPPU_DLLPUBLIC sal_Bool SAL_CALL uno_setCurrentContext( void * pCurrentContext, rtl_uString * pEnvDcp, void * pEnvContext ) SAL_THROW_EXTERN_C(); diff --git a/cppu/inc/uno/data.h b/cppu/inc/uno/data.h index 8a86b89841d7..0ee31682e891 100644 --- a/cppu/inc/uno/data.h +++ b/cppu/inc/uno/data.h @@ -28,7 +28,7 @@ #ifndef _UNO_DATA_H_ #define _UNO_DATA_H_ -#include <sal/types.h> +#include <cppu/cppudllapi.h> #ifdef __cplusplus extern "C" @@ -72,7 +72,7 @@ typedef void (SAL_CALL * uno_ReleaseFunc)( @param release function to release queried interfaces; defaults (0) to uno @return true if values are equal */ -sal_Bool SAL_CALL uno_equalData( +CPPU_DLLPUBLIC sal_Bool SAL_CALL uno_equalData( void * pVal1, struct _typelib_TypeDescription * pVal1TypeDescr, void * pVal2, struct _typelib_TypeDescription * pVal2TypeDescr, uno_QueryInterfaceFunc queryInterface, uno_ReleaseFunc release ) @@ -88,7 +88,7 @@ sal_Bool SAL_CALL uno_equalData( @param release function to release queried interfaces; defaults (0) to uno @return true if values are equal */ -sal_Bool SAL_CALL uno_type_equalData( +CPPU_DLLPUBLIC sal_Bool SAL_CALL uno_type_equalData( void * pVal1, struct _typelib_TypeDescriptionReference * pVal1Type, void * pVal2, struct _typelib_TypeDescriptionReference * pVal2Type, uno_QueryInterfaceFunc queryInterface, uno_ReleaseFunc release ) @@ -103,7 +103,7 @@ sal_Bool SAL_CALL uno_type_equalData( @param acquire function called each time an interface needs to be acquired; defaults (0) to uno */ -void SAL_CALL uno_copyData( +CPPU_DLLPUBLIC void SAL_CALL uno_copyData( void * pDest, void * pSource, struct _typelib_TypeDescription * pTypeDescr, uno_AcquireFunc acquire ) SAL_THROW_EXTERN_C(); @@ -116,7 +116,7 @@ void SAL_CALL uno_copyData( @param acquire function called each time an interface needs to be acquired; defaults (0) to uno */ -void SAL_CALL uno_type_copyData( +CPPU_DLLPUBLIC void SAL_CALL uno_type_copyData( void * pDest, void * pSource, struct _typelib_TypeDescriptionReference * pType, uno_AcquireFunc acquire ) SAL_THROW_EXTERN_C(); @@ -129,7 +129,7 @@ void SAL_CALL uno_type_copyData( @param pTypeDescr type description of source @param mapping mapping to convert/ map interfaces */ -void SAL_CALL uno_copyAndConvertData( +CPPU_DLLPUBLIC void SAL_CALL uno_copyAndConvertData( void * pDest, void * pSource, struct _typelib_TypeDescription * pTypeDescr, struct _uno_Mapping * mapping ) SAL_THROW_EXTERN_C(); @@ -141,7 +141,7 @@ void SAL_CALL uno_copyAndConvertData( @param pType type of source @param mapping mapping to convert/ map interfaces */ -void SAL_CALL uno_type_copyAndConvertData( +CPPU_DLLPUBLIC void SAL_CALL uno_type_copyAndConvertData( void * pDest, void * pSource, struct _typelib_TypeDescriptionReference * pType, struct _uno_Mapping * mapping ) SAL_THROW_EXTERN_C(); @@ -153,7 +153,7 @@ void SAL_CALL uno_type_copyAndConvertData( @param release function called each time an interface pointer needs to be released; defaults (0) to uno */ -void SAL_CALL uno_destructData( +CPPU_DLLPUBLIC void SAL_CALL uno_destructData( void * pValue, struct _typelib_TypeDescription * pTypeDescr, uno_ReleaseFunc release ) SAL_THROW_EXTERN_C(); /** Destructs a given value; does NOT free its memory! @@ -163,7 +163,7 @@ void SAL_CALL uno_destructData( @param release function called each time an interface pointer needs to be released; defaults (0) to uno */ -void SAL_CALL uno_type_destructData( +CPPU_DLLPUBLIC void SAL_CALL uno_type_destructData( void * pValue, struct _typelib_TypeDescriptionReference * pType, uno_ReleaseFunc release ) SAL_THROW_EXTERN_C(); @@ -172,7 +172,7 @@ void SAL_CALL uno_type_destructData( @param pMem pointer to memory of value to be constructed @param pTypeDescr type description of value to be constructed */ -void SAL_CALL uno_constructData( +CPPU_DLLPUBLIC void SAL_CALL uno_constructData( void * pMem, struct _typelib_TypeDescription * pTypeDescr ) SAL_THROW_EXTERN_C(); /** Default constructs a value. All simple types are set to 0, enums are set to their default value. @@ -180,7 +180,7 @@ void SAL_CALL uno_constructData( @param pMem pointer to memory of value to be constructed @param pType type of value to be constructed */ -void SAL_CALL uno_type_constructData( +CPPU_DLLPUBLIC void SAL_CALL uno_type_constructData( void * pMem, struct _typelib_TypeDescriptionReference * pType ) SAL_THROW_EXTERN_C(); @@ -202,7 +202,7 @@ void SAL_CALL uno_type_constructData( defaults (0) to uno @return true if destination has been successfully assigned */ -sal_Bool SAL_CALL uno_assignData( +CPPU_DLLPUBLIC sal_Bool SAL_CALL uno_assignData( void * pDest, struct _typelib_TypeDescription * pDestTypeDescr, void * pSource, struct _typelib_TypeDescription * pSourceTypeDescr, uno_QueryInterfaceFunc queryInterface, uno_AcquireFunc acquire, uno_ReleaseFunc release ) @@ -225,7 +225,7 @@ sal_Bool SAL_CALL uno_assignData( defaults (0) to uno @return true if destination has been successfully assigned */ -sal_Bool SAL_CALL uno_type_assignData( +CPPU_DLLPUBLIC sal_Bool SAL_CALL uno_type_assignData( void * pDest, struct _typelib_TypeDescriptionReference * pDestType, void * pSource, struct _typelib_TypeDescriptionReference * pSourceType, uno_QueryInterfaceFunc queryInterface, uno_AcquireFunc acquire, uno_ReleaseFunc release ) @@ -245,7 +245,7 @@ sal_Bool SAL_CALL uno_type_assignData( defaults (0) to uno @return true if value is destination has been successfully assigned */ -sal_Bool SAL_CALL uno_type_isAssignableFromData( +CPPU_DLLPUBLIC sal_Bool SAL_CALL uno_type_isAssignableFromData( struct _typelib_TypeDescriptionReference * pAssignable, void * pFrom, struct _typelib_TypeDescriptionReference * pFromType, uno_QueryInterfaceFunc queryInterface, uno_ReleaseFunc release ) diff --git a/cppu/inc/uno/environment.h b/cppu/inc/uno/environment.h index 5ef4a5de5323..df6c35122674 100644 --- a/cppu/inc/uno/environment.h +++ b/cppu/inc/uno/environment.h @@ -28,7 +28,7 @@ #ifndef _UNO_ENVIRONMENT_H_ #define _UNO_ENVIRONMENT_H_ -#include <sal/types.h> +#include <cppu/cppudllapi.h> #include <rtl/ustring.h> #include <stdarg.h> @@ -273,7 +273,7 @@ typedef void (SAL_CALL * uno_initEnvironmentFunc)( uno_Environment * pEnv ); @param pEnvDcp descriptor of environment @param pContext some context pointer (e.g., to distinguish java vm; set 0 if not needed) */ -void SAL_CALL uno_getEnvironment( +CPPU_DLLPUBLIC void SAL_CALL uno_getEnvironment( uno_Environment ** ppEnv, rtl_uString * pEnvDcp, void * pContext ) SAL_THROW_EXTERN_C(); @@ -285,7 +285,7 @@ void SAL_CALL uno_getEnvironment( @param memAlloc function for allocating memory that is passed back @param pEnvDcp descriptor of environments; 0 defaults to all */ -void SAL_CALL uno_getRegisteredEnvironments( +CPPU_DLLPUBLIC void SAL_CALL uno_getRegisteredEnvironments( uno_Environment *** pppEnvs, sal_Int32 * pnLen, uno_memAlloc memAlloc, rtl_uString * pEnvDcp ) SAL_THROW_EXTERN_C(); @@ -296,7 +296,7 @@ void SAL_CALL uno_getRegisteredEnvironments( @param pEnvDcp descriptor of environment @param pContext context pointer (e.g., to distinguish java vm); set 0 if not needed */ -void SAL_CALL uno_createEnvironment( +CPPU_DLLPUBLIC void SAL_CALL uno_createEnvironment( uno_Environment ** ppEnv, rtl_uString * pEnvDcp, void * pContext ) SAL_THROW_EXTERN_C(); @@ -306,7 +306,7 @@ void SAL_CALL uno_createEnvironment( @param pEnv environment to be dumped @param pFilter if not null, filters output */ -void SAL_CALL uno_dumpEnvironment( +CPPU_DLLPUBLIC void SAL_CALL uno_dumpEnvironment( void * stream, uno_Environment * pEnv, const sal_Char * pFilter ) SAL_THROW_EXTERN_C(); /** Dumps out environment information, i.e. registered interfaces. @@ -315,7 +315,7 @@ void SAL_CALL uno_dumpEnvironment( @param pEnvDcp descritpro of environment to be dumped @param pFilter if not null, filters output */ -void SAL_CALL uno_dumpEnvironmentByName( +CPPU_DLLPUBLIC void SAL_CALL uno_dumpEnvironmentByName( void * stream, rtl_uString * pEnvDcp, const sal_Char * pFilter ) SAL_THROW_EXTERN_C(); @@ -329,7 +329,7 @@ void SAL_CALL uno_dumpEnvironmentByName( @param pTypeName the optional type of the environment, falls back to "uno" @since UDK 3.2.7 */ -void SAL_CALL uno_getCurrentEnvironment(uno_Environment ** ppEnv, rtl_uString * pTypeName) +CPPU_DLLPUBLIC void SAL_CALL uno_getCurrentEnvironment(uno_Environment ** ppEnv, rtl_uString * pTypeName) SAL_THROW_EXTERN_C(); /** Typedef for variable argument function. @@ -343,7 +343,7 @@ typedef void SAL_CALL uno_EnvCallee(va_list * pParam); @param pParam the parameter pointer passed to the function @since UDK 3.2.7 */ -void SAL_CALL uno_Environment_invoke_v(uno_Environment * pEnv, uno_EnvCallee * pCallee, va_list * pParam) +CPPU_DLLPUBLIC void SAL_CALL uno_Environment_invoke_v(uno_Environment * pEnv, uno_EnvCallee * pCallee, va_list * pParam) SAL_THROW_EXTERN_C(); /** Invoke the passed function in the given environment. @@ -353,7 +353,7 @@ void SAL_CALL uno_Environment_invoke_v(uno_Environment * pEnv, uno_EnvCallee * p @param ... the parameters passed to the function @since UDK 3.2.7 */ -void SAL_CALL uno_Environment_invoke (uno_Environment * pEnv, uno_EnvCallee * pCallee, ...) +CPPU_DLLPUBLIC void SAL_CALL uno_Environment_invoke (uno_Environment * pEnv, uno_EnvCallee * pCallee, ...) SAL_THROW_EXTERN_C(); /** Enter an environment explicitly. @@ -361,7 +361,7 @@ void SAL_CALL uno_Environment_invoke (uno_Environment * pEnv, uno_EnvCallee * pC @param pEnv the environment to enter; NULL leaves all environments @since UDK 3.2.7 */ -void SAL_CALL uno_Environment_enter(uno_Environment * pEnv) +CPPU_DLLPUBLIC void SAL_CALL uno_Environment_enter(uno_Environment * pEnv) SAL_THROW_EXTERN_C(); /** Check if a particular environment is currently valid, so @@ -372,7 +372,7 @@ void SAL_CALL uno_Environment_enter(uno_Environment * pEnv) @return 1 == valid, 0 == invalid @since UDK 3.2.7 */ -int SAL_CALL uno_Environment_isValid(uno_Environment * pEnv, rtl_uString ** pReason) +CPPU_DLLPUBLIC int SAL_CALL uno_Environment_isValid(uno_Environment * pEnv, rtl_uString ** pReason) SAL_THROW_EXTERN_C(); #ifdef IOS diff --git a/cppu/inc/uno/mapping.h b/cppu/inc/uno/mapping.h index 53ea250dd31d..65fb206f11b4 100644 --- a/cppu/inc/uno/mapping.h +++ b/cppu/inc/uno/mapping.h @@ -28,7 +28,7 @@ #ifndef _UNO_MAPPING_H_ #define _UNO_MAPPING_H_ -#include <sal/types.h> +#include <cppu/cppudllapi.h> #include <rtl/ustring.h> @@ -98,7 +98,7 @@ typedef struct _uno_Mapping in this language environment) @param pAddPurpose additional purpose of mapping (e.g., protocolling); defaults to 0 (none) */ -void SAL_CALL uno_getMapping( +CPPU_DLLPUBLIC void SAL_CALL uno_getMapping( struct _uno_Mapping ** ppMapping, struct _uno_Environment * pFrom, struct _uno_Environment * pTo, @@ -122,7 +122,7 @@ typedef void (SAL_CALL * uno_getMappingFunc)( @param pCallback callback function */ -void SAL_CALL uno_registerMappingCallback( +CPPU_DLLPUBLIC void SAL_CALL uno_registerMappingCallback( uno_getMappingFunc pCallback ) SAL_THROW_EXTERN_C(); @@ -130,7 +130,7 @@ void SAL_CALL uno_registerMappingCallback( @param pCallback callback function */ -void SAL_CALL uno_revokeMappingCallback( +CPPU_DLLPUBLIC void SAL_CALL uno_revokeMappingCallback( uno_getMappingFunc pCallback ) SAL_THROW_EXTERN_C(); @@ -149,7 +149,7 @@ typedef void (SAL_CALL * uno_freeMappingFunc)( struct _uno_Mapping * pMapping ); @param pTo destination environment @param pAddPurpose additional purpose string; defaults to 0 */ -void SAL_CALL uno_registerMapping( +CPPU_DLLPUBLIC void SAL_CALL uno_registerMapping( struct _uno_Mapping ** ppMapping, uno_freeMappingFunc freeMapping, struct _uno_Environment * pFrom, struct _uno_Environment * pTo, rtl_uString * pAddPurpose ) SAL_THROW_EXTERN_C(); @@ -159,7 +159,7 @@ void SAL_CALL uno_registerMapping( @param pMapping mapping to be revoked */ -void SAL_CALL uno_revokeMapping( +CPPU_DLLPUBLIC void SAL_CALL uno_revokeMapping( struct _uno_Mapping * pMapping ) SAL_THROW_EXTERN_C(); @@ -173,7 +173,7 @@ void SAL_CALL uno_revokeMapping( in this language environment) @param pAddPurpose additional purpose of mapping (e.g., protocolling); defaults to 0 (none) */ -void SAL_CALL uno_getMappingByName( +CPPU_DLLPUBLIC void SAL_CALL uno_getMappingByName( struct _uno_Mapping ** ppMapping, rtl_uString * pFrom, rtl_uString * pTo, diff --git a/cppu/inc/uno/sequence2.h b/cppu/inc/uno/sequence2.h index d1a50a3743f5..1e9fceadc03a 100644 --- a/cppu/inc/uno/sequence2.h +++ b/cppu/inc/uno/sequence2.h @@ -28,7 +28,7 @@ #ifndef _UNO_SEQUENCE2_H_ #define _UNO_SEQUENCE2_H_ -#include <sal/types.h> +#include <cppu/cppudllapi.h> #include <uno/data.h> #ifdef __cplusplus @@ -48,7 +48,7 @@ typedef sal_Sequence uno_Sequence; @param release function called each time an interface needs to be released; defaults (0) to uno */ -void SAL_CALL uno_sequence_assign( +CPPU_DLLPUBLIC void SAL_CALL uno_sequence_assign( uno_Sequence ** ppDest, uno_Sequence * pSource, struct _typelib_TypeDescription * pTypeDescr, @@ -62,7 +62,7 @@ void SAL_CALL uno_sequence_assign( @param release function called each time an interface needs to be released; defaults (0) to uno */ -void SAL_CALL uno_type_sequence_assign( +CPPU_DLLPUBLIC void SAL_CALL uno_type_sequence_assign( uno_Sequence ** ppDest, uno_Sequence * pSource, struct _typelib_TypeDescriptionReference * pType, @@ -81,7 +81,7 @@ void SAL_CALL uno_type_sequence_assign( be acquired; defaults (0) to uno @return false, if memoray allocation has failed */ -sal_Bool SAL_CALL uno_sequence_construct( +CPPU_DLLPUBLIC sal_Bool SAL_CALL uno_sequence_construct( uno_Sequence ** ppSequence, struct _typelib_TypeDescription * pTypeDescr, void * pElements, sal_Int32 len, @@ -98,7 +98,7 @@ sal_Bool SAL_CALL uno_sequence_construct( be acquired; defaults (0) to uno @return false, if memoray allocation has failed */ -sal_Bool SAL_CALL uno_type_sequence_construct( +CPPU_DLLPUBLIC sal_Bool SAL_CALL uno_type_sequence_construct( uno_Sequence ** ppSequence, struct _typelib_TypeDescriptionReference * pType, void * pElements, sal_Int32 len, @@ -117,7 +117,7 @@ sal_Bool SAL_CALL uno_type_sequence_construct( be released; defaults (0) to uno @return false, if memoray allocation has failed */ -sal_Bool SAL_CALL uno_sequence_reference2One( +CPPU_DLLPUBLIC sal_Bool SAL_CALL uno_sequence_reference2One( uno_Sequence ** ppSequence, struct _typelib_TypeDescription * pTypeDescr, uno_AcquireFunc acquire, @@ -135,7 +135,7 @@ sal_Bool SAL_CALL uno_sequence_reference2One( be released; defaults (0) to uno @return false, if memoray allocation has failed */ -sal_Bool SAL_CALL uno_type_sequence_reference2One( +CPPU_DLLPUBLIC sal_Bool SAL_CALL uno_type_sequence_reference2One( uno_Sequence ** ppSequence, struct _typelib_TypeDescriptionReference * pType, uno_AcquireFunc acquire, @@ -154,7 +154,7 @@ sal_Bool SAL_CALL uno_type_sequence_reference2One( be released; defaults (0) to uno @return false, if memoray allocation has failed */ -sal_Bool SAL_CALL uno_sequence_realloc( +CPPU_DLLPUBLIC sal_Bool SAL_CALL uno_sequence_realloc( uno_Sequence ** ppSequence, struct _typelib_TypeDescription * pTypeDescr, sal_Int32 nSize, @@ -173,7 +173,7 @@ sal_Bool SAL_CALL uno_sequence_realloc( be released; defaults (0) to uno @return false, if memoray allocation has failed */ -sal_Bool SAL_CALL uno_type_sequence_realloc( +CPPU_DLLPUBLIC sal_Bool SAL_CALL uno_type_sequence_realloc( uno_Sequence ** ppSequence, struct _typelib_TypeDescriptionReference * pType, sal_Int32 nSize, diff --git a/cppu/inc/uno/threadpool.h b/cppu/inc/uno/threadpool.h index 0c647442e377..08c60cc3e44a 100644 --- a/cppu/inc/uno/threadpool.h +++ b/cppu/inc/uno/threadpool.h @@ -26,7 +26,7 @@ * ************************************************************************/ -#include <sal/types.h> +#include <cppu/cppudllapi.h> #include <rtl/byteseq.h> #ifdef __cplusplus @@ -50,7 +50,7 @@ extern "C" { @see uno_releaseIdFromCurrentThread() */ -sal_Bool SAL_CALL uno_bindIdToCurrentThread( sal_Sequence *pThreadId ) +CPPU_DLLPUBLIC sal_Bool SAL_CALL uno_bindIdToCurrentThread( sal_Sequence *pThreadId ) SAL_THROW_EXTERN_C(); @@ -64,7 +64,7 @@ sal_Bool SAL_CALL uno_bindIdToCurrentThread( sal_Sequence *pThreadId ) @param ppThreadId [out] Contains the (acquired) ThreadId. @see uno_releaseIdFromCurrentThread() */ -void SAL_CALL uno_getIdOfCurrentThread( sal_Sequence **ppThreadId ) +CPPU_DLLPUBLIC void SAL_CALL uno_getIdOfCurrentThread( sal_Sequence **ppThreadId ) SAL_THROW_EXTERN_C(); @@ -72,7 +72,7 @@ void SAL_CALL uno_getIdOfCurrentThread( sal_Sequence **ppThreadId ) If the internal refcount drops to zero, the association betwen threadId and thread is broken. */ -void SAL_CALL uno_releaseIdFromCurrentThread() +CPPU_DLLPUBLIC void SAL_CALL uno_releaseIdFromCurrentThread() SAL_THROW_EXTERN_C(); @@ -83,7 +83,7 @@ typedef struct _uno_ThreadPool * uno_ThreadPool; Creates a threadpool handle. Typically each remote bridge instances creates one handle. */ -uno_ThreadPool SAL_CALL +CPPU_DLLPUBLIC uno_ThreadPool SAL_CALL uno_threadpool_create() SAL_THROW_EXTERN_C(); @@ -98,7 +98,7 @@ uno_threadpool_create() SAL_THROW_EXTERN_C(); @param hPool The bridge threadpool handle previously created by uno_threadpool_create. */ -void SAL_CALL +CPPU_DLLPUBLIC void SAL_CALL uno_threadpool_attach( uno_ThreadPool hPool ) SAL_THROW_EXTERN_C(); /** @@ -110,7 +110,7 @@ uno_threadpool_attach( uno_ThreadPool hPool ) SAL_THROW_EXTERN_C(); 0, when uno_threadpool_dispose() was the reason to fall off from threadpool. @see uno_threadpool_dispose() **/ -void SAL_CALL +CPPU_DLLPUBLIC void SAL_CALL uno_threadpool_enter( uno_ThreadPool hPool , void **ppJob ) SAL_THROW_EXTERN_C(); @@ -118,7 +118,7 @@ uno_threadpool_enter( uno_ThreadPool hPool , void **ppJob ) Detaches the current thread from the threadpool. Must be called for every call to uno_threadpool_attach. */ -void SAL_CALL +CPPU_DLLPUBLIC void SAL_CALL uno_threadpool_detach( uno_ThreadPool hPool ) SAL_THROW_EXTERN_C(); /** @@ -150,7 +150,7 @@ uno_threadpool_detach( uno_ThreadPool hPool ) SAL_THROW_EXTERN_C(); @param bIsOneway True, if the request is asynchrons. False, if it is synchronous. Set to sal_False, if pJob is a reply. */ -void SAL_CALL +CPPU_DLLPUBLIC void SAL_CALL uno_threadpool_putJob( uno_ThreadPool hPool, sal_Sequence *pThreadId, @@ -173,7 +173,7 @@ uno_threadpool_putJob( This function is called i.e. by a bridge, that is forced to dispose itself. */ -void SAL_CALL +CPPU_DLLPUBLIC void SAL_CALL uno_threadpool_dispose( uno_ThreadPool hPool ) SAL_THROW_EXTERN_C(); @@ -182,7 +182,7 @@ uno_threadpool_dispose( uno_ThreadPool hPool ) SAL_THROW_EXTERN_C(); uno_threadpool_destroy(). @see uno_threadpool_create() */ -void SAL_CALL +CPPU_DLLPUBLIC void SAL_CALL uno_threadpool_destroy( uno_ThreadPool hPool ) SAL_THROW_EXTERN_C(); #ifdef __cplusplus diff --git a/cppu/source/cppu/cppu_opt.cxx b/cppu/source/cppu/cppu_opt.cxx index 20774df133a1..a39524131aa5 100644 --- a/cppu/source/cppu/cppu_opt.cxx +++ b/cppu/source/cppu/cppu_opt.cxx @@ -35,7 +35,7 @@ using namespace ::rtl; //################################################################################################## -extern "C" rtl_uString * SAL_CALL cppu_unsatisfied_iquery_msg( +extern "C" CPPU_DLLPUBLIC rtl_uString * SAL_CALL cppu_unsatisfied_iquery_msg( typelib_TypeDescriptionReference * pType ) SAL_THROW_EXTERN_C() { @@ -49,7 +49,7 @@ extern "C" rtl_uString * SAL_CALL cppu_unsatisfied_iquery_msg( } //################################################################################################## -extern "C" rtl_uString * SAL_CALL cppu_unsatisfied_iset_msg( +extern "C" CPPU_DLLPUBLIC rtl_uString * SAL_CALL cppu_unsatisfied_iset_msg( typelib_TypeDescriptionReference * pType ) SAL_THROW_EXTERN_C() { @@ -63,7 +63,7 @@ extern "C" rtl_uString * SAL_CALL cppu_unsatisfied_iset_msg( } //############################################################################## -extern "C" rtl_uString * SAL_CALL cppu_Any_extraction_failure_msg( +extern "C" CPPU_DLLPUBLIC rtl_uString * SAL_CALL cppu_Any_extraction_failure_msg( uno_Any * pAny, typelib_TypeDescriptionReference * pType ) SAL_THROW_EXTERN_C() { diff --git a/cppu/source/threadpool/current.cxx b/cppu/source/threadpool/current.cxx index 4521a7c64380..2839406ea172 100644 --- a/cppu/source/threadpool/current.cxx +++ b/cppu/source/threadpool/current.cxx @@ -200,7 +200,7 @@ IdContainer * getIdContainer() SAL_THROW( () ) } //################################################################################################## -extern "C" sal_Bool SAL_CALL uno_setCurrentContext( +extern "C" CPPU_DLLPUBLIC sal_Bool SAL_CALL uno_setCurrentContext( void * pCurrentContext, rtl_uString * pEnvTypeName, void * pEnvContext ) SAL_THROW_EXTERN_C() @@ -248,7 +248,7 @@ extern "C" sal_Bool SAL_CALL uno_setCurrentContext( return sal_True; } //################################################################################################## -extern "C" sal_Bool SAL_CALL uno_getCurrentContext( +extern "C" CPPU_DLLPUBLIC sal_Bool SAL_CALL uno_getCurrentContext( void ** ppCurrentContext, rtl_uString * pEnvTypeName, void * pEnvContext ) SAL_THROW_EXTERN_C() { diff --git a/cppu/source/threadpool/threadident.cxx b/cppu/source/threadpool/threadident.cxx index a4e76c4b91e7..c190572b3d4a 100644 --- a/cppu/source/threadpool/threadident.cxx +++ b/cppu/source/threadpool/threadident.cxx @@ -60,7 +60,7 @@ static inline void createLocalId( sal_Sequence **ppThreadId ) } -extern "C" void SAL_CALL +extern "C" CPPU_DLLPUBLIC void SAL_CALL uno_getIdOfCurrentThread( sal_Sequence **ppThreadId ) SAL_THROW_EXTERN_C() { @@ -92,7 +92,7 @@ uno_getIdOfCurrentThread( sal_Sequence **ppThreadId ) } -extern "C" void SAL_CALL uno_releaseIdFromCurrentThread() +extern "C" CPPU_DLLPUBLIC void SAL_CALL uno_releaseIdFromCurrentThread() SAL_THROW_EXTERN_C() { IdContainer *p = getIdContainer(); @@ -106,7 +106,7 @@ extern "C" void SAL_CALL uno_releaseIdFromCurrentThread() } } -extern "C" sal_Bool SAL_CALL uno_bindIdToCurrentThread( sal_Sequence *pThreadId ) +extern "C" CPPU_DLLPUBLIC sal_Bool SAL_CALL uno_bindIdToCurrentThread( sal_Sequence *pThreadId ) SAL_THROW_EXTERN_C() { IdContainer *p = getIdContainer(); diff --git a/cppu/source/threadpool/threadpool.cxx b/cppu/source/threadpool/threadpool.cxx index 312fd89c4375..fe1094774f70 100644 --- a/cppu/source/threadpool/threadpool.cxx +++ b/cppu/source/threadpool/threadpool.cxx @@ -412,7 +412,7 @@ struct _uno_ThreadPool sal_Int32 dummy; }; -extern "C" uno_ThreadPool SAL_CALL +extern "C" CPPU_DLLPUBLIC uno_ThreadPool SAL_CALL uno_threadpool_create() SAL_THROW_EXTERN_C() { MutexGuard guard( Mutex::getGlobalMutex() ); @@ -427,7 +427,7 @@ uno_threadpool_create() SAL_THROW_EXTERN_C() return h; } -extern "C" void SAL_CALL +extern "C" CPPU_DLLPUBLIC void SAL_CALL uno_threadpool_attach( uno_ThreadPool ) SAL_THROW_EXTERN_C() { sal_Sequence *pThreadId = 0; @@ -437,7 +437,7 @@ uno_threadpool_attach( uno_ThreadPool ) SAL_THROW_EXTERN_C() uno_releaseIdFromCurrentThread(); } -extern "C" void SAL_CALL +extern "C" CPPU_DLLPUBLIC void SAL_CALL uno_threadpool_enter( uno_ThreadPool hPool , void **ppJob ) SAL_THROW_EXTERN_C() { @@ -452,13 +452,13 @@ uno_threadpool_enter( uno_ThreadPool hPool , void **ppJob ) uno_releaseIdFromCurrentThread(); } -extern "C" void SAL_CALL +extern "C" CPPU_DLLPUBLIC void SAL_CALL uno_threadpool_detach( uno_ThreadPool ) SAL_THROW_EXTERN_C() { // we might do here some tiding up in case a thread called attach but never detach } -extern "C" void SAL_CALL +extern "C" CPPU_DLLPUBLIC void SAL_CALL uno_threadpool_putJob( uno_ThreadPool, sal_Sequence *pThreadId, @@ -469,7 +469,7 @@ uno_threadpool_putJob( ThreadPool::getInstance()->addJob( pThreadId, bIsOneway, pJob ,doRequest ); } -extern "C" void SAL_CALL +extern "C" CPPU_DLLPUBLIC void SAL_CALL uno_threadpool_dispose( uno_ThreadPool hPool ) SAL_THROW_EXTERN_C() { ThreadPool::getInstance()->dispose( @@ -477,7 +477,7 @@ uno_threadpool_dispose( uno_ThreadPool hPool ) SAL_THROW_EXTERN_C() reinterpret_cast< sal_IntPtr >(hPool)) ); } -extern "C" void SAL_CALL +extern "C" CPPU_DLLPUBLIC void SAL_CALL uno_threadpool_destroy( uno_ThreadPool hPool ) SAL_THROW_EXTERN_C() { ThreadPool::getInstance()->stopDisposing( diff --git a/cppu/source/typelib/static_types.cxx b/cppu/source/typelib/static_types.cxx index 32e468443810..5a5e415c4790 100644 --- a/cppu/source/typelib/static_types.cxx +++ b/cppu/source/typelib/static_types.cxx @@ -141,7 +141,7 @@ static inline typelib_TypeDescriptionReference * igetTypeByName( rtl_uString * p extern "C" { //################################################################################################## -typelib_TypeDescriptionReference ** SAL_CALL typelib_static_type_getByTypeClass( +CPPU_DLLPUBLIC typelib_TypeDescriptionReference ** SAL_CALL typelib_static_type_getByTypeClass( typelib_TypeClass eTypeClass ) SAL_THROW_EXTERN_C() { @@ -306,7 +306,7 @@ typelib_TypeDescriptionReference ** SAL_CALL typelib_static_type_getByTypeClass( } //################################################################################################## -void SAL_CALL typelib_static_type_init( +CPPU_DLLPUBLIC void SAL_CALL typelib_static_type_init( typelib_TypeDescriptionReference ** ppRef, typelib_TypeClass eTypeClass, const sal_Char * pTypeName ) SAL_THROW_EXTERN_C() @@ -326,7 +326,7 @@ void SAL_CALL typelib_static_type_init( } //################################################################################################## -void SAL_CALL typelib_static_sequence_type_init( +CPPU_DLLPUBLIC void SAL_CALL typelib_static_sequence_type_init( typelib_TypeDescriptionReference ** ppRef, typelib_TypeDescriptionReference * pElementType ) SAL_THROW_EXTERN_C() @@ -446,7 +446,7 @@ void init( } -void SAL_CALL typelib_static_compound_type_init( +CPPU_DLLPUBLIC void SAL_CALL typelib_static_compound_type_init( typelib_TypeDescriptionReference ** ppRef, typelib_TypeClass eTypeClass, const sal_Char * pTypeName, typelib_TypeDescriptionReference * pBaseType, @@ -456,7 +456,7 @@ void SAL_CALL typelib_static_compound_type_init( init(ppRef, eTypeClass, pTypeName, pBaseType, nMembers, ppMembers, 0); } -void SAL_CALL typelib_static_struct_type_init( +CPPU_DLLPUBLIC void SAL_CALL typelib_static_struct_type_init( typelib_TypeDescriptionReference ** ppRef, const sal_Char * pTypeName, typelib_TypeDescriptionReference * pBaseType, sal_Int32 nMembers, typelib_TypeDescriptionReference ** ppMembers, @@ -469,7 +469,7 @@ void SAL_CALL typelib_static_struct_type_init( } //################################################################################################## -void SAL_CALL typelib_static_interface_type_init( +CPPU_DLLPUBLIC void SAL_CALL typelib_static_interface_type_init( typelib_TypeDescriptionReference ** ppRef, const sal_Char * pTypeName, typelib_TypeDescriptionReference * pBaseType ) @@ -480,7 +480,7 @@ void SAL_CALL typelib_static_interface_type_init( } //################################################################################################## -void SAL_CALL typelib_static_mi_interface_type_init( +CPPU_DLLPUBLIC void SAL_CALL typelib_static_mi_interface_type_init( typelib_TypeDescriptionReference ** ppRef, const sal_Char * pTypeName, sal_Int32 nBaseTypes, @@ -544,7 +544,7 @@ void SAL_CALL typelib_static_mi_interface_type_init( } //################################################################################################## -void SAL_CALL typelib_static_enum_type_init( +CPPU_DLLPUBLIC void SAL_CALL typelib_static_enum_type_init( typelib_TypeDescriptionReference ** ppRef, const sal_Char * pTypeName, sal_Int32 nDefaultValue ) @@ -584,7 +584,7 @@ void SAL_CALL typelib_static_enum_type_init( } //################################################################################################## -void SAL_CALL typelib_static_array_type_init( +CPPU_DLLPUBLIC void SAL_CALL typelib_static_array_type_init( typelib_TypeDescriptionReference ** ppRef, typelib_TypeDescriptionReference * pElementTypeRef, sal_Int32 nDimensions, ... ) diff --git a/cppu/source/typelib/typelib.cxx b/cppu/source/typelib/typelib.cxx index 841bcf757610..c197f731ff53 100644 --- a/cppu/source/typelib/typelib.cxx +++ b/cppu/source/typelib/typelib.cxx @@ -363,7 +363,7 @@ TypeDescriptor_Init_Impl::~TypeDescriptor_Init_Impl() SAL_THROW( () ) namespace { struct Init : public rtl::Static< TypeDescriptor_Init_Impl, Init > {}; } -extern "C" void SAL_CALL typelib_typedescription_registerCallback( +extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_registerCallback( void * pContext, typelib_typedescription_Callback pCallback ) SAL_THROW_EXTERN_C() { @@ -376,7 +376,7 @@ extern "C" void SAL_CALL typelib_typedescription_registerCallback( } //------------------------------------------------------------------------ -extern "C" void SAL_CALL typelib_typedescription_revokeCallback( +extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_revokeCallback( void * pContext, typelib_typedescription_Callback pCallback ) SAL_THROW_EXTERN_C() { @@ -906,7 +906,7 @@ void newTypeDescription( } -extern "C" void SAL_CALL typelib_typedescription_new( +extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_new( typelib_TypeDescription ** ppRet, typelib_TypeClass eTypeClass, rtl_uString * pTypeName, @@ -919,7 +919,7 @@ extern "C" void SAL_CALL typelib_typedescription_new( ppRet, eTypeClass, pTypeName, pType, nMembers, pMembers, 0); } -extern "C" void SAL_CALL typelib_typedescription_newStruct( +extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_newStruct( typelib_TypeDescription ** ppRet, rtl_uString * pTypeName, typelib_TypeDescriptionReference * pType, @@ -933,7 +933,7 @@ extern "C" void SAL_CALL typelib_typedescription_newStruct( } //------------------------------------------------------------------------ -extern "C" void SAL_CALL typelib_typedescription_newUnion( +extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_newUnion( typelib_TypeDescription ** ppRet, rtl_uString * pTypeName, typelib_TypeDescriptionReference * pDiscriminantTypeRef, @@ -986,7 +986,7 @@ extern "C" void SAL_CALL typelib_typedescription_newUnion( } //------------------------------------------------------------------------ -extern "C" void SAL_CALL typelib_typedescription_newEnum( +extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_newEnum( typelib_TypeDescription ** ppRet, rtl_uString * pTypeName, sal_Int32 nDefaultValue, @@ -1015,7 +1015,7 @@ extern "C" void SAL_CALL typelib_typedescription_newEnum( } //------------------------------------------------------------------------ -extern "C" void SAL_CALL typelib_typedescription_newArray( +extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_newArray( typelib_TypeDescription ** ppRet, typelib_TypeDescriptionReference * pElementTypeRef, sal_Int32 nDimensions, @@ -1053,7 +1053,7 @@ extern "C" void SAL_CALL typelib_typedescription_newArray( } //------------------------------------------------------------------------ -extern "C" void SAL_CALL typelib_typedescription_newInterface( +extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_newInterface( typelib_InterfaceTypeDescription ** ppRet, rtl_uString * pTypeName, sal_uInt32 nUik1, sal_uInt16 nUik2, sal_uInt16 nUik3, sal_uInt32 nUik4, sal_uInt32 nUik5, @@ -1138,7 +1138,7 @@ void BaseList::calculate( } -extern "C" void SAL_CALL typelib_typedescription_newMIInterface( +extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_newMIInterface( typelib_InterfaceTypeDescription ** ppRet, rtl_uString * pTypeName, sal_uInt32 nUik1, sal_uInt16 nUik2, sal_uInt16 nUik3, sal_uInt32 nUik4, sal_uInt32 nUik5, @@ -1269,7 +1269,7 @@ typelib_TypeDescriptionReference ** copyExceptions( } -extern "C" void SAL_CALL typelib_typedescription_newInterfaceMethod( +extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_newInterfaceMethod( typelib_InterfaceMethodTypeDescription ** ppRet, sal_Int32 nAbsolutePosition, sal_Bool bOneWay, @@ -1349,7 +1349,7 @@ extern "C" void SAL_CALL typelib_typedescription_newInterfaceMethod( //------------------------------------------------------------------------ -extern "C" void SAL_CALL typelib_typedescription_newInterfaceAttribute( +extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_newInterfaceAttribute( typelib_InterfaceAttributeTypeDescription ** ppRet, sal_Int32 nAbsolutePosition, rtl_uString * pTypeName, @@ -1364,7 +1364,7 @@ extern "C" void SAL_CALL typelib_typedescription_newInterfaceAttribute( } //------------------------------------------------------------------------ -extern "C" void SAL_CALL typelib_typedescription_newExtendedInterfaceAttribute( +extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_newExtendedInterfaceAttribute( typelib_InterfaceAttributeTypeDescription ** ppRet, sal_Int32 nAbsolutePosition, rtl_uString * pTypeName, @@ -1427,7 +1427,7 @@ extern "C" void SAL_CALL typelib_typedescription_newExtendedInterfaceAttribute( } //------------------------------------------------------------------------ -extern "C" void SAL_CALL typelib_typedescription_acquire( +extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_acquire( typelib_TypeDescription * pTypeDescription ) SAL_THROW_EXTERN_C() { @@ -1584,7 +1584,7 @@ static inline void typelib_typedescription_destructExtendedMembers( } //------------------------------------------------------------------------ -extern "C" void SAL_CALL typelib_typedescription_release( +extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_release( typelib_TypeDescription * pTD ) SAL_THROW_EXTERN_C() { @@ -1661,7 +1661,7 @@ extern "C" void SAL_CALL typelib_typedescription_release( } //------------------------------------------------------------------------ -extern "C" void SAL_CALL typelib_typedescription_register( +extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_register( typelib_TypeDescription ** ppNewDescription ) SAL_THROW_EXTERN_C() { @@ -1802,7 +1802,7 @@ static inline sal_Bool type_equals( p1->pTypeName->length == p2->pTypeName->length && rtl_ustr_compare( p1->pTypeName->buffer, p2->pTypeName->buffer ) == 0)); } -extern "C" sal_Bool SAL_CALL typelib_typedescription_equals( +extern "C" CPPU_DLLPUBLIC sal_Bool SAL_CALL typelib_typedescription_equals( const typelib_TypeDescription * p1, const typelib_TypeDescription * p2 ) SAL_THROW_EXTERN_C() { @@ -2081,7 +2081,7 @@ bool createDerivedInterfaceMemberDescription( } -extern "C" void SAL_CALL typelib_typedescription_getByName( +extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_getByName( typelib_TypeDescription ** ppRet, rtl_uString * pName ) SAL_THROW_EXTERN_C() { @@ -2273,7 +2273,7 @@ extern "C" void SAL_CALL typelib_typedescription_getByName( } } -extern "C" void SAL_CALL typelib_typedescriptionreference_newByAsciiName( +extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescriptionreference_newByAsciiName( typelib_TypeDescriptionReference ** ppTDR, typelib_TypeClass eTypeClass, const sal_Char * pTypeName ) @@ -2283,7 +2283,7 @@ extern "C" void SAL_CALL typelib_typedescriptionreference_newByAsciiName( typelib_typedescriptionreference_new( ppTDR, eTypeClass, aTypeName.pData ); } //------------------------------------------------------------------------ -extern "C" void SAL_CALL typelib_typedescriptionreference_new( +extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescriptionreference_new( typelib_TypeDescriptionReference ** ppTDR, typelib_TypeClass eTypeClass, rtl_uString * pTypeName ) SAL_THROW_EXTERN_C() @@ -2380,7 +2380,7 @@ extern "C" void SAL_CALL typelib_typedescriptionreference_new( } //------------------------------------------------------------------------ -extern "C" void SAL_CALL typelib_typedescriptionreference_acquire( +extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescriptionreference_acquire( typelib_TypeDescriptionReference * pRef ) SAL_THROW_EXTERN_C() { @@ -2388,7 +2388,7 @@ extern "C" void SAL_CALL typelib_typedescriptionreference_acquire( } //------------------------------------------------------------------------ -extern "C" void SAL_CALL typelib_typedescriptionreference_release( +extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescriptionreference_release( typelib_TypeDescriptionReference * pRef ) SAL_THROW_EXTERN_C() { @@ -2424,7 +2424,7 @@ extern "C" void SAL_CALL typelib_typedescriptionreference_release( } //------------------------------------------------------------------------ -extern "C" void SAL_CALL typelib_typedescriptionreference_getDescription( +extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescriptionreference_getDescription( typelib_TypeDescription ** ppRet, typelib_TypeDescriptionReference * pRef ) SAL_THROW_EXTERN_C() { @@ -2507,7 +2507,7 @@ extern "C" void SAL_CALL typelib_typedescriptionreference_getByName( } //------------------------------------------------------------------------ -extern "C" sal_Bool SAL_CALL typelib_typedescriptionreference_equals( +extern "C" CPPU_DLLPUBLIC sal_Bool SAL_CALL typelib_typedescriptionreference_equals( const typelib_TypeDescriptionReference * p1, const typelib_TypeDescriptionReference * p2 ) SAL_THROW_EXTERN_C() @@ -2519,7 +2519,7 @@ extern "C" sal_Bool SAL_CALL typelib_typedescriptionreference_equals( } //################################################################################################## -extern "C" void SAL_CALL typelib_typedescriptionreference_assign( +extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescriptionreference_assign( typelib_TypeDescriptionReference ** ppDest, typelib_TypeDescriptionReference * pSource ) SAL_THROW_EXTERN_C() @@ -2533,7 +2533,7 @@ extern "C" void SAL_CALL typelib_typedescriptionreference_assign( } //################################################################################################## -extern "C" void SAL_CALL typelib_setCacheSize( sal_Int32 nNewSize ) +extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_setCacheSize( sal_Int32 nNewSize ) SAL_THROW_EXTERN_C() { OSL_ENSURE( nNewSize >= 0, "### illegal cache size given!" ); @@ -2571,7 +2571,7 @@ static sal_Bool s_aAssignableFromTab[11][11] = }; //################################################################################################## -extern "C" sal_Bool SAL_CALL typelib_typedescriptionreference_isAssignableFrom( +extern "C" CPPU_DLLPUBLIC sal_Bool SAL_CALL typelib_typedescriptionreference_isAssignableFrom( typelib_TypeDescriptionReference * pAssignable, typelib_TypeDescriptionReference * pFrom ) SAL_THROW_EXTERN_C() @@ -2643,7 +2643,7 @@ extern "C" sal_Bool SAL_CALL typelib_typedescriptionreference_isAssignableFrom( return sal_False; } //################################################################################################## -extern "C" sal_Bool SAL_CALL typelib_typedescription_isAssignableFrom( +extern "C" CPPU_DLLPUBLIC sal_Bool SAL_CALL typelib_typedescription_isAssignableFrom( typelib_TypeDescription * pAssignable, typelib_TypeDescription * pFrom ) SAL_THROW_EXTERN_C() @@ -2653,7 +2653,7 @@ extern "C" sal_Bool SAL_CALL typelib_typedescription_isAssignableFrom( } //################################################################################################## -extern "C" sal_Bool SAL_CALL typelib_typedescription_complete( +extern "C" CPPU_DLLPUBLIC sal_Bool SAL_CALL typelib_typedescription_complete( typelib_TypeDescription ** ppTypeDescr ) SAL_THROW_EXTERN_C() { diff --git a/cppu/source/uno/EnvDcp.c b/cppu/source/uno/EnvDcp.c index a9d6dc3d59c7..d03a38d68436 100644 --- a/cppu/source/uno/EnvDcp.c +++ b/cppu/source/uno/EnvDcp.c @@ -29,7 +29,7 @@ #include "uno/EnvDcp.h" -void uno_EnvDcp_getTypeName(rtl_uString const * pEnvDcp, rtl_uString ** ppEnvTypeName) +CPPU_DLLPUBLIC void uno_EnvDcp_getTypeName(rtl_uString const * pEnvDcp, rtl_uString ** ppEnvTypeName) { sal_Int32 colIdx = rtl_ustr_indexOfChar_WithLength(pEnvDcp->buffer, pEnvDcp->length, ':'); if (colIdx >= 0) @@ -39,7 +39,7 @@ void uno_EnvDcp_getTypeName(rtl_uString const * pEnvDcp, rtl_uString ** ppEnvTyp rtl_uString_newFromStr(ppEnvTypeName, pEnvDcp->buffer); } -void uno_EnvDcp_getPurpose(rtl_uString const * pEnvDcp, rtl_uString ** ppEnvPurpose) +CPPU_DLLPUBLIC void uno_EnvDcp_getPurpose(rtl_uString const * pEnvDcp, rtl_uString ** ppEnvPurpose) { sal_Int32 colIdx = rtl_ustr_indexOfChar_WithLength(pEnvDcp->buffer, pEnvDcp->length, ':'); if (colIdx >= 0) diff --git a/cppu/source/uno/EnvStack.cxx b/cppu/source/uno/EnvStack.cxx index 954244088450..ffe5290c73d2 100644 --- a/cppu/source/uno/EnvStack.cxx +++ b/cppu/source/uno/EnvStack.cxx @@ -107,7 +107,7 @@ static uno_Environment * s_getCurrent(void) } -extern "C" void SAL_CALL uno_getCurrentEnvironment(uno_Environment ** ppEnv, rtl_uString * pTypeName) +extern "C" CPPU_DLLPUBLIC void SAL_CALL uno_getCurrentEnvironment(uno_Environment ** ppEnv, rtl_uString * pTypeName) SAL_THROW_EXTERN_C() { if (*ppEnv) @@ -309,13 +309,13 @@ static void s_environment_invoke_v(uno_Environment * pCurrEnv, uno_Environment * pNextEnv->release(pNextEnv); } -extern "C" void SAL_CALL uno_Environment_invoke_v(uno_Environment * pTargetEnv, uno_EnvCallee * pCallee, va_list * pParam) +extern "C" CPPU_DLLPUBLIC void SAL_CALL uno_Environment_invoke_v(uno_Environment * pTargetEnv, uno_EnvCallee * pCallee, va_list * pParam) SAL_THROW_EXTERN_C() { s_environment_invoke_v(s_getCurrent(), pTargetEnv, pCallee, pParam); } -extern "C" void SAL_CALL uno_Environment_invoke(uno_Environment * pEnv, uno_EnvCallee * pCallee, ...) +extern "C" CPPU_DLLPUBLIC void SAL_CALL uno_Environment_invoke(uno_Environment * pEnv, uno_EnvCallee * pCallee, ...) SAL_THROW_EXTERN_C() { va_list param; @@ -325,7 +325,7 @@ extern "C" void SAL_CALL uno_Environment_invoke(uno_Environment * pEnv, uno_EnvC va_end(param); } -extern "C" void SAL_CALL uno_Environment_enter(uno_Environment * pTargetEnv) +extern "C" CPPU_DLLPUBLIC void SAL_CALL uno_Environment_enter(uno_Environment * pTargetEnv) SAL_THROW_EXTERN_C() { uno_Environment * pNextEnv = NULL; @@ -358,7 +358,7 @@ extern "C" void SAL_CALL uno_Environment_enter(uno_Environment * pTargetEnv) } } -int SAL_CALL uno_Environment_isValid(uno_Environment * pEnv, rtl_uString ** pReason) +CPPU_DLLPUBLIC int SAL_CALL uno_Environment_isValid(uno_Environment * pEnv, rtl_uString ** pReason) SAL_THROW_EXTERN_C() { int result = 1; diff --git a/cppu/source/uno/any.cxx b/cppu/source/uno/any.cxx index b75c3b250203..d031683c414f 100644 --- a/cppu/source/uno/any.cxx +++ b/cppu/source/uno/any.cxx @@ -36,7 +36,7 @@ using namespace cppu; extern "C" { //################################################################################################## -void SAL_CALL uno_type_any_assign( +CPPU_DLLPUBLIC void SAL_CALL uno_type_any_assign( uno_Any * pDest, void * pSource, typelib_TypeDescriptionReference * pType, uno_AcquireFunc acquire, uno_ReleaseFunc release ) @@ -53,7 +53,7 @@ void SAL_CALL uno_type_any_assign( } } //################################################################################################## -void SAL_CALL uno_any_assign( +CPPU_DLLPUBLIC void SAL_CALL uno_any_assign( uno_Any * pDest, void * pSource, typelib_TypeDescription * pTypeDescr, uno_AcquireFunc acquire, uno_ReleaseFunc release ) @@ -70,7 +70,7 @@ void SAL_CALL uno_any_assign( } } //################################################################################################## -void SAL_CALL uno_type_any_construct( +CPPU_DLLPUBLIC void SAL_CALL uno_type_any_construct( uno_Any * pDest, void * pSource, typelib_TypeDescriptionReference * pType, uno_AcquireFunc acquire ) @@ -86,7 +86,7 @@ void SAL_CALL uno_type_any_construct( } } //################################################################################################## -void SAL_CALL uno_any_construct( +CPPU_DLLPUBLIC void SAL_CALL uno_any_construct( uno_Any * pDest, void * pSource, typelib_TypeDescription * pTypeDescr, uno_AcquireFunc acquire ) @@ -102,7 +102,7 @@ void SAL_CALL uno_any_construct( } } //################################################################################################## -void SAL_CALL uno_type_any_constructAndConvert( +CPPU_DLLPUBLIC void SAL_CALL uno_type_any_constructAndConvert( uno_Any * pDest, void * pSource, typelib_TypeDescriptionReference * pType, uno_Mapping * mapping ) @@ -118,7 +118,7 @@ void SAL_CALL uno_type_any_constructAndConvert( } } //################################################################################################## -void SAL_CALL uno_any_constructAndConvert( +CPPU_DLLPUBLIC void SAL_CALL uno_any_constructAndConvert( uno_Any * pDest, void * pSource, typelib_TypeDescription * pTypeDescr, uno_Mapping * mapping ) @@ -134,13 +134,13 @@ void SAL_CALL uno_any_constructAndConvert( } } //################################################################################################## -void SAL_CALL uno_any_destruct( uno_Any * pValue, uno_ReleaseFunc release ) +CPPU_DLLPUBLIC void SAL_CALL uno_any_destruct( uno_Any * pValue, uno_ReleaseFunc release ) SAL_THROW_EXTERN_C() { _destructAny( pValue, release ); } //################################################################################################## -void SAL_CALL uno_any_clear( uno_Any * pValue, uno_ReleaseFunc release ) +CPPU_DLLPUBLIC void SAL_CALL uno_any_clear( uno_Any * pValue, uno_ReleaseFunc release ) SAL_THROW_EXTERN_C() { _destructAny( pValue, release ); diff --git a/cppu/source/uno/data.cxx b/cppu/source/uno/data.cxx index 3f9b9788e31b..88634494b83c 100644 --- a/cppu/source/uno/data.cxx +++ b/cppu/source/uno/data.cxx @@ -200,21 +200,21 @@ sal_Bool equalSequence( extern "C" { //################################################################################################## -void SAL_CALL uno_type_constructData( +CPPU_DLLPUBLIC void SAL_CALL uno_type_constructData( void * pMem, typelib_TypeDescriptionReference * pType ) SAL_THROW_EXTERN_C() { _defaultConstructData( pMem, pType, 0 ); } //################################################################################################## -void SAL_CALL uno_constructData( +CPPU_DLLPUBLIC void SAL_CALL uno_constructData( void * pMem, typelib_TypeDescription * pTypeDescr ) SAL_THROW_EXTERN_C() { _defaultConstructData( pMem, pTypeDescr->pWeakRef, pTypeDescr ); } //################################################################################################## -void SAL_CALL uno_type_destructData( +CPPU_DLLPUBLIC void SAL_CALL uno_type_destructData( void * pValue, typelib_TypeDescriptionReference * pType, uno_ReleaseFunc release ) SAL_THROW_EXTERN_C() @@ -222,7 +222,7 @@ void SAL_CALL uno_type_destructData( _destructData( pValue, pType, 0, release ); } //################################################################################################## -void SAL_CALL uno_destructData( +CPPU_DLLPUBLIC void SAL_CALL uno_destructData( void * pValue, typelib_TypeDescription * pTypeDescr, uno_ReleaseFunc release ) @@ -231,7 +231,7 @@ void SAL_CALL uno_destructData( _destructData( pValue, pTypeDescr->pWeakRef, pTypeDescr, release ); } //################################################################################################## -void SAL_CALL uno_type_copyData( +CPPU_DLLPUBLIC void SAL_CALL uno_type_copyData( void * pDest, void * pSource, typelib_TypeDescriptionReference * pType, uno_AcquireFunc acquire ) @@ -240,7 +240,7 @@ void SAL_CALL uno_type_copyData( _copyConstructData( pDest, pSource, pType, 0, acquire, 0 ); } //################################################################################################## -void SAL_CALL uno_copyData( +CPPU_DLLPUBLIC void SAL_CALL uno_copyData( void * pDest, void * pSource, typelib_TypeDescription * pTypeDescr, uno_AcquireFunc acquire ) @@ -249,7 +249,7 @@ void SAL_CALL uno_copyData( _copyConstructData( pDest, pSource, pTypeDescr->pWeakRef, pTypeDescr, acquire, 0 ); } //################################################################################################## -void SAL_CALL uno_type_copyAndConvertData( +CPPU_DLLPUBLIC void SAL_CALL uno_type_copyAndConvertData( void * pDest, void * pSource, typelib_TypeDescriptionReference * pType, uno_Mapping * mapping ) @@ -258,7 +258,7 @@ void SAL_CALL uno_type_copyAndConvertData( _copyConstructData( pDest, pSource, pType, 0, 0, mapping ); } //################################################################################################## -void SAL_CALL uno_copyAndConvertData( +CPPU_DLLPUBLIC void SAL_CALL uno_copyAndConvertData( void * pDest, void * pSource, typelib_TypeDescription * pTypeDescr, uno_Mapping * mapping ) @@ -267,7 +267,7 @@ void SAL_CALL uno_copyAndConvertData( _copyConstructData( pDest, pSource, pTypeDescr->pWeakRef, pTypeDescr, 0, mapping ); } //################################################################################################## -sal_Bool SAL_CALL uno_type_equalData( +CPPU_DLLPUBLIC sal_Bool SAL_CALL uno_type_equalData( void * pVal1, typelib_TypeDescriptionReference * pVal1Type, void * pVal2, typelib_TypeDescriptionReference * pVal2Type, uno_QueryInterfaceFunc queryInterface, uno_ReleaseFunc release ) @@ -279,7 +279,7 @@ sal_Bool SAL_CALL uno_type_equalData( queryInterface, release ); } //################################################################################################## -sal_Bool SAL_CALL uno_equalData( +CPPU_DLLPUBLIC sal_Bool SAL_CALL uno_equalData( void * pVal1, typelib_TypeDescription * pVal1TD, void * pVal2, typelib_TypeDescription * pVal2TD, uno_QueryInterfaceFunc queryInterface, uno_ReleaseFunc release ) @@ -291,7 +291,7 @@ sal_Bool SAL_CALL uno_equalData( queryInterface, release ); } //################################################################################################## -sal_Bool SAL_CALL uno_type_assignData( +CPPU_DLLPUBLIC sal_Bool SAL_CALL uno_type_assignData( void * pDest, typelib_TypeDescriptionReference * pDestType, void * pSource, typelib_TypeDescriptionReference * pSourceType, uno_QueryInterfaceFunc queryInterface, uno_AcquireFunc acquire, uno_ReleaseFunc release ) @@ -303,7 +303,7 @@ sal_Bool SAL_CALL uno_type_assignData( queryInterface, acquire, release ); } //################################################################################################## -sal_Bool SAL_CALL uno_assignData( +CPPU_DLLPUBLIC sal_Bool SAL_CALL uno_assignData( void * pDest, typelib_TypeDescription * pDestTD, void * pSource, typelib_TypeDescription * pSourceTD, uno_QueryInterfaceFunc queryInterface, uno_AcquireFunc acquire, uno_ReleaseFunc release ) @@ -315,7 +315,7 @@ sal_Bool SAL_CALL uno_assignData( queryInterface, acquire, release ); } //################################################################################################## -sal_Bool SAL_CALL uno_type_isAssignableFromData( +CPPU_DLLPUBLIC sal_Bool SAL_CALL uno_type_isAssignableFromData( typelib_TypeDescriptionReference * pAssignable, void * pFrom, typelib_TypeDescriptionReference * pFromType, uno_QueryInterfaceFunc queryInterface, uno_ReleaseFunc release ) diff --git a/cppu/source/uno/env_subst.cxx b/cppu/source/uno/env_subst.cxx index 6d75a35b662b..4f4eed4669ce 100644 --- a/cppu/source/uno/env_subst.cxx +++ b/cppu/source/uno/env_subst.cxx @@ -31,7 +31,7 @@ #include "env_subst.hxx" -void SAL_CALL uno_getEnvironment(uno_Environment ** ppEnv, +CPPU_DLLPUBLIC void SAL_CALL uno_getEnvironment(uno_Environment ** ppEnv, rtl_uString * pEnvDcp, void * pContext) SAL_THROW_EXTERN_C() diff --git a/cppu/source/uno/lbenv.cxx b/cppu/source/uno/lbenv.cxx index ba3465ca9a99..79581a5d765b 100644 --- a/cppu/source/uno/lbenv.cxx +++ b/cppu/source/uno/lbenv.cxx @@ -715,7 +715,7 @@ static void writeLine( } //############################################################################## -extern "C" void SAL_CALL uno_dumpEnvironment( +extern "C" CPPU_DLLPUBLIC void SAL_CALL uno_dumpEnvironment( void * stream, uno_Environment * pEnv, const sal_Char * pFilter ) SAL_THROW_EXTERN_C() { @@ -802,7 +802,7 @@ extern "C" void SAL_CALL uno_dumpEnvironment( } //############################################################################## -extern "C" void SAL_CALL uno_dumpEnvironmentByName( +extern "C" CPPU_DLLPUBLIC void SAL_CALL uno_dumpEnvironmentByName( void * stream, rtl_uString * pEnvDcp, const sal_Char * pFilter ) SAL_THROW_EXTERN_C() { @@ -1147,7 +1147,7 @@ static uno_Environment * initDefaultEnvironment( } //############################################################################## -void SAL_CALL uno_createEnvironment( +CPPU_DLLPUBLIC void SAL_CALL uno_createEnvironment( uno_Environment ** ppEnv, rtl_uString * pEnvDcp, void * pContext ) SAL_THROW_EXTERN_C() { @@ -1183,7 +1183,7 @@ void SAL_CALL uno_direct_getEnvironment( } //############################################################################## -void SAL_CALL uno_getRegisteredEnvironments( +CPPU_DLLPUBLIC void SAL_CALL uno_getRegisteredEnvironments( uno_Environment *** pppEnvs, sal_Int32 * pnLen, uno_memAlloc memAlloc, rtl_uString * pEnvDcp ) SAL_THROW_EXTERN_C() diff --git a/cppu/source/uno/lbmap.cxx b/cppu/source/uno/lbmap.cxx index 84e2cc79b14b..6df981866a0d 100644 --- a/cppu/source/uno/lbmap.cxx +++ b/cppu/source/uno/lbmap.cxx @@ -509,7 +509,7 @@ using namespace ::cppu; extern "C" { //################################################################################################## -void SAL_CALL uno_getMapping( +CPPU_DLLPUBLIC void SAL_CALL uno_getMapping( uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo, rtl_uString * pAddPurpose ) SAL_THROW_EXTERN_C() @@ -577,7 +577,7 @@ void SAL_CALL uno_getMapping( } } //################################################################################################## -void SAL_CALL uno_getMappingByName( +CPPU_DLLPUBLIC void SAL_CALL uno_getMappingByName( uno_Mapping ** ppMapping, rtl_uString * pFrom, rtl_uString * pTo, rtl_uString * pAddPurpose ) SAL_THROW_EXTERN_C() @@ -607,7 +607,7 @@ void SAL_CALL uno_getMappingByName( } //################################################################################################## -void SAL_CALL uno_registerMapping( +CPPU_DLLPUBLIC void SAL_CALL uno_registerMapping( uno_Mapping ** ppMapping, uno_freeMappingFunc freeMapping, uno_Environment * pFrom, uno_Environment * pTo, rtl_uString * pAddPurpose ) SAL_THROW_EXTERN_C() @@ -645,7 +645,7 @@ void SAL_CALL uno_registerMapping( } } //################################################################################################## -void SAL_CALL uno_revokeMapping( +CPPU_DLLPUBLIC void SAL_CALL uno_revokeMapping( uno_Mapping * pMapping ) SAL_THROW_EXTERN_C() { @@ -670,7 +670,7 @@ void SAL_CALL uno_revokeMapping( } //################################################################################################## -void SAL_CALL uno_registerMappingCallback( +CPPU_DLLPUBLIC void SAL_CALL uno_registerMappingCallback( uno_getMappingFunc pCallback ) SAL_THROW_EXTERN_C() { @@ -680,7 +680,7 @@ void SAL_CALL uno_registerMappingCallback( rData.aCallbacks.insert( pCallback ); } //################################################################################################## -void SAL_CALL uno_revokeMappingCallback( +CPPU_DLLPUBLIC void SAL_CALL uno_revokeMappingCallback( uno_getMappingFunc pCallback ) SAL_THROW_EXTERN_C() { diff --git a/cppu/source/uno/sequence.cxx b/cppu/source/uno/sequence.cxx index 5affbef38a0c..0c635984675c 100644 --- a/cppu/source/uno/sequence.cxx +++ b/cppu/source/uno/sequence.cxx @@ -766,7 +766,7 @@ extern "C" { //############################################################################## -sal_Bool SAL_CALL uno_type_sequence_construct( +CPPU_DLLPUBLIC sal_Bool SAL_CALL uno_type_sequence_construct( uno_Sequence ** ppSequence, typelib_TypeDescriptionReference * pType, void * pElements, sal_Int32 len, uno_AcquireFunc acquire ) @@ -810,7 +810,7 @@ sal_Bool SAL_CALL uno_type_sequence_construct( } //############################################################################## -sal_Bool SAL_CALL uno_sequence_construct( +CPPU_DLLPUBLIC sal_Bool SAL_CALL uno_sequence_construct( uno_Sequence ** ppSequence, typelib_TypeDescription * pTypeDescr, void * pElements, sal_Int32 len, uno_AcquireFunc acquire ) @@ -849,7 +849,7 @@ sal_Bool SAL_CALL uno_sequence_construct( } //############################################################################## -sal_Bool SAL_CALL uno_type_sequence_realloc( +CPPU_DLLPUBLIC sal_Bool SAL_CALL uno_type_sequence_realloc( uno_Sequence ** ppSequence, typelib_TypeDescriptionReference * pType, sal_Int32 nSize, uno_AcquireFunc acquire, uno_ReleaseFunc release ) SAL_THROW_EXTERN_C() @@ -871,7 +871,7 @@ sal_Bool SAL_CALL uno_type_sequence_realloc( } //############################################################################## -sal_Bool SAL_CALL uno_sequence_realloc( +CPPU_DLLPUBLIC sal_Bool SAL_CALL uno_sequence_realloc( uno_Sequence ** ppSequence, typelib_TypeDescription * pTypeDescr, sal_Int32 nSize, uno_AcquireFunc acquire, uno_ReleaseFunc release ) SAL_THROW_EXTERN_C() @@ -890,7 +890,7 @@ sal_Bool SAL_CALL uno_sequence_realloc( } //############################################################################## -sal_Bool SAL_CALL uno_type_sequence_reference2One( +CPPU_DLLPUBLIC sal_Bool SAL_CALL uno_type_sequence_reference2One( uno_Sequence ** ppSequence, typelib_TypeDescriptionReference * pType, uno_AcquireFunc acquire, uno_ReleaseFunc release ) @@ -937,7 +937,7 @@ sal_Bool SAL_CALL uno_type_sequence_reference2One( } //############################################################################## -sal_Bool SAL_CALL uno_sequence_reference2One( +CPPU_DLLPUBLIC sal_Bool SAL_CALL uno_sequence_reference2One( uno_Sequence ** ppSequence, typelib_TypeDescription * pTypeDescr, uno_AcquireFunc acquire, uno_ReleaseFunc release ) @@ -981,7 +981,7 @@ sal_Bool SAL_CALL uno_sequence_reference2One( } //############################################################################## -void SAL_CALL uno_sequence_assign( +CPPU_DLLPUBLIC void SAL_CALL uno_sequence_assign( uno_Sequence ** ppDest, uno_Sequence * pSource, typelib_TypeDescription * pTypeDescr, @@ -997,7 +997,7 @@ void SAL_CALL uno_sequence_assign( } //############################################################################## -void SAL_CALL uno_type_sequence_assign( +CPPU_DLLPUBLIC void SAL_CALL uno_type_sequence_assign( uno_Sequence ** ppDest, uno_Sequence * pSource, typelib_TypeDescriptionReference * pType, |