diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-01-05 13:05:50 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-01-05 13:10:48 +0100 |
commit | 9720e8e5ef49ee56e3612123a52b4a464d5e96ad (patch) | |
tree | 4b725a63422f12f4d78abb240a15bd24689e1dc9 /registry | |
parent | 32fb1cd5041383908041811c58fdf8d06e75cc49 (diff) |
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
Diffstat (limited to 'registry')
-rw-r--r-- | registry/source/reflread.cxx | 70 | ||||
-rw-r--r-- | registry/source/reflwrit.cxx | 20 | ||||
-rw-r--r-- | registry/source/registry.cxx | 24 |
3 files changed, 57 insertions, 57 deletions
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; |