diff options
Diffstat (limited to 'include')
24 files changed, 108 insertions, 108 deletions
diff --git a/include/comphelper/componentmodule.hxx b/include/comphelper/componentmodule.hxx index 9cb07461ce7d..bc0292a667ca 100644 --- a/include/comphelper/componentmodule.hxx +++ b/include/comphelper/componentmodule.hxx @@ -39,7 +39,7 @@ namespace comphelper /** factory factory declaration */ - typedef css::uno::Reference< css::lang::XSingleComponentFactory > (SAL_CALL *FactoryInstantiation) + typedef css::uno::Reference< css::lang::XSingleComponentFactory > (*FactoryInstantiation) ( ::cppu::ComponentFactoryFunc _pFactoryFunc, OUString const& _rComponentName, diff --git a/include/comphelper/extract.hxx b/include/comphelper/extract.hxx index 4330faa1a625..e0eab28897af 100644 --- a/include/comphelper/extract.hxx +++ b/include/comphelper/extract.hxx @@ -39,7 +39,7 @@ namespace cppu * @param rType enum type * @return enum or empty any. */ -inline css::uno::Any SAL_CALL int2enum( +inline css::uno::Any int2enum( sal_Int32 nEnum, const css::uno::Type & rType ) { assert(rType.getTypeClass() == css::uno::TypeClass_ENUM); diff --git a/include/cppunittester/protectorfactory.hxx b/include/cppunittester/protectorfactory.hxx index a0246970311f..6617dbb47385 100644 --- a/include/cppunittester/protectorfactory.hxx +++ b/include/cppunittester/protectorfactory.hxx @@ -27,7 +27,7 @@ namespace cppunittester { // The type of CppUnit::Protector factory functions that can be plugged into // cppunittester: - extern "C" typedef CppUnit::Protector * SAL_CALL ProtectorFactory(); + extern "C" typedef CppUnit::Protector * ProtectorFactory(); } #ifdef DISABLE_DYNLOADING diff --git a/include/editeng/unofield.hxx b/include/editeng/unofield.hxx index 8e81da850f99..e9cc8865c6b7 100644 --- a/include/editeng/unofield.hxx +++ b/include/editeng/unofield.hxx @@ -40,7 +40,7 @@ class SvxFieldData; /// @throws css::uno::Exception /// @throws css::uno::RuntimeException -css::uno::Reference< css::uno::XInterface > EDITENG_DLLPUBLIC SAL_CALL SvxUnoTextCreateTextField( +css::uno::Reference< css::uno::XInterface > EDITENG_DLLPUBLIC SvxUnoTextCreateTextField( const OUString& ServiceSpecifier ); class EDITENG_DLLPUBLIC SvxUnoTextField final : public SvxMutexHelper, diff --git a/include/filter/msfilter/msvbahelper.hxx b/include/filter/msfilter/msvbahelper.hxx index b5b3079dfcdf..a22f97aadd52 100644 --- a/include/filter/msfilter/msvbahelper.hxx +++ b/include/filter/msfilter/msvbahelper.hxx @@ -110,13 +110,13 @@ private: OUString maProjectName; }; -OUString SAL_CALL VBAMacroResolver_getImplementationName(); +OUString VBAMacroResolver_getImplementationName(); -css::uno::Sequence<OUString> SAL_CALL +css::uno::Sequence<OUString> VBAMacroResolver_getSupportedServiceNames(); /// @throws css::uno::Exception -css::uno::Reference<css::uno::XInterface> SAL_CALL +css::uno::Reference<css::uno::XInterface> VBAMacroResolver_createInstance( css::uno::Reference<css::uno::XComponentContext > const & rxContext); diff --git a/include/framework/sfxhelperfunctions.hxx b/include/framework/sfxhelperfunctions.hxx index f5b5226b21fd..d2362166a88e 100644 --- a/include/framework/sfxhelperfunctions.hxx +++ b/include/framework/sfxhelperfunctions.hxx @@ -54,31 +54,31 @@ typedef bool ( *pfunc_isDockingWindowVisible)( namespace framework { -FWE_DLLPUBLIC pfunc_setToolBoxControllerCreator SAL_CALL SetToolBoxControllerCreator( pfunc_setToolBoxControllerCreator pSetToolBoxControllerCreator ); -FWE_DLLPUBLIC svt::ToolboxController* SAL_CALL CreateToolBoxController( +FWE_DLLPUBLIC pfunc_setToolBoxControllerCreator SetToolBoxControllerCreator( pfunc_setToolBoxControllerCreator pSetToolBoxControllerCreator ); +FWE_DLLPUBLIC svt::ToolboxController* CreateToolBoxController( const css::uno::Reference< css::frame::XFrame >& rFrame, ToolBox* pToolbox, unsigned short nID, const OUString& aCommandURL ); -FWE_DLLPUBLIC pfunc_setStatusBarControllerCreator SAL_CALL SetStatusBarControllerCreator( pfunc_setStatusBarControllerCreator pSetStatusBarControllerCreator ); -FWE_DLLPUBLIC svt::StatusbarController* SAL_CALL CreateStatusBarController( +FWE_DLLPUBLIC pfunc_setStatusBarControllerCreator SetStatusBarControllerCreator( pfunc_setStatusBarControllerCreator pSetStatusBarControllerCreator ); +FWE_DLLPUBLIC svt::StatusbarController* CreateStatusBarController( const css::uno::Reference< css::frame::XFrame >& rFrame, StatusBar* pStatusBar, unsigned short nID, const OUString& aCommandURL ); -FWE_DLLPUBLIC pfunc_getRefreshToolbars SAL_CALL SetRefreshToolbars( pfunc_getRefreshToolbars pRefreshToolbarsFunc ); -FWE_DLLPUBLIC void SAL_CALL RefreshToolbars( +FWE_DLLPUBLIC pfunc_getRefreshToolbars SetRefreshToolbars( pfunc_getRefreshToolbars pRefreshToolbarsFunc ); +FWE_DLLPUBLIC void RefreshToolbars( css::uno::Reference< css::frame::XFrame > const & rFrame ); -FWE_DLLPUBLIC pfunc_createDockingWindow SAL_CALL SetDockingWindowCreator( pfunc_createDockingWindow pCreateDockingWindow ); -FWE_DLLPUBLIC void SAL_CALL CreateDockingWindow( +FWE_DLLPUBLIC pfunc_createDockingWindow SetDockingWindowCreator( pfunc_createDockingWindow pCreateDockingWindow ); +FWE_DLLPUBLIC void CreateDockingWindow( const css::uno::Reference< css::frame::XFrame >& rFrame, const OUString& rResourceURL ); -FWE_DLLPUBLIC pfunc_isDockingWindowVisible SAL_CALL SetIsDockingWindowVisible( pfunc_isDockingWindowVisible pIsDockingWindowVisible ); -FWE_DLLPUBLIC bool SAL_CALL IsDockingWindowVisible( +FWE_DLLPUBLIC pfunc_isDockingWindowVisible SetIsDockingWindowVisible( pfunc_isDockingWindowVisible pIsDockingWindowVisible ); +FWE_DLLPUBLIC bool IsDockingWindowVisible( const css::uno::Reference< css::frame::XFrame >& rFrame, const OUString& rResourceURL ); } diff --git a/include/linguistic/misc.hxx b/include/linguistic/misc.hxx index 8083dbab23e4..c2d4849e42d3 100644 --- a/include/linguistic/misc.hxx +++ b/include/linguistic/misc.hxx @@ -137,7 +137,7 @@ css::uno::Reference< css::linguistic2::XHyphenatedWord > LNG_DLLPUBLIC bool IsUpper( const OUString &rText, sal_Int32 nPos, sal_Int32 nLen, LanguageType nLanguage ); inline bool IsUpper( const OUString &rText, LanguageType nLanguage ) { return IsUpper( rText, 0, rText.getLength(), nLanguage ); } -LNG_DLLPUBLIC CapType SAL_CALL capitalType(const OUString&, CharClass const *); +LNG_DLLPUBLIC CapType capitalType(const OUString&, CharClass const *); OUString ToLower( const OUString &rText, LanguageType nLanguage ); LNG_DLLPUBLIC bool HasDigits( const OUString &rText ); diff --git a/include/registry/typereg_reader.hxx b/include/registry/typereg_reader.hxx index d8639ed28121..3d5a2cfd830d 100644 --- a/include/registry/typereg_reader.hxx +++ b/include/registry/typereg_reader.hxx @@ -56,7 +56,7 @@ @since UDK 3.2.0 */ -REG_DLLPUBLIC bool SAL_CALL typereg_reader_create( +REG_DLLPUBLIC bool typereg_reader_create( void const * buffer, sal_uInt32 length, bool copy, typereg_Version maxVersion, void ** result); @@ -67,7 +67,7 @@ REG_DLLPUBLIC bool SAL_CALL typereg_reader_create( @since UDK 3.2.0 */ -REG_DLLPUBLIC void SAL_CALL typereg_reader_acquire(void * handle); +REG_DLLPUBLIC void typereg_reader_acquire(void * handle); /** Decrements the reference count of a type reader. @@ -78,7 +78,7 @@ REG_DLLPUBLIC void SAL_CALL typereg_reader_acquire(void * handle); @since UDK 3.2.0 */ -REG_DLLPUBLIC void SAL_CALL typereg_reader_release(void * handle); +REG_DLLPUBLIC void typereg_reader_release(void * handle); /** Returns the binary blob version of a type reader. @@ -91,7 +91,7 @@ REG_DLLPUBLIC void SAL_CALL typereg_reader_release(void * handle); @since UDK 3.2.0 */ -REG_DLLPUBLIC typereg_Version SAL_CALL typereg_reader_getVersion(void const * handle); +REG_DLLPUBLIC typereg_Version typereg_reader_getVersion(void const * handle); /** Returns the documentation of a type reader. @@ -104,7 +104,7 @@ REG_DLLPUBLIC typereg_Version SAL_CALL typereg_reader_getVersion(void const * ha @since UDK 3.2.0 */ -REG_DLLPUBLIC void SAL_CALL typereg_reader_getDocumentation( +REG_DLLPUBLIC void typereg_reader_getDocumentation( void * handle, rtl_uString ** result); /** @@ -119,7 +119,7 @@ REG_DLLPUBLIC void SAL_CALL typereg_reader_getDocumentation( @since UDK 3.2.0 @deprecated */ -REG_DLLPUBLIC void SAL_CALL typereg_reader_getFileName(void * handle, rtl_uString ** result); +REG_DLLPUBLIC void typereg_reader_getFileName(void * handle, rtl_uString ** result); /** Returns the type class of a type reader. @@ -136,7 +136,7 @@ REG_DLLPUBLIC void SAL_CALL typereg_reader_getFileName(void * handle, rtl_uStrin @since UDK 3.2.0 */ -REG_DLLPUBLIC RTTypeClass SAL_CALL typereg_reader_getTypeClass(void * handle); +REG_DLLPUBLIC RTTypeClass typereg_reader_getTypeClass(void * handle); /** Returns whether a type reader is published. @@ -148,7 +148,7 @@ REG_DLLPUBLIC RTTypeClass SAL_CALL typereg_reader_getTypeClass(void * handle); @since UDK 3.2.0 */ -REG_DLLPUBLIC bool SAL_CALL typereg_reader_isPublished(void * handle); +REG_DLLPUBLIC bool typereg_reader_isPublished(void * handle); /** Returns the type name of a type reader. @@ -161,7 +161,7 @@ REG_DLLPUBLIC bool SAL_CALL typereg_reader_isPublished(void * handle); @since UDK 3.2.0 */ -REG_DLLPUBLIC void SAL_CALL typereg_reader_getTypeName(void * handle, rtl_uString ** result); +REG_DLLPUBLIC void typereg_reader_getTypeName(void * handle, rtl_uString ** result); /** Returns the number of super types of a type reader. @@ -173,7 +173,7 @@ REG_DLLPUBLIC void SAL_CALL typereg_reader_getTypeName(void * handle, rtl_uStrin @since UDK 3.2.0 */ -REG_DLLPUBLIC sal_uInt16 SAL_CALL typereg_reader_getSuperTypeCount(void * handle); +REG_DLLPUBLIC sal_uInt16 typereg_reader_getSuperTypeCount(void * handle); /** Returns the type name of a super type of a type reader. @@ -189,7 +189,7 @@ REG_DLLPUBLIC sal_uInt16 SAL_CALL typereg_reader_getSuperTypeCount(void * handle @since UDK 3.2.0 */ -REG_DLLPUBLIC void SAL_CALL typereg_reader_getSuperTypeName( +REG_DLLPUBLIC void typereg_reader_getSuperTypeName( void * handle, rtl_uString ** result, sal_uInt16 index); /** @@ -202,7 +202,7 @@ REG_DLLPUBLIC void SAL_CALL typereg_reader_getSuperTypeName( @since UDK 3.2.0 */ -REG_DLLPUBLIC sal_uInt16 SAL_CALL typereg_reader_getFieldCount(void * handle); +REG_DLLPUBLIC sal_uInt16 typereg_reader_getFieldCount(void * handle); /** Returns the documentation of a field of a type reader. @@ -217,7 +217,7 @@ REG_DLLPUBLIC sal_uInt16 SAL_CALL typereg_reader_getFieldCount(void * handle); @since UDK 3.2.0 */ -REG_DLLPUBLIC void SAL_CALL typereg_reader_getFieldDocumentation( +REG_DLLPUBLIC void typereg_reader_getFieldDocumentation( void * handle, rtl_uString ** result, sal_uInt16 index); /** @@ -234,7 +234,7 @@ REG_DLLPUBLIC void SAL_CALL typereg_reader_getFieldDocumentation( @since UDK 3.2.0 @deprecated */ -REG_DLLPUBLIC void SAL_CALL typereg_reader_getFieldFileName( +REG_DLLPUBLIC void typereg_reader_getFieldFileName( void * handle, rtl_uString ** result, sal_uInt16 index); /** @@ -248,7 +248,7 @@ REG_DLLPUBLIC void SAL_CALL typereg_reader_getFieldFileName( @since UDK 3.2.0 */ -REG_DLLPUBLIC RTFieldAccess SAL_CALL typereg_reader_getFieldFlags( +REG_DLLPUBLIC RTFieldAccess typereg_reader_getFieldFlags( void * handle, sal_uInt16 index); /** @@ -264,7 +264,7 @@ REG_DLLPUBLIC RTFieldAccess SAL_CALL typereg_reader_getFieldFlags( @since UDK 3.2.0 */ -REG_DLLPUBLIC void SAL_CALL typereg_reader_getFieldName( +REG_DLLPUBLIC void typereg_reader_getFieldName( void * handle, rtl_uString ** result, sal_uInt16 index); /** @@ -280,7 +280,7 @@ REG_DLLPUBLIC void SAL_CALL typereg_reader_getFieldName( @since UDK 3.2.0 */ -REG_DLLPUBLIC void SAL_CALL typereg_reader_getFieldTypeName( +REG_DLLPUBLIC void typereg_reader_getFieldTypeName( void * handle, rtl_uString ** result, sal_uInt16 index); /** @@ -301,7 +301,7 @@ REG_DLLPUBLIC void SAL_CALL typereg_reader_getFieldTypeName( @since UDK 3.2.0 */ -REG_DLLPUBLIC bool SAL_CALL typereg_reader_getFieldValue( +REG_DLLPUBLIC bool typereg_reader_getFieldValue( void * handle, sal_uInt16 index, RTValueType * type, union RTConstValueUnion * value); @@ -315,7 +315,7 @@ REG_DLLPUBLIC bool SAL_CALL typereg_reader_getFieldValue( @since UDK 3.2.0 */ -REG_DLLPUBLIC sal_uInt16 SAL_CALL typereg_reader_getMethodCount(void * handle); +REG_DLLPUBLIC sal_uInt16 typereg_reader_getMethodCount(void * handle); /** Returns the documentation of a method of a type reader. @@ -330,7 +330,7 @@ REG_DLLPUBLIC sal_uInt16 SAL_CALL typereg_reader_getMethodCount(void * handle); @since UDK 3.2.0 */ -REG_DLLPUBLIC void SAL_CALL typereg_reader_getMethodDocumentation( +REG_DLLPUBLIC void typereg_reader_getMethodDocumentation( void * handle, rtl_uString ** result, sal_uInt16 index); /** @@ -344,7 +344,7 @@ REG_DLLPUBLIC void SAL_CALL typereg_reader_getMethodDocumentation( @since UDK 3.2.0 */ -REG_DLLPUBLIC RTMethodMode SAL_CALL typereg_reader_getMethodFlags( +REG_DLLPUBLIC RTMethodMode typereg_reader_getMethodFlags( void * handle, sal_uInt16 index); /** @@ -360,7 +360,7 @@ REG_DLLPUBLIC RTMethodMode SAL_CALL typereg_reader_getMethodFlags( @since UDK 3.2.0 */ -REG_DLLPUBLIC void SAL_CALL typereg_reader_getMethodName( +REG_DLLPUBLIC void typereg_reader_getMethodName( void * handle, rtl_uString ** result, sal_uInt16 index); /** @@ -376,7 +376,7 @@ REG_DLLPUBLIC void SAL_CALL typereg_reader_getMethodName( @since UDK 3.2.0 */ -REG_DLLPUBLIC void SAL_CALL typereg_reader_getMethodReturnTypeName( +REG_DLLPUBLIC void typereg_reader_getMethodReturnTypeName( void * handle, rtl_uString ** result, sal_uInt16 index); /** @@ -390,7 +390,7 @@ REG_DLLPUBLIC void SAL_CALL typereg_reader_getMethodReturnTypeName( @since UDK 3.2.0 */ -REG_DLLPUBLIC sal_uInt16 SAL_CALL typereg_reader_getMethodParameterCount( +REG_DLLPUBLIC sal_uInt16 typereg_reader_getMethodParameterCount( void * handle, sal_uInt16 index); /** @@ -409,7 +409,7 @@ REG_DLLPUBLIC sal_uInt16 SAL_CALL typereg_reader_getMethodParameterCount( @since UDK 3.2.0 */ -REG_DLLPUBLIC RTParamMode SAL_CALL typereg_reader_getMethodParameterFlags( +REG_DLLPUBLIC RTParamMode typereg_reader_getMethodParameterFlags( void * handle, sal_uInt16 methodIndex, sal_uInt16 parameterIndex); /** @@ -429,7 +429,7 @@ REG_DLLPUBLIC RTParamMode SAL_CALL typereg_reader_getMethodParameterFlags( @since UDK 3.2.0 */ -REG_DLLPUBLIC void SAL_CALL typereg_reader_getMethodParameterName( +REG_DLLPUBLIC void typereg_reader_getMethodParameterName( void * handle, rtl_uString ** result, sal_uInt16 methodIndex, sal_uInt16 parameterIndex); @@ -450,7 +450,7 @@ REG_DLLPUBLIC void SAL_CALL typereg_reader_getMethodParameterName( @since UDK 3.2.0 */ -REG_DLLPUBLIC void SAL_CALL typereg_reader_getMethodParameterTypeName( +REG_DLLPUBLIC void typereg_reader_getMethodParameterTypeName( void * handle, rtl_uString ** result, sal_uInt16 methodIndex, sal_uInt16 parameterIndex); @@ -465,7 +465,7 @@ REG_DLLPUBLIC void SAL_CALL typereg_reader_getMethodParameterTypeName( @since UDK 3.2.0 */ -REG_DLLPUBLIC sal_uInt16 SAL_CALL typereg_reader_getMethodExceptionCount( +REG_DLLPUBLIC sal_uInt16 typereg_reader_getMethodExceptionCount( void * handle, sal_uInt16 index); /** @@ -485,7 +485,7 @@ REG_DLLPUBLIC sal_uInt16 SAL_CALL typereg_reader_getMethodExceptionCount( @since UDK 3.2.0 */ -REG_DLLPUBLIC void SAL_CALL typereg_reader_getMethodExceptionTypeName( +REG_DLLPUBLIC void typereg_reader_getMethodExceptionTypeName( void * handle, rtl_uString ** result, sal_uInt16 methodIndex, sal_uInt16 exceptionIndex); @@ -499,7 +499,7 @@ REG_DLLPUBLIC void SAL_CALL typereg_reader_getMethodExceptionTypeName( @since UDK 3.2.0 */ -REG_DLLPUBLIC sal_uInt16 SAL_CALL typereg_reader_getReferenceCount(void * handle); +REG_DLLPUBLIC sal_uInt16 typereg_reader_getReferenceCount(void * handle); /** Returns the documentation of a reference of a type reader. @@ -515,7 +515,7 @@ REG_DLLPUBLIC sal_uInt16 SAL_CALL typereg_reader_getReferenceCount(void * handle @since UDK 3.2.0 */ -REG_DLLPUBLIC void SAL_CALL typereg_reader_getReferenceDocumentation( +REG_DLLPUBLIC void typereg_reader_getReferenceDocumentation( void * handle, rtl_uString ** result, sal_uInt16 index); /** @@ -530,7 +530,7 @@ REG_DLLPUBLIC void SAL_CALL typereg_reader_getReferenceDocumentation( @since UDK 3.2.0 */ -REG_DLLPUBLIC RTFieldAccess SAL_CALL typereg_reader_getReferenceFlags( +REG_DLLPUBLIC RTFieldAccess typereg_reader_getReferenceFlags( void * handle, sal_uInt16 index); /** @@ -545,7 +545,7 @@ REG_DLLPUBLIC RTFieldAccess SAL_CALL typereg_reader_getReferenceFlags( @since UDK 3.2.0 */ -REG_DLLPUBLIC RTReferenceType SAL_CALL typereg_reader_getReferenceSort( +REG_DLLPUBLIC RTReferenceType typereg_reader_getReferenceSort( void * handle, sal_uInt16 index); /** @@ -562,7 +562,7 @@ REG_DLLPUBLIC RTReferenceType SAL_CALL typereg_reader_getReferenceSort( @since UDK 3.2.0 */ -REG_DLLPUBLIC void SAL_CALL typereg_reader_getReferenceTypeName( +REG_DLLPUBLIC void typereg_reader_getReferenceTypeName( void * handle, rtl_uString ** result, sal_uInt16 index); #endif diff --git a/include/registry/writer.h b/include/registry/writer.h index 741c9451932f..8f07437c5a7a 100644 --- a/include/registry/writer.h +++ b/include/registry/writer.h @@ -62,7 +62,7 @@ extern "C" { @since UDK 3.2.0 */ -REG_DLLPUBLIC void * SAL_CALL typereg_writer_create( +REG_DLLPUBLIC void * 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, @@ -77,7 +77,7 @@ REG_DLLPUBLIC void * SAL_CALL typereg_writer_create( @since UDK 3.2.0 */ -REG_DLLPUBLIC void SAL_CALL typereg_writer_destroy(void * handle) SAL_THROW_EXTERN_C(); +REG_DLLPUBLIC void typereg_writer_destroy(void * handle) SAL_THROW_EXTERN_C(); /** Sets the type name of a super type of a type writer. @@ -94,7 +94,7 @@ REG_DLLPUBLIC void SAL_CALL typereg_writer_destroy(void * handle) SAL_THROW_EXTE @since UDK 3.2.0 */ -REG_DLLPUBLIC sal_Bool SAL_CALL typereg_writer_setSuperTypeName( +REG_DLLPUBLIC sal_Bool typereg_writer_setSuperTypeName( void const * handle, sal_uInt16 index, rtl_uString const * typeName) SAL_THROW_EXTERN_C(); @@ -124,7 +124,7 @@ REG_DLLPUBLIC sal_Bool SAL_CALL typereg_writer_setSuperTypeName( @since UDK 3.2.0 */ -REG_DLLPUBLIC sal_Bool SAL_CALL typereg_writer_setFieldData( +REG_DLLPUBLIC sal_Bool 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, @@ -155,7 +155,7 @@ REG_DLLPUBLIC sal_Bool SAL_CALL typereg_writer_setFieldData( @since UDK 3.2.0 */ -REG_DLLPUBLIC sal_Bool SAL_CALL typereg_writer_setMethodData( +REG_DLLPUBLIC sal_Bool 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, @@ -184,7 +184,7 @@ REG_DLLPUBLIC sal_Bool SAL_CALL typereg_writer_setMethodData( @since UDK 3.2.0 */ -REG_DLLPUBLIC sal_Bool SAL_CALL typereg_writer_setMethodParameterData( +REG_DLLPUBLIC sal_Bool typereg_writer_setMethodParameterData( void const * handle, sal_uInt16 methodIndex, sal_uInt16 parameterIndex, RTParamMode flags, rtl_uString const * name, rtl_uString const * typeName) SAL_THROW_EXTERN_C(); @@ -207,7 +207,7 @@ REG_DLLPUBLIC sal_Bool SAL_CALL typereg_writer_setMethodParameterData( @since UDK 3.2.0 */ -REG_DLLPUBLIC sal_Bool SAL_CALL typereg_writer_setMethodExceptionTypeName( +REG_DLLPUBLIC sal_Bool typereg_writer_setMethodExceptionTypeName( void const * handle, sal_uInt16 methodIndex, sal_uInt16 exceptionIndex, rtl_uString const * typeName) SAL_THROW_EXTERN_C(); @@ -233,7 +233,7 @@ REG_DLLPUBLIC sal_Bool SAL_CALL typereg_writer_setMethodExceptionTypeName( @since UDK 3.2.0 */ -REG_DLLPUBLIC sal_Bool SAL_CALL typereg_writer_setReferenceData( +REG_DLLPUBLIC sal_Bool typereg_writer_setReferenceData( void * handle, sal_uInt16 index, rtl_uString const * documentation, RTReferenceType sort, RTFieldAccess flags, rtl_uString const * typeName) SAL_THROW_EXTERN_C(); @@ -250,7 +250,7 @@ REG_DLLPUBLIC sal_Bool SAL_CALL typereg_writer_setReferenceData( the given type writer; if an out-of-memory condition occurs, null is returned and <code>size</code> is not modified */ -REG_DLLPUBLIC void const * SAL_CALL typereg_writer_getBlob(void * handle, sal_uInt32 * size) +REG_DLLPUBLIC void const * typereg_writer_getBlob(void * handle, sal_uInt32 * size) SAL_THROW_EXTERN_C(); #ifdef __cplusplus diff --git a/include/sfx2/dockwin.hxx b/include/sfx2/dockwin.hxx index 7b078a96af35..6d6d681a26c2 100644 --- a/include/sfx2/dockwin.hxx +++ b/include/sfx2/dockwin.hxx @@ -35,8 +35,8 @@ class SfxSplitWindow; class SfxDockingWindow_Impl; enum class SplitWindowItemFlags; -void SFX2_DLLPUBLIC SAL_CALL SfxDockingWindowFactory( const css::uno::Reference< css::frame::XFrame >& rFrame, const OUString& rDockingWindowName ); -bool SFX2_DLLPUBLIC SAL_CALL IsDockingWindowVisible( const css::uno::Reference< css::frame::XFrame >& rFrame, const OUString& rDockingWindowName ); +void SFX2_DLLPUBLIC SfxDockingWindowFactory( const css::uno::Reference< css::frame::XFrame >& rFrame, const OUString& rDockingWindowName ); +bool SFX2_DLLPUBLIC IsDockingWindowVisible( const css::uno::Reference< css::frame::XFrame >& rFrame, const OUString& rDockingWindowName ); class SFX2_DLLPUBLIC SfxDockingWindow : public DockingWindow { diff --git a/include/sfx2/sfxmodelfactory.hxx b/include/sfx2/sfxmodelfactory.hxx index b4013a965d37..f7b000b548e4 100644 --- a/include/sfx2/sfxmodelfactory.hxx +++ b/include/sfx2/sfxmodelfactory.hxx @@ -41,7 +41,7 @@ namespace o3tl namespace sfx2 { - typedef css::uno::Reference< css::uno::XInterface > ( SAL_CALL * SfxModelFactoryFunc ) ( + typedef css::uno::Reference< css::uno::XInterface > ( * SfxModelFactoryFunc ) ( const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory, SfxModelFlags _nCreationFlags ); diff --git a/include/sfx2/stbitem.hxx b/include/sfx2/stbitem.hxx index e8c0f2a354b3..b72688486e94 100644 --- a/include/sfx2/stbitem.hxx +++ b/include/sfx2/stbitem.hxx @@ -30,7 +30,7 @@ class SfxModule; class SfxStatusBarControl; class SfxBindings; -svt::StatusbarController* SAL_CALL SfxStatusBarControllerFactory( +svt::StatusbarController* SfxStatusBarControllerFactory( const css::uno::Reference< css::frame::XFrame >& rFrame, StatusBar* pStatusBar, unsigned short nID, diff --git a/include/sfx2/tbxctrl.hxx b/include/sfx2/tbxctrl.hxx index 9bbd0a09b58e..c78673c0cfaa 100644 --- a/include/sfx2/tbxctrl.hxx +++ b/include/sfx2/tbxctrl.hxx @@ -41,7 +41,7 @@ class SfxToolBoxControl; class SfxModule; -svt::ToolboxController* SAL_CALL SfxToolBoxControllerFactory( const css::uno::Reference< css::frame::XFrame >& rFrame, ToolBox* pToolbox, unsigned short nID, const OUString& aCommandURL ); +svt::ToolboxController* SfxToolBoxControllerFactory( const css::uno::Reference< css::frame::XFrame >& rFrame, ToolBox* pToolbox, unsigned short nID, const OUString& aCommandURL ); typedef SfxToolBoxControl* (*SfxToolBoxControlCtor)( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rBox ); diff --git a/include/store/store.h b/include/store/store.h index 3f6177a1af47..7da4901a09dd 100644 --- a/include/store/store.h +++ b/include/store/store.h @@ -37,7 +37,7 @@ typedef void* storeHandle; @param Handle [in] the Handle. @return store_E_None upon success */ -STORE_DLLPUBLIC storeError SAL_CALL store_acquireHandle ( +STORE_DLLPUBLIC storeError store_acquireHandle ( storeHandle Handle ) SAL_THROW_EXTERN_C(); @@ -46,7 +46,7 @@ STORE_DLLPUBLIC storeError SAL_CALL store_acquireHandle ( @return store_E_None upon success, store_E_InvalidHandle otherwise. */ -STORE_DLLPUBLIC storeError SAL_CALL store_releaseHandle ( +STORE_DLLPUBLIC storeError store_releaseHandle ( storeHandle Handle ) SAL_THROW_EXTERN_C(); @@ -60,7 +60,7 @@ typedef void* storeFileHandle; @param phFile [out] the File Handle. @return store_E_None upon success */ -STORE_DLLPUBLIC storeError SAL_CALL store_createMemoryFile ( +STORE_DLLPUBLIC storeError store_createMemoryFile ( sal_uInt16 nPageSize, storeFileHandle *phFile ) SAL_THROW_EXTERN_C(); @@ -77,7 +77,7 @@ STORE_DLLPUBLIC storeError SAL_CALL store_createMemoryFile ( @param phFile [out] the File Handle. @return store_E_None upon success */ -STORE_DLLPUBLIC storeError SAL_CALL store_openFile ( +STORE_DLLPUBLIC storeError store_openFile ( rtl_uString *pFilename, storeAccessMode eAccessMode, sal_uInt16 nPageSize, @@ -89,7 +89,7 @@ STORE_DLLPUBLIC storeError SAL_CALL store_openFile ( @return store_E_None upon success, store_E_InvalidHandle otherwise. */ -STORE_DLLPUBLIC storeError SAL_CALL store_closeFile ( +STORE_DLLPUBLIC storeError store_closeFile ( storeFileHandle hFile ) SAL_THROW_EXTERN_C(); @@ -97,7 +97,7 @@ STORE_DLLPUBLIC storeError SAL_CALL store_closeFile ( @param hFile [in] the File Handle. @return store_E_None upon success */ -STORE_DLLPUBLIC storeError SAL_CALL store_flushFile ( +STORE_DLLPUBLIC storeError store_flushFile ( storeFileHandle hFile ) SAL_THROW_EXTERN_C(); @@ -115,7 +115,7 @@ typedef void* storeDirectoryHandle; @param phDirectory [out] the Directory Handle. @return store_E_None upon success */ -STORE_DLLPUBLIC storeError SAL_CALL store_openDirectory ( +STORE_DLLPUBLIC storeError store_openDirectory ( storeFileHandle hFile, rtl_uString const *pPath, rtl_uString const *pName, @@ -129,7 +129,7 @@ STORE_DLLPUBLIC storeError SAL_CALL store_openDirectory ( @return store_E_None upon success, store_E_NoMoreFile upon end of iteration. */ -STORE_DLLPUBLIC storeError SAL_CALL store_findFirst ( +STORE_DLLPUBLIC storeError store_findFirst ( storeDirectoryHandle hDirectory, storeFindData *pFindData ) SAL_THROW_EXTERN_C(); @@ -140,7 +140,7 @@ STORE_DLLPUBLIC storeError SAL_CALL store_findFirst ( @return store_E_None upon success, store_E_NoMoreFile upon end of iteration. */ -STORE_DLLPUBLIC storeError SAL_CALL store_findNext ( +STORE_DLLPUBLIC storeError store_findNext ( storeDirectoryHandle hDirectory, storeFindData *pFindData ) SAL_THROW_EXTERN_C(); @@ -159,7 +159,7 @@ typedef void* storeStreamHandle; @param phStrm [out] the Stream Handle. @return store_E_None upon success */ -STORE_DLLPUBLIC storeError SAL_CALL store_openStream ( +STORE_DLLPUBLIC storeError store_openStream ( storeFileHandle hFile, rtl_uString const *pPath, rtl_uString const *pName, @@ -175,7 +175,7 @@ STORE_DLLPUBLIC storeError SAL_CALL store_openStream ( @param pnDone [out] the number of bytes actually read. @return store_E_None upon success */ -STORE_DLLPUBLIC storeError SAL_CALL store_readStream ( +STORE_DLLPUBLIC storeError store_readStream ( storeStreamHandle hStrm, sal_uInt32 nOffset, void *pBuffer, @@ -191,7 +191,7 @@ STORE_DLLPUBLIC storeError SAL_CALL store_readStream ( @param pnDone [out] the number of bytes actually written. @return store_E_None upon success */ -STORE_DLLPUBLIC storeError SAL_CALL store_writeStream ( +STORE_DLLPUBLIC storeError store_writeStream ( storeStreamHandle hStrm, sal_uInt32 nOffset, const void *pBuffer, @@ -205,7 +205,7 @@ STORE_DLLPUBLIC storeError SAL_CALL store_writeStream ( @param pName [in] the entry name @return store_E_None upon success */ -STORE_DLLPUBLIC storeError SAL_CALL store_remove ( +STORE_DLLPUBLIC storeError store_remove ( storeFileHandle hFile, rtl_uString const *pPath, rtl_uString const *pName diff --git a/include/svtools/accessiblefactory.hxx b/include/svtools/accessiblefactory.hxx index d9f3271d4490..bfd6e9a57cc9 100644 --- a/include/svtools/accessiblefactory.hxx +++ b/include/svtools/accessiblefactory.hxx @@ -64,7 +64,7 @@ namespace svt <em>once</em>. The caller is responsible for holding this reference as long as it needs the factory, and release it afterwards. */ - typedef void* (SAL_CALL * GetSvtAccessibilityComponentFactory)( ); + typedef void* (* GetSvtAccessibilityComponentFactory)( ); //= IAccessibleFactory diff --git a/include/svx/UnoNamespaceMap.hxx b/include/svx/UnoNamespaceMap.hxx index a39c60783e46..47fa2d474473 100644 --- a/include/svx/UnoNamespaceMap.hxx +++ b/include/svx/UnoNamespaceMap.hxx @@ -27,7 +27,7 @@ class SfxItemPool; namespace svx { -SVX_DLLPUBLIC css::uno::Reference< css::uno::XInterface > SAL_CALL NamespaceMap_createInstance( sal_uInt16* pWhichIds, SfxItemPool* pPool ); +SVX_DLLPUBLIC css::uno::Reference< css::uno::XInterface > NamespaceMap_createInstance( sal_uInt16* pWhichIds, SfxItemPool* pPool ); } diff --git a/include/svx/XPropertyTable.hxx b/include/svx/XPropertyTable.hxx index 28daced3e6e9..9e52d29715d6 100644 --- a/include/svx/XPropertyTable.hxx +++ b/include/svx/XPropertyTable.hxx @@ -26,12 +26,12 @@ // FIXME: should have a single factory method with an enumeration here [!] -css::uno::Reference< css::uno::XInterface > SAL_CALL SvxUnoXColorTable_createInstance( XPropertyList* pList ) throw(); -css::uno::Reference< css::uno::XInterface > SAL_CALL SvxUnoXLineEndTable_createInstance( XPropertyList* pList ) throw(); -css::uno::Reference< css::uno::XInterface > SAL_CALL SvxUnoXDashTable_createInstance( XPropertyList* pList ) throw(); -css::uno::Reference< css::uno::XInterface > SAL_CALL SvxUnoXHatchTable_createInstance( XPropertyList* pList ) throw(); -css::uno::Reference< css::uno::XInterface > SAL_CALL SvxUnoXGradientTable_createInstance( XPropertyList* pList ) throw(); -css::uno::Reference< css::uno::XInterface > SAL_CALL SvxUnoXBitmapTable_createInstance( XPropertyList* pList ) throw(); +css::uno::Reference< css::uno::XInterface > SvxUnoXColorTable_createInstance( XPropertyList* pList ) throw(); +css::uno::Reference< css::uno::XInterface > SvxUnoXLineEndTable_createInstance( XPropertyList* pList ) throw(); +css::uno::Reference< css::uno::XInterface > SvxUnoXDashTable_createInstance( XPropertyList* pList ) throw(); +css::uno::Reference< css::uno::XInterface > SvxUnoXHatchTable_createInstance( XPropertyList* pList ) throw(); +css::uno::Reference< css::uno::XInterface > SvxUnoXGradientTable_createInstance( XPropertyList* pList ) throw(); +css::uno::Reference< css::uno::XInterface > SvxUnoXBitmapTable_createInstance( XPropertyList* pList ) throw(); #endif diff --git a/include/svx/unofill.hxx b/include/svx/unofill.hxx index b316e1b984ac..63d854e7b355 100644 --- a/include/svx/unofill.hxx +++ b/include/svx/unofill.hxx @@ -25,12 +25,12 @@ class SdrModel; -SVX_DLLPUBLIC css::uno::Reference< css::uno::XInterface > SAL_CALL SvxUnoGradientTable_createInstance( SdrModel* pModel ); -SVX_DLLPUBLIC css::uno::Reference< css::uno::XInterface > SAL_CALL SvxUnoHatchTable_createInstance( SdrModel* pModel ); -SVX_DLLPUBLIC css::uno::Reference< css::uno::XInterface > SAL_CALL SvxUnoBitmapTable_createInstance( SdrModel* pModel ); -SVX_DLLPUBLIC css::uno::Reference< css::uno::XInterface > SAL_CALL SvxUnoTransGradientTable_createInstance( SdrModel* pModel ); -SVX_DLLPUBLIC css::uno::Reference< css::uno::XInterface > SAL_CALL SvxUnoMarkerTable_createInstance( SdrModel* pModel ); -SVX_DLLPUBLIC css::uno::Reference< css::uno::XInterface > SAL_CALL SvxUnoDashTable_createInstance( SdrModel* pModel ); +SVX_DLLPUBLIC css::uno::Reference< css::uno::XInterface > SvxUnoGradientTable_createInstance( SdrModel* pModel ); +SVX_DLLPUBLIC css::uno::Reference< css::uno::XInterface > SvxUnoHatchTable_createInstance( SdrModel* pModel ); +SVX_DLLPUBLIC css::uno::Reference< css::uno::XInterface > SvxUnoBitmapTable_createInstance( SdrModel* pModel ); +SVX_DLLPUBLIC css::uno::Reference< css::uno::XInterface > SvxUnoTransGradientTable_createInstance( SdrModel* pModel ); +SVX_DLLPUBLIC css::uno::Reference< css::uno::XInterface > SvxUnoMarkerTable_createInstance( SdrModel* pModel ); +SVX_DLLPUBLIC css::uno::Reference< css::uno::XInterface > SvxUnoDashTable_createInstance( SdrModel* pModel ); #endif // INCLUDED_SVX_UNOFILL_HXX diff --git a/include/toolkit/helper/accessiblefactory.hxx b/include/toolkit/helper/accessiblefactory.hxx index 1dfd3d7d7e35..8a5483394478 100644 --- a/include/toolkit/helper/accessiblefactory.hxx +++ b/include/toolkit/helper/accessiblefactory.hxx @@ -53,7 +53,7 @@ namespace toolkit <em>once</em>. The caller is responsible for holding this reference as long as it needs the factory, and release it afterwards. */ - typedef void* (SAL_CALL * GetStandardAccComponentFactory)( ); + typedef void* (* GetStandardAccComponentFactory)( ); //= IAccessibleFactory diff --git a/include/vcl/checksum.hxx b/include/vcl/checksum.hxx index bdc503a409ba..34817613e7e2 100644 --- a/include/vcl/checksum.hxx +++ b/include/vcl/checksum.hxx @@ -60,7 +60,7 @@ extern "C" { @param DatLen [in] data buffer length. @return new CRC64 value. */ -VCL_DLLPUBLIC sal_uInt64 SAL_CALL vcl_crc64 ( +VCL_DLLPUBLIC sal_uInt64 vcl_crc64 ( sal_uInt64 Crc, const void *Data, sal_uInt32 DatLen ) SAL_THROW_EXTERN_C(); diff --git a/include/xmlscript/xml_helper.hxx b/include/xmlscript/xml_helper.hxx index 92ac0ed3b2a4..dad9f599f158 100644 --- a/include/xmlscript/xml_helper.hxx +++ b/include/xmlscript/xml_helper.hxx @@ -105,15 +105,15 @@ private: ##################################################################################################*/ XMLSCRIPT_DLLPUBLIC css::uno::Reference< css::io::XInputStream > -SAL_CALL createInputStream( +createInputStream( std::vector<sal_Int8> const & rInData ); XMLSCRIPT_DLLPUBLIC css::uno::Reference< css::io::XInputStream > -SAL_CALL createInputStream( +createInputStream( const sal_Int8* pData, int len ); XMLSCRIPT_DLLPUBLIC css::uno::Reference< css::io::XOutputStream > -SAL_CALL createOutputStream( +createOutputStream( std::vector<sal_Int8> * pOutData ); } diff --git a/include/xmlscript/xmldlg_imexp.hxx b/include/xmlscript/xmldlg_imexp.hxx index 3436e1b8c562..34286a7f66b6 100644 --- a/include/xmlscript/xmldlg_imexp.hxx +++ b/include/xmlscript/xmldlg_imexp.hxx @@ -32,13 +32,13 @@ namespace xmlscript { -XMLSCRIPT_DLLPUBLIC void SAL_CALL exportDialogModel( +XMLSCRIPT_DLLPUBLIC void exportDialogModel( css::uno::Reference< css::xml::sax::XExtendedDocumentHandler > const & xOut, css::uno::Reference< css::container::XNameContainer > const & xDialogModel, css::uno::Reference< css::frame::XModel > const & xDocument ); XMLSCRIPT_DLLPUBLIC css::uno::Reference< css::xml::sax::XDocumentHandler > -SAL_CALL importDialogModel( +importDialogModel( css::uno::Reference< css::container::XNameContainer > const & xDialogModel, css::uno::Reference< css::uno::XComponentContext > const & xContext, css::uno::Reference< css::frame::XModel > const & xDocument ); @@ -46,12 +46,12 @@ SAL_CALL importDialogModel( // additional functions for convenience XMLSCRIPT_DLLPUBLIC css::uno::Reference< css::io::XInputStreamProvider > -SAL_CALL exportDialogModel( +exportDialogModel( css::uno::Reference< css::container::XNameContainer > const & xDialogModel, css::uno::Reference< css::uno::XComponentContext > const & xContext, css::uno::Reference< css::frame::XModel > const & xDocument ); -XMLSCRIPT_DLLPUBLIC void SAL_CALL importDialogModel( +XMLSCRIPT_DLLPUBLIC void importDialogModel( css::uno::Reference< css::io::XInputStream > const & xInput, css::uno::Reference< css::container::XNameContainer > const & xDialogModel, css::uno::Reference< css::uno::XComponentContext > const & xContext, diff --git a/include/xmlscript/xmllib_imexp.hxx b/include/xmlscript/xmllib_imexp.hxx index c54324219ecf..6bd49a47b23c 100644 --- a/include/xmlscript/xmllib_imexp.hxx +++ b/include/xmlscript/xmllib_imexp.hxx @@ -59,23 +59,23 @@ struct XMLSCRIPT_DLLPUBLIC LibDescriptorArray }; XMLSCRIPT_DLLPUBLIC void -SAL_CALL exportLibraryContainer( +exportLibraryContainer( css::uno::Reference< css::xml::sax::XWriter > const & xOut, const LibDescriptorArray* pLibArray ); XMLSCRIPT_DLLPUBLIC css::uno::Reference< css::xml::sax::XDocumentHandler > -SAL_CALL importLibraryContainer( LibDescriptorArray* pLibArray ); +importLibraryContainer( LibDescriptorArray* pLibArray ); XMLSCRIPT_DLLPUBLIC void -SAL_CALL exportLibrary( +exportLibrary( css::uno::Reference< css::xml::sax::XWriter > const & xOut, const LibDescriptor& rLib ); XMLSCRIPT_DLLPUBLIC css::uno::Reference< css::xml::sax::XDocumentHandler > -SAL_CALL importLibrary( LibDescriptor& rLib ); +importLibrary( LibDescriptor& rLib ); } diff --git a/include/xmlscript/xmlmod_imexp.hxx b/include/xmlscript/xmlmod_imexp.hxx index 41dd8a5ccaee..dd974cc712f6 100644 --- a/include/xmlscript/xmlmod_imexp.hxx +++ b/include/xmlscript/xmlmod_imexp.hxx @@ -40,12 +40,12 @@ struct XMLSCRIPT_DLLPUBLIC ModuleDescriptor }; XMLSCRIPT_DLLPUBLIC void -SAL_CALL exportScriptModule( +exportScriptModule( css::uno::Reference< css::xml::sax::XWriter > const & xOut, const ModuleDescriptor& rMod ); XMLSCRIPT_DLLPUBLIC css::uno::Reference< css::xml::sax::XDocumentHandler > -SAL_CALL importScriptModule( ModuleDescriptor& rMod ); +importScriptModule( ModuleDescriptor& rMod ); } |