diff options
39 files changed, 280 insertions, 210 deletions
diff --git a/chart2/source/tools/_serviceregistration_tools.cxx b/chart2/source/tools/_serviceregistration_tools.cxx index 7870ad03aadc..c50f46118c32 100644 --- a/chart2/source/tools/_serviceregistration_tools.cxx +++ b/chart2/source/tools/_serviceregistration_tools.cxx @@ -182,7 +182,7 @@ static const struct ::cppu::ImplementationEntry g_entries_chart2_tools[] = // component exports extern "C" { -SAL_DLLPUBLIC_EXPORT void * SAL_CALL charttools_component_getFactory( +void * SAL_CALL charttools_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { return ::cppu::component_getFactoryHelper( diff --git a/compilerplugins/clang/store/revisibility.cxx b/compilerplugins/clang/store/revisibility.cxx new file mode 100644 index 000000000000..11e3cc89ee5e --- /dev/null +++ b/compilerplugins/clang/store/revisibility.cxx @@ -0,0 +1,71 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#include "plugin.hxx" + +// Find function declarations that redundantly re-specify a visibility attribute +// (via SAL_DLLPUBLIC_EXPORT etc.) that was already specified with a previous +// declaration of that function. But MSVC wants consistency of __declspec +// across friend declarations, so just ignore those for now. + +namespace { + +bool hasExplicitVisibilityAttr(Decl const * decl) { + VisibilityAttr const * attr = decl->getAttr<VisibilityAttr>(); + return attr != nullptr && !attr->isInherited(); +} + +bool isFriendDecl(Decl const * decl) { + return decl->getFriendObjectKind() != Decl::FOK_None; +} + +class ReVisibility: + public RecursiveASTVisitor<ReVisibility>, public loplugin::Plugin +{ +public: + explicit ReVisibility(InstantiationData const & data): Plugin(data) {} + + void run() override + { TraverseDecl(compiler.getASTContext().getTranslationUnitDecl()); } + + bool VisitFunctionDecl(FunctionDecl const * decl); +}; + +bool ReVisibility::VisitFunctionDecl(FunctionDecl const * decl) { + if (!ignoreLocation(decl) && hasExplicitVisibilityAttr(decl) + && !isFriendDecl(decl)) + { + for (Decl const * p = decl;;) { + p = p->getPreviousDecl(); + if (p == nullptr) { + break; + } + if (hasExplicitVisibilityAttr(p) && !isFriendDecl(p)) { + report( + DiagnosticsEngine::Warning, + "Redundant visibility re-declaration", + decl->getAttr<VisibilityAttr>()->getLocation()) + << decl->getAttr<VisibilityAttr>()->getRange(); + report( + DiagnosticsEngine::Note, + "Previous visibility declaration is here", + p->getAttr<VisibilityAttr>()->getLocation()) + << p->getAttr<VisibilityAttr>()->getRange(); + break; + } + } + } + return true; +} + +loplugin::Plugin::Registration<ReVisibility> X("revisibility"); + +} + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/hsqldb/HStorageAccess.cxx b/connectivity/source/drivers/hsqldb/HStorageAccess.cxx index d3cb62b889b0..4c38968bd337 100644 --- a/connectivity/source/drivers/hsqldb/HStorageAccess.cxx +++ b/connectivity/source/drivers/hsqldb/HStorageAccess.cxx @@ -45,7 +45,7 @@ using namespace ::connectivity::hsqldb; * Method: openStream * Signature: (Ljava/lang/String;Ljava/lang/String;I)V */ -SAL_JNI_EXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_openStream +void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_openStream (JNIEnv * env, jobject /*obj_this*/,jstring name, jstring key, jint mode) { #ifdef HSQLDB_DBG @@ -63,7 +63,7 @@ SAL_JNI_EXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAcc * Method: close * Signature: (Ljava/lang/String;Ljava/lang/String;)V */ -SAL_JNI_EXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_close +void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_close (JNIEnv * env, jobject /*obj_this*/,jstring name, jstring key) { #ifdef HSQLDB_DBG @@ -102,7 +102,7 @@ SAL_JNI_EXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAcc * Method: getFilePointer * Signature: (Ljava/lang/String;Ljava/lang/String;)J */ -SAL_JNI_EXPORT jlong JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_getFilePointer +jlong JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_getFilePointer (JNIEnv * env, jobject /*obj_this*/,jstring name, jstring key) { #ifdef HSQLDB_DBG @@ -126,7 +126,7 @@ SAL_JNI_EXPORT jlong JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAc * Method: length * Signature: (Ljava/lang/String;Ljava/lang/String;)J */ -SAL_JNI_EXPORT jlong JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_length +jlong JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_length (JNIEnv * env, jobject /*obj_this*/,jstring name, jstring key) { #ifdef HSQLDB_DBG @@ -193,7 +193,7 @@ jint read_from_storage_stream( JNIEnv * env, jobject /*obj_this*/, jstring name, * Method: read * Signature: (Ljava/lang/String;Ljava/lang/String;)I */ -SAL_JNI_EXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_read__Ljava_lang_String_2Ljava_lang_String_2 +jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_read__Ljava_lang_String_2Ljava_lang_String_2 (JNIEnv* env, jobject obj_this, jstring name, jstring key) { #ifdef HSQLDB_DBG @@ -266,7 +266,7 @@ jint read_from_storage_stream_into_buffer( JNIEnv * env, jobject /*obj_this*/,js * Method: read * Signature: (Ljava/lang/String;Ljava/lang/String;[BII)I */ -SAL_JNI_EXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_read__Ljava_lang_String_2Ljava_lang_String_2_3BII +jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_read__Ljava_lang_String_2Ljava_lang_String_2_3BII (JNIEnv * env, jobject obj_this,jstring name, jstring key, jbyteArray buffer, jint off, jint len) { #ifdef HSQLDB_DBG @@ -287,7 +287,7 @@ SAL_JNI_EXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAcc * Method: readInt * Signature: (Ljava/lang/String;Ljava/lang/String;)I */ -SAL_JNI_EXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_readInt +jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_readInt (JNIEnv * env, jobject /*obj_this*/,jstring name, jstring key) { #ifdef HSQLDB_DBG @@ -355,7 +355,7 @@ SAL_JNI_EXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAcc * Method: seek * Signature: (Ljava/lang/String;Ljava/lang/String;J)V */ -SAL_JNI_EXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_seek +void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_seek (JNIEnv * env, jobject /*obj_this*/,jstring name, jstring key, jlong position) { #ifdef HSQLDB_DBG @@ -467,7 +467,7 @@ void write_to_storage_stream_from_buffer( JNIEnv* env, jobject /*obj_this*/, jst * Method: write * Signature: (Ljava/lang/String;Ljava/lang/String;[BII)V */ -SAL_JNI_EXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_write +void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_write (JNIEnv * env, jobject obj_this,jstring name, jstring key, jbyteArray buffer, jint off, jint len) { #ifdef HSQLDB_DBG @@ -526,7 +526,7 @@ void write_to_storage_stream( JNIEnv* env, jobject /*obj_this*/, jstring name, j * Method: writeInt * Signature: (Ljava/lang/String;Ljava/lang/String;I)V */ -SAL_JNI_EXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_writeInt +void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_writeInt (JNIEnv * env, jobject obj_this,jstring name, jstring key, jint v) { #ifdef HSQLDB_DBG diff --git a/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx b/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx index d6ca0cf1b89e..04c7d80fba4d 100644 --- a/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx +++ b/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx @@ -40,7 +40,7 @@ using namespace ::connectivity::hsqldb; * Method: isStreamElement * Signature: (Ljava/lang/String;Ljava/lang/String;)Z */ -SAL_JNI_EXPORT jboolean JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageFileAccess_isStreamElement +jboolean JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageFileAccess_isStreamElement (JNIEnv * env, jobject /*obj_this*/,jstring key, jstring name) { TStorages::mapped_type aStoragePair = StorageContainer::getRegisteredStorage(StorageContainer::jstring2ustring(env,key)); @@ -92,7 +92,7 @@ SAL_JNI_EXPORT jboolean JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageFileA * Method: removeElement * Signature: (Ljava/lang/String;Ljava/lang/String;)V */ -SAL_JNI_EXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageFileAccess_removeElement +void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageFileAccess_removeElement (JNIEnv * env, jobject /*obj_this*/,jstring key, jstring name) { #ifdef HSQLDB_DBG @@ -127,7 +127,7 @@ SAL_JNI_EXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageFileAcces * Method: renameElement * Signature: (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V */ -SAL_JNI_EXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageFileAccess_renameElement +void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageFileAccess_renameElement (JNIEnv * env, jobject /*obj_this*/,jstring key, jstring oldname, jstring newname) { #ifdef HSQLDB_DBG diff --git a/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx b/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx index a0ea03530a3a..435218e6515c 100644 --- a/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx +++ b/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx @@ -57,7 +57,7 @@ using namespace ::connectivity::hsqldb; * Method: openStream * Signature: (Ljava/lang/String;Ljava/lang/String;I)V */ -SAL_JNI_EXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_openStream +void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_openStream (JNIEnv * env, jobject /*obj_this*/,jstring key, jstring name, jint mode) { #ifdef HSQLDB_DBG @@ -75,7 +75,7 @@ SAL_JNI_EXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInp * Method: read * Signature: (Ljava/lang/String;Ljava/lang/String;)I */ -SAL_JNI_EXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_read__Ljava_lang_String_2Ljava_lang_String_2 +jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_read__Ljava_lang_String_2Ljava_lang_String_2 (JNIEnv * env, jobject obj_this,jstring key, jstring name) { #ifdef HSQLDB_DBG @@ -94,7 +94,7 @@ SAL_JNI_EXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInp * Method: read * Signature: (Ljava/lang/String;Ljava/lang/String;[BII)I */ -SAL_JNI_EXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_read__Ljava_lang_String_2Ljava_lang_String_2_3BII +jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_read__Ljava_lang_String_2Ljava_lang_String_2_3BII (JNIEnv * env, jobject obj_this,jstring key, jstring name, jbyteArray buffer, jint off, jint len) { #ifdef HSQLDB_DBG @@ -113,7 +113,7 @@ SAL_JNI_EXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInp * Method: close * Signature: (Ljava/lang/String;Ljava/lang/String;)V */ -SAL_JNI_EXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_close +void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_close (JNIEnv * env, jobject /*obj_this*/,jstring key, jstring name) { #ifdef HSQLDB_DBG @@ -133,7 +133,7 @@ SAL_JNI_EXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInp * Method: skip * Signature: (Ljava/lang/String;Ljava/lang/String;J)J */ -SAL_JNI_EXPORT jlong JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_skip +jlong JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_skip (JNIEnv * env, jobject /*obj_this*/,jstring key, jstring name, jlong n) { #ifdef HSQLDB_DBG @@ -199,7 +199,7 @@ SAL_JNI_EXPORT jlong JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeIn * Method: available * Signature: (Ljava/lang/String;Ljava/lang/String;)I */ -SAL_JNI_EXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_available +jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_available (JNIEnv * env, jobject /*obj_this*/,jstring key, jstring name) { #ifdef HSQLDB_DBG @@ -241,7 +241,7 @@ SAL_JNI_EXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInp * Method: read * Signature: (Ljava/lang/String;Ljava/lang/String;[B)I */ -SAL_JNI_EXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_read__Ljava_lang_String_2Ljava_lang_String_2_3B +jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_read__Ljava_lang_String_2Ljava_lang_String_2_3B (JNIEnv * env, jobject /*obj_this*/,jstring key, jstring name, jbyteArray buffer) { #ifdef HSQLDB_DBG 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() { diff --git a/desktop/source/pkgchk/unopkg/unopkg_app.cxx b/desktop/source/pkgchk/unopkg/unopkg_app.cxx index 649f382a3644..b7f0e0e15288 100644 --- a/desktop/source/pkgchk/unopkg/unopkg_app.cxx +++ b/desktop/source/pkgchk/unopkg/unopkg_app.cxx @@ -177,7 +177,7 @@ Reference<deployment::XPackage> findPackage( } // anon namespace -extern "C" DESKTOP_DLLPUBLIC int unopkg_main() +extern "C" int unopkg_main() { tools::extendApplicationEnvironment(); bool bNoOtherErrorMsg = false; diff --git a/editeng/source/outliner/outlvw.cxx b/editeng/source/outliner/outlvw.cxx index f0032b8b10d1..652fcaa48220 100644 --- a/editeng/source/outliner/outlvw.cxx +++ b/editeng/source/outliner/outlvw.cxx @@ -1471,7 +1471,7 @@ bool isSingleScriptType( sal_uInt16 nScriptType ) // returns: true if a word for thesaurus look-up was found at the current cursor position. // The status string will be word + iso language string (e.g. "light#en-US") -bool EDITENG_DLLPUBLIC GetStatusValueForThesaurusFromContext( +bool GetStatusValueForThesaurusFromContext( OUString &rStatusVal, LanguageType &rLang, const EditView &rEditView ) @@ -1499,7 +1499,7 @@ bool EDITENG_DLLPUBLIC GetStatusValueForThesaurusFromContext( } -void EDITENG_DLLPUBLIC ReplaceTextWithSynonym( EditView &rEditView, const OUString &rSynonmText ) +void ReplaceTextWithSynonym( EditView &rEditView, const OUString &rSynonmText ) { // get selection to use ESelection aCurSel( rEditView.GetSelection() ); diff --git a/helpcompiler/source/HelpLinker.cxx b/helpcompiler/source/HelpLinker.cxx index cb3d6a699f6d..944946916f89 100644 --- a/helpcompiler/source/HelpLinker.cxx +++ b/helpcompiler/source/HelpLinker.cxx @@ -909,7 +909,7 @@ HelpProcessingErrorInfo& HelpProcessingErrorInfo::operator=( const struct HelpPr // Returns true in case of success, false in case of error -HELPLINKER_DLLPUBLIC bool compileExtensionHelp +bool compileExtensionHelp ( const OUString& aOfficeHelpPath, const OUString& aExtensionName, diff --git a/registry/source/reflread.cxx b/registry/source/reflread.cxx index 838010c66b2d..5f2838a3d3d2 100644 --- a/registry/source/reflread.cxx +++ b/registry/source/reflread.cxx @@ -1258,7 +1258,7 @@ typereg_Version TypeRegistryEntry::getVersion() const { extern "C" { -REG_DLLPUBLIC sal_Bool TYPEREG_CALLTYPE typereg_reader_create( +sal_Bool TYPEREG_CALLTYPE typereg_reader_create( void const * buffer, sal_uInt32 length, sal_Bool copy, typereg_Version maxVersion, void ** result) SAL_THROW_EXTERN_C() @@ -1301,7 +1301,7 @@ static TypeReaderImpl TYPEREG_CALLTYPE createEntry(const sal_uInt8* buffer, sal_ return handle; } -REG_DLLPUBLIC void TYPEREG_CALLTYPE typereg_reader_acquire(void * hEntry) SAL_THROW_EXTERN_C() +void TYPEREG_CALLTYPE typereg_reader_acquire(void * hEntry) SAL_THROW_EXTERN_C() { TypeRegistryEntry* pEntry = (TypeRegistryEntry*) hEntry; @@ -1309,7 +1309,7 @@ REG_DLLPUBLIC void TYPEREG_CALLTYPE typereg_reader_acquire(void * hEntry) SAL_TH pEntry->m_refCount++; } -REG_DLLPUBLIC void TYPEREG_CALLTYPE typereg_reader_release(void * hEntry) SAL_THROW_EXTERN_C() +void TYPEREG_CALLTYPE typereg_reader_release(void * hEntry) SAL_THROW_EXTERN_C() { TypeRegistryEntry* pEntry = (TypeRegistryEntry*) hEntry; @@ -1320,7 +1320,7 @@ REG_DLLPUBLIC void TYPEREG_CALLTYPE typereg_reader_release(void * hEntry) SAL_TH } } -REG_DLLPUBLIC typereg_Version TYPEREG_CALLTYPE typereg_reader_getVersion(void * handle) SAL_THROW_EXTERN_C() { +typereg_Version TYPEREG_CALLTYPE typereg_reader_getVersion(void * handle) SAL_THROW_EXTERN_C() { if (handle != nullptr) { try { return static_cast< TypeRegistryEntry * >(handle)->getVersion(); @@ -1357,7 +1357,7 @@ static sal_uInt16 TYPEREG_CALLTYPE getMajorVersion(TypeReaderImpl hEntry) return 0; } -REG_DLLPUBLIC RTTypeClass TYPEREG_CALLTYPE typereg_reader_getTypeClass(void * hEntry) SAL_THROW_EXTERN_C() +RTTypeClass TYPEREG_CALLTYPE typereg_reader_getTypeClass(void * hEntry) SAL_THROW_EXTERN_C() { TypeRegistryEntry* pEntry = (TypeRegistryEntry*) hEntry; if (pEntry != nullptr) { @@ -1371,7 +1371,7 @@ REG_DLLPUBLIC RTTypeClass TYPEREG_CALLTYPE typereg_reader_getTypeClass(void * hE return RT_TYPE_INVALID; } -REG_DLLPUBLIC sal_Bool TYPEREG_CALLTYPE typereg_reader_isPublished(void * hEntry) SAL_THROW_EXTERN_C() +sal_Bool TYPEREG_CALLTYPE typereg_reader_isPublished(void * hEntry) SAL_THROW_EXTERN_C() { TypeRegistryEntry * entry = static_cast< TypeRegistryEntry * >(hEntry); if (entry != nullptr) { @@ -1384,7 +1384,7 @@ REG_DLLPUBLIC sal_Bool TYPEREG_CALLTYPE typereg_reader_isPublished(void * hEntry return false; } -REG_DLLPUBLIC void TYPEREG_CALLTYPE typereg_reader_getTypeName(void * hEntry, rtl_uString** pTypeName) +void TYPEREG_CALLTYPE typereg_reader_getTypeName(void * hEntry, rtl_uString** pTypeName) SAL_THROW_EXTERN_C() { TypeRegistryEntry* pEntry = (TypeRegistryEntry*) hEntry; @@ -1434,7 +1434,7 @@ static void TYPEREG_CALLTYPE getUik(TypeReaderImpl hEntry, RTUik* uik) } } -REG_DLLPUBLIC void TYPEREG_CALLTYPE typereg_reader_getDocumentation(void * hEntry, rtl_uString** pDoku) +void TYPEREG_CALLTYPE typereg_reader_getDocumentation(void * hEntry, rtl_uString** pDoku) SAL_THROW_EXTERN_C() { TypeRegistryEntry* pEntry = (TypeRegistryEntry*) hEntry; @@ -1452,7 +1452,7 @@ REG_DLLPUBLIC void TYPEREG_CALLTYPE typereg_reader_getDocumentation(void * hEntr rtl_uString_new(pDoku); } -REG_DLLPUBLIC void TYPEREG_CALLTYPE typereg_reader_getFileName(void * hEntry, rtl_uString** pFileName) +void TYPEREG_CALLTYPE typereg_reader_getFileName(void * hEntry, rtl_uString** pFileName) SAL_THROW_EXTERN_C() { TypeRegistryEntry* pEntry = (TypeRegistryEntry*) hEntry; @@ -1471,7 +1471,7 @@ REG_DLLPUBLIC void TYPEREG_CALLTYPE typereg_reader_getFileName(void * hEntry, rt } -REG_DLLPUBLIC sal_uInt16 TYPEREG_CALLTYPE typereg_reader_getFieldCount(void * hEntry) SAL_THROW_EXTERN_C() +sal_uInt16 TYPEREG_CALLTYPE typereg_reader_getFieldCount(void * hEntry) SAL_THROW_EXTERN_C() { TypeRegistryEntry* pEntry = (TypeRegistryEntry*) hEntry; @@ -1485,7 +1485,7 @@ static sal_uInt32 TYPEREG_CALLTYPE getFieldCount(TypeReaderImpl hEntry) return typereg_reader_getFieldCount(hEntry); } -REG_DLLPUBLIC void TYPEREG_CALLTYPE typereg_reader_getFieldName(void * hEntry, rtl_uString** pFieldName, sal_uInt16 index) +void TYPEREG_CALLTYPE typereg_reader_getFieldName(void * hEntry, rtl_uString** pFieldName, sal_uInt16 index) SAL_THROW_EXTERN_C() { TypeRegistryEntry* pEntry = (TypeRegistryEntry*) hEntry; @@ -1501,7 +1501,7 @@ REG_DLLPUBLIC void TYPEREG_CALLTYPE typereg_reader_getFieldName(void * hEntry, r RTL_TEXTENCODING_UTF8, OSTRING_TO_OUSTRING_CVTFLAGS); } -REG_DLLPUBLIC void TYPEREG_CALLTYPE typereg_reader_getFieldTypeName(void * hEntry, rtl_uString** pFieldType, sal_uInt16 index) +void TYPEREG_CALLTYPE typereg_reader_getFieldTypeName(void * hEntry, rtl_uString** pFieldType, sal_uInt16 index) SAL_THROW_EXTERN_C() { TypeRegistryEntry* pEntry = (TypeRegistryEntry*) hEntry; @@ -1518,7 +1518,7 @@ REG_DLLPUBLIC void TYPEREG_CALLTYPE typereg_reader_getFieldTypeName(void * hEntr RTL_TEXTENCODING_UTF8, OSTRING_TO_OUSTRING_CVTFLAGS); } -REG_DLLPUBLIC RTFieldAccess TYPEREG_CALLTYPE typereg_reader_getFieldFlags(void * hEntry, sal_uInt16 index) +RTFieldAccess TYPEREG_CALLTYPE typereg_reader_getFieldFlags(void * hEntry, sal_uInt16 index) SAL_THROW_EXTERN_C() { TypeRegistryEntry* pEntry = (TypeRegistryEntry*) hEntry; @@ -1528,7 +1528,7 @@ REG_DLLPUBLIC RTFieldAccess TYPEREG_CALLTYPE typereg_reader_getFieldFlags(void * return pEntry->m_pFields->getFieldAccess(index); } -REG_DLLPUBLIC sal_Bool TYPEREG_CALLTYPE typereg_reader_getFieldValue( +sal_Bool TYPEREG_CALLTYPE typereg_reader_getFieldValue( void * hEntry, sal_uInt16 index, RTValueType * type, RTConstValueUnion * value) SAL_THROW_EXTERN_C() @@ -1555,7 +1555,7 @@ static RTValueType TYPEREG_CALLTYPE getFieldConstValue(TypeReaderImpl hEntry, sa return t; } -REG_DLLPUBLIC void TYPEREG_CALLTYPE typereg_reader_getFieldDocumentation(void * hEntry, rtl_uString** pDoku, sal_uInt16 index) +void TYPEREG_CALLTYPE typereg_reader_getFieldDocumentation(void * hEntry, rtl_uString** pDoku, sal_uInt16 index) SAL_THROW_EXTERN_C() { TypeRegistryEntry* pEntry = (TypeRegistryEntry*) hEntry; @@ -1572,7 +1572,7 @@ REG_DLLPUBLIC void TYPEREG_CALLTYPE typereg_reader_getFieldDocumentation(void * RTL_TEXTENCODING_UTF8, OSTRING_TO_OUSTRING_CVTFLAGS); } -REG_DLLPUBLIC void TYPEREG_CALLTYPE typereg_reader_getFieldFileName(void * hEntry, rtl_uString** pFieldFileName, sal_uInt16 index) +void TYPEREG_CALLTYPE typereg_reader_getFieldFileName(void * hEntry, rtl_uString** pFieldFileName, sal_uInt16 index) SAL_THROW_EXTERN_C() { TypeRegistryEntry* pEntry = (TypeRegistryEntry*) hEntry; @@ -1590,7 +1590,7 @@ REG_DLLPUBLIC void TYPEREG_CALLTYPE typereg_reader_getFieldFileName(void * hEntr } -REG_DLLPUBLIC sal_uInt16 TYPEREG_CALLTYPE typereg_reader_getMethodCount(void * hEntry) SAL_THROW_EXTERN_C() +sal_uInt16 TYPEREG_CALLTYPE typereg_reader_getMethodCount(void * hEntry) SAL_THROW_EXTERN_C() { TypeRegistryEntry* pEntry = (TypeRegistryEntry*) hEntry; @@ -1604,7 +1604,7 @@ static sal_uInt32 TYPEREG_CALLTYPE getMethodCount(TypeReaderImpl hEntry) return typereg_reader_getMethodCount(hEntry); } -REG_DLLPUBLIC void TYPEREG_CALLTYPE typereg_reader_getMethodName(void * hEntry, rtl_uString** pMethodName, sal_uInt16 index) +void TYPEREG_CALLTYPE typereg_reader_getMethodName(void * hEntry, rtl_uString** pMethodName, sal_uInt16 index) SAL_THROW_EXTERN_C() { TypeRegistryEntry* pEntry = (TypeRegistryEntry*) hEntry; @@ -1621,7 +1621,7 @@ REG_DLLPUBLIC void TYPEREG_CALLTYPE typereg_reader_getMethodName(void * hEntry, RTL_TEXTENCODING_UTF8, OSTRING_TO_OUSTRING_CVTFLAGS); } -REG_DLLPUBLIC sal_uInt16 TYPEREG_CALLTYPE typereg_reader_getMethodParameterCount( +sal_uInt16 TYPEREG_CALLTYPE typereg_reader_getMethodParameterCount( void * hEntry, sal_uInt16 index) SAL_THROW_EXTERN_C() { TypeRegistryEntry* pEntry = (TypeRegistryEntry*) hEntry; @@ -1636,7 +1636,7 @@ static sal_uInt32 TYPEREG_CALLTYPE getMethodParamCount(TypeReaderImpl hEntry, sa return typereg_reader_getMethodParameterCount(hEntry, index); } -REG_DLLPUBLIC void TYPEREG_CALLTYPE typereg_reader_getMethodParameterTypeName(void * hEntry, rtl_uString** pMethodParamType, sal_uInt16 index, sal_uInt16 paramIndex) +void TYPEREG_CALLTYPE typereg_reader_getMethodParameterTypeName(void * hEntry, rtl_uString** pMethodParamType, sal_uInt16 index, sal_uInt16 paramIndex) SAL_THROW_EXTERN_C() { TypeRegistryEntry* pEntry = (TypeRegistryEntry*) hEntry; @@ -1653,7 +1653,7 @@ REG_DLLPUBLIC void TYPEREG_CALLTYPE typereg_reader_getMethodParameterTypeName(vo RTL_TEXTENCODING_UTF8, OSTRING_TO_OUSTRING_CVTFLAGS); } -REG_DLLPUBLIC void TYPEREG_CALLTYPE typereg_reader_getMethodParameterName(void * hEntry, rtl_uString** pMethodParamName, sal_uInt16 index, sal_uInt16 paramIndex) +void TYPEREG_CALLTYPE typereg_reader_getMethodParameterName(void * hEntry, rtl_uString** pMethodParamName, sal_uInt16 index, sal_uInt16 paramIndex) SAL_THROW_EXTERN_C() { TypeRegistryEntry* pEntry = (TypeRegistryEntry*) hEntry; @@ -1670,7 +1670,7 @@ REG_DLLPUBLIC void TYPEREG_CALLTYPE typereg_reader_getMethodParameterName(void * RTL_TEXTENCODING_UTF8, OSTRING_TO_OUSTRING_CVTFLAGS); } -REG_DLLPUBLIC RTParamMode TYPEREG_CALLTYPE typereg_reader_getMethodParameterFlags(void * hEntry, sal_uInt16 index, sal_uInt16 paramIndex) +RTParamMode TYPEREG_CALLTYPE typereg_reader_getMethodParameterFlags(void * hEntry, sal_uInt16 index, sal_uInt16 paramIndex) SAL_THROW_EXTERN_C() { TypeRegistryEntry* pEntry = (TypeRegistryEntry*) hEntry; @@ -1680,7 +1680,7 @@ REG_DLLPUBLIC RTParamMode TYPEREG_CALLTYPE typereg_reader_getMethodParameterFlag return pEntry->m_pMethods->getMethodParamMode(index, paramIndex); } -REG_DLLPUBLIC sal_uInt16 TYPEREG_CALLTYPE typereg_reader_getMethodExceptionCount( +sal_uInt16 TYPEREG_CALLTYPE typereg_reader_getMethodExceptionCount( void * hEntry, sal_uInt16 index) SAL_THROW_EXTERN_C() { TypeRegistryEntry* pEntry = (TypeRegistryEntry*) hEntry; @@ -1695,7 +1695,7 @@ static sal_uInt32 TYPEREG_CALLTYPE getMethodExcCount(TypeReaderImpl hEntry, sal_ return typereg_reader_getMethodExceptionCount(hEntry, index); } -REG_DLLPUBLIC void TYPEREG_CALLTYPE typereg_reader_getMethodExceptionTypeName(void * hEntry, rtl_uString** pMethodExcpType, sal_uInt16 index, sal_uInt16 excIndex) +void TYPEREG_CALLTYPE typereg_reader_getMethodExceptionTypeName(void * hEntry, rtl_uString** pMethodExcpType, sal_uInt16 index, sal_uInt16 excIndex) SAL_THROW_EXTERN_C() { TypeRegistryEntry* pEntry = (TypeRegistryEntry*) hEntry; @@ -1712,7 +1712,7 @@ REG_DLLPUBLIC void TYPEREG_CALLTYPE typereg_reader_getMethodExceptionTypeName(vo RTL_TEXTENCODING_UTF8, OSTRING_TO_OUSTRING_CVTFLAGS); } -REG_DLLPUBLIC void TYPEREG_CALLTYPE typereg_reader_getMethodReturnTypeName(void * hEntry, rtl_uString** pMethodReturnType, sal_uInt16 index) +void TYPEREG_CALLTYPE typereg_reader_getMethodReturnTypeName(void * hEntry, rtl_uString** pMethodReturnType, sal_uInt16 index) SAL_THROW_EXTERN_C() { TypeRegistryEntry* pEntry = (TypeRegistryEntry*) hEntry; @@ -1729,7 +1729,7 @@ REG_DLLPUBLIC void TYPEREG_CALLTYPE typereg_reader_getMethodReturnTypeName(void RTL_TEXTENCODING_UTF8, OSTRING_TO_OUSTRING_CVTFLAGS); } -REG_DLLPUBLIC RTMethodMode TYPEREG_CALLTYPE typereg_reader_getMethodFlags(void * hEntry, sal_uInt16 index) +RTMethodMode TYPEREG_CALLTYPE typereg_reader_getMethodFlags(void * hEntry, sal_uInt16 index) SAL_THROW_EXTERN_C() { TypeRegistryEntry* pEntry = (TypeRegistryEntry*) hEntry; @@ -1739,7 +1739,7 @@ REG_DLLPUBLIC RTMethodMode TYPEREG_CALLTYPE typereg_reader_getMethodFlags(void * return pEntry->m_pMethods->getMethodMode(index); } -REG_DLLPUBLIC void TYPEREG_CALLTYPE typereg_reader_getMethodDocumentation(void * hEntry, rtl_uString** pMethodDoku, sal_uInt16 index) +void TYPEREG_CALLTYPE typereg_reader_getMethodDocumentation(void * hEntry, rtl_uString** pMethodDoku, sal_uInt16 index) SAL_THROW_EXTERN_C() { TypeRegistryEntry* pEntry = (TypeRegistryEntry*) hEntry; @@ -1756,7 +1756,7 @@ REG_DLLPUBLIC void TYPEREG_CALLTYPE typereg_reader_getMethodDocumentation(void * RTL_TEXTENCODING_UTF8, OSTRING_TO_OUSTRING_CVTFLAGS); } -REG_DLLPUBLIC sal_uInt16 TYPEREG_CALLTYPE typereg_reader_getReferenceCount(void * hEntry) SAL_THROW_EXTERN_C() +sal_uInt16 TYPEREG_CALLTYPE typereg_reader_getReferenceCount(void * hEntry) SAL_THROW_EXTERN_C() { TypeRegistryEntry* pEntry = (TypeRegistryEntry*) hEntry; @@ -1770,7 +1770,7 @@ static sal_uInt32 TYPEREG_CALLTYPE getReferenceCount(TypeReaderImpl hEntry) return typereg_reader_getReferenceCount(hEntry); } -REG_DLLPUBLIC void TYPEREG_CALLTYPE typereg_reader_getReferenceTypeName(void * hEntry, rtl_uString** pReferenceName, sal_uInt16 index) +void TYPEREG_CALLTYPE typereg_reader_getReferenceTypeName(void * hEntry, rtl_uString** pReferenceName, sal_uInt16 index) SAL_THROW_EXTERN_C() { TypeRegistryEntry* pEntry = (TypeRegistryEntry*) hEntry; @@ -1787,7 +1787,7 @@ REG_DLLPUBLIC void TYPEREG_CALLTYPE typereg_reader_getReferenceTypeName(void * h RTL_TEXTENCODING_UTF8, OSTRING_TO_OUSTRING_CVTFLAGS); } -REG_DLLPUBLIC RTReferenceType TYPEREG_CALLTYPE typereg_reader_getReferenceSort(void * hEntry, sal_uInt16 index) +RTReferenceType TYPEREG_CALLTYPE typereg_reader_getReferenceSort(void * hEntry, sal_uInt16 index) SAL_THROW_EXTERN_C() { TypeRegistryEntry* pEntry = (TypeRegistryEntry*) hEntry; @@ -1797,7 +1797,7 @@ REG_DLLPUBLIC RTReferenceType TYPEREG_CALLTYPE typereg_reader_getReferenceSort(v return pEntry->m_pReferences->getReferenceType(index); } -REG_DLLPUBLIC void TYPEREG_CALLTYPE typereg_reader_getReferenceDocumentation(void * hEntry, rtl_uString** pReferenceDoku, sal_uInt16 index) +void TYPEREG_CALLTYPE typereg_reader_getReferenceDocumentation(void * hEntry, rtl_uString** pReferenceDoku, sal_uInt16 index) SAL_THROW_EXTERN_C() { TypeRegistryEntry* pEntry = (TypeRegistryEntry*) hEntry; @@ -1814,7 +1814,7 @@ REG_DLLPUBLIC void TYPEREG_CALLTYPE typereg_reader_getReferenceDocumentation(voi RTL_TEXTENCODING_UTF8, OSTRING_TO_OUSTRING_CVTFLAGS); } -REG_DLLPUBLIC RTFieldAccess TYPEREG_CALLTYPE typereg_reader_getReferenceFlags(void * hEntry, sal_uInt16 index) +RTFieldAccess TYPEREG_CALLTYPE typereg_reader_getReferenceFlags(void * hEntry, sal_uInt16 index) SAL_THROW_EXTERN_C() { TypeRegistryEntry* pEntry = (TypeRegistryEntry*) hEntry; @@ -1824,7 +1824,7 @@ REG_DLLPUBLIC RTFieldAccess TYPEREG_CALLTYPE typereg_reader_getReferenceFlags(vo return pEntry->m_pReferences->getReferenceAccess(index); } -REG_DLLPUBLIC sal_uInt16 TYPEREG_CALLTYPE typereg_reader_getSuperTypeCount(void * hEntry) +sal_uInt16 TYPEREG_CALLTYPE typereg_reader_getSuperTypeCount(void * hEntry) SAL_THROW_EXTERN_C() { TypeRegistryEntry* pEntry = (TypeRegistryEntry*) hEntry; @@ -1834,7 +1834,7 @@ REG_DLLPUBLIC sal_uInt16 TYPEREG_CALLTYPE typereg_reader_getSuperTypeCount(void return pEntry->m_nSuperTypes; } -REG_DLLPUBLIC void TYPEREG_CALLTYPE typereg_reader_getSuperTypeName( +void TYPEREG_CALLTYPE typereg_reader_getSuperTypeName( void * hEntry, rtl_uString ** pSuperTypeName, sal_uInt16 index) SAL_THROW_EXTERN_C() { @@ -1854,7 +1854,7 @@ REG_DLLPUBLIC void TYPEREG_CALLTYPE typereg_reader_getSuperTypeName( rtl_uString_new(pSuperTypeName); } -REG_DLLPUBLIC RegistryTypeReader_Api* TYPEREG_CALLTYPE initRegistryTypeReader_Api(void) +RegistryTypeReader_Api* TYPEREG_CALLTYPE initRegistryTypeReader_Api(void) { static RegistryTypeReader_Api aApi= {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}; if (!aApi.acquire) diff --git a/registry/source/reflwrit.cxx b/registry/source/reflwrit.cxx index 3cbcc2f68bf2..b35af8d3db4d 100644 --- a/registry/source/reflwrit.cxx +++ b/registry/source/reflwrit.cxx @@ -1216,7 +1216,7 @@ static void TYPEREG_CALLTYPE setFileName(TypeWriterImpl hEntry, rtl_uString* fil static_cast< TypeWriter * >(hEntry)->m_fileName = toByteString(fileName); } -REG_DLLPUBLIC sal_Bool TYPEREG_CALLTYPE typereg_writer_setFieldData( +sal_Bool TYPEREG_CALLTYPE typereg_writer_setFieldData( void * handle, sal_uInt16 index, rtl_uString const * documentation, rtl_uString const * fileName, RTFieldAccess flags, rtl_uString const * name, rtl_uString const * typeName, RTValueType valueType, @@ -1249,7 +1249,7 @@ static void TYPEREG_CALLTYPE setFieldData(TypeWriterImpl hEntry, constValue); } -REG_DLLPUBLIC sal_Bool TYPEREG_CALLTYPE typereg_writer_setMethodData( +sal_Bool TYPEREG_CALLTYPE typereg_writer_setMethodData( void * handle, sal_uInt16 index, rtl_uString const * documentation, RTMethodMode flags, rtl_uString const * name, rtl_uString const * returnTypeName, sal_uInt16 parameterCount, @@ -1279,7 +1279,7 @@ static void TYPEREG_CALLTYPE setMethodData(TypeWriterImpl hEntry, hEntry, index, doku, mode, name, returnTypeName, paramCount, excCount); } -REG_DLLPUBLIC sal_Bool TYPEREG_CALLTYPE typereg_writer_setMethodParameterData( +sal_Bool TYPEREG_CALLTYPE typereg_writer_setMethodParameterData( void * handle, sal_uInt16 methodIndex, sal_uInt16 parameterIndex, RTParamMode flags, rtl_uString const * name, rtl_uString const * typeName) SAL_THROW_EXTERN_C() @@ -1305,7 +1305,7 @@ static void TYPEREG_CALLTYPE setParamData(TypeWriterImpl hEntry, hEntry, index, paramIndex, mode, name, type); } -REG_DLLPUBLIC sal_Bool TYPEREG_CALLTYPE typereg_writer_setMethodExceptionTypeName( +sal_Bool TYPEREG_CALLTYPE typereg_writer_setMethodExceptionTypeName( void * handle, sal_uInt16 methodIndex, sal_uInt16 exceptionIndex, rtl_uString const * typeName) SAL_THROW_EXTERN_C() @@ -1327,7 +1327,7 @@ static void TYPEREG_CALLTYPE setExcData(TypeWriterImpl hEntry, typereg_writer_setMethodExceptionTypeName(hEntry, index, excIndex, type); } -REG_DLLPUBLIC void const * TYPEREG_CALLTYPE typereg_writer_getBlob(void * handle, sal_uInt32 * size) +void const * TYPEREG_CALLTYPE typereg_writer_getBlob(void * handle, sal_uInt32 * size) SAL_THROW_EXTERN_C() { TypeWriter * writer = static_cast< TypeWriter * >(handle); @@ -1356,7 +1356,7 @@ static sal_uInt32 TYPEREG_CALLTYPE getBlopSize(TypeWriterImpl hEntry) return size; } -REG_DLLPUBLIC sal_Bool TYPEREG_CALLTYPE typereg_writer_setReferenceData( +sal_Bool TYPEREG_CALLTYPE typereg_writer_setReferenceData( void * handle, sal_uInt16 index, rtl_uString const * documentation, RTReferenceType sort, RTFieldAccess flags, rtl_uString const * typeName) SAL_THROW_EXTERN_C() @@ -1380,7 +1380,7 @@ static void TYPEREG_CALLTYPE setReferenceData(TypeWriterImpl hEntry, typereg_writer_setReferenceData(hEntry, index, doku, refType, access, name); } -REG_DLLPUBLIC void * TYPEREG_CALLTYPE typereg_writer_create( +void * TYPEREG_CALLTYPE typereg_writer_create( typereg_Version version, rtl_uString const * documentation, rtl_uString const * fileName, RTTypeClass typeClass, sal_Bool published, rtl_uString const * typeName, sal_uInt16 superTypeCount, @@ -1397,11 +1397,11 @@ REG_DLLPUBLIC void * TYPEREG_CALLTYPE typereg_writer_create( } } -REG_DLLPUBLIC void TYPEREG_CALLTYPE typereg_writer_destroy(void * handle) SAL_THROW_EXTERN_C() { +void TYPEREG_CALLTYPE typereg_writer_destroy(void * handle) SAL_THROW_EXTERN_C() { delete static_cast< TypeWriter * >(handle); } -REG_DLLPUBLIC sal_Bool TYPEREG_CALLTYPE typereg_writer_setSuperTypeName( +sal_Bool TYPEREG_CALLTYPE typereg_writer_setSuperTypeName( void * handle, sal_uInt16 index, rtl_uString const * typeName) SAL_THROW_EXTERN_C() { @@ -1430,7 +1430,7 @@ static TypeWriterImpl TYPEREG_CALLTYPE createEntry( return t; } -REG_DLLPUBLIC RegistryTypeWriter_Api* TYPEREG_CALLTYPE initRegistryTypeWriter_Api(void) +RegistryTypeWriter_Api* TYPEREG_CALLTYPE initRegistryTypeWriter_Api(void) { static RegistryTypeWriter_Api aApi= {0,0,0,0,0,0,0,0,0,0,0,0,0}; if (!aApi.acquire) diff --git a/registry/source/registry.cxx b/registry/source/registry.cxx index 3086adb44b2e..fc1412dfbcc3 100644 --- a/registry/source/registry.cxx +++ b/registry/source/registry.cxx @@ -401,7 +401,7 @@ static RegError REGISTRY_CALLTYPE dumpRegistry(RegHandle hReg, // initRegistry_Api -REG_DLLPUBLIC Registry_Api* REGISTRY_CALLTYPE initRegistry_Api(void) +Registry_Api* REGISTRY_CALLTYPE initRegistry_Api(void) { static Registry_Api aApi= {&acquire, &release, @@ -452,7 +452,7 @@ REG_DLLPUBLIC Registry_Api* REGISTRY_CALLTYPE initRegistry_Api(void) // reg_loadRegKey -REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_loadKey(RegKeyHandle hKey, +RegError REGISTRY_CALLTYPE reg_loadKey(RegKeyHandle hKey, rtl_uString* keyName, rtl_uString* regFileName) { @@ -469,7 +469,7 @@ REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_loadKey(RegKeyHandle hKey, // reg_saveKey -REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_saveKey(RegKeyHandle hKey, +RegError REGISTRY_CALLTYPE reg_saveKey(RegKeyHandle hKey, rtl_uString* keyName, rtl_uString* regFileName) { @@ -486,7 +486,7 @@ REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_saveKey(RegKeyHandle hKey, // reg_mergeKey -REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_mergeKey(RegKeyHandle hKey, +RegError REGISTRY_CALLTYPE reg_mergeKey(RegKeyHandle hKey, rtl_uString* keyName, rtl_uString* regFileName, sal_Bool bWarnings, @@ -505,7 +505,7 @@ REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_mergeKey(RegKeyHandle hKey, // reg_createRegistry -REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_createRegistry(rtl_uString* registryName, +RegError REGISTRY_CALLTYPE reg_createRegistry(rtl_uString* registryName, RegHandle* phRegistry) { RegError ret; @@ -526,7 +526,7 @@ REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_createRegistry(rtl_uString* registr // reg_openRootKey -REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_openRootKey(RegHandle hRegistry, +RegError REGISTRY_CALLTYPE reg_openRootKey(RegHandle hRegistry, RegKeyHandle* phRootKey) { return openRootKey(hRegistry, phRootKey); @@ -536,7 +536,7 @@ REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_openRootKey(RegHandle hRegistry, // reg_getName -REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_getName(RegHandle hRegistry, rtl_uString** pName) +RegError REGISTRY_CALLTYPE reg_getName(RegHandle hRegistry, rtl_uString** pName) { return getName(hRegistry, pName); } @@ -545,7 +545,7 @@ REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_getName(RegHandle hRegistry, rtl_uS // reg_isReadOnly -REG_DLLPUBLIC sal_Bool REGISTRY_CALLTYPE reg_isReadOnly(RegHandle hRegistry) +sal_Bool REGISTRY_CALLTYPE reg_isReadOnly(RegHandle hRegistry) { return isReadOnly(hRegistry); } @@ -554,7 +554,7 @@ REG_DLLPUBLIC sal_Bool REGISTRY_CALLTYPE reg_isReadOnly(RegHandle hRegistry) // reg_openRegistry -REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_openRegistry(rtl_uString* registryName, +RegError REGISTRY_CALLTYPE reg_openRegistry(rtl_uString* registryName, RegHandle* phRegistry, RegAccessMode accessMode) { @@ -576,7 +576,7 @@ REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_openRegistry(rtl_uString* registryN // reg_closeRegistry -REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_closeRegistry(RegHandle hRegistry) +RegError REGISTRY_CALLTYPE reg_closeRegistry(RegHandle hRegistry) { if (hRegistry) { @@ -593,7 +593,7 @@ REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_closeRegistry(RegHandle hRegistry) // reg_destroyRegistry -REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_destroyRegistry(RegHandle hRegistry, +RegError REGISTRY_CALLTYPE reg_destroyRegistry(RegHandle hRegistry, rtl_uString* registryName) { return destroyRegistry(hRegistry, registryName); @@ -603,7 +603,7 @@ REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_destroyRegistry(RegHandle hRegistry // reg_dumpRegistry -REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_dumpRegistry(RegKeyHandle hKey) +RegError REGISTRY_CALLTYPE reg_dumpRegistry(RegKeyHandle hKey) { ORegKey *pKey; diff --git a/sc/source/filter/ftools/ftools.cxx b/sc/source/filter/ftools/ftools.cxx index c1bddcb81070..23adece956e1 100644 --- a/sc/source/filter/ftools/ftools.cxx +++ b/sc/source/filter/ftools/ftools.cxx @@ -363,7 +363,7 @@ ScOrcusFilters* ScFormatFilterPluginImpl::GetOrcusFilters() #endif } -SAL_DLLPUBLIC_EXPORT ScFormatFilterPlugin * SAL_CALL ScFilterCreate(void) +ScFormatFilterPlugin * SAL_CALL ScFilterCreate(void) { return new ScFormatFilterPluginImpl(); } diff --git a/sc/source/ui/drawfunc/fuins1.cxx b/sc/source/ui/drawfunc/fuins1.cxx index e135b29fb5e8..d53741d617e9 100644 --- a/sc/source/ui/drawfunc/fuins1.cxx +++ b/sc/source/ui/drawfunc/fuins1.cxx @@ -43,7 +43,7 @@ using namespace ::com::sun::star; -void SC_DLLPUBLIC ScLimitSizeOnDrawPage( Size& rSize, Point& rPos, const Size& rPage ) +void ScLimitSizeOnDrawPage( Size& rSize, Point& rPos, const Size& rPage ) { if ( !rPage.Width() || !rPage.Height() ) return; diff --git a/sfx2/source/dialog/dialoghelper.cxx b/sfx2/source/dialog/dialoghelper.cxx index 4c4242390c38..cbc95798dc9c 100644 --- a/sfx2/source/dialog/dialoghelper.cxx +++ b/sfx2/source/dialog/dialoghelper.cxx @@ -68,17 +68,17 @@ Size getDrawListBoxOptimalSize(const vcl::Window *pReference) return pReference->LogicToPixel(Size(88, 110), MAP_APPFONT); } -Size SFX2_DLLPUBLIC getPreviewStripSize(const vcl::Window *pReference) +Size getPreviewStripSize(const vcl::Window *pReference) { return pReference->LogicToPixel(Size(70 , 40), MapMode(MAP_APPFONT)); } -Size SFX2_DLLPUBLIC getPreviewOptionsSize(const vcl::Window *pReference) +Size getPreviewOptionsSize(const vcl::Window *pReference) { return pReference->LogicToPixel(Size(70 , 27), MapMode(MAP_APPFONT)); } -OUString SFX2_DLLPUBLIC getWidestTime(const LocaleDataWrapper& rWrapper) +OUString getWidestTime(const LocaleDataWrapper& rWrapper) { Date aDate(22, 12, 2000); tools::Time aTime(22, 59, 59); @@ -86,7 +86,7 @@ OUString SFX2_DLLPUBLIC getWidestTime(const LocaleDataWrapper& rWrapper) return formatTime(aDateTime, rWrapper); } -OUString SFX2_DLLPUBLIC formatTime(const DateTime& rDateTime, const LocaleDataWrapper& rWrapper) +OUString formatTime(const DateTime& rDateTime, const LocaleDataWrapper& rWrapper) { OUString sString = rWrapper.getDate(rDateTime); sString += OUString(' '); diff --git a/sfx2/source/doc/docinf.cxx b/sfx2/source/doc/docinf.cxx index 5e494372ed85..ec18c6dec433 100644 --- a/sfx2/source/doc/docinf.cxx +++ b/sfx2/source/doc/docinf.cxx @@ -44,7 +44,7 @@ using namespace ::com::sun::star; namespace sfx2 { -sal_uInt32 SFX2_DLLPUBLIC LoadOlePropertySet( +sal_uInt32 LoadOlePropertySet( uno::Reference< document::XDocumentProperties> i_xDocProps, SotStorage* i_pStorage ) { @@ -194,7 +194,7 @@ sal_uInt32 SFX2_DLLPUBLIC LoadOlePropertySet( return (nGlobError != ERRCODE_NONE) ? nGlobError : nDocError; } -bool SFX2_DLLPUBLIC SaveOlePropertySet( +bool SaveOlePropertySet( uno::Reference< document::XDocumentProperties> i_xDocProps, SotStorage* i_pStorage, const uno::Sequence<sal_uInt8> * i_pThumb, @@ -305,7 +305,7 @@ bool SFX2_DLLPUBLIC SaveOlePropertySet( return (nGlobError == ERRCODE_NONE) && (nDocError == ERRCODE_NONE); } -uno::Sequence<sal_uInt8> SFX2_DLLPUBLIC convertMetaFile(GDIMetaFile* i_pThumb) +uno::Sequence<sal_uInt8> convertMetaFile(GDIMetaFile* i_pThumb) { if (i_pThumb) { BitmapEx aBitmap; diff --git a/svtools/source/misc/langtab.cxx b/svtools/source/misc/langtab.cxx index 88bf4dd1d540..70e835f5b774 100644 --- a/svtools/source/misc/langtab.cxx +++ b/svtools/source/misc/langtab.cxx @@ -52,7 +52,7 @@ namespace { struct theLanguageTable : public rtl::Static< SvtLanguageTableImpl, theLanguageTable > {}; } -SVT_DLLPUBLIC const OUString ApplyLreOrRleEmbedding( const OUString &rText ) +const OUString ApplyLreOrRleEmbedding( const OUString &rText ) { const sal_Int32 nLen = rText.getLength(); if (nLen == 0) diff --git a/svx/source/engine3d/helperhittest3d.cxx b/svx/source/engine3d/helperhittest3d.cxx index d38445dfb8d8..809717255bb7 100644 --- a/svx/source/engine3d/helperhittest3d.cxx +++ b/svx/source/engine3d/helperhittest3d.cxx @@ -159,7 +159,7 @@ E3dScene* fillViewInformation3DForCompoundObject(drawinglayer::geometry::ViewInf -SVX_DLLPUBLIC void getAllHit3DObjectsSortedFrontToBack( +void getAllHit3DObjectsSortedFrontToBack( const basegfx::B2DPoint& rPoint, const E3dScene& rScene, ::std::vector< const E3dCompoundObject* >& o_rResult) diff --git a/svx/source/table/tabledesign.cxx b/svx/source/table/tabledesign.cxx index e8a23022ed23..66c05447861e 100644 --- a/svx/source/table/tabledesign.cxx +++ b/svx/source/table/tabledesign.cxx @@ -769,7 +769,7 @@ void TableDesignFamily::removeVetoableChangeListener( const OUString& , const Re -SVX_DLLPUBLIC Reference< XNameAccess > CreateTableDesignFamily() +Reference< XNameAccess > CreateTableDesignFamily() { return new TableDesignFamily(); } diff --git a/svx/source/xoutdev/xattrbmp.cxx b/svx/source/xoutdev/xattrbmp.cxx index 101f8d7150b5..23baafe96647 100644 --- a/svx/source/xoutdev/xattrbmp.cxx +++ b/svx/source/xoutdev/xattrbmp.cxx @@ -244,7 +244,7 @@ Bitmap createHistorical8x8FromArray(const sal_uInt16* pArray, Color aColorPix, C return aBitmap; } -bool SVX_DLLPUBLIC isHistorical8x8(const BitmapEx& rBitmapEx, BitmapColor& o_rBack, BitmapColor& o_rFront) +bool isHistorical8x8(const BitmapEx& rBitmapEx, BitmapColor& o_rBack, BitmapColor& o_rFront) { if(!rBitmapEx.IsTransparent()) { diff --git a/sw/source/core/doc/dbgoutsw.cxx b/sw/source/core/doc/dbgoutsw.cxx index c45561aa643e..cb4d7aed8545 100644 --- a/sw/source/core/doc/dbgoutsw.cxx +++ b/sw/source/core/doc/dbgoutsw.cxx @@ -72,7 +72,7 @@ static OUString lcl_dbg_out_SvPtrArr(const T & rArr) return aStr; } -SW_DLLPUBLIC const char * dbg_out(const void * pVoid) +const char * dbg_out(const void * pVoid) { char sBuffer[1024]; @@ -83,7 +83,7 @@ SW_DLLPUBLIC const char * dbg_out(const void * pVoid) return dbg_out(aTmpStr); } -SW_DLLPUBLIC const char * dbg_out(const OUString & aStr) +const char * dbg_out(const OUString & aStr) { aDbgOutResult = OUStringToOString(aStr, RTL_TEXTENCODING_ASCII_US); @@ -253,12 +253,12 @@ static const OUString lcl_dbg_out(const SfxPoolItem & rItem) return aStr; } -SW_DLLPUBLIC const char * dbg_out(const SfxPoolItem & rItem) +const char * dbg_out(const SfxPoolItem & rItem) { return dbg_out(lcl_dbg_out(rItem)); } -SW_DLLPUBLIC const char * dbg_out(const SfxPoolItem * pItem) +const char * dbg_out(const SfxPoolItem * pItem) { return dbg_out(pItem ? lcl_dbg_out(*pItem) : OUString("(nil)")); } @@ -292,7 +292,7 @@ static const OUString lcl_dbg_out(const SfxItemSet & rSet) return aStr; } -SW_DLLPUBLIC const char * dbg_out(const SfxItemSet & rSet) +const char * dbg_out(const SfxItemSet & rSet) { return dbg_out(lcl_dbg_out(rSet)); } @@ -312,7 +312,7 @@ static const OUString lcl_dbg_out(const SwTxtAttr & rAttr) return aStr; } -SW_DLLPUBLIC const char * dbg_out(const SwTxtAttr & rAttr) +const char * dbg_out(const SwTxtAttr & rAttr) { return dbg_out(lcl_dbg_out(rAttr)); } @@ -333,7 +333,7 @@ static const OUString lcl_dbg_out(const SwpHints & rHints) return aStr; } -SW_DLLPUBLIC const char * dbg_out(const SwpHints &rHints) +const char * dbg_out(const SwpHints &rHints) { return dbg_out(lcl_dbg_out(rHints)); } @@ -354,7 +354,7 @@ static OUString lcl_dbg_out(const SwPosition & rPos) return aStr; } -SW_DLLPUBLIC const char * dbg_out(const SwPosition & rPos) +const char * dbg_out(const SwPosition & rPos) { return dbg_out(lcl_dbg_out(rPos)); } @@ -376,7 +376,7 @@ static OUString lcl_dbg_out(const SwPaM & rPam) return aStr; } -SW_DLLPUBLIC const char * dbg_out(const SwPaM & rPam) +const char * dbg_out(const SwPaM & rPam) { return dbg_out(lcl_dbg_out(rPam)); } @@ -386,7 +386,7 @@ static OUString lcl_dbg_out(const SwNodeNum & ) return OUString();/*rNum.ToString();*/ } -SW_DLLPUBLIC const char * dbg_out(const SwNodeNum & rNum) +const char * dbg_out(const SwNodeNum & rNum) { return dbg_out(lcl_dbg_out(rNum)); } @@ -408,7 +408,7 @@ static OUString lcl_dbg_out(const SwRect & rRect) return aResult; } -SW_DLLPUBLIC const char * dbg_out(const SwRect & rRect) +const char * dbg_out(const SwRect & rRect) { return dbg_out(lcl_dbg_out(rRect)); } @@ -435,7 +435,7 @@ static OUString lcl_dbg_out(const SwFrmFmt & rFrmFmt) return aResult; } -SW_DLLPUBLIC const char * dbg_out(const SwFrmFmt & rFrmFmt) +const char * dbg_out(const SwFrmFmt & rFrmFmt) { return dbg_out(lcl_dbg_out(rFrmFmt)); } @@ -666,12 +666,12 @@ static OUString lcl_dbg_out(const SwNode & rNode) return aTmpStr; } -SW_DLLPUBLIC const char * dbg_out(const SwNode & rNode) +const char * dbg_out(const SwNode & rNode) { return dbg_out(lcl_dbg_out(rNode)); } -SW_DLLPUBLIC const char * dbg_out(const SwNode * pNode) +const char * dbg_out(const SwNode * pNode) { if (NULL != pNode) return dbg_out(*pNode); @@ -679,7 +679,7 @@ SW_DLLPUBLIC const char * dbg_out(const SwNode * pNode) return NULL; } -SW_DLLPUBLIC const char * dbg_out(const SwCntntNode * pNode) +const char * dbg_out(const SwCntntNode * pNode) { if (NULL != pNode) return dbg_out(*pNode); @@ -687,7 +687,7 @@ SW_DLLPUBLIC const char * dbg_out(const SwCntntNode * pNode) return NULL; } -SW_DLLPUBLIC const char * dbg_out(const SwTxtNode * pNode) +const char * dbg_out(const SwTxtNode * pNode) { if (NULL != pNode) return dbg_out(*pNode); @@ -761,7 +761,7 @@ static OUString lcl_dbg_out(SwNodes & rNodes) return aStr; } -SW_DLLPUBLIC const char * dbg_out(SwNodes & rNodes) +const char * dbg_out(SwNodes & rNodes) { return dbg_out(lcl_dbg_out(rNodes)); } @@ -780,7 +780,7 @@ static OUString lcl_dbg_out(const SwUndo & rUndo) return aStr; } -SW_DLLPUBLIC const char * dbg_out(const SwUndo & rUndo) +const char * dbg_out(const SwUndo & rUndo) { return dbg_out(lcl_dbg_out(rUndo)); } @@ -800,7 +800,7 @@ static OUString lcl_dbg_out(SwOutlineNodes & rNodes) return aStr; } -SW_DLLPUBLIC const char * dbg_out(SwOutlineNodes & rNodes) +const char * dbg_out(SwOutlineNodes & rNodes) { return dbg_out(lcl_dbg_out(rNodes)); } @@ -816,7 +816,7 @@ static OUString lcl_dbg_out(const SwRewriter & rRewriter) return aResult; } -SW_DLLPUBLIC const char * dbg_out(const SwRewriter & rRewriter) +const char * dbg_out(const SwRewriter & rRewriter) { return dbg_out(lcl_dbg_out(rRewriter)); } @@ -852,7 +852,7 @@ static OUString lcl_dbg_out(const SwNumRule & rRule) return aResult; } -SW_DLLPUBLIC const char * dbg_out(const SwNumRule & rRule) +const char * dbg_out(const SwNumRule & rRule) { return dbg_out(lcl_dbg_out(rRule)); } @@ -868,7 +868,7 @@ static OUString lcl_dbg_out(const SwTxtFmtColl & rFmt) return aResult; } -SW_DLLPUBLIC const char * dbg_out(const SwTxtFmtColl & rFmt) +const char * dbg_out(const SwTxtFmtColl & rFmt) { return dbg_out(lcl_dbg_out(rFmt)); } @@ -878,7 +878,7 @@ static OUString lcl_dbg_out(const SwFrmFmts & rFrmFmts) return lcl_dbg_out_SvPtrArr<SwFrmFmts>(rFrmFmts); } -SW_DLLPUBLIC const char * dbg_out(const SwFrmFmts & rFrmFmts) +const char * dbg_out(const SwFrmFmts & rFrmFmts) { return dbg_out(lcl_dbg_out(rFrmFmts)); } @@ -904,7 +904,7 @@ static OUString lcl_dbg_out(const SwNumRuleTbl & rTbl) return aResult; } -SW_DLLPUBLIC const char * dbg_out(const SwNumRuleTbl & rTbl) +const char * dbg_out(const SwNumRuleTbl & rTbl) { return dbg_out(lcl_dbg_out(rTbl)); } @@ -946,7 +946,7 @@ static OUString lcl_dbg_out(const SwFormToken & rToken) return rToken.GetString(); } -SW_DLLPUBLIC const char * dbg_out(const SwFormToken & rToken) +const char * dbg_out(const SwFormToken & rToken) { return dbg_out(lcl_dbg_out(rToken)); } @@ -972,7 +972,7 @@ static OUString lcl_dbg_out(const SwFormTokens & rTokens) return aStr; } -SW_DLLPUBLIC const char * dbg_out(const SwFormTokens & rTokens) +const char * dbg_out(const SwFormTokens & rTokens) { return dbg_out(lcl_dbg_out(rTokens)); } @@ -990,7 +990,7 @@ static OUString lcl_dbg_out(const SwNodeRange & rRange) return aStr; } -SW_DLLPUBLIC const char * dbg_out(const SwNodeRange & rRange) +const char * dbg_out(const SwNodeRange & rRange) { return dbg_out(lcl_dbg_out(rRange)); } diff --git a/sw/source/core/sw3io/sw3convert.cxx b/sw/source/core/sw3io/sw3convert.cxx index 3ab15897b396..0ff31eff2074 100644 --- a/sw/source/core/sw3io/sw3convert.cxx +++ b/sw/source/core/sw3io/sw3convert.cxx @@ -169,7 +169,7 @@ static const OldFormats aOldGetSetExpFmt30[] = { NF_NUMERIC_START, 0 } // End of table }; -SW_DLLPUBLIC void sw3io_ConvertFromOldField( SwDoc& rDoc, sal_uInt16& rWhich, +void sw3io_ConvertFromOldField( SwDoc& rDoc, sal_uInt16& rWhich, sal_uInt16& rSubType, sal_uLong &rFmt, sal_uInt16 nVersion ) { diff --git a/sw/source/filter/basflt/fltini.cxx b/sw/source/filter/basflt/fltini.cxx index 136d085941b6..2bd5a5d76bbd 100644 --- a/sw/source/filter/basflt/fltini.cxx +++ b/sw/source/filter/basflt/fltini.cxx @@ -157,12 +157,12 @@ oslGenericFunction Filters::GetMswordLibSymbol( const char *pSymbol ) namespace SwReaderWriter { -SW_DLLPUBLIC Reader* GetReader( ReaderWriterEnum eReader ) +Reader* GetReader( ReaderWriterEnum eReader ) { return aReaderWriter[eReader].GetReader(); } -SW_DLLPUBLIC void GetWriter( const OUString& rFltName, const OUString& rBaseURL, WriterRef& xRet ) +void GetWriter( const OUString& rFltName, const OUString& rBaseURL, WriterRef& xRet ) { for( sal_uInt16 n = 0; n < MAXFILTER; ++n ) if ( aFilterDetect[n].IsFilter( rFltName ) ) diff --git a/sw/source/uibase/envelp/envimg.cxx b/sw/source/uibase/envelp/envimg.cxx index b655e4dbe98a..9975522d123f 100644 --- a/sw/source/uibase/envelp/envimg.cxx +++ b/sw/source/uibase/envelp/envimg.cxx @@ -45,7 +45,7 @@ using namespace ::com::sun::star::uno; TYPEINIT1_AUTOFACTORY( SwEnvItem, SfxPoolItem ); -SW_DLLPUBLIC OUString MakeSender() +OUString MakeSender() { SvtUserOptions& rUserOpt = SW_MOD()->GetUserOptions(); diff --git a/toolkit/source/helper/formpdfexport.cxx b/toolkit/source/helper/formpdfexport.cxx index 3e0f1699478b..c9f95ab91e25 100644 --- a/toolkit/source/helper/formpdfexport.cxx +++ b/toolkit/source/helper/formpdfexport.cxx @@ -254,7 +254,7 @@ namespace toolkitform /** creates a PDF compatible control descriptor for the given control */ - std::unique_ptr<vcl::PDFWriter::AnyWidget> TOOLKIT_DLLPUBLIC describePDFControl( const Reference< XControl >& _rxControl, + std::unique_ptr<vcl::PDFWriter::AnyWidget> describePDFControl( const Reference< XControl >& _rxControl, ::vcl::PDFExtOutDevData& i_pdfExportData ) { std::unique_ptr<vcl::PDFWriter::AnyWidget> Descriptor; diff --git a/tools/source/debug/debug.cxx b/tools/source/debug/debug.cxx index 9e65c44fa9e6..38b6ba5f6c9a 100644 --- a/tools/source/debug/debug.cxx +++ b/tools/source/debug/debug.cxx @@ -308,7 +308,7 @@ void* DbgFunc( sal_uInt16 nAction, void* pParam ) #if OSL_DEBUG_LEVEL > 0 -TOOLS_DLLPUBLIC void DbgUnhandledException(const css::uno::Any & caught, const char* currentFunction, const char* fileAndLineNo) +void DbgUnhandledException(const css::uno::Any & caught, const char* currentFunction, const char* fileAndLineNo) { OString sMessage( "caught an exception!" ); sMessage += "\nin function:"; diff --git a/vcl/source/gdi/bitmapex.cxx b/vcl/source/gdi/bitmapex.cxx index 687cc943b09a..ca40b4a46e4a 100644 --- a/vcl/source/gdi/bitmapex.cxx +++ b/vcl/source/gdi/bitmapex.cxx @@ -1160,7 +1160,7 @@ BitmapEx BitmapEx::ModifyBitmapEx(const basegfx::BColorModifierStack& rBColorMod } } -BitmapEx VCL_DLLPUBLIC createBlendFrame( +BitmapEx createBlendFrame( const Size& rSize, sal_uInt8 nAlpha, Color aColorTopLeft, @@ -1184,7 +1184,7 @@ BitmapEx VCL_DLLPUBLIC createBlendFrame( return BitmapEx(); } -BitmapEx VCL_DLLPUBLIC createBlendFrame( +BitmapEx createBlendFrame( const Size& rSize, sal_uInt8 nAlpha, Color aColorTopLeft, diff --git a/vcl/source/gdi/gdimetafiletools.cxx b/vcl/source/gdi/gdimetafiletools.cxx index 963592b9853f..e58fb0c2dadb 100644 --- a/vcl/source/gdi/gdimetafiletools.cxx +++ b/vcl/source/gdi/gdimetafiletools.cxx @@ -1057,7 +1057,7 @@ void clipMetafileContentAgainstOwnRegions(GDIMetaFile& rSource) } } -bool VCL_DLLPUBLIC usesClipActions(const GDIMetaFile& rSource) +bool usesClipActions(const GDIMetaFile& rSource) { const sal_uLong nObjCount(rSource.GetActionSize()); diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx index 1a5938bdebab..4d9ee516c259 100644 --- a/vcl/source/gdi/sallayout.cxx +++ b/vcl/source/gdi/sallayout.cxx @@ -219,13 +219,13 @@ sal_UCS4 GetVerticalChar( sal_UCS4 ) return 0; // #i14788# input method is responsible vertical char changes } -VCL_DLLPUBLIC sal_UCS4 GetMirroredChar( sal_UCS4 nChar ) +sal_UCS4 GetMirroredChar( sal_UCS4 nChar ) { nChar = u_charMirror( nChar ); return nChar; } -VCL_DLLPUBLIC sal_UCS4 GetLocalizedChar( sal_UCS4 nChar, LanguageType eLang ) +sal_UCS4 GetLocalizedChar( sal_UCS4 nChar, LanguageType eLang ) { // currently only conversion from ASCII digits is interesting if( (nChar < '0') || ('9' < nChar) ) diff --git a/vcl/source/gdi/svgdata.cxx b/vcl/source/gdi/svgdata.cxx index b844c502c689..3a98b87d8b55 100644 --- a/vcl/source/gdi/svgdata.cxx +++ b/vcl/source/gdi/svgdata.cxx @@ -31,7 +31,7 @@ using namespace ::com::sun::star; -BitmapEx VCL_DLLPUBLIC convertPrimitive2DSequenceToBitmapEx( +BitmapEx convertPrimitive2DSequenceToBitmapEx( const Primitive2DSequence& rSequence, const basegfx::B2DRange& rTargetRange, const sal_uInt32 nMaximumQuadraticPixels) diff --git a/vcl/source/helper/canvastools.cxx b/vcl/source/helper/canvastools.cxx index 54a9ae1f2e36..901527b36a34 100644 --- a/vcl/source/helper/canvastools.cxx +++ b/vcl/source/helper/canvastools.cxx @@ -181,7 +181,7 @@ namespace vcl } } - ::BitmapEx VCL_DLLPUBLIC bitmapExFromXBitmap( const uno::Reference< rendering::XIntegerReadOnlyBitmap >& xInputBitmap ) + ::BitmapEx bitmapExFromXBitmap( const uno::Reference< rendering::XIntegerReadOnlyBitmap >& xInputBitmap ) { SAL_INFO( "vcl.helper", "::vcl::unotools::bitmapExFromXBitmap()" ); @@ -563,7 +563,7 @@ namespace vcl }; } - uno::Reference<rendering::XColorSpace> VCL_DLLPUBLIC createStandardColorSpace() + uno::Reference<rendering::XColorSpace> createStandardColorSpace() { return new StandardColorSpace(); } @@ -599,7 +599,7 @@ namespace vcl return aColor; } - uno::Sequence< double > VCL_DLLPUBLIC colorToDoubleSequence( + uno::Sequence< double > colorToDoubleSequence( const Color& rColor, const uno::Reference< rendering::XColorSpace >& xColorSpace ) { @@ -613,7 +613,7 @@ namespace vcl return xColorSpace->convertFromARGB(aSeq); } - Color VCL_DLLPUBLIC doubleSequenceToColor( + Color doubleSequenceToColor( const uno::Sequence< double >& rColor, const uno::Reference< rendering::XColorSpace >& xColorSpace ) { diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index 0d2042c7a88d..57f491f3ce49 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -2288,7 +2288,6 @@ static OUString lcl_ExtractToken(OUString const& rCommand, } } -SAL_DLLPUBLIC_EXPORT // export just for test boost::tuple<OUString, std::vector<OUString>, std::vector<OUString> > lcl_SplitFieldCommand(const OUString& rCommand) { |