Some loplugin:revisibility clean-up

Stumbled across such redundant visibility re-specifications when looking at the
odd case of cppu_unsatisfied_iquery_msg declared CPPU_DLLPUBLIC in
cppu/source/cppu/cppu_opt.cxx and used in inline code in
include/com/sun/star/uno/Reference.hxx with only a declaration lacking
CPPU_DLLPUBLIC visible, and wondering how that actually works on Windows.

However, this plugin is probably not worth it being run all the time, so
committing it to compilerplugins/clang/store/.

Change-Id: Ibc3c4e7499213de1b419ce7eb85455cb832e1510

8 files changed, 71 insertions, 71 deletions

diff --git a/cppu/source/typelib/static_types.cxx b/cppu/source/typelib/static_types.cxx
index fb99775b073f..2d66d24b37f7 100644
--- a/cppu/source/typelib/static_types.cxx
+++ b/cppu/source/typelib/static_types.cxx
@@ -114,7 +114,7 @@ static inline typelib_TypeDescriptionReference * igetTypeByName( rtl_uString * p
 extern "C"
 {
 
-CPPU_DLLPUBLIC typelib_TypeDescriptionReference ** SAL_CALL typelib_static_type_getByTypeClass(
+typelib_TypeDescriptionReference ** SAL_CALL typelib_static_type_getByTypeClass(
     typelib_TypeClass eTypeClass )
     SAL_THROW_EXTERN_C()
 {
@@ -277,7 +277,7 @@ CPPU_DLLPUBLIC typelib_TypeDescriptionReference ** SAL_CALL typelib_static_type_
     return &s_aTypes[eTypeClass];
 }
 
-CPPU_DLLPUBLIC void SAL_CALL typelib_static_type_init(
+void SAL_CALL typelib_static_type_init(
     typelib_TypeDescriptionReference ** ppRef,
     typelib_TypeClass eTypeClass, const sal_Char * pTypeName )
     SAL_THROW_EXTERN_C()
@@ -296,7 +296,7 @@ CPPU_DLLPUBLIC void SAL_CALL typelib_static_type_init(
     }
 }
 
-CPPU_DLLPUBLIC void SAL_CALL typelib_static_sequence_type_init(
+void SAL_CALL typelib_static_sequence_type_init(
     typelib_TypeDescriptionReference ** ppRef,
     typelib_TypeDescriptionReference * pElementType )
     SAL_THROW_EXTERN_C()
@@ -415,7 +415,7 @@ void init(
 
 }
 
-CPPU_DLLPUBLIC void SAL_CALL typelib_static_compound_type_init(
+void SAL_CALL typelib_static_compound_type_init(
     typelib_TypeDescriptionReference ** ppRef,
     typelib_TypeClass eTypeClass, const sal_Char * pTypeName,
     typelib_TypeDescriptionReference * pBaseType,
@@ -425,7 +425,7 @@ CPPU_DLLPUBLIC void SAL_CALL typelib_static_compound_type_init(
     init(ppRef, eTypeClass, pTypeName, pBaseType, nMembers, ppMembers, 0);
 }
 
-CPPU_DLLPUBLIC void SAL_CALL typelib_static_struct_type_init(
+void SAL_CALL typelib_static_struct_type_init(
     typelib_TypeDescriptionReference ** ppRef, const sal_Char * pTypeName,
     typelib_TypeDescriptionReference * pBaseType,
     sal_Int32 nMembers, typelib_TypeDescriptionReference ** ppMembers,
@@ -437,7 +437,7 @@ CPPU_DLLPUBLIC void SAL_CALL typelib_static_struct_type_init(
         ppMembers, pParameterizedTypes);
 }
 
-CPPU_DLLPUBLIC void SAL_CALL typelib_static_interface_type_init(
+void SAL_CALL typelib_static_interface_type_init(
     typelib_TypeDescriptionReference ** ppRef,
     const sal_Char * pTypeName,
     typelib_TypeDescriptionReference * pBaseType )
@@ -448,7 +448,7 @@ CPPU_DLLPUBLIC void SAL_CALL typelib_static_interface_type_init(
         ppRef, pTypeName, pBaseType == 0 ? 0 : 1, &pBaseType);
 }
 
-CPPU_DLLPUBLIC void SAL_CALL typelib_static_mi_interface_type_init(
+void SAL_CALL typelib_static_mi_interface_type_init(
     typelib_TypeDescriptionReference ** ppRef,
     const sal_Char * pTypeName,
     sal_Int32 nBaseTypes,
@@ -512,7 +512,7 @@ CPPU_DLLPUBLIC void SAL_CALL typelib_static_mi_interface_type_init(
 }
 
 
-CPPU_DLLPUBLIC void SAL_CALL typelib_static_enum_type_init(
+void SAL_CALL typelib_static_enum_type_init(
     typelib_TypeDescriptionReference ** ppRef,
     const sal_Char * pTypeName,
     sal_Int32 nDefaultValue )
diff --git a/cppu/source/typelib/typelib.cxx b/cppu/source/typelib/typelib.cxx
index 507b20f7a919..89427072ea4a 100644
--- a/cppu/source/typelib/typelib.cxx
+++ b/cppu/source/typelib/typelib.cxx
@@ -340,7 +340,7 @@ TypeDescriptor_Init_Impl::~TypeDescriptor_Init_Impl()
 
 namespace { struct Init : public rtl::Static< TypeDescriptor_Init_Impl, Init > {}; }
 
-extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_registerCallback(
+extern "C" void SAL_CALL typelib_typedescription_registerCallback(
     void * pContext, typelib_typedescription_Callback pCallback )
     SAL_THROW_EXTERN_C()
 {
@@ -353,7 +353,7 @@ extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_registerCallback
 }
 
 
-extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_revokeCallback(
+extern "C" void SAL_CALL typelib_typedescription_revokeCallback(
     void * pContext, typelib_typedescription_Callback pCallback )
     SAL_THROW_EXTERN_C()
 {
@@ -834,7 +834,7 @@ void newTypeDescription(
 
 }
 
-extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_new(
+extern "C" void SAL_CALL typelib_typedescription_new(
     typelib_TypeDescription ** ppRet,
     typelib_TypeClass eTypeClass,
     rtl_uString * pTypeName,
@@ -847,7 +847,7 @@ extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_new(
         ppRet, eTypeClass, pTypeName, pType, nMembers, pMembers, 0);
 }
 
-extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_newStruct(
+extern "C" void SAL_CALL typelib_typedescription_newStruct(
     typelib_TypeDescription ** ppRet,
     rtl_uString * pTypeName,
     typelib_TypeDescriptionReference * pType,
@@ -861,7 +861,7 @@ extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_newStruct(
 }
 
 
-extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_newEnum(
+extern "C" void SAL_CALL typelib_typedescription_newEnum(
     typelib_TypeDescription ** ppRet,
     rtl_uString * pTypeName,
     sal_Int32 nDefaultValue,
@@ -890,7 +890,7 @@ extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_newEnum(
 }
 
 
-extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_newInterface(
+extern "C" void SAL_CALL typelib_typedescription_newInterface(
     typelib_InterfaceTypeDescription ** ppRet,
     rtl_uString * pTypeName,
     SAL_UNUSED_PARAMETER sal_uInt32, SAL_UNUSED_PARAMETER sal_uInt16,
@@ -976,7 +976,7 @@ void BaseList::calculate(
 
 }
 
-extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_newMIInterface(
+extern "C" void SAL_CALL typelib_typedescription_newMIInterface(
     typelib_InterfaceTypeDescription ** ppRet,
     rtl_uString * pTypeName,
     SAL_UNUSED_PARAMETER sal_uInt32, SAL_UNUSED_PARAMETER sal_uInt16,
@@ -1109,7 +1109,7 @@ typelib_TypeDescriptionReference ** copyExceptions(
 
 }
 
-extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_newInterfaceMethod(
+extern "C" void SAL_CALL typelib_typedescription_newInterfaceMethod(
     typelib_InterfaceMethodTypeDescription ** ppRet,
     sal_Int32 nAbsolutePosition,
     sal_Bool bOneWay,
@@ -1189,7 +1189,7 @@ extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_newInterfaceMeth
 
 
 
-extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_newInterfaceAttribute(
+extern "C" void SAL_CALL typelib_typedescription_newInterfaceAttribute(
     typelib_InterfaceAttributeTypeDescription ** ppRet,
     sal_Int32 nAbsolutePosition,
     rtl_uString * pTypeName,
@@ -1204,7 +1204,7 @@ extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_newInterfaceAttr
 }
 
 
-extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_newExtendedInterfaceAttribute(
+extern "C" void SAL_CALL typelib_typedescription_newExtendedInterfaceAttribute(
     typelib_InterfaceAttributeTypeDescription ** ppRet,
     sal_Int32 nAbsolutePosition,
     rtl_uString * pTypeName,
@@ -1267,7 +1267,7 @@ extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_newExtendedInter
 }
 
 
-extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_acquire(
+extern "C" void SAL_CALL typelib_typedescription_acquire(
     typelib_TypeDescription * pTypeDescription )
     SAL_THROW_EXTERN_C()
 {
@@ -1396,7 +1396,7 @@ static inline void typelib_typedescription_destructExtendedMembers(
 }
 
 
-extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_release(
+extern "C" void SAL_CALL typelib_typedescription_release(
     typelib_TypeDescription * pTD )
     SAL_THROW_EXTERN_C()
 {
@@ -1467,7 +1467,7 @@ extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_release(
 }
 
 
-extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_register(
+extern "C" void SAL_CALL typelib_typedescription_register(
     typelib_TypeDescription ** ppNewDescription )
     SAL_THROW_EXTERN_C()
 {
@@ -1611,7 +1611,7 @@ static inline bool type_equals(
              p1->pTypeName->length == p2->pTypeName->length &&
              rtl_ustr_compare( p1->pTypeName->buffer, p2->pTypeName->buffer ) == 0));
 }
-extern "C" CPPU_DLLPUBLIC sal_Bool SAL_CALL typelib_typedescription_equals(
+extern "C" sal_Bool SAL_CALL typelib_typedescription_equals(
     const typelib_TypeDescription * p1, const typelib_TypeDescription * p2 )
     SAL_THROW_EXTERN_C()
 {
@@ -1863,7 +1863,7 @@ bool createDerivedInterfaceMemberDescription(
 
 }
 
-extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_getByName(
+extern "C" void SAL_CALL typelib_typedescription_getByName(
     typelib_TypeDescription ** ppRet, rtl_uString * pName )
     SAL_THROW_EXTERN_C()
 {
@@ -2055,7 +2055,7 @@ extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_getByName(
     }
 }
 
-extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescriptionreference_newByAsciiName(
+extern "C" void SAL_CALL typelib_typedescriptionreference_newByAsciiName(
     typelib_TypeDescriptionReference ** ppTDR,
     typelib_TypeClass eTypeClass,
     const sal_Char * pTypeName )
@@ -2065,7 +2065,7 @@ extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescriptionreference_newByAs
     typelib_typedescriptionreference_new( ppTDR, eTypeClass, aTypeName.pData );
 }
 
-extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescriptionreference_new(
+extern "C" void SAL_CALL typelib_typedescriptionreference_new(
     typelib_TypeDescriptionReference ** ppTDR,
     typelib_TypeClass eTypeClass, rtl_uString * pTypeName )
     SAL_THROW_EXTERN_C()
@@ -2162,7 +2162,7 @@ extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescriptionreference_new(
 }
 
 
-extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescriptionreference_acquire(
+extern "C" void SAL_CALL typelib_typedescriptionreference_acquire(
     typelib_TypeDescriptionReference * pRef )
     SAL_THROW_EXTERN_C()
 {
@@ -2170,7 +2170,7 @@ extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescriptionreference_acquire
 }
 
 
-extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescriptionreference_release(
+extern "C" void SAL_CALL typelib_typedescriptionreference_release(
     typelib_TypeDescriptionReference * pRef )
     SAL_THROW_EXTERN_C()
 {
@@ -2206,7 +2206,7 @@ extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescriptionreference_release
 }
 
 
-extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescriptionreference_getDescription(
+extern "C" void SAL_CALL typelib_typedescriptionreference_getDescription(
     typelib_TypeDescription ** ppRet, typelib_TypeDescriptionReference * pRef )
     SAL_THROW_EXTERN_C()
 {
@@ -2289,7 +2289,7 @@ extern "C" void SAL_CALL typelib_typedescriptionreference_getByName(
 }
 
 
-extern "C" CPPU_DLLPUBLIC sal_Bool SAL_CALL typelib_typedescriptionreference_equals(
+extern "C" sal_Bool SAL_CALL typelib_typedescriptionreference_equals(
     const typelib_TypeDescriptionReference * p1,
     const typelib_TypeDescriptionReference * p2 )
     SAL_THROW_EXTERN_C()
@@ -2301,7 +2301,7 @@ extern "C" CPPU_DLLPUBLIC sal_Bool SAL_CALL typelib_typedescriptionreference_equ
 }
 
 
-extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescriptionreference_assign(
+extern "C" void SAL_CALL typelib_typedescriptionreference_assign(
     typelib_TypeDescriptionReference ** ppDest,
     typelib_TypeDescriptionReference * pSource )
     SAL_THROW_EXTERN_C()
@@ -2315,7 +2315,7 @@ extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescriptionreference_assign(
 }
 
 
-extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_setCacheSize( sal_Int32 nNewSize )
+extern "C" void SAL_CALL typelib_setCacheSize( sal_Int32 nNewSize )
     SAL_THROW_EXTERN_C()
 {
     OSL_ENSURE( nNewSize >= 0, "### illegal cache size given!" );
@@ -2353,7 +2353,7 @@ static const sal_Bool s_aAssignableFromTab[11][11] =
 };
 
 
-extern "C" CPPU_DLLPUBLIC sal_Bool SAL_CALL typelib_typedescriptionreference_isAssignableFrom(
+extern "C" sal_Bool SAL_CALL typelib_typedescriptionreference_isAssignableFrom(
     typelib_TypeDescriptionReference * pAssignable,
     typelib_TypeDescriptionReference * pFrom )
     SAL_THROW_EXTERN_C()
@@ -2425,7 +2425,7 @@ extern "C" CPPU_DLLPUBLIC sal_Bool SAL_CALL typelib_typedescriptionreference_isA
     return sal_False;
 }
 
-extern "C" CPPU_DLLPUBLIC sal_Bool SAL_CALL typelib_typedescription_isAssignableFrom(
+extern "C" sal_Bool SAL_CALL typelib_typedescription_isAssignableFrom(
     typelib_TypeDescription * pAssignable,
     typelib_TypeDescription * pFrom )
     SAL_THROW_EXTERN_C()
@@ -2435,7 +2435,7 @@ extern "C" CPPU_DLLPUBLIC sal_Bool SAL_CALL typelib_typedescription_isAssignable
 }
 
 
-extern "C" CPPU_DLLPUBLIC sal_Bool SAL_CALL typelib_typedescription_complete(
+extern "C" 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 2ef5d279d584..5e2ac2e2f97c 100644
--- a/cppu/source/uno/EnvDcp.c
+++ b/cppu/source/uno/EnvDcp.c
@@ -20,7 +20,7 @@
 #include "uno/EnvDcp.h"
 
 
-CPPU_DLLPUBLIC void uno_EnvDcp_getTypeName(rtl_uString const * pEnvDcp, rtl_uString ** ppEnvTypeName)
+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)
@@ -30,7 +30,7 @@ CPPU_DLLPUBLIC void uno_EnvDcp_getTypeName(rtl_uString const * pEnvDcp, rtl_uStr
         rtl_uString_newFromStr(ppEnvTypeName, pEnvDcp->buffer);
 }
 
-CPPU_DLLPUBLIC void uno_EnvDcp_getPurpose(rtl_uString const * pEnvDcp, rtl_uString ** ppEnvPurpose)
+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 080fa2e0726a..731ee46de3e8 100644
--- a/cppu/source/uno/EnvStack.cxx
+++ b/cppu/source/uno/EnvStack.cxx
@@ -102,7 +102,7 @@ static uno_Environment * s_getCurrent(void)
 }
 
 
-extern "C" CPPU_DLLPUBLIC void SAL_CALL uno_getCurrentEnvironment(uno_Environment ** ppEnv, rtl_uString * pTypeName)
+extern "C" void SAL_CALL uno_getCurrentEnvironment(uno_Environment ** ppEnv, rtl_uString * pTypeName)
     SAL_THROW_EXTERN_C()
 {
     if (*ppEnv)
@@ -306,13 +306,13 @@ static void s_environment_invoke_v(uno_Environment * pCurrEnv, uno_Environment *
         pNextEnv->release(pNextEnv);
 }
 
-extern "C" CPPU_DLLPUBLIC void SAL_CALL uno_Environment_invoke_v(uno_Environment * pTargetEnv, uno_EnvCallee * pCallee, va_list * pParam)
+extern "C" 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" CPPU_DLLPUBLIC void SAL_CALL uno_Environment_invoke(uno_Environment * pEnv, uno_EnvCallee * pCallee, ...)
+extern "C" void SAL_CALL uno_Environment_invoke(uno_Environment * pEnv, uno_EnvCallee * pCallee, ...)
     SAL_THROW_EXTERN_C()
 {
     va_list param;
@@ -322,7 +322,7 @@ extern "C" CPPU_DLLPUBLIC void SAL_CALL uno_Environment_invoke(uno_Environment *
     va_end(param);
 }
 
-extern "C" CPPU_DLLPUBLIC void SAL_CALL uno_Environment_enter(uno_Environment * pTargetEnv)
+extern "C" void SAL_CALL uno_Environment_enter(uno_Environment * pTargetEnv)
     SAL_THROW_EXTERN_C()
 {
     uno_Environment * pNextEnv = NULL;
@@ -355,7 +355,7 @@ extern "C" CPPU_DLLPUBLIC void SAL_CALL uno_Environment_enter(uno_Environment *
     }
 }
 
-CPPU_DLLPUBLIC int SAL_CALL uno_Environment_isValid(uno_Environment * pEnv, rtl_uString ** pReason)
+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 71c87de324e0..891518422a51 100644
--- a/cppu/source/uno/any.cxx
+++ b/cppu/source/uno/any.cxx
@@ -27,7 +27,7 @@ using namespace cppu;
 extern "C"
 {
 
-CPPU_DLLPUBLIC void SAL_CALL uno_type_any_assign(
+void SAL_CALL uno_type_any_assign(
     uno_Any * pDest, void * pSource,
     typelib_TypeDescriptionReference * pType,
     uno_AcquireFunc acquire, uno_ReleaseFunc release )
@@ -44,7 +44,7 @@ CPPU_DLLPUBLIC void SAL_CALL uno_type_any_assign(
     }
 }
 
-CPPU_DLLPUBLIC void SAL_CALL uno_any_assign(
+void SAL_CALL uno_any_assign(
     uno_Any * pDest, void * pSource,
     typelib_TypeDescription * pTypeDescr,
     uno_AcquireFunc acquire, uno_ReleaseFunc release )
@@ -61,7 +61,7 @@ CPPU_DLLPUBLIC void SAL_CALL uno_any_assign(
     }
 }
 
-CPPU_DLLPUBLIC void SAL_CALL uno_type_any_construct(
+void SAL_CALL uno_type_any_construct(
     uno_Any * pDest, void * pSource,
     typelib_TypeDescriptionReference * pType,
     uno_AcquireFunc acquire )
@@ -77,7 +77,7 @@ CPPU_DLLPUBLIC void SAL_CALL uno_type_any_construct(
     }
 }
 
-CPPU_DLLPUBLIC void SAL_CALL uno_any_construct(
+void SAL_CALL uno_any_construct(
     uno_Any * pDest, void * pSource,
     typelib_TypeDescription * pTypeDescr,
     uno_AcquireFunc acquire )
@@ -93,7 +93,7 @@ CPPU_DLLPUBLIC void SAL_CALL uno_any_construct(
     }
 }
 
-CPPU_DLLPUBLIC void SAL_CALL uno_type_any_constructAndConvert(
+void SAL_CALL uno_type_any_constructAndConvert(
     uno_Any * pDest, void * pSource,
     typelib_TypeDescriptionReference * pType,
     uno_Mapping * mapping )
@@ -109,7 +109,7 @@ CPPU_DLLPUBLIC void SAL_CALL uno_type_any_constructAndConvert(
     }
 }
 
-CPPU_DLLPUBLIC void SAL_CALL uno_any_constructAndConvert(
+void SAL_CALL uno_any_constructAndConvert(
     uno_Any * pDest, void * pSource,
     typelib_TypeDescription * pTypeDescr,
     uno_Mapping * mapping )
@@ -125,13 +125,13 @@ CPPU_DLLPUBLIC void SAL_CALL uno_any_constructAndConvert(
     }
 }
 
-CPPU_DLLPUBLIC void SAL_CALL uno_any_destruct( uno_Any * pValue, uno_ReleaseFunc release )
+void SAL_CALL uno_any_destruct( uno_Any * pValue, uno_ReleaseFunc release )
     SAL_THROW_EXTERN_C()
 {
     _destructAny( pValue, release );
 }
 
-CPPU_DLLPUBLIC void SAL_CALL uno_any_clear( uno_Any * pValue, uno_ReleaseFunc release )
+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 818506b71b0a..68c6d87a4389 100644
--- a/cppu/source/uno/data.cxx
+++ b/cppu/source/uno/data.cxx
@@ -176,21 +176,21 @@ bool equalSequence(
 extern "C"
 {
 
-CPPU_DLLPUBLIC void SAL_CALL uno_type_constructData(
+void SAL_CALL uno_type_constructData(
     void * pMem, typelib_TypeDescriptionReference * pType )
     SAL_THROW_EXTERN_C()
 {
     _defaultConstructData( pMem, pType, 0 );
 }
 
-CPPU_DLLPUBLIC void SAL_CALL uno_constructData(
+void SAL_CALL uno_constructData(
     void * pMem, typelib_TypeDescription * pTypeDescr )
     SAL_THROW_EXTERN_C()
 {
     _defaultConstructData( pMem, pTypeDescr->pWeakRef, pTypeDescr );
 }
 
-CPPU_DLLPUBLIC void SAL_CALL uno_type_destructData(
+void SAL_CALL uno_type_destructData(
     void * pValue, typelib_TypeDescriptionReference * pType,
     uno_ReleaseFunc release )
     SAL_THROW_EXTERN_C()
@@ -198,7 +198,7 @@ CPPU_DLLPUBLIC void SAL_CALL uno_type_destructData(
     _destructData( pValue, pType, 0, release );
 }
 
-CPPU_DLLPUBLIC void SAL_CALL uno_destructData(
+void SAL_CALL uno_destructData(
     void * pValue,
     typelib_TypeDescription * pTypeDescr,
     uno_ReleaseFunc release )
@@ -207,7 +207,7 @@ CPPU_DLLPUBLIC void SAL_CALL uno_destructData(
     _destructData( pValue, pTypeDescr->pWeakRef, pTypeDescr, release );
 }
 
-CPPU_DLLPUBLIC void SAL_CALL uno_type_copyData(
+void SAL_CALL uno_type_copyData(
     void * pDest, void * pSource,
     typelib_TypeDescriptionReference * pType,
     uno_AcquireFunc acquire )
@@ -216,7 +216,7 @@ CPPU_DLLPUBLIC void SAL_CALL uno_type_copyData(
     _copyConstructData( pDest, pSource, pType, 0, acquire, 0 );
 }
 
-CPPU_DLLPUBLIC void SAL_CALL uno_copyData(
+void SAL_CALL uno_copyData(
     void * pDest, void * pSource,
     typelib_TypeDescription * pTypeDescr,
     uno_AcquireFunc acquire )
@@ -225,7 +225,7 @@ CPPU_DLLPUBLIC void SAL_CALL uno_copyData(
     _copyConstructData( pDest, pSource, pTypeDescr->pWeakRef, pTypeDescr, acquire, 0 );
 }
 
-CPPU_DLLPUBLIC void SAL_CALL uno_type_copyAndConvertData(
+void SAL_CALL uno_type_copyAndConvertData(
     void * pDest, void * pSource,
     typelib_TypeDescriptionReference * pType,
     uno_Mapping * mapping )
@@ -234,7 +234,7 @@ CPPU_DLLPUBLIC void SAL_CALL uno_type_copyAndConvertData(
     _copyConstructData( pDest, pSource, pType, 0, 0, mapping );
 }
 
-CPPU_DLLPUBLIC void SAL_CALL uno_copyAndConvertData(
+void SAL_CALL uno_copyAndConvertData(
     void * pDest, void * pSource,
     typelib_TypeDescription * pTypeDescr,
     uno_Mapping * mapping )
@@ -243,7 +243,7 @@ CPPU_DLLPUBLIC void SAL_CALL uno_copyAndConvertData(
     _copyConstructData( pDest, pSource, pTypeDescr->pWeakRef, pTypeDescr, 0, mapping );
 }
 
-CPPU_DLLPUBLIC sal_Bool SAL_CALL uno_type_equalData(
+sal_Bool SAL_CALL uno_type_equalData(
     void * pVal1, typelib_TypeDescriptionReference * pVal1Type,
     void * pVal2, typelib_TypeDescriptionReference * pVal2Type,
     uno_QueryInterfaceFunc queryInterface, uno_ReleaseFunc release )
@@ -255,7 +255,7 @@ CPPU_DLLPUBLIC sal_Bool SAL_CALL uno_type_equalData(
         queryInterface, release );
 }
 
-CPPU_DLLPUBLIC sal_Bool SAL_CALL uno_equalData(
+sal_Bool SAL_CALL uno_equalData(
     void * pVal1, typelib_TypeDescription * pVal1TD,
     void * pVal2, typelib_TypeDescription * pVal2TD,
     uno_QueryInterfaceFunc queryInterface, uno_ReleaseFunc release )
@@ -267,7 +267,7 @@ CPPU_DLLPUBLIC sal_Bool SAL_CALL uno_equalData(
         queryInterface, release );
 }
 
-CPPU_DLLPUBLIC sal_Bool SAL_CALL uno_type_assignData(
+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 )
@@ -279,7 +279,7 @@ CPPU_DLLPUBLIC sal_Bool SAL_CALL uno_type_assignData(
         queryInterface, acquire, release );
 }
 
-CPPU_DLLPUBLIC sal_Bool SAL_CALL uno_assignData(
+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 )
@@ -291,7 +291,7 @@ CPPU_DLLPUBLIC sal_Bool SAL_CALL uno_assignData(
         queryInterface, acquire, release );
 }
 
-CPPU_DLLPUBLIC sal_Bool SAL_CALL uno_type_isAssignableFromData(
+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/lbenv.cxx b/cppu/source/uno/lbenv.cxx
index eb4e105b379a..ebbe6020638a 100644
--- a/cppu/source/uno/lbenv.cxx
+++ b/cppu/source/uno/lbenv.cxx
@@ -697,7 +697,7 @@ static void writeLine(
 }
 
 
-extern "C" CPPU_DLLPUBLIC void SAL_CALL uno_dumpEnvironment(
+extern "C" void SAL_CALL uno_dumpEnvironment(
     void * stream, uno_Environment * pEnv, const sal_Char * pFilter )
     SAL_THROW_EXTERN_C()
 {
@@ -782,7 +782,7 @@ extern "C" CPPU_DLLPUBLIC void SAL_CALL uno_dumpEnvironment(
 }
 
 
-extern "C" CPPU_DLLPUBLIC void SAL_CALL uno_dumpEnvironmentByName(
+extern "C" void SAL_CALL uno_dumpEnvironmentByName(
     void * stream, rtl_uString * pEnvDcp, const sal_Char * pFilter )
     SAL_THROW_EXTERN_C()
 {
@@ -1130,7 +1130,7 @@ static uno_Environment * initDefaultEnvironment(
 }
 
 
-CPPU_DLLPUBLIC void SAL_CALL uno_createEnvironment(
+void SAL_CALL uno_createEnvironment(
     uno_Environment ** ppEnv, rtl_uString * pEnvDcp, void * pContext )
     SAL_THROW_EXTERN_C()
 {
@@ -1142,7 +1142,7 @@ CPPU_DLLPUBLIC void SAL_CALL uno_createEnvironment(
     *ppEnv = initDefaultEnvironment( rEnvDcp, pContext );
 }
 
-CPPU_DLLPUBLIC void SAL_CALL uno_getEnvironment(
+void SAL_CALL uno_getEnvironment(
     uno_Environment ** ppEnv, rtl_uString * pEnvDcp, void * pContext )
     SAL_THROW_EXTERN_C()
 {
@@ -1164,7 +1164,7 @@ CPPU_DLLPUBLIC void SAL_CALL uno_getEnvironment(
     }
 }
 
-CPPU_DLLPUBLIC void SAL_CALL uno_getRegisteredEnvironments(
+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 cd9db7f3238c..a887f899a8dd 100644
--- a/cppu/source/uno/lbmap.cxx
+++ b/cppu/source/uno/lbmap.cxx
@@ -651,7 +651,7 @@ void SAL_CALL uno_getMappingByName(
 }
 
 
-CPPU_DLLPUBLIC void SAL_CALL uno_registerMapping(
+void SAL_CALL uno_registerMapping(
     uno_Mapping ** ppMapping, uno_freeMappingFunc freeMapping,
     uno_Environment * pFrom, uno_Environment * pTo, rtl_uString * pAddPurpose )
     SAL_THROW_EXTERN_C()
@@ -689,7 +689,7 @@ CPPU_DLLPUBLIC void SAL_CALL uno_registerMapping(
     }
 }
 
-CPPU_DLLPUBLIC void SAL_CALL uno_revokeMapping(
+void SAL_CALL uno_revokeMapping(
     uno_Mapping * pMapping )
     SAL_THROW_EXTERN_C()
 {
@@ -714,7 +714,7 @@ CPPU_DLLPUBLIC void SAL_CALL uno_revokeMapping(
 }
 
 
-CPPU_DLLPUBLIC void SAL_CALL uno_registerMappingCallback(
+void SAL_CALL uno_registerMappingCallback(
     uno_getMappingFunc pCallback )
     SAL_THROW_EXTERN_C()
 {
@@ -724,7 +724,7 @@ CPPU_DLLPUBLIC void SAL_CALL uno_registerMappingCallback(
     rData.aCallbacks.insert( pCallback );
 }
 
-CPPU_DLLPUBLIC void SAL_CALL uno_revokeMappingCallback(
+void SAL_CALL uno_revokeMappingCallback(
     uno_getMappingFunc pCallback )
     SAL_THROW_EXTERN_C()
 {