diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-12-08 15:58:41 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-12-11 12:13:46 +0100 |
| commit | 3af500580b1c82eabd60335c9ebc458a3f68850c (patch) | |
| tree | e0ad105be694cfb46221d16e9ce987879794fa04 | |
| parent | tdf#114333: consider trleft for 1st cell width on import; don't... (diff) | |
| download | core-3af500580b1c82eabd60335c9ebc458a3f68850c.tar.gz core-3af500580b1c82eabd60335c9ebc458a3f68850c.zip | |
loplugin:salcall fix functions
since cdecl is the default calling convention on Windows for
such functions, the annotation is redundant.
Change-Id: I1a85fa27e5ac65ce0e04a19bde74c90800ffaa2d
Reviewed-on: https://gerrit.libreoffice.org/46164
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
940 files changed, 2107 insertions, 2126 deletions
diff --git a/UnoControls/source/base/registercontrols.cxx b/UnoControls/source/base/registercontrols.cxx index 4b83ed611d12..46145f1c0a48 100644 --- a/UnoControls/source/base/registercontrols.cxx +++ b/UnoControls/source/base/registercontrols.cxx @@ -32,7 +32,7 @@ namespace { /// @throws css::uno::Exception -css::uno::Reference<css::uno::XInterface> SAL_CALL FrameControl_createInstance( +css::uno::Reference<css::uno::XInterface> FrameControl_createInstance( css::uno::Reference<css::lang::XMultiServiceFactory> const & rServiceManager) { @@ -42,7 +42,7 @@ css::uno::Reference<css::uno::XInterface> SAL_CALL FrameControl_createInstance( } /// @throws css::uno::Exception -css::uno::Reference<css::uno::XInterface> SAL_CALL ProgressBar_createInstance( +css::uno::Reference<css::uno::XInterface> ProgressBar_createInstance( css::uno::Reference<css::lang::XMultiServiceFactory> const & rServiceManager) { @@ -52,7 +52,7 @@ css::uno::Reference<css::uno::XInterface> SAL_CALL ProgressBar_createInstance( } /// @throws css::uno::Exception -css::uno::Reference<css::uno::XInterface> SAL_CALL +css::uno::Reference<css::uno::XInterface> ProgressMonitor_createInstance( css::uno::Reference<css::lang::XMultiServiceFactory> const & rServiceManager) @@ -63,7 +63,7 @@ ProgressMonitor_createInstance( } /// @throws css::uno::Exception -css::uno::Reference<css::uno::XInterface> SAL_CALL +css::uno::Reference<css::uno::XInterface> StatusIndicator_createInstance( css::uno::Reference<css::lang::XMultiServiceFactory> const & rServiceManager) @@ -75,7 +75,7 @@ StatusIndicator_createInstance( } -extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL ctl_component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * ctl_component_getFactory( char const * pImplName, void * pServiceManager, SAL_UNUSED_PARAMETER void *) { css::uno::Reference<css::lang::XMultiServiceFactory > smgr( diff --git a/accessibility/source/helper/acc_factory.cxx b/accessibility/source/helper/acc_factory.cxx index 1f452c7d2d2d..cbc9669b18c8 100644 --- a/accessibility/source/helper/acc_factory.cxx +++ b/accessibility/source/helper/acc_factory.cxx @@ -451,7 +451,7 @@ Reference< XAccessible > AccessibleFactory::createEditBrowseBoxTableCellAccess( */ extern "C" { - SAL_DLLPUBLIC_EXPORT void* SAL_CALL getStandardAccessibleFactory() + SAL_DLLPUBLIC_EXPORT void* getStandardAccessibleFactory() { ::toolkit::IAccessibleFactory* pFactory = new AccessibleFactory; pFactory->acquire(); @@ -467,7 +467,7 @@ extern "C" */ extern "C" { - SAL_DLLPUBLIC_EXPORT void* SAL_CALL getSvtAccessibilityComponentFactory() + SAL_DLLPUBLIC_EXPORT void* getSvtAccessibilityComponentFactory() { ::svt::IAccessibleFactory* pFactory = new AccessibleFactory; pFactory->acquire(); diff --git a/animations/source/animcore/animcore.cxx b/animations/source/animcore/animcore.cxx index f4af2aada347..e4ec6379d7e0 100644 --- a/animations/source/animcore/animcore.cxx +++ b/animations/source/animcore/animcore.cxx @@ -1989,77 +1989,77 @@ void AnimationNode::fireChangeListener() } // namespace animcore -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_animations_ParallelTimeContainer_get_implementation(css::uno::XComponentContext*, css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new animcore::AnimationNode(PAR)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_animations_SequenceTimeContainer_get_implementation(css::uno::XComponentContext*, css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new animcore::AnimationNode(SEQ)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_animations_IterateContainer_get_implementation(css::uno::XComponentContext*, css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new animcore::AnimationNode(ITERATE)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_animations_Animate_get_implementation(css::uno::XComponentContext*, css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new animcore::AnimationNode(ANIMATE)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_animations_AnimateSet_get_implementation(css::uno::XComponentContext*, css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new animcore::AnimationNode(SET)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_animations_AnimateColor_get_implementation(css::uno::XComponentContext*, css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new animcore::AnimationNode(ANIMATECOLOR)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_animations_AnimateMotion_get_implementation(css::uno::XComponentContext*, css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new animcore::AnimationNode(ANIMATEMOTION)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_animations_AnimateTransform_get_implementation(css::uno::XComponentContext*, css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new animcore::AnimationNode(ANIMATETRANSFORM)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_animations_TransitionFilter_get_implementation(css::uno::XComponentContext*, css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new animcore::AnimationNode(TRANSITIONFILTER)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_animations_Audio_get_implementation(css::uno::XComponentContext*, css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new animcore::AnimationNode(AUDIO)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_animations_Command_get_implementation(css::uno::XComponentContext*, css::uno::Sequence<css::uno::Any> const &) { diff --git a/avmedia/source/framework/soundhandler.cxx b/avmedia/source/framework/soundhandler.cxx index 3f2ffcd9771f..0fb8a2b7d5a0 100644 --- a/avmedia/source/framework/soundhandler.cxx +++ b/avmedia/source/framework/soundhandler.cxx @@ -336,7 +336,7 @@ IMPL_LINK_NOARG(SoundHandler, implts_PlayerNotify, Timer *, void) } // namespace framework -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_comp_framework_SoundHandler_get_implementation(css::uno::XComponentContext*, css::uno::Sequence<css::uno::Any> const &) { diff --git a/avmedia/source/gstreamer/gstuno.cxx b/avmedia/source/gstreamer/gstuno.cxx index b4126fd9f9e5..abd01f5cfb62 100644 --- a/avmedia/source/gstreamer/gstuno.cxx +++ b/avmedia/source/gstreamer/gstuno.cxx @@ -34,12 +34,12 @@ using namespace ::com::sun::star; # define SERVICE_NAME AVMEDIA_MANAGER_SERVICE_NAME // "com.sun.star.comp.avmedia.Manager_GStreamer" #endif -static uno::Reference< uno::XInterface > SAL_CALL create_MediaPlayer( const uno::Reference< lang::XMultiServiceFactory >& ) +static uno::Reference< uno::XInterface > create_MediaPlayer( const uno::Reference< lang::XMultiServiceFactory >& ) { return uno::Reference< uno::XInterface >( *new ::avmedia::gstreamer::Manager ); } -extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL avmediagst_component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* /*pRegistryKey*/ ) +extern "C" SAL_DLLPUBLIC_EXPORT void* avmediagst_component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* /*pRegistryKey*/ ) { uno::Reference< lang::XSingleServiceFactory > xFactory; void* pRet = nullptr; diff --git a/avmedia/source/vlc/vlcuno.cxx b/avmedia/source/vlc/vlcuno.cxx index 0c505696261a..99ffd3522026 100644 --- a/avmedia/source/vlc/vlcuno.cxx +++ b/avmedia/source/vlc/vlcuno.cxx @@ -29,7 +29,7 @@ using namespace ::com::sun::star; #define IMPL_NAME "com.sun.star.comp.media.Manager_VLC" #define SERVICE_NAME "com.sun.star.comp.avmedia.Manager_VLC" -static uno::Reference< uno::XInterface > SAL_CALL create_MediaPlayer( const uno::Reference< lang::XMultiServiceFactory >& rxFact ) +static uno::Reference< uno::XInterface > create_MediaPlayer( const uno::Reference< lang::XMultiServiceFactory >& rxFact ) { SAL_INFO("avmedia", "create VLC Media player !"); @@ -42,7 +42,7 @@ static uno::Reference< uno::XInterface > SAL_CALL create_MediaPlayer( const uno: return manager; } -extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL avmediavlc_component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* /*pRegistryKey*/ ) +extern "C" SAL_DLLPUBLIC_EXPORT void* avmediavlc_component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* /*pRegistryKey*/ ) { uno::Reference< lang::XSingleServiceFactory > xFactory; void* pRet = nullptr; diff --git a/basctl/source/basicide/register.cxx b/basctl/source/basicide/register.cxx index 22d06f80bb2d..8219af8858a0 100644 --- a/basctl/source/basicide/register.cxx +++ b/basctl/source/basicide/register.cxx @@ -32,7 +32,7 @@ using namespace ::com::sun::star::lang; extern "C" { -SAL_DLLPUBLIC_EXPORT void* SAL_CALL basctl_component_getFactory( const sal_Char* pImplementationName, +SAL_DLLPUBLIC_EXPORT void* basctl_component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, void* ) { diff --git a/basctl/source/basicide/unomodel.cxx b/basctl/source/basicide/unomodel.cxx index f823dfedd115..b85090a04833 100644 --- a/basctl/source/basicide/unomodel.cxx +++ b/basctl/source/basicide/unomodel.cxx @@ -103,7 +103,7 @@ uno::Sequence< OUString > SIDEModel::getSupportedServiceNames_Static() return { "com.sun.star.script.BasicIDE" }; } -uno::Reference< uno::XInterface > SAL_CALL SIDEModel_createInstance( +uno::Reference< uno::XInterface > SIDEModel_createInstance( const uno::Reference< lang::XMultiServiceFactory > & ) { SolarMutexGuard aGuard; diff --git a/basctl/source/basicide/unomodel.hxx b/basctl/source/basicide/unomodel.hxx index 3d5fa6966cc6..b73fa5fa0814 100644 --- a/basctl/source/basicide/unomodel.hxx +++ b/basctl/source/basicide/unomodel.hxx @@ -60,7 +60,7 @@ public: }; /// @throws com::sun::star::uno::Exception -css::uno::Reference< css::uno::XInterface > SAL_CALL SIDEModel_createInstance( +css::uno::Reference< css::uno::XInterface > SIDEModel_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr ); } // namespace basctl diff --git a/basic/source/uno/dlgcont.cxx b/basic/source/uno/dlgcont.cxx index affeb0bcf4be..a6eab0fdcaba 100644 --- a/basic/source/uno/dlgcont.cxx +++ b/basic/source/uno/dlgcont.cxx @@ -574,7 +574,7 @@ bool SfxDialogLibrary::isLibraryElementValid(const css::uno::Any& rElement) cons } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_comp_sfx2_DialogLibraryContainer_get_implementation(css::uno::XComponentContext*, css::uno::Sequence<css::uno::Any> const &) { diff --git a/basic/source/uno/scriptcont.cxx b/basic/source/uno/scriptcont.cxx index 72126748d713..a80bec7938b7 100644 --- a/basic/source/uno/scriptcont.cxx +++ b/basic/source/uno/scriptcont.cxx @@ -1237,7 +1237,7 @@ void SAL_CALL SfxScriptLibrary::removeModuleInfo( const OUString& ModuleName ) } // namespace basic -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_comp_sfx2_ScriptLibraryContainer_get_implementation(css::uno::XComponentContext*, css::uno::Sequence<css::uno::Any> const &) { diff --git a/binaryurp/source/bridge.cxx b/binaryurp/source/bridge.cxx index d39d1f24e667..d1c7256c6ad5 100644 --- a/binaryurp/source/bridge.cxx +++ b/binaryurp/source/bridge.cxx @@ -86,7 +86,7 @@ OUString toString(css::uno::TypeDescription const & type) { return OUString(d->pTypeName); } -extern "C" void SAL_CALL freeProxyCallback( +extern "C" void freeProxyCallback( SAL_UNUSED_PARAMETER uno_ExtEnvironment *, void * pProxy) { assert(pProxy != nullptr); diff --git a/binaryurp/source/bridgefactory.cxx b/binaryurp/source/bridgefactory.cxx index b1e3be93ea74..d82599363288 100644 --- a/binaryurp/source/bridgefactory.cxx +++ b/binaryurp/source/bridgefactory.cxx @@ -210,7 +210,7 @@ static cppu::ImplementationEntry const services[] = { } -extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL binaryurp_component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * binaryurp_component_getFactory( char const * pImplName, void * pServiceManager, void * pRegistryKey) { return cppu::component_getFactoryHelper( diff --git a/binaryurp/source/proxy.cxx b/binaryurp/source/proxy.cxx index 5f83660f1ddd..0e5a92b68f9e 100644 --- a/binaryurp/source/proxy.cxx +++ b/binaryurp/source/proxy.cxx @@ -42,17 +42,17 @@ namespace binaryurp { namespace { -extern "C" void SAL_CALL proxy_acquireInterface(uno_Interface * pInterface) { +extern "C" void proxy_acquireInterface(uno_Interface * pInterface) { assert(pInterface != nullptr); static_cast< Proxy * >(pInterface)->do_acquire(); } -extern "C" void SAL_CALL proxy_releaseInterface(uno_Interface * pInterface) { +extern "C" void proxy_releaseInterface(uno_Interface * pInterface) { assert(pInterface != nullptr); static_cast< Proxy * >(pInterface)->do_release(); } -extern "C" void SAL_CALL proxy_dispatchInterface( +extern "C" void proxy_dispatchInterface( uno_Interface * pUnoI, typelib_TypeDescription const * pMemberType, void * pReturn, void ** pArgs, uno_Any ** ppException) { diff --git a/binaryurp/source/reader.cxx b/binaryurp/source/reader.cxx index 7ce1ba1244c3..fa5e91be704e 100644 --- a/binaryurp/source/reader.cxx +++ b/binaryurp/source/reader.cxx @@ -78,7 +78,7 @@ css::uno::Sequence< sal_Int8 > read( return buf; } -extern "C" void SAL_CALL request(void * pThreadSpecificData) { +extern "C" void request(void * pThreadSpecificData) { assert(pThreadSpecificData != nullptr); std::unique_ptr< IncomingRequest >( static_cast< IncomingRequest * >(pThreadSpecificData))-> diff --git a/bridges/inc/bridge.hxx b/bridges/inc/bridge.hxx index d5c3ba9d9b40..b702dd9b6e07 100644 --- a/bridges/inc/bridge.hxx +++ b/bridges/inc/bridge.hxx @@ -33,20 +33,20 @@ namespace bridges { namespace cpp_uno { namespace shared { // private: -extern "C" void SAL_CALL freeMapping(uno_Mapping *); +extern "C" void freeMapping(uno_Mapping *); // private: -extern "C" void SAL_CALL acquireMapping(uno_Mapping *); +extern "C" void acquireMapping(uno_Mapping *); // private: -extern "C" void SAL_CALL releaseMapping(uno_Mapping *); +extern "C" void releaseMapping(uno_Mapping *); // private: -extern "C" void SAL_CALL cpp2unoMapping( +extern "C" void cpp2unoMapping( uno_Mapping *, void **, void *, typelib_InterfaceTypeDescription *); // private: -extern "C" void SAL_CALL uno2cppMapping( +extern "C" void uno2cppMapping( uno_Mapping *, void **, void *, typelib_InterfaceTypeDescription *); /** @@ -97,17 +97,17 @@ private: bool bExportCpp2Uno; - friend void SAL_CALL freeMapping(uno_Mapping * pMapping); + friend void freeMapping(uno_Mapping * pMapping); - friend void SAL_CALL acquireMapping(uno_Mapping * pMapping); + friend void acquireMapping(uno_Mapping * pMapping); - friend void SAL_CALL releaseMapping(uno_Mapping * pMapping); + friend void releaseMapping(uno_Mapping * pMapping); - friend void SAL_CALL cpp2unoMapping( + friend void cpp2unoMapping( uno_Mapping * pMapping, void ** ppUnoI, void * pCppI, typelib_InterfaceTypeDescription * pTypeDescr); - friend void SAL_CALL uno2cppMapping( + friend void uno2cppMapping( uno_Mapping * pMapping, void ** ppCppI, void * pUnoI, typelib_InterfaceTypeDescription * pTypeDescr); }; diff --git a/bridges/inc/cppinterfaceproxy.hxx b/bridges/inc/cppinterfaceproxy.hxx index dfb1bdbf1e2b..d508146bdcb0 100644 --- a/bridges/inc/cppinterfaceproxy.hxx +++ b/bridges/inc/cppinterfaceproxy.hxx @@ -45,7 +45,7 @@ namespace bridges { namespace cpp_uno { namespace shared { class Bridge; -extern "C" void SAL_CALL freeCppInterfaceProxy( +extern "C" void freeCppInterfaceProxy( uno_ExtEnvironment * pEnv, void * pInterface); /** @@ -97,7 +97,7 @@ private: VtableFactory::Slot * vtables[1]; - friend void SAL_CALL freeCppInterfaceProxy( + friend void freeCppInterfaceProxy( uno_ExtEnvironment * pEnv, void * pInterface); }; diff --git a/bridges/inc/unointerfaceproxy.hxx b/bridges/inc/unointerfaceproxy.hxx index 77cd8e98a346..374ac956caec 100644 --- a/bridges/inc/unointerfaceproxy.hxx +++ b/bridges/inc/unointerfaceproxy.hxx @@ -39,21 +39,21 @@ namespace bridges { namespace cpp_uno { namespace shared { class Bridge; -extern "C" void SAL_CALL freeUnoInterfaceProxy( +extern "C" void freeUnoInterfaceProxy( uno_ExtEnvironment * pEnv, void * pProxy); // private: -extern "C" void SAL_CALL unoInterfaceProxyDispatch( +extern "C" void unoInterfaceProxyDispatch( uno_Interface * pUnoI, typelib_TypeDescription const * pMemberDescr, void * pReturn, void * pArgs[], uno_Any ** ppException); // this function is not defined in the generic part, but instead has to be // defined individually for each CPP--UNO bridge // private: -extern "C" void SAL_CALL acquireProxy(uno_Interface *); +extern "C" void acquireProxy(uno_Interface *); // private: -extern "C" void SAL_CALL releaseProxy(uno_Interface *); +extern "C" void releaseProxy(uno_Interface *); /** * A uno proxy wrapping a cpp interface. @@ -91,16 +91,16 @@ private: typelib_InterfaceTypeDescription * pTypeDescr; OUString oid; - friend void SAL_CALL freeUnoInterfaceProxy( + friend void freeUnoInterfaceProxy( uno_ExtEnvironment * pEnv, void * pProxy); - friend void SAL_CALL unoInterfaceProxyDispatch( + friend void unoInterfaceProxyDispatch( uno_Interface * pUnoI, typelib_TypeDescription const * pMemberDescr, void * pReturn, void * pArgs[], uno_Any ** ppException); - friend void SAL_CALL acquireProxy(uno_Interface * pUnoI); + friend void acquireProxy(uno_Interface * pUnoI); - friend void SAL_CALL releaseProxy(uno_Interface * pUnoI); + friend void releaseProxy(uno_Interface * pUnoI); }; } } } diff --git a/bridges/source/cpp_uno/shared/component.cxx b/bridges/source/cpp_uno/shared/component.cxx index 35217307a1b4..48b32331bf2e 100644 --- a/bridges/source/cpp_uno/shared/component.cxx +++ b/bridges/source/cpp_uno/shared/component.cxx @@ -42,7 +42,7 @@ namespace { static OUString * s_pStaticOidPart = nullptr; #endif -const OUString & SAL_CALL cppu_cppenv_getStaticOIdPart() +const OUString & cppu_cppenv_getStaticOIdPart() { #if ! (defined(__GNUC__) && defined(__APPLE__)) static OUString * s_pStaticOidPart = nullptr; @@ -128,7 +128,7 @@ static void s_stub_computeObjectIdentifier(va_list * pParam) } } -static void SAL_CALL computeObjectIdentifier( +static void computeObjectIdentifier( uno_ExtEnvironment * pExtEnv, rtl_uString ** ppOId, void * pInterface ) { uno_Environment_invoke(&pExtEnv->aBase, s_stub_computeObjectIdentifier, pExtEnv, ppOId, pInterface); @@ -142,7 +142,7 @@ static void s_stub_acquireInterface(va_list * pParam) static_cast< ::com::sun::star::uno::XInterface * >( pCppI )->acquire(); } -static void SAL_CALL acquireInterface( uno_ExtEnvironment * pExtEnv, void * pCppI ) +static void acquireInterface( uno_ExtEnvironment * pExtEnv, void * pCppI ) { uno_Environment_invoke(&pExtEnv->aBase, s_stub_acquireInterface, pExtEnv, pCppI); } @@ -155,12 +155,12 @@ static void s_stub_releaseInterface(va_list * pParam) static_cast< ::com::sun::star::uno::XInterface * >( pCppI )->release(); } -static void SAL_CALL releaseInterface( uno_ExtEnvironment * pExtEnv, void * pCppI ) +static void releaseInterface( uno_ExtEnvironment * pExtEnv, void * pCppI ) { uno_Environment_invoke(&pExtEnv->aBase, s_stub_releaseInterface, pExtEnv, pCppI); } -static void SAL_CALL environmentDisposing( +static void environmentDisposing( SAL_UNUSED_PARAMETER uno_Environment * ) { } @@ -169,7 +169,7 @@ static void SAL_CALL environmentDisposing( #define uno_initEnvironment CPPU_ENV_uno_initEnvironment #endif -SAL_DLLPUBLIC_EXPORT void SAL_CALL uno_initEnvironment(uno_Environment * pCppEnv) +SAL_DLLPUBLIC_EXPORT void uno_initEnvironment(uno_Environment * pCppEnv) SAL_THROW_EXTERN_C() { assert(pCppEnv->pExtEnv); @@ -189,7 +189,7 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL uno_initEnvironment(uno_Environment * pCppEnv #define uno_ext_getMapping CPPU_ENV_uno_ext_getMapping #endif -SAL_DLLPUBLIC_EXPORT void SAL_CALL uno_ext_getMapping( +SAL_DLLPUBLIC_EXPORT void uno_ext_getMapping( uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo) SAL_THROW_EXTERN_C() { diff --git a/bridges/source/cpp_uno/shared/vtablefactory.cxx b/bridges/source/cpp_uno/shared/vtablefactory.cxx index 47bd40069f4f..50419298d87f 100644 --- a/bridges/source/cpp_uno/shared/vtablefactory.cxx +++ b/bridges/source/cpp_uno/shared/vtablefactory.cxx @@ -64,7 +64,7 @@ using bridges::cpp_uno::shared::VtableFactory; namespace { -extern "C" void * SAL_CALL allocExec( +extern "C" void * allocExec( SAL_UNUSED_PARAMETER rtl_arena_type *, sal_Size * size) { std::size_t pagesize; @@ -104,7 +104,7 @@ extern "C" void * SAL_CALL allocExec( return p; } -extern "C" void SAL_CALL freeExec( +extern "C" void freeExec( SAL_UNUSED_PARAMETER rtl_arena_type *, void * address, sal_Size size) { #if defined SAL_UNX diff --git a/bridges/source/jni_uno/jni_bridge.cxx b/bridges/source/jni_uno/jni_bridge.cxx index 3859b148c541..ac671d173e9c 100644 --- a/bridges/source/jni_uno/jni_bridge.cxx +++ b/bridges/source/jni_uno/jni_bridge.cxx @@ -39,7 +39,7 @@ extern "C" { -void SAL_CALL Mapping_acquire( uno_Mapping * mapping ) +void Mapping_acquire( uno_Mapping * mapping ) SAL_THROW_EXTERN_C() { Mapping const * that = static_cast< Mapping const * >( mapping ); @@ -47,7 +47,7 @@ void SAL_CALL Mapping_acquire( uno_Mapping * mapping ) } -void SAL_CALL Mapping_release( uno_Mapping * mapping ) +void Mapping_release( uno_Mapping * mapping ) SAL_THROW_EXTERN_C() { Mapping const * that = static_cast< Mapping const * >( mapping ); @@ -55,7 +55,7 @@ void SAL_CALL Mapping_release( uno_Mapping * mapping ) } -void SAL_CALL Mapping_map_to_uno( +void Mapping_map_to_uno( uno_Mapping * mapping, void ** ppOut, void * pIn, typelib_InterfaceTypeDescription * td ) SAL_THROW_EXTERN_C() @@ -114,7 +114,7 @@ void SAL_CALL Mapping_map_to_uno( } -void SAL_CALL Mapping_map_to_java( +void Mapping_map_to_java( uno_Mapping * mapping, void ** ppOut, void * pIn, typelib_InterfaceTypeDescription * td ) SAL_THROW_EXTERN_C() @@ -177,7 +177,7 @@ void SAL_CALL Mapping_map_to_java( } -void SAL_CALL Bridge_free( uno_Mapping * mapping ) +void Bridge_free( uno_Mapping * mapping ) SAL_THROW_EXTERN_C() { Mapping * that = static_cast< Mapping * >( mapping ); @@ -421,7 +421,7 @@ using namespace ::jni_uno; extern "C" { -void SAL_CALL java_env_dispose(uno_Environment * env) { +void java_env_dispose(uno_Environment * env) { auto * envData = static_cast<jni_uno::JniUnoEnvironmentData *>(env->pContext); if (envData != nullptr) { @@ -455,7 +455,7 @@ void SAL_CALL java_env_dispose(uno_Environment * env) { } } -void SAL_CALL java_env_disposing(uno_Environment * env) { +void java_env_disposing(uno_Environment * env) { java_env_dispose(env); delete static_cast<jni_uno::JniUnoEnvironmentData *>(env->pContext); } @@ -465,7 +465,7 @@ void SAL_CALL java_env_disposing(uno_Environment * env) { #endif -SAL_DLLPUBLIC_EXPORT void SAL_CALL uno_initEnvironment( uno_Environment * java_env ) +SAL_DLLPUBLIC_EXPORT void uno_initEnvironment( uno_Environment * java_env ) SAL_THROW_EXTERN_C() { try { @@ -510,7 +510,7 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL uno_initEnvironment( uno_Environment * java_e #endif -SAL_DLLPUBLIC_EXPORT void SAL_CALL uno_ext_getMapping( +SAL_DLLPUBLIC_EXPORT void uno_ext_getMapping( uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo ) SAL_THROW_EXTERN_C() { diff --git a/bridges/source/jni_uno/jni_uno2java.cxx b/bridges/source/jni_uno/jni_uno2java.cxx index 45bcbaedc3f0..ecdab00e4512 100644 --- a/bridges/source/jni_uno/jni_uno2java.cxx +++ b/bridges/source/jni_uno/jni_uno2java.cxx @@ -39,19 +39,19 @@ extern "C" { -void SAL_CALL UNO_proxy_free( uno_ExtEnvironment * env, void * proxy ) +void UNO_proxy_free( uno_ExtEnvironment * env, void * proxy ) SAL_THROW_EXTERN_C(); -void SAL_CALL UNO_proxy_acquire( uno_Interface * pUnoI ) +void UNO_proxy_acquire( uno_Interface * pUnoI ) SAL_THROW_EXTERN_C(); -void SAL_CALL UNO_proxy_release( uno_Interface * pUnoI ) +void UNO_proxy_release( uno_Interface * pUnoI ) SAL_THROW_EXTERN_C(); -void SAL_CALL UNO_proxy_dispatch( +void UNO_proxy_dispatch( uno_Interface * pUnoI, typelib_TypeDescription const * member_td, void * uno_ret, void * uno_args[], uno_Any ** uno_exc ) SAL_THROW_EXTERN_C(); @@ -502,7 +502,7 @@ extern "C" { -void SAL_CALL UNO_proxy_free( uno_ExtEnvironment * env, void * proxy ) +void UNO_proxy_free( uno_ExtEnvironment * env, void * proxy ) SAL_THROW_EXTERN_C() { UNO_proxy * that = static_cast< UNO_proxy * >( proxy ); @@ -540,7 +540,7 @@ void SAL_CALL UNO_proxy_free( uno_ExtEnvironment * env, void * proxy ) } -void SAL_CALL UNO_proxy_acquire( uno_Interface * pUnoI ) +void UNO_proxy_acquire( uno_Interface * pUnoI ) SAL_THROW_EXTERN_C() { UNO_proxy const * that = static_cast< UNO_proxy const * >( pUnoI ); @@ -548,7 +548,7 @@ void SAL_CALL UNO_proxy_acquire( uno_Interface * pUnoI ) } -void SAL_CALL UNO_proxy_release( uno_Interface * pUnoI ) +void UNO_proxy_release( uno_Interface * pUnoI ) SAL_THROW_EXTERN_C() { UNO_proxy const * that = static_cast< UNO_proxy const * >( pUnoI ); @@ -556,7 +556,7 @@ void SAL_CALL UNO_proxy_release( uno_Interface * pUnoI ) } -void SAL_CALL UNO_proxy_dispatch( +void UNO_proxy_dispatch( uno_Interface * pUnoI, typelib_TypeDescription const * member_td, void * uno_ret, void * uno_args [], uno_Any ** uno_exc ) SAL_THROW_EXTERN_C() diff --git a/bridges/source/jni_uno/nativethreadpool.cxx b/bridges/source/jni_uno/nativethreadpool.cxx index 547001a7f51e..4fe4a0a2fb8d 100644 --- a/bridges/source/jni_uno/nativethreadpool.cxx +++ b/bridges/source/jni_uno/nativethreadpool.cxx @@ -64,7 +64,7 @@ void throwOutOfMemory(JNIEnv * env) { extern "C" { -static void SAL_CALL executeRequest(void * data) { +static void executeRequest(void * data) { Job * job = static_cast< Job * >(data); try { jvmaccess::VirtualMachine::AttachGuard guard(job->pool->virtualMachine); diff --git a/canvas/source/cairo/cairo_services.cxx b/canvas/source/cairo/cairo_services.cxx index 0c484d3644f3..5117764668c3 100644 --- a/canvas/source/cairo/cairo_services.cxx +++ b/canvas/source/cairo/cairo_services.cxx @@ -74,7 +74,7 @@ namespace cairocanvas // The C shared lib entry points extern "C" -SAL_DLLPUBLIC_EXPORT void* SAL_CALL cairocanvas_component_getFactory( sal_Char const* pImplName, +SAL_DLLPUBLIC_EXPORT void* cairocanvas_component_getFactory( sal_Char const* pImplName, void*, void* ) { return sdecl::component_getFactoryHelper( pImplName, {&cairocanvas::cairoCanvasDecl, &cairocanvas::cairoSpriteCanvasDecl} ); diff --git a/canvas/source/factory/cf_service.cxx b/canvas/source/factory/cf_service.cxx index 8ec48901728c..f971df139f31 100644 --- a/canvas/source/factory/cf_service.cxx +++ b/canvas/source/factory/cf_service.cxx @@ -475,7 +475,7 @@ Reference<XInterface> CanvasFactory::createInstanceWithArguments( } // anon namespace -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_comp_rendering_CanvasFactory_get_implementation(css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const &) { diff --git a/canvas/source/opengl/ogl_spritecanvas.cxx b/canvas/source/opengl/ogl_spritecanvas.cxx index 1da1a464281f..3f913fd64ab4 100644 --- a/canvas/source/opengl/ogl_spritecanvas.cxx +++ b/canvas/source/opengl/ogl_spritecanvas.cxx @@ -175,7 +175,7 @@ namespace oglcanvas // The C shared lib entry points extern "C" -SAL_DLLPUBLIC_EXPORT void* SAL_CALL oglcanvas_component_getFactory( sal_Char const* pImplName, +SAL_DLLPUBLIC_EXPORT void* oglcanvas_component_getFactory( sal_Char const* pImplName, void*, void* ) { return sdecl::component_getFactoryHelper( pImplName, {&oglcanvas::oglSpriteCanvasDecl} ); diff --git a/canvas/source/simplecanvas/simplecanvasimpl.cxx b/canvas/source/simplecanvas/simplecanvasimpl.cxx index e957db00bf64..1915b746cf55 100644 --- a/canvas/source/simplecanvas/simplecanvasimpl.cxx +++ b/canvas/source/simplecanvas/simplecanvasimpl.cxx @@ -375,7 +375,7 @@ namespace } // The C shared lib entry points -extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL simplecanvas_component_getFactory( sal_Char const* pImplName, +extern "C" SAL_DLLPUBLIC_EXPORT void* simplecanvas_component_getFactory( sal_Char const* pImplName, void*, void* ) { return sdecl::component_getFactoryHelper( pImplName, {&simpleCanvasDecl} ); diff --git a/canvas/source/vcl/services.cxx b/canvas/source/vcl/services.cxx index 9c4d0ab9e9fb..89e24d2e337c 100644 --- a/canvas/source/vcl/services.cxx +++ b/canvas/source/vcl/services.cxx @@ -74,7 +74,7 @@ namespace vclcanvas // The C shared lib entry points extern "C" -SAL_DLLPUBLIC_EXPORT void* SAL_CALL vclcanvas_component_getFactory( sal_Char const* pImplName, +SAL_DLLPUBLIC_EXPORT void* vclcanvas_component_getFactory( sal_Char const* pImplName, void*, void* ) { return sdecl::component_getFactoryHelper( pImplName, {&vclcanvas::vclCanvasDecl, &vclcanvas::vclSpriteCanvasDecl} ); diff --git a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx index 97f605edf7bc..cd62dbfe61dd 100644 --- a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx @@ -1456,7 +1456,7 @@ css::uno::Sequence< OUString > SAL_CALL ChartDocumentWrapper::getSupportedServic } // namespace wrapper } // namespace chart -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_chart2_ChartDocumentWrapper_get_implementation(css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) { diff --git a/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx b/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx index 43950c39a147..c0563986ea91 100644 --- a/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx +++ b/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx @@ -90,7 +90,7 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ChartTypeUnoDlg::getPropertySe } //namespace chart -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_chart2_ChartTypeDialog_get_implementation(css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) { diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx index 7139f0208d06..fa64f29277fe 100644 --- a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx +++ b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx @@ -360,7 +360,7 @@ void SAL_CALL CreationWizardUnoDlg::removeVetoableChangeListener( const OUString } //namespace chart -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_chart2_WizardDialog_get_implementation(css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) { diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx index a505335cfa9a..bd58a05b2d8c 100644 --- a/chart2/source/controller/main/ChartController.cxx +++ b/chart2/source/controller/main/ChartController.cxx @@ -1608,7 +1608,7 @@ ViewElementListProvider ChartController::getViewElementListProvider() } //namespace chart -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_chart2_ChartController_get_implementation(css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) { diff --git a/chart2/source/controller/main/ChartFrameloader.cxx b/chart2/source/controller/main/ChartFrameloader.cxx index c26afdc54b84..cc15fc5a035e 100644 --- a/chart2/source/controller/main/ChartFrameloader.cxx +++ b/chart2/source/controller/main/ChartFrameloader.cxx @@ -191,7 +191,7 @@ void SAL_CALL ChartFrameLoader::cancel() } //namespace chart -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_chart2_ChartFrameLoader_get_implementation(css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) { diff --git a/chart2/source/controller/main/ElementSelector.cxx b/chart2/source/controller/main/ElementSelector.cxx index 2f9ec11510c8..927dae225462 100644 --- a/chart2/source/controller/main/ElementSelector.cxx +++ b/chart2/source/controller/main/ElementSelector.cxx @@ -312,7 +312,7 @@ uno::Reference< awt::XWindow > SAL_CALL ElementSelectorToolbarController::create } // chart2 -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_chart_ElementSelectorToolbarController_get_implementation(css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) { diff --git a/chart2/source/controller/main/ToolbarController.cxx b/chart2/source/controller/main/ToolbarController.cxx index e6ccf06a0b5c..103e8b4bb97f 100644 --- a/chart2/source/controller/main/ToolbarController.cxx +++ b/chart2/source/controller/main/ToolbarController.cxx @@ -118,7 +118,7 @@ css::uno::Sequence<OUString> ChartToolbarController::getSupportedServiceNames() } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* org_libreoffice_chart2_Chart2ToolboxController(css::uno::XComponentContext*, css::uno::Sequence<css::uno::Any> const & rProperties) { return cppu::acquire(new ::chart::ChartToolbarController(rProperties)); diff --git a/chart2/source/controller/sidebar/Chart2PanelFactory.cxx b/chart2/source/controller/sidebar/Chart2PanelFactory.cxx index 518479a83c8d..4034156f289d 100644 --- a/chart2/source/controller/sidebar/Chart2PanelFactory.cxx +++ b/chart2/source/controller/sidebar/Chart2PanelFactory.cxx @@ -136,7 +136,7 @@ css::uno::Sequence<OUString> ChartPanelFactory::getSupportedServiceNames() } } // end of namespace chart::sidebar -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* org_libreoffice_comp_chart2_sidebar_ChartPanelFactory(css::uno::XComponentContext*, css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new ::chart::sidebar::ChartPanelFactory()); diff --git a/chart2/source/model/filter/XMLFilter.cxx b/chart2/source/model/filter/XMLFilter.cxx index 4d7720e72d9b..b18207ac277c 100644 --- a/chart2/source/model/filter/XMLFilter.cxx +++ b/chart2/source/model/filter/XMLFilter.cxx @@ -768,14 +768,14 @@ OUString XMLReportFilterHelper::getMediaType(bool ) } // namespace chart -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_chart2_XMLFilter_get_implementation(css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new ::chart::XMLFilter(context)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_chart2_report_XMLFilter_get_implementation(css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) { diff --git a/chart2/source/model/main/Axis.cxx b/chart2/source/model/main/Axis.cxx index 9f385af2bb29..639c347582da 100644 --- a/chart2/source/model/main/Axis.cxx +++ b/chart2/source/model/main/Axis.cxx @@ -620,7 +620,7 @@ css::uno::Sequence< OUString > SAL_CALL Axis::getSupportedServiceNames() } // namespace chart -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_chart2_Axis_get_implementation(css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) { diff --git a/chart2/source/model/main/CartesianCoordinateSystem.cxx b/chart2/source/model/main/CartesianCoordinateSystem.cxx index 1a54ff46a0c3..e2f2f5f2fda0 100644 --- a/chart2/source/model/main/CartesianCoordinateSystem.cxx +++ b/chart2/source/model/main/CartesianCoordinateSystem.cxx @@ -145,14 +145,14 @@ css::uno::Sequence< OUString > SAL_CALL CartesianCoordinateSystem3d::getSupporte } // namespace chart -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_chart2_CartesianCoordinateSystem2d_get_implementation(css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new ::chart::CartesianCoordinateSystem2d(context)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_chart2_CartesianCoordinateSystem3d_get_implementation(css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) { diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx index 055f3a94fe50..1a0d3899019c 100644 --- a/chart2/source/model/main/ChartModel.cxx +++ b/chart2/source/model/main/ChartModel.cxx @@ -1334,7 +1334,7 @@ bool ChartModel::isDataFromPivotTable() } // namespace chart -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_chart2_ChartModel_get_implementation(css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) { diff --git a/chart2/source/model/main/DataSeries.cxx b/chart2/source/model/main/DataSeries.cxx index 0d2a6342db6c..ff805227b3f5 100644 --- a/chart2/source/model/main/DataSeries.cxx +++ b/chart2/source/model/main/DataSeries.cxx @@ -555,7 +555,7 @@ css::uno::Sequence< OUString > SAL_CALL DataSeries::getSupportedServiceNames() } // namespace chart -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_chart_DataSeries_get_implementation(css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) { diff --git a/chart2/source/model/main/Diagram.cxx b/chart2/source/model/main/Diagram.cxx index 136db02b14e2..6dd8b747de32 100644 --- a/chart2/source/model/main/Diagram.cxx +++ b/chart2/source/model/main/Diagram.cxx @@ -697,7 +697,7 @@ css::uno::Sequence< OUString > SAL_CALL Diagram::getSupportedServiceNames() } // namespace chart -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_chart2_Diagram_get_implementation(css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) { diff --git a/chart2/source/model/main/FormattedString.cxx b/chart2/source/model/main/FormattedString.cxx index 4f26acc95e3f..0a89c555a0e1 100644 --- a/chart2/source/model/main/FormattedString.cxx +++ b/chart2/source/model/main/FormattedString.cxx @@ -232,7 +232,7 @@ css::uno::Sequence< OUString > SAL_CALL FormattedString::getSupportedServiceName } // namespace chart -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_chart_FormattedString_get_implementation(css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) { diff --git a/chart2/source/model/main/GridProperties.cxx b/chart2/source/model/main/GridProperties.cxx index 0c106f70668d..479d261367f3 100644 --- a/chart2/source/model/main/GridProperties.cxx +++ b/chart2/source/model/main/GridProperties.cxx @@ -237,7 +237,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( GridProperties, GridProperties_Base, ::propert } // namespace chart -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_chart2_GridProperties_get_implementation(css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) { diff --git a/chart2/source/model/main/Legend.cxx b/chart2/source/model/main/Legend.cxx index fc9ab86de607..4694e3b744c8 100644 --- a/chart2/source/model/main/Legend.cxx +++ b/chart2/source/model/main/Legend.cxx @@ -295,7 +295,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( Legend, Legend_Base, ::property::OPropertySet } // namespace chart -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_chart2_Legend_get_implementation(css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) { diff --git a/chart2/source/model/main/PageBackground.cxx b/chart2/source/model/main/PageBackground.cxx index e90a42797c6d..0a88bc4af34d 100644 --- a/chart2/source/model/main/PageBackground.cxx +++ b/chart2/source/model/main/PageBackground.cxx @@ -219,7 +219,7 @@ IMPLEMENT_FORWARD_XINTERFACE2( PageBackground, PageBackground_Base, ::property:: } // namespace chart -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_chart2_PageBackground_get_implementation(css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) { diff --git a/chart2/source/model/main/PolarCoordinateSystem.cxx b/chart2/source/model/main/PolarCoordinateSystem.cxx index d6c58ee24c76..a47f5a2add6c 100644 --- a/chart2/source/model/main/PolarCoordinateSystem.cxx +++ b/chart2/source/model/main/PolarCoordinateSystem.cxx @@ -143,14 +143,14 @@ css::uno::Sequence< OUString > SAL_CALL PolarCoordinateSystem3d::getSupportedSer } // namespace chart -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_chart2_PolarCoordinateSystem2d_get_implementation(css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new ::chart::PolarCoordinateSystem2d(context)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_chart2_PolarCoordinateSystem3d_get_implementation(css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) { diff --git a/chart2/source/model/main/Title.cxx b/chart2/source/model/main/Title.cxx index 6dbd924d08dc..058087529d31 100644 --- a/chart2/source/model/main/Title.cxx +++ b/chart2/source/model/main/Title.cxx @@ -377,7 +377,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( Title, Title_Base, ::property::OPropertySet ) } // namespace chart -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_chart2_Title_get_implementation(css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) { diff --git a/chart2/source/model/template/AreaChartType.cxx b/chart2/source/model/template/AreaChartType.cxx index 45ebcf72b310..b10d6110ae3b 100644 --- a/chart2/source/model/template/AreaChartType.cxx +++ b/chart2/source/model/template/AreaChartType.cxx @@ -69,7 +69,7 @@ css::uno::Sequence< OUString > SAL_CALL AreaChartType::getSupportedServiceNames( } // namespace chart -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_chart_AreaChartType_get_implementation(css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) { diff --git a/chart2/source/model/template/BarChartType.cxx b/chart2/source/model/template/BarChartType.cxx index 6f11dd5458a2..bfdf6ec47249 100644 --- a/chart2/source/model/template/BarChartType.cxx +++ b/chart2/source/model/template/BarChartType.cxx @@ -79,7 +79,7 @@ css::uno::Sequence< OUString > SAL_CALL BarChartType::getSupportedServiceNames() } // namespace chart -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_chart_BarChartType_get_implementation(css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) { diff --git a/chart2/source/model/template/BubbleChartType.cxx b/chart2/source/model/template/BubbleChartType.cxx index 8179594e2ceb..49a43c3134f9 100644 --- a/chart2/source/model/template/BubbleChartType.cxx +++ b/chart2/source/model/template/BubbleChartType.cxx @@ -214,7 +214,7 @@ css::uno::Sequence< OUString > SAL_CALL BubbleChartType::getSupportedServiceName } // namespace chart -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_chart_BubbleChartType_get_implementation(css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) { diff --git a/chart2/source/model/template/CandleStickChartType.cxx b/chart2/source/model/template/CandleStickChartType.cxx index 81f084540815..619af6cb08f7 100644 --- a/chart2/source/model/template/CandleStickChartType.cxx +++ b/chart2/source/model/template/CandleStickChartType.cxx @@ -330,7 +330,7 @@ css::uno::Sequence< OUString > SAL_CALL CandleStickChartType::getSupportedServic } // namespace chart -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_chart_CandleStickChartType_get_implementation(css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) { diff --git a/chart2/source/model/template/ChartTypeManager.cxx b/chart2/source/model/template/ChartTypeManager.cxx index a94253a577ac..4d174d968130 100644 --- a/chart2/source/model/template/ChartTypeManager.cxx +++ b/chart2/source/model/template/ChartTypeManager.cxx @@ -616,7 +616,7 @@ css::uno::Sequence< OUString > SAL_CALL ChartTypeManager::getSupportedServiceNam } // namespace chart -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_chart_ChartTypeManager_get_implementation(css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) { diff --git a/chart2/source/model/template/ColumnChartType.cxx b/chart2/source/model/template/ColumnChartType.cxx index 0655689d8f4e..668cdb9d2e0b 100644 --- a/chart2/source/model/template/ColumnChartType.cxx +++ b/chart2/source/model/template/ColumnChartType.cxx @@ -196,7 +196,7 @@ css::uno::Sequence< OUString > SAL_CALL ColumnChartType::getSupportedServiceName } // namespace chart -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_chart_ColumnChartType_get_implementation(css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) { diff --git a/chart2/source/model/template/FilledNetChartType.cxx b/chart2/source/model/template/FilledNetChartType.cxx index e693671f9b07..dfb78ecf6a44 100644 --- a/chart2/source/model/template/FilledNetChartType.cxx +++ b/chart2/source/model/template/FilledNetChartType.cxx @@ -79,7 +79,7 @@ css::uno::Sequence< OUString > SAL_CALL FilledNetChartType::getSupportedServiceN } // namespace chart -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_chart_FilledNetChartType_get_implementation(css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) { diff --git a/chart2/source/model/template/GL3DBarChartType.cxx b/chart2/source/model/template/GL3DBarChartType.cxx index 0e45c8d8d6fe..e40e43477d05 100644 --- a/chart2/source/model/template/GL3DBarChartType.cxx +++ b/chart2/source/model/template/GL3DBarChartType.cxx @@ -156,7 +156,7 @@ css::uno::Reference<css::beans::XPropertySetInfo> GL3DBarChartType::getPropertyS } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_chart_GL3DBarChartType_get_implementation(css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) { diff --git a/chart2/source/model/template/LineChartType.cxx b/chart2/source/model/template/LineChartType.cxx index 3c25980e2eaa..b82dd9f8d6af 100644 --- a/chart2/source/model/template/LineChartType.cxx +++ b/chart2/source/model/template/LineChartType.cxx @@ -198,7 +198,7 @@ css::uno::Sequence< OUString > SAL_CALL LineChartType::getSupportedServiceNames( } // namespace chart -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_chart_LineChartType_get_implementation(css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) { diff --git a/chart2/source/model/template/NetChartType.cxx b/chart2/source/model/template/NetChartType.cxx index 829a2f27d41d..b124d9cbda93 100644 --- a/chart2/source/model/template/NetChartType.cxx +++ b/chart2/source/model/template/NetChartType.cxx @@ -179,7 +179,7 @@ css::uno::Sequence< OUString > SAL_CALL NetChartType::getSupportedServiceNames() } // namespace chart -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_chart_NetChartType_get_implementation(css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) { diff --git a/chart2/source/model/template/PieChartType.cxx b/chart2/source/model/template/PieChartType.cxx index f99ab3c1a408..689ef9b491a2 100644 --- a/chart2/source/model/template/PieChartType.cxx +++ b/chart2/source/model/template/PieChartType.cxx @@ -233,7 +233,7 @@ css::uno::Sequence< OUString > SAL_CALL PieChartType::getSupportedServiceNames() } // namespace chart -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_chart_PieChartType_get_implementation(css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) { diff --git a/chart2/source/model/template/ScatterChartType.cxx b/chart2/source/model/template/ScatterChartType.cxx index 0e5e2c66cc62..3e5a1fb0c633 100644 --- a/chart2/source/model/template/ScatterChartType.cxx +++ b/chart2/source/model/template/ScatterChartType.cxx @@ -255,7 +255,7 @@ css::uno::Sequence< OUString > SAL_CALL ScatterChartType::getSupportedServiceNam } // namespace chart -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_chart_ScatterChartType_get_implementation(css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) { diff --git a/chart2/source/tools/CachedDataSequence.cxx b/chart2/source/tools/CachedDataSequence.cxx index 5db3cbdb45f0..72f2e544e79e 100644 --- a/chart2/source/tools/CachedDataSequence.cxx +++ b/chart2/source/tools/CachedDataSequence.cxx @@ -365,7 +365,7 @@ void SAL_CALL CachedDataSequence::initialize(const uno::Sequence< uno::Any > & _ } } // namespace chart -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_chart_CachedDataSequence_get_implementation(css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) { diff --git a/chart2/source/tools/ConfigColorScheme.cxx b/chart2/source/tools/ConfigColorScheme.cxx index 72e3ca7e6a7f..4484beadd204 100644 --- a/chart2/source/tools/ConfigColorScheme.cxx +++ b/chart2/source/tools/ConfigColorScheme.cxx @@ -180,7 +180,7 @@ css::uno::Sequence< OUString > SAL_CALL ConfigColorScheme::getSupportedServiceNa } // namespace chart -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_chart2_ConfigDefaultColorScheme_get_implementation(css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) { diff --git a/chart2/source/tools/DataSource.cxx b/chart2/source/tools/DataSource.cxx index 91c33b10bd81..9d17d4b4b6e7 100644 --- a/chart2/source/tools/DataSource.cxx +++ b/chart2/source/tools/DataSource.cxx @@ -71,7 +71,7 @@ css::uno::Sequence< OUString > SAL_CALL DataSource::getSupportedServiceNames() } // namespace chart -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_chart_DataSource_get_implementation(css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) { diff --git a/chart2/source/tools/ErrorBar.cxx b/chart2/source/tools/ErrorBar.cxx index 682a13827ba1..d6380b0cb050 100644 --- a/chart2/source/tools/ErrorBar.cxx +++ b/chart2/source/tools/ErrorBar.cxx @@ -471,7 +471,7 @@ using impl::ErrorBar_Base; } // namespace chart -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_chart2_ErrorBar_get_implementation(css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) { diff --git a/chart2/source/tools/InternalDataProvider.cxx b/chart2/source/tools/InternalDataProvider.cxx index a8e0c93759f9..f272c9feb9ce 100644 --- a/chart2/source/tools/InternalDataProvider.cxx +++ b/chart2/source/tools/InternalDataProvider.cxx @@ -1517,7 +1517,7 @@ css::uno::Sequence< OUString > SAL_CALL InternalDataProvider::getSupportedServic } // namespace chart -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_chart_InternalDataProvider_get_implementation(css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) { diff --git a/chart2/source/tools/LabeledDataSequence.cxx b/chart2/source/tools/LabeledDataSequence.cxx index 85c0a2747d4f..d47d26ebdc1a 100644 --- a/chart2/source/tools/LabeledDataSequence.cxx +++ b/chart2/source/tools/LabeledDataSequence.cxx @@ -158,7 +158,7 @@ css::uno::Sequence< OUString > SAL_CALL LabeledDataSequence::getSupportedService } // namespace chart -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_chart2_LabeledDataSequence_get_implementation(css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) { diff --git a/chart2/source/tools/RegressionCurveModel.cxx b/chart2/source/tools/RegressionCurveModel.cxx index 04816377ae1c..8dee11b28e75 100644 --- a/chart2/source/tools/RegressionCurveModel.cxx +++ b/chart2/source/tools/RegressionCurveModel.cxx @@ -535,49 +535,49 @@ uno::Reference< util::XCloneable > SAL_CALL MovingAverageRegressionCurve::create } // namespace chart -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_chart2_ExponentialRegressionCurve_get_implementation(css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new ::chart::ExponentialRegressionCurve ); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_chart2_LinearRegressionCurve_get_implementation(css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new ::chart::LinearRegressionCurve ); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_chart2_LogarithmicRegressionCurve_get_implementation(css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new ::chart::LogarithmicRegressionCurve ); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_chart2_MeanValueRegressionCurve_get_implementation(css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new ::chart::MeanValueRegressionCurve ); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_chart2_PotentialRegressionCurve_get_implementation(css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new ::chart::PotentialRegressionCurve ); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_chart2_PolynomialRegressionCurve_get_implementation(css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new ::chart::PolynomialRegressionCurve ); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_chart2_MovingAverageRegressionCurve_get_implementation(css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) { diff --git a/chart2/source/tools/RegressionEquation.cxx b/chart2/source/tools/RegressionEquation.cxx index c7ac08ec1928..4cdda2b80272 100644 --- a/chart2/source/tools/RegressionEquation.cxx +++ b/chart2/source/tools/RegressionEquation.cxx @@ -322,7 +322,7 @@ IMPLEMENT_FORWARD_XINTERFACE2( RegressionEquation, RegressionEquation_Base, ::pr } // namespace chart -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_chart2_RegressionEquation_get_implementation(css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) { diff --git a/chart2/source/tools/Scaling.cxx b/chart2/source/tools/Scaling.cxx index 7440a5e3264c..34adacf97e13 100644 --- a/chart2/source/tools/Scaling.cxx +++ b/chart2/source/tools/Scaling.cxx @@ -244,28 +244,28 @@ css::uno::Sequence< OUString > SAL_CALL PowerScaling::getSupportedServiceNames() } //namespace chart -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_chart2_LinearScaling_get_implementation(css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new chart::LinearScaling ); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_chart2_ExponentialScaling_get_implementation(css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new chart::ExponentialScaling ); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_chart2_LogarithmicScaling_get_implementation(css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new chart::LogarithmicScaling ); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_chart2_PowerScaling_get_implementation(css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) { diff --git a/chart2/source/view/main/AbstractShapeFactory.cxx b/chart2/source/view/main/AbstractShapeFactory.cxx index 8bb4f3debfbc..b340869bddc6 100644 --- a/chart2/source/view/main/AbstractShapeFactory.cxx +++ b/chart2/source/view/main/AbstractShapeFactory.cxx @@ -57,7 +57,7 @@ typedef opengl::OpenglShapeFactory* (*getOpenglShapeFactory_)(void); #ifndef DISABLE_DYNLOADING -void SAL_CALL thisModule() {} +void thisModule() {} osl::Module* getOpenGLModule() { diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx index 4fa863406671..2fb8a1f67c20 100644 --- a/chart2/source/view/main/ChartView.cxx +++ b/chart2/source/view/main/ChartView.cxx @@ -3408,7 +3408,7 @@ void ChartView::updateOpenGLWindow() } //namespace chart -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_chart2_ChartView_get_implementation(css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) { diff --git a/comphelper/source/compare/AnyCompareFactory.cxx b/comphelper/source/compare/AnyCompareFactory.cxx index c3df018c14ee..8879359b6566 100644 --- a/comphelper/source/compare/AnyCompareFactory.cxx +++ b/comphelper/source/compare/AnyCompareFactory.cxx @@ -128,7 +128,7 @@ Sequence< OUString > SAL_CALL AnyCompareFactory::getSupportedServiceNames( ) return aSeq; } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * AnyCompareFactory_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) diff --git a/comphelper/source/container/IndexedPropertyValuesContainer.cxx b/comphelper/source/container/IndexedPropertyValuesContainer.cxx index e095ebc785db..cf0e37b59dee 100644 --- a/comphelper/source/container/IndexedPropertyValuesContainer.cxx +++ b/comphelper/source/container/IndexedPropertyValuesContainer.cxx @@ -147,7 +147,7 @@ css::uno::Sequence< OUString > SAL_CALL IndexedPropertyValuesContainer::getSuppo return aSeq; } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * IndexedPropertyValuesContainer_get_implementation( css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) diff --git a/comphelper/source/container/NamedPropertyValuesContainer.cxx b/comphelper/source/container/NamedPropertyValuesContainer.cxx index 771c9ac5a262..17ddb300edd4 100644 --- a/comphelper/source/container/NamedPropertyValuesContainer.cxx +++ b/comphelper/source/container/NamedPropertyValuesContainer.cxx @@ -156,7 +156,7 @@ css::uno::Sequence< OUString > SAL_CALL NamedPropertyValuesContainer::getSupport return aSeq; } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * NamedPropertyValuesContainer_get_implementation( css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) diff --git a/comphelper/source/misc/comphelper_services.cxx b/comphelper/source/misc/comphelper_services.cxx index e126e55ecdce..54009eaf9425 100644 --- a/comphelper/source/misc/comphelper_services.cxx +++ b/comphelper/source/misc/comphelper_services.cxx @@ -50,7 +50,7 @@ namespace comphelper { namespace module } } // namespace comphelper::module -extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL comphelp_component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void* comphelp_component_getFactory( const sal_Char* pImplementationName, SAL_UNUSED_PARAMETER void*, SAL_UNUSED_PARAMETER void* ) { diff --git a/comphelper/source/misc/instancelocker.cxx b/comphelper/source/misc/instancelocker.cxx index ea22167ac261..76d2cd1a761a 100644 --- a/comphelper/source/misc/instancelocker.cxx +++ b/comphelper/source/misc/instancelocker.cxx @@ -440,7 +440,7 @@ void OLockListener::Init() m_bInitialized = true; } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_embed_InstanceLocker( css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) diff --git a/comphelper/source/misc/officerestartmanager.cxx b/comphelper/source/misc/officerestartmanager.cxx index 37b1d0d02882..b2997c9fa867 100644 --- a/comphelper/source/misc/officerestartmanager.cxx +++ b/comphelper/source/misc/officerestartmanager.cxx @@ -164,7 +164,7 @@ struct Singleton: } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_task_OfficeRestartManager( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) diff --git a/comphelper/source/officeinstdir/officeinstallationdirectories.cxx b/comphelper/source/officeinstdir/officeinstallationdirectories.cxx index 63d88868add6..a1850d4b6fc8 100644 --- a/comphelper/source/officeinstdir/officeinstallationdirectories.cxx +++ b/comphelper/source/officeinstdir/officeinstallationdirectories.cxx @@ -259,7 +259,7 @@ struct Singleton: } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_util_OfficeInstallationDirectories( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) diff --git a/comphelper/source/property/opropertybag.cxx b/comphelper/source/property/opropertybag.cxx index 243c3920c7cd..718d04b56fb9 100644 --- a/comphelper/source/property/opropertybag.cxx +++ b/comphelper/source/property/opropertybag.cxx @@ -37,7 +37,7 @@ using namespace ::com::sun::star; -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_comphelper_OPropertyBag ( css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) diff --git a/comphelper/source/streaming/memorystream.cxx b/comphelper/source/streaming/memorystream.cxx index 61afcdc85391..b85701c30321 100644 --- a/comphelper/source/streaming/memorystream.cxx +++ b/comphelper/source/streaming/memorystream.cxx @@ -226,7 +226,7 @@ void SAL_CALL UNOMemoryStream::truncate() } // namespace comphelper -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_MemoryStream( css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) diff --git a/comphelper/source/streaming/seqinputstreamserv.cxx b/comphelper/source/streaming/seqinputstreamserv.cxx index 7dcc1a71022f..fbf3cbab04b1 100644 --- a/comphelper/source/streaming/seqinputstreamserv.cxx +++ b/comphelper/source/streaming/seqinputstreamserv.cxx @@ -210,7 +210,7 @@ void SAL_CALL SequenceInputStreamService::initialize( const uno::Sequence< css:: } // anonymous namespace -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_SequenceInputStreamService( css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) diff --git a/comphelper/source/streaming/seqoutputstreamserv.cxx b/comphelper/source/streaming/seqoutputstreamserv.cxx index 69deca26ed28..7175ad2789d1 100644 --- a/comphelper/source/streaming/seqoutputstreamserv.cxx +++ b/comphelper/source/streaming/seqoutputstreamserv.cxx @@ -134,7 +134,7 @@ uno::Sequence< ::sal_Int8 > SAL_CALL SequenceOutputStreamService::getWrittenByte } // anonymous namespace -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_SequenceOutputStreamService( css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) diff --git a/compilerplugins/clang/salcall.cxx b/compilerplugins/clang/salcall.cxx index 250994c07f5e..16657e848d5a 100644 --- a/compilerplugins/clang/salcall.cxx +++ b/compilerplugins/clang/salcall.cxx @@ -222,32 +222,13 @@ bool SalCall::VisitFunctionDecl(FunctionDecl const* decl) if (!bCanonicalDeclIsSalCall) return true; - // @TODO For now, I am ignore free functions, since those are most likely to have their address taken. - // I'll do them later. They are harder to verify since MSVC does not verify when assigning to function pointers - // that the calling convention of the function matches the calling convention of the function pointer! - if (!methodDecl) + if (!decl->isThisDeclarationADefinition() && !(methodDecl && methodDecl->isPure())) return true; - // can only check when we have a definition since this is the most likely time // when the address of the method will be taken - if (!(methodDecl && methodDecl->isPure()) && !decl->isThisDeclarationADefinition()) - return true; - if (m_addressOfSet.find(decl->getCanonicalDecl()) != m_addressOfSet.end()) - return true; - - // ignore extern "C" UNO factory constructor functions - if (decl->isExternC()) + if (methodDecl) { - if (loplugin::TypeCheck(decl->getReturnType()) - .Pointer() - .Class("XInterface") - .Namespace("uno") - .Namespace("star") - .Namespace("sun") - .Namespace("com") - .GlobalNamespace()) - return true; - if (loplugin::TypeCheck(decl->getReturnType()).Pointer().Void()) + if (m_addressOfSet.find(decl->getCanonicalDecl()) != m_addressOfSet.end()) return true; } diff --git a/configmgr/source/configurationprovider.hxx b/configmgr/source/configurationprovider.hxx index f29a8c728976..143ce9548fcd 100644 --- a/configmgr/source/configurationprovider.hxx +++ b/configmgr/source/configurationprovider.hxx @@ -41,13 +41,13 @@ css::uno::Reference< css::uno::XInterface > createDefault( css::uno::Reference< css::uno::XComponentContext > const & context); -OUString SAL_CALL getImplementationName(); +OUString getImplementationName(); -css::uno::Sequence< OUString > SAL_CALL +css::uno::Sequence< OUString > getSupportedServiceNames(); css::uno::Reference< css::lang::XSingleComponentFactory > -SAL_CALL createFactory( +createFactory( cppu::ComponentFactoryFunc, OUString const &, css::uno::Sequence< OUString > const &, rtl_ModuleCount *); diff --git a/configmgr/source/configurationregistry.hxx b/configmgr/source/configurationregistry.hxx index 1bfda104dc1c..75c35884e044 100644 --- a/configmgr/source/configurationregistry.hxx +++ b/configmgr/source/configurationregistry.hxx @@ -35,14 +35,14 @@ namespace com { namespace sun { namespace star { namespace configmgr { namespace configuration_registry { -css::uno::Reference< css::uno::XInterface > SAL_CALL +css::uno::Reference< css::uno::XInterface > create( css::uno::Reference< css::uno::XComponentContext > const & context); -OUString SAL_CALL getImplementationName(); +OUString getImplementationName(); -css::uno::Sequence< OUString > SAL_CALL +css::uno::Sequence< OUString > getSupportedServiceNames(); } } diff --git a/configmgr/source/defaultprovider.hxx b/configmgr/source/defaultprovider.hxx index c3825ea46a88..d054137bf1d1 100644 --- a/configmgr/source/defaultprovider.hxx +++ b/configmgr/source/defaultprovider.hxx @@ -35,14 +35,14 @@ namespace com { namespace sun { namespace star { namespace configmgr { namespace default_provider { -css::uno::Reference< css::uno::XInterface > SAL_CALL +css::uno::Reference< css::uno::XInterface > create( css::uno::Reference< css::uno::XComponentContext > const & context); -OUString SAL_CALL getImplementationName(); +OUString getImplementationName(); -css::uno::Sequence< OUString > SAL_CALL +css::uno::Sequence< OUString > getSupportedServiceNames(); } } diff --git a/configmgr/source/readonlyaccess.hxx b/configmgr/source/readonlyaccess.hxx index 9b8d903d5504..c8d1a336c321 100644 --- a/configmgr/source/readonlyaccess.hxx +++ b/configmgr/source/readonlyaccess.hxx @@ -23,14 +23,14 @@ namespace com { namespace sun { namespace star { namespace configmgr { namespace read_only_access { -css::uno::Reference< css::uno::XInterface > SAL_CALL +css::uno::Reference< css::uno::XInterface > create( css::uno::Reference< css::uno::XComponentContext > const &); -OUString SAL_CALL getImplementationName(); +OUString getImplementationName(); -css::uno::Sequence< OUString > SAL_CALL +css::uno::Sequence< OUString > getSupportedServiceNames(); } } diff --git a/configmgr/source/readwriteaccess.hxx b/configmgr/source/readwriteaccess.hxx index 82f8300ccfe0..d891662d15aa 100644 --- a/configmgr/source/readwriteaccess.hxx +++ b/configmgr/source/readwriteaccess.hxx @@ -23,14 +23,14 @@ namespace com { namespace sun { namespace star { namespace configmgr { namespace read_write_access { -css::uno::Reference< css::uno::XInterface > SAL_CALL +css::uno::Reference< css::uno::XInterface > create( css::uno::Reference< css::uno::XComponentContext > const &); -OUString SAL_CALL getImplementationName(); +OUString getImplementationName(); -css::uno::Sequence< OUString > SAL_CALL +css::uno::Sequence< OUString > getSupportedServiceNames(); } } diff --git a/configmgr/source/services.cxx b/configmgr/source/services.cxx index 6affa5f1b79f..27675f93d766 100644 --- a/configmgr/source/services.cxx +++ b/configmgr/source/services.cxx @@ -38,7 +38,7 @@ namespace { -css::uno::Reference< css::uno::XInterface > SAL_CALL dummy( +css::uno::Reference< css::uno::XInterface > dummy( SAL_UNUSED_PARAMETER css::uno::Reference< css::uno::XComponentContext > const &) { @@ -74,7 +74,7 @@ static cppu::ImplementationEntry const services[] = { } -extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL configmgr_component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * configmgr_component_getFactory( char const * pImplName, void * pServiceManager, void * pRegistryKey) { return cppu::component_getFactoryHelper( diff --git a/configmgr/source/update.hxx b/configmgr/source/update.hxx index c1ede9b21caf..6ea08645fd6b 100644 --- a/configmgr/source/update.hxx +++ b/configmgr/source/update.hxx @@ -35,14 +35,14 @@ namespace com { namespace sun { namespace star { namespace configmgr { namespace update { -css::uno::Reference< css::uno::XInterface > SAL_CALL +css::uno::Reference< css::uno::XInterface > create( css::uno::Reference< css::uno::XComponentContext > const &); -OUString SAL_CALL getImplementationName(); +OUString getImplementationName(); -css::uno::Sequence< OUString > SAL_CALL +css::uno::Sequence< OUString > getSupportedServiceNames(); } } diff --git a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx index 224e96c91924..4e6ae28ac7de 100644 --- a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx +++ b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx @@ -874,7 +874,7 @@ void SAL_CALL ODatabaseMetaDataResultSet::initialize( const Sequence< Any >& _aA namespace connectivity { /// @throws Exception - Reference< XInterface > SAL_CALL ODatabaseMetaDataResultSet_CreateInstance(const Reference< XComponentContext >& ) + Reference< XInterface > ODatabaseMetaDataResultSet_CreateInstance(const Reference< XComponentContext >& ) { return *(new ODatabaseMetaDataResultSet()); } @@ -896,7 +896,7 @@ extern "C" { -SAL_DLLPUBLIC_EXPORT void* SAL_CALL dbtools_component_getFactory(const sal_Char* implName, void* serviceManager, void* registryKey) +SAL_DLLPUBLIC_EXPORT void* dbtools_component_getFactory(const sal_Char* implName, void* serviceManager, void* registryKey) { return cppu::component_getFactoryHelper(implName, serviceManager, registryKey, entries); } diff --git a/connectivity/source/cpool/Zregistration.cxx b/connectivity/source/cpool/Zregistration.cxx index d17800159fed..81138a32fb54 100644 --- a/connectivity/source/cpool/Zregistration.cxx +++ b/connectivity/source/cpool/Zregistration.cxx @@ -31,7 +31,7 @@ extern "C" { -SAL_DLLPUBLIC_EXPORT void* SAL_CALL dbpool2_component_getFactory(const sal_Char* _pImplName, void * _pServiceManager, void* /*_pRegistryKey*/) +SAL_DLLPUBLIC_EXPORT void* dbpool2_component_getFactory(const sal_Char* _pImplName, void * _pServiceManager, void* /*_pRegistryKey*/) { void* pRet = nullptr; diff --git a/connectivity/source/drivers/ado/Aservices.cxx b/connectivity/source/drivers/ado/Aservices.cxx index d9617ab0d460..88c3e298e077 100644 --- a/connectivity/source/drivers/ado/Aservices.cxx +++ b/connectivity/source/drivers/ado/Aservices.cxx @@ -26,7 +26,7 @@ using ::com::sun::star::uno::Sequence; using ::com::sun::star::lang::XSingleServiceFactory; using ::com::sun::star::lang::XMultiServiceFactory; -typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc) +typedef Reference< XSingleServiceFactory > (*createFactoryFunc) ( const Reference< XMultiServiceFactory > & rServiceManager, const OUString & rComponentName, diff --git a/connectivity/source/drivers/calc/CDriver.cxx b/connectivity/source/drivers/calc/CDriver.cxx index 6bfae82bcada..25c9fffc3322 100644 --- a/connectivity/source/drivers/calc/CDriver.cxx +++ b/connectivity/source/drivers/calc/CDriver.cxx @@ -49,7 +49,7 @@ OUString SAL_CALL ODriver::getImplementationName( ) // service names from file::OFileDriver -css::uno::Reference< css::uno::XInterface > SAL_CALL +css::uno::Reference< css::uno::XInterface > connectivity::calc::ODriver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory) { diff --git a/connectivity/source/drivers/calc/Cservices.cxx b/connectivity/source/drivers/calc/Cservices.cxx index d1f1e5adebcf..c1d840965f30 100644 --- a/connectivity/source/drivers/calc/Cservices.cxx +++ b/connectivity/source/drivers/calc/Cservices.cxx @@ -26,7 +26,7 @@ using ::com::sun::star::uno::Sequence; using ::com::sun::star::lang::XSingleServiceFactory; using ::com::sun::star::lang::XMultiServiceFactory; -typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc) +typedef Reference< XSingleServiceFactory > (*createFactoryFunc) ( const Reference< XMultiServiceFactory > & rServiceManager, const OUString & rComponentName, @@ -75,7 +75,7 @@ struct ProviderRequest }; -extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL connectivity_calc_component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void* connectivity_calc_component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, void* /*pRegistryKey*/) diff --git a/connectivity/source/drivers/dbase/DDriver.cxx b/connectivity/source/drivers/dbase/DDriver.cxx index 9dbcdddd3e21..eae07c4707fa 100644 --- a/connectivity/source/drivers/dbase/DDriver.cxx +++ b/connectivity/source/drivers/dbase/DDriver.cxx @@ -47,7 +47,7 @@ OUString SAL_CALL ODriver::getImplementationName( ) } -css::uno::Reference< css::uno::XInterface > SAL_CALL connectivity::dbase::ODriver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory) +css::uno::Reference< css::uno::XInterface > connectivity::dbase::ODriver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory) { return *(new ODriver( comphelper::getComponentContext(_rxFactory) )); } diff --git a/connectivity/source/drivers/dbase/Dservices.cxx b/connectivity/source/drivers/dbase/Dservices.cxx index da3636b03953..a45443680f42 100644 --- a/connectivity/source/drivers/dbase/Dservices.cxx +++ b/connectivity/source/drivers/dbase/Dservices.cxx @@ -26,7 +26,7 @@ using ::com::sun::star::uno::Sequence; using ::com::sun::star::lang::XSingleServiceFactory; using ::com::sun::star::lang::XMultiServiceFactory; -typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc) +typedef Reference< XSingleServiceFactory > (*createFactoryFunc) ( const Reference< XMultiServiceFactory > & rServiceManager, const OUString & rComponentName, @@ -75,7 +75,7 @@ struct ProviderRequest }; -extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL dbase_component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void* dbase_component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, void* /*pRegistryKey*/) diff --git a/connectivity/source/drivers/evoab2/NDriver.cxx b/connectivity/source/drivers/evoab2/NDriver.cxx index 921ad6e6427b..6ed8daf0676e 100644 --- a/connectivity/source/drivers/evoab2/NDriver.cxx +++ b/connectivity/source/drivers/evoab2/NDriver.cxx @@ -111,7 +111,7 @@ Sequence< OUString > SAL_CALL OEvoabDriver::getSupportedServiceNames( ) } -css::uno::Reference< css::uno::XInterface > SAL_CALL connectivity::evoab::OEvoabDriver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory) +css::uno::Reference< css::uno::XInterface > connectivity::evoab::OEvoabDriver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory) { return *(new OEvoabDriver(_rxFactory)); } diff --git a/connectivity/source/drivers/evoab2/NDriver.hxx b/connectivity/source/drivers/evoab2/NDriver.hxx index df7cd46c6e3c..0fafcc90b80b 100644 --- a/connectivity/source/drivers/evoab2/NDriver.hxx +++ b/connectivity/source/drivers/evoab2/NDriver.hxx @@ -34,7 +34,7 @@ namespace connectivity namespace evoab { /// @throws css::uno::Exception - css::uno::Reference< css::uno::XInterface > SAL_CALL OEvoabDriver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory); + css::uno::Reference< css::uno::XInterface > OEvoabDriver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory); typedef ::cppu::WeakComponentImplHelper< css::sdbc::XDriver, diff --git a/connectivity/source/drivers/evoab2/NServices.cxx b/connectivity/source/drivers/evoab2/NServices.cxx index 8599b69e9b8d..3fa7a83a36e7 100644 --- a/connectivity/source/drivers/evoab2/NServices.cxx +++ b/connectivity/source/drivers/evoab2/NServices.cxx @@ -27,7 +27,7 @@ using ::com::sun::star::uno::Sequence; using ::com::sun::star::lang::XSingleServiceFactory; using ::com::sun::star::lang::XMultiServiceFactory; -typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc) +typedef Reference< XSingleServiceFactory > (*createFactoryFunc) ( const Reference< XMultiServiceFactory > & rServiceManager, const OUString & rComponentName, @@ -77,7 +77,7 @@ struct ProviderRequest }; -extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL evoab2_component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void* evoab2_component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, void* /*pRegistryKey*/) diff --git a/connectivity/source/drivers/firebird/Driver.cxx b/connectivity/source/drivers/firebird/Driver.cxx index 99eafb987168..b3b129d3fbe2 100644 --- a/connectivity/source/drivers/firebird/Driver.cxx +++ b/connectivity/source/drivers/firebird/Driver.cxx @@ -47,7 +47,7 @@ namespace connectivity { namespace firebird { - Reference< XInterface > SAL_CALL FirebirdDriver_CreateInstance( + Reference< XInterface > FirebirdDriver_CreateInstance( const Reference< XMultiServiceFactory >& _rxFactory) { SAL_INFO("connectivity.firebird", "FirebirdDriver_CreateInstance()" ); diff --git a/connectivity/source/drivers/firebird/Driver.hxx b/connectivity/source/drivers/firebird/Driver.hxx index c314fc69fe4f..7394f6ad238f 100644 --- a/connectivity/source/drivers/firebird/Driver.hxx +++ b/connectivity/source/drivers/firebird/Driver.hxx @@ -39,7 +39,7 @@ namespace connectivity static const int FIREBIRD_SQL_DIALECT = 3; /// @throws css::uno::Exception - css::uno::Reference< css::uno::XInterface > SAL_CALL FirebirdDriver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory); + css::uno::Reference< css::uno::XInterface > FirebirdDriver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory); typedef ::cppu::WeakComponentImplHelper< css::sdbc::XDriver, css::sdbcx::XDataDefinitionSupplier, diff --git a/connectivity/source/drivers/firebird/Services.cxx b/connectivity/source/drivers/firebird/Services.cxx index 5f2c2e2fc9d5..75b247c32fe5 100644 --- a/connectivity/source/drivers/firebird/Services.cxx +++ b/connectivity/source/drivers/firebird/Services.cxx @@ -29,7 +29,7 @@ using ::com::sun::star::uno::Sequence; using ::com::sun::star::lang::XSingleServiceFactory; using ::com::sun::star::lang::XMultiServiceFactory; -typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc) +typedef Reference< XSingleServiceFactory > (*createFactoryFunc) ( const Reference< XMultiServiceFactory > & rServiceManager, const OUString & rComponentName, @@ -77,7 +77,7 @@ struct ProviderRequest }; -extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL firebird_sdbc_component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void* firebird_sdbc_component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, void*) diff --git a/connectivity/source/drivers/flat/EDriver.cxx b/connectivity/source/drivers/flat/EDriver.cxx index d4bde3ba363f..97f35622ac8e 100644 --- a/connectivity/source/drivers/flat/EDriver.cxx +++ b/connectivity/source/drivers/flat/EDriver.cxx @@ -50,7 +50,7 @@ OUString SAL_CALL ODriver::getImplementationName( ) } -css::uno::Reference< css::uno::XInterface > SAL_CALL connectivity::flat::ODriver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory) +css::uno::Reference< css::uno::XInterface > connectivity::flat::ODriver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory) { return *(new ODriver( comphelper::getComponentContext(_rxFactory) )); } diff --git a/connectivity/source/drivers/flat/Eservices.cxx b/connectivity/source/drivers/flat/Eservices.cxx index 5cd3092a329d..2771617c82b7 100644 --- a/connectivity/source/drivers/flat/Eservices.cxx +++ b/connectivity/source/drivers/flat/Eservices.cxx @@ -26,7 +26,7 @@ using ::com::sun::star::uno::Sequence; using ::com::sun::star::lang::XSingleServiceFactory; using ::com::sun::star::lang::XMultiServiceFactory; -typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc) +typedef Reference< XSingleServiceFactory > (*createFactoryFunc) ( const Reference< XMultiServiceFactory > & rServiceManager, const OUString & rComponentName, @@ -75,7 +75,7 @@ struct ProviderRequest }; -extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL flat_component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void* flat_component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, void* /*pRegistryKey*/) diff --git a/connectivity/source/drivers/hsqldb/HDriver.cxx b/connectivity/source/drivers/hsqldb/HDriver.cxx index 215de60a03e0..5b3c9f208214 100644 --- a/connectivity/source/drivers/hsqldb/HDriver.cxx +++ b/connectivity/source/drivers/hsqldb/HDriver.cxx @@ -76,7 +76,7 @@ namespace connectivity namespace hsqldb { - Reference< XInterface > SAL_CALL ODriverDelegator_CreateInstance(const Reference< css::lang::XMultiServiceFactory >& _rxFac) + Reference< XInterface > ODriverDelegator_CreateInstance(const Reference< css::lang::XMultiServiceFactory >& _rxFac) { return *(new ODriverDelegator(comphelper::getComponentContext(_rxFac))); } diff --git a/connectivity/source/drivers/hsqldb/Hservices.cxx b/connectivity/source/drivers/hsqldb/Hservices.cxx index 5bec6c648ade..6d1294b9b072 100644 --- a/connectivity/source/drivers/hsqldb/Hservices.cxx +++ b/connectivity/source/drivers/hsqldb/Hservices.cxx @@ -27,7 +27,7 @@ using css::uno::Sequence; using css::lang::XSingleServiceFactory; using css::lang::XMultiServiceFactory; -typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc) +typedef Reference< XSingleServiceFactory > (*createFactoryFunc) ( const Reference< XMultiServiceFactory > & rServiceManager, const OUString & rComponentName, @@ -76,7 +76,7 @@ struct ProviderRequest }; -extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL hsqldb_component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void* hsqldb_component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, void* /*pRegistryKey*/) diff --git a/connectivity/source/drivers/jdbc/JDriver.cxx b/connectivity/source/drivers/jdbc/JDriver.cxx index ed912aad3398..0466d98309aa 100644 --- a/connectivity/source/drivers/jdbc/JDriver.cxx +++ b/connectivity/source/drivers/jdbc/JDriver.cxx @@ -65,7 +65,7 @@ Sequence< OUString > java_sql_Driver::getSupportedServiceNames_Static( ) return aSNS; } -css::uno::Reference< css::uno::XInterface > SAL_CALL connectivity::java_sql_Driver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory) +css::uno::Reference< css::uno::XInterface > connectivity::java_sql_Driver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory) { return *(new java_sql_Driver( comphelper::getComponentContext(_rxFactory))); } diff --git a/connectivity/source/drivers/jdbc/jservices.cxx b/connectivity/source/drivers/jdbc/jservices.cxx index 6f78fcc51108..c5977439638b 100644 --- a/connectivity/source/drivers/jdbc/jservices.cxx +++ b/connectivity/source/drivers/jdbc/jservices.cxx @@ -26,7 +26,7 @@ using ::com::sun::star::uno::Sequence; using ::com::sun::star::lang::XSingleServiceFactory; using ::com::sun::star::lang::XMultiServiceFactory; -typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc) +typedef Reference< XSingleServiceFactory > (*createFactoryFunc) ( const Reference< XMultiServiceFactory > & rServiceManager, const OUString & rComponentName, @@ -74,7 +74,7 @@ struct ProviderRequest void* getProvider() const { return xRet.get(); } }; -extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL jdbc_component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void* jdbc_component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, void* /*pRegistryKey*/) diff --git a/connectivity/source/drivers/macab/MacabServices.cxx b/connectivity/source/drivers/macab/MacabServices.cxx index 469e342912c6..faf214f703da 100644 --- a/connectivity/source/drivers/macab/MacabServices.cxx +++ b/connectivity/source/drivers/macab/MacabServices.cxx @@ -27,7 +27,7 @@ using ::com::sun::star::uno::Sequence; using ::com::sun::star::lang::XSingleServiceFactory; using ::com::sun::star::lang::XMultiServiceFactory; -typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc) +typedef Reference< XSingleServiceFactory > (*createFactoryFunc) ( const Reference< XMultiServiceFactory > & rServiceManager, const OUString & rComponentName, diff --git a/connectivity/source/drivers/mork/MDriver.cxx b/connectivity/source/drivers/mork/MDriver.cxx index 58b714c72df7..7cd1dba4145c 100644 --- a/connectivity/source/drivers/mork/MDriver.cxx +++ b/connectivity/source/drivers/mork/MDriver.cxx @@ -14,7 +14,7 @@ using namespace connectivity::mork; -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL com_sun_star_comp_sdbc_MorkDriver_get_implementation( +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_sdbc_MorkDriver_get_implementation( css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const &) { diff --git a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx index d84e8a1eaedd..1eb3b91b66bc 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx +++ b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx @@ -36,7 +36,7 @@ using ::com::sun::star::lang::XMultiServiceFactory; static MozillaBootstrap *pMozillaBootstrap=nullptr; static Reference<XMozillaBootstrap> xMozillaBootstrap; -extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL OMozillaBootstrap_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& ) +extern "C" SAL_DLLPUBLIC_EXPORT void* OMozillaBootstrap_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& ) { if (!pMozillaBootstrap) { @@ -144,13 +144,13 @@ OUString SAL_CALL MozillaBootstrap::setCurrentProfile( css::mozilla::MozillaProd return -1; } -static Reference< XInterface > SAL_CALL createInstance( const Reference< XMultiServiceFactory >& rServiceManager ) +static Reference< XInterface > createInstance( const Reference< XMultiServiceFactory >& rServiceManager ) { MozillaBootstrap * pBootstrap = static_cast<MozillaBootstrap*>(OMozillaBootstrap_CreateInstance(rServiceManager)); return *pBootstrap; } -extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL mozbootstrap_component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void* mozbootstrap_component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, void* /*pRegistryKey*/) diff --git a/connectivity/source/drivers/mysql/YDriver.cxx b/connectivity/source/drivers/mysql/YDriver.cxx index b814d5f31e9c..a79db52b95bf 100644 --- a/connectivity/source/drivers/mysql/YDriver.cxx +++ b/connectivity/source/drivers/mysql/YDriver.cxx @@ -42,7 +42,7 @@ namespace connectivity namespace mysql { - Reference< XInterface > SAL_CALL ODriverDelegator_CreateInstance(const Reference< css::lang::XMultiServiceFactory >& _rxFac) + Reference< XInterface > ODriverDelegator_CreateInstance(const Reference< css::lang::XMultiServiceFactory >& _rxFac) { return *(new ODriverDelegator( comphelper::getComponentContext(_rxFac) )); } diff --git a/connectivity/source/drivers/mysql/Yservices.cxx b/connectivity/source/drivers/mysql/Yservices.cxx index 20f337e80530..b08ce3425255 100644 --- a/connectivity/source/drivers/mysql/Yservices.cxx +++ b/connectivity/source/drivers/mysql/Yservices.cxx @@ -26,7 +26,7 @@ using ::com::sun::star::uno::Sequence; using ::com::sun::star::lang::XSingleServiceFactory; using ::com::sun::star::lang::XMultiServiceFactory; -typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc) +typedef Reference< XSingleServiceFactory > (*createFactoryFunc) ( const Reference< XMultiServiceFactory > & rServiceManager, const OUString & rComponentName, @@ -35,7 +35,7 @@ typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc) rtl_ModuleCount* ); -extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL mysql_component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void* mysql_component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, void* /*pRegistryKey*/) diff --git a/connectivity/source/drivers/odbc/ORealDriver.cxx b/connectivity/source/drivers/odbc/ORealDriver.cxx index ee59b0d8ae15..3cfe29794a05 100644 --- a/connectivity/source/drivers/odbc/ORealDriver.cxx +++ b/connectivity/source/drivers/odbc/ORealDriver.cxx @@ -258,7 +258,7 @@ oslGenericFunction ORealObdcDriver::getOdbcFunction(ODBC3SQLFunctionId _nIndex) } -css::uno::Reference< css::uno::XInterface > SAL_CALL ODBCDriver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory) +css::uno::Reference< css::uno::XInterface > ODBCDriver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory) { return *(new ORealObdcDriver(_rxFactory)); } diff --git a/connectivity/source/drivers/odbc/ORealDriver.hxx b/connectivity/source/drivers/odbc/ORealDriver.hxx index 5a103d80fec3..b4b092b87697 100644 --- a/connectivity/source/drivers/odbc/ORealDriver.hxx +++ b/connectivity/source/drivers/odbc/ORealDriver.hxx @@ -33,7 +33,7 @@ namespace com { namespace sun { namespace star { namespace connectivity { namespace odbc { /// @throws css::uno::Exception -css::uno::Reference< css::uno::XInterface > SAL_CALL +css::uno::Reference< css::uno::XInterface > ODBCDriver_CreateInstance( css::uno::Reference< css::lang::XMultiServiceFactory > const & factory); } } diff --git a/connectivity/source/drivers/odbc/oservices.cxx b/connectivity/source/drivers/odbc/oservices.cxx index 4d13ae9bdef9..a4a5cd4e6aa1 100644 --- a/connectivity/source/drivers/odbc/oservices.cxx +++ b/connectivity/source/drivers/odbc/oservices.cxx @@ -27,7 +27,7 @@ using ::com::sun::star::uno::Sequence; using ::com::sun::star::lang::XSingleServiceFactory; using ::com::sun::star::lang::XMultiServiceFactory; -typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc) +typedef Reference< XSingleServiceFactory > (*createFactoryFunc) ( const Reference< XMultiServiceFactory > & rServiceManager, const OUString & rComponentName, @@ -76,7 +76,7 @@ struct ProviderRequest }; -extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL odbc_component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void* odbc_component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, void* /*pRegistryKey*/) diff --git a/connectivity/source/drivers/postgresql/pq_connection.cxx b/connectivity/source/drivers/postgresql/pq_connection.cxx index 76ac4de02d57..6c5eb35ed5df 100644 --- a/connectivity/source/drivers/postgresql/pq_connection.cxx +++ b/connectivity/source/drivers/postgresql/pq_connection.cxx @@ -708,7 +708,7 @@ static const struct cppu::ImplementationEntry g_entries[] = extern "C" { -SAL_DLLPUBLIC_EXPORT void * SAL_CALL postgresql_sdbc_impl_component_getFactory( +SAL_DLLPUBLIC_EXPORT void * postgresql_sdbc_impl_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { return cppu::component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , g_entries ); diff --git a/connectivity/source/drivers/postgresql/pq_driver.cxx b/connectivity/source/drivers/postgresql/pq_driver.cxx index 40a6abf09026..e877776b3a3a 100644 --- a/connectivity/source/drivers/postgresql/pq_driver.cxx +++ b/connectivity/source/drivers/postgresql/pq_driver.cxx @@ -274,7 +274,7 @@ static const struct cppu::ImplementationEntry g_entries[] = extern "C" { -SAL_DLLPUBLIC_EXPORT void * SAL_CALL postgresql_sdbc_component_getFactory( +SAL_DLLPUBLIC_EXPORT void * postgresql_sdbc_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * ) { // need to extract the defaultcontext, because the way, sdbc diff --git a/connectivity/source/drivers/writer/WDriver.cxx b/connectivity/source/drivers/writer/WDriver.cxx index d19f2fb2425b..d07d2f326b31 100644 --- a/connectivity/source/drivers/writer/WDriver.cxx +++ b/connectivity/source/drivers/writer/WDriver.cxx @@ -43,7 +43,7 @@ OUString SAL_CALL ODriver::getImplementationName() return getImplementationName_Static(); } -uno::Reference< css::uno::XInterface > SAL_CALL +uno::Reference< css::uno::XInterface > ODriver_CreateInstance(const uno::Reference< lang::XMultiServiceFactory >& _rxFactory) { diff --git a/connectivity/source/drivers/writer/Wservices.cxx b/connectivity/source/drivers/writer/Wservices.cxx index 8b1a7cb314f4..ad59d7639153 100644 --- a/connectivity/source/drivers/writer/Wservices.cxx +++ b/connectivity/source/drivers/writer/Wservices.cxx @@ -22,7 +22,7 @@ using namespace com::sun::star; -typedef uno::Reference< lang::XSingleServiceFactory > (SAL_CALL* createFactoryFunc) +typedef uno::Reference< lang::XSingleServiceFactory > (* createFactoryFunc) ( const uno::Reference< lang::XMultiServiceFactory >& rServiceManager, const OUString& rComponentName, @@ -74,7 +74,7 @@ struct ProviderRequest }; -extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL connectivity_writer_component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void* connectivity_writer_component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, void* /*pRegistryKey*/) diff --git a/connectivity/source/inc/calc/CDriver.hxx b/connectivity/source/inc/calc/CDriver.hxx index 831284c7c68b..89e92f4144c4 100644 --- a/connectivity/source/inc/calc/CDriver.hxx +++ b/connectivity/source/inc/calc/CDriver.hxx @@ -29,7 +29,7 @@ namespace connectivity namespace calc { /// @throws css::uno::Exception - css::uno::Reference< css::uno::XInterface > SAL_CALL + css::uno::Reference< css::uno::XInterface > ODriver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory); class ODriver : public file::OFileDriver diff --git a/connectivity/source/inc/dbase/DDriver.hxx b/connectivity/source/inc/dbase/DDriver.hxx index d8d340af840f..9378b4c5f693 100644 --- a/connectivity/source/inc/dbase/DDriver.hxx +++ b/connectivity/source/inc/dbase/DDriver.hxx @@ -29,7 +29,7 @@ namespace connectivity namespace dbase { /// @throws css::uno::Exception - css::uno::Reference< css::uno::XInterface > SAL_CALL ODriver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory); + css::uno::Reference< css::uno::XInterface > ODriver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory); class ODriver : public file::OFileDriver { diff --git a/connectivity/source/inc/flat/EDriver.hxx b/connectivity/source/inc/flat/EDriver.hxx index 036d845cc61b..c818b363203a 100644 --- a/connectivity/source/inc/flat/EDriver.hxx +++ b/connectivity/source/inc/flat/EDriver.hxx @@ -29,7 +29,7 @@ namespace connectivity namespace flat { /// @throws css::uno::Exception - css::uno::Reference< css::uno::XInterface > SAL_CALL ODriver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory); + css::uno::Reference< css::uno::XInterface > ODriver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory); class ODriver : public file::OFileDriver { diff --git a/connectivity/source/inc/hsqldb/HDriver.hxx b/connectivity/source/inc/hsqldb/HDriver.hxx index 675d63993242..b88e1227de1c 100644 --- a/connectivity/source/inc/hsqldb/HDriver.hxx +++ b/connectivity/source/inc/hsqldb/HDriver.hxx @@ -39,7 +39,7 @@ namespace connectivity namespace hsqldb { /// @throws css::uno::Exception - css::uno::Reference< css::uno::XInterface > SAL_CALL ODriverDelegator_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory); + css::uno::Reference< css::uno::XInterface > ODriverDelegator_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory); typedef ::cppu::WeakComponentImplHelper< css::sdbc::XDriver , css::sdbcx::XDataDefinitionSupplier diff --git a/connectivity/source/inc/java/sql/Driver.hxx b/connectivity/source/inc/java/sql/Driver.hxx index 09a2c03b40a0..d01f3896b7ef 100644 --- a/connectivity/source/inc/java/sql/Driver.hxx +++ b/connectivity/source/inc/java/sql/Driver.hxx @@ -30,7 +30,7 @@ namespace connectivity { /// @throws css::uno::Exception - css::uno::Reference< css::uno::XInterface > SAL_CALL java_sql_Driver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory); + css::uno::Reference< css::uno::XInterface > java_sql_Driver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory); class java_sql_Driver : public ::cppu::WeakImplHelper< css::sdbc::XDriver,css::lang::XServiceInfo> { diff --git a/connectivity/source/inc/mysql/YDriver.hxx b/connectivity/source/inc/mysql/YDriver.hxx index 23b9f89fb961..fc4b7b35f493 100644 --- a/connectivity/source/inc/mysql/YDriver.hxx +++ b/connectivity/source/inc/mysql/YDriver.hxx @@ -43,7 +43,7 @@ namespace connectivity namespace mysql { /// @throws css::uno::Exception - css::uno::Reference< css::uno::XInterface > SAL_CALL ODriverDelegator_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxMSF); + css::uno::Reference< css::uno::XInterface > ODriverDelegator_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxMSF); typedef ::cppu::WeakComponentImplHelper< css::sdbc::XDriver , css::sdbcx::XDataDefinitionSupplier diff --git a/connectivity/source/inc/writer/WDriver.hxx b/connectivity/source/inc/writer/WDriver.hxx index d531da480f7f..614c8321d1a0 100644 --- a/connectivity/source/inc/writer/WDriver.hxx +++ b/connectivity/source/inc/writer/WDriver.hxx @@ -29,7 +29,7 @@ namespace connectivity namespace writer { /// @throws css::uno::Exception -css::uno::Reference< css::uno::XInterface > SAL_CALL +css::uno::Reference< css::uno::XInterface > ODriver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory); class ODriver : public file::OFileDriver diff --git a/connectivity/source/manager/mregistration.cxx b/connectivity/source/manager/mregistration.cxx index 11bc4f73eb8d..40cd37698f70 100644 --- a/connectivity/source/manager/mregistration.cxx +++ b/connectivity/source/manager/mregistration.cxx @@ -29,7 +29,7 @@ extern "C" { -SAL_DLLPUBLIC_EXPORT void* SAL_CALL sdbc2_component_getFactory(const sal_Char* _pImplName, void * _pServiceManager, void* /*_pRegistryKey*/) +SAL_DLLPUBLIC_EXPORT void* sdbc2_component_getFactory(const sal_Char* _pImplName, void * _pServiceManager, void* /*_pRegistryKey*/) { void* pRet = nullptr; diff --git a/cppcanvas/source/uno/uno_mtfrenderer.cxx b/cppcanvas/source/uno/uno_mtfrenderer.cxx index a13b995e6e3a..557f5902f872 100644 --- a/cppcanvas/source/uno/uno_mtfrenderer.cxx +++ b/cppcanvas/source/uno/uno_mtfrenderer.cxx @@ -54,7 +54,7 @@ namespace sdecl = comphelper::service_decl; // The C shared lib entry points extern "C" -SAL_DLLPUBLIC_EXPORT void* SAL_CALL mtfrenderer_component_getFactory( sal_Char const* pImplName, +SAL_DLLPUBLIC_EXPORT void* mtfrenderer_component_getFactory( sal_Char const* pImplName, void*, void* ) { return sdecl::component_getFactoryHelper( pImplName, {&MtfRendererDecl} ); diff --git a/cppu/source/AffineBridge/AffineBridge.cxx b/cppu/source/AffineBridge/AffineBridge.cxx index bf0455f689a1..b63b8777a0dd 100644 --- a/cppu/source/AffineBridge/AffineBridge.cxx +++ b/cppu/source/AffineBridge/AffineBridge.cxx @@ -340,13 +340,13 @@ bool AffineBridge::v_isValid(rtl::OUString * pReason) #endif -extern "C" void SAL_DLLPUBLIC_EXPORT SAL_CALL uno_initEnvironment(uno_Environment * pEnv) +extern "C" void SAL_DLLPUBLIC_EXPORT uno_initEnvironment(uno_Environment * pEnv) SAL_THROW_EXTERN_C() { cppu::helper::purpenv::Environment_initWithEnterable(pEnv, new AffineBridge()); } -extern "C" void SAL_DLLPUBLIC_EXPORT SAL_CALL uno_ext_getMapping(uno_Mapping ** ppMapping, +extern "C" void SAL_DLLPUBLIC_EXPORT uno_ext_getMapping(uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo ) { diff --git a/cppu/source/LogBridge/LogBridge.cxx b/cppu/source/LogBridge/LogBridge.cxx index 2e891603c152..395d7d8ef164 100644 --- a/cppu/source/LogBridge/LogBridge.cxx +++ b/cppu/source/LogBridge/LogBridge.cxx @@ -249,13 +249,13 @@ void LogProbe( #endif -extern "C" void SAL_DLLPUBLIC_EXPORT SAL_CALL uno_initEnvironment(uno_Environment * pEnv) +extern "C" void SAL_DLLPUBLIC_EXPORT uno_initEnvironment(uno_Environment * pEnv) SAL_THROW_EXTERN_C() { cppu::helper::purpenv::Environment_initWithEnterable(pEnv, new LogBridge()); } -extern "C" void SAL_DLLPUBLIC_EXPORT SAL_CALL uno_ext_getMapping(uno_Mapping ** ppMapping, +extern "C" void SAL_DLLPUBLIC_EXPORT uno_ext_getMapping(uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo ) { diff --git a/cppu/source/UnsafeBridge/UnsafeBridge.cxx b/cppu/source/UnsafeBridge/UnsafeBridge.cxx index 772f2a7bd703..892390b7a263 100644 --- a/cppu/source/UnsafeBridge/UnsafeBridge.cxx +++ b/cppu/source/UnsafeBridge/UnsafeBridge.cxx @@ -124,13 +124,13 @@ bool UnsafeBridge::v_isValid(rtl::OUString * pReason) return result; } -extern "C" void SAL_DLLPUBLIC_EXPORT SAL_CALL uno_initEnvironment(uno_Environment * pEnv) +extern "C" void SAL_DLLPUBLIC_EXPORT uno_initEnvironment(uno_Environment * pEnv) SAL_THROW_EXTERN_C() { cppu::helper::purpenv::Environment_initWithEnterable(pEnv, new UnsafeBridge()); } -extern "C" void SAL_DLLPUBLIC_EXPORT SAL_CALL uno_ext_getMapping(uno_Mapping ** ppMapping, +extern "C" void SAL_DLLPUBLIC_EXPORT uno_ext_getMapping(uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo ) { diff --git a/cppu/source/helper/purpenv/Proxy.hxx b/cppu/source/helper/purpenv/Proxy.hxx index 3c270fa6421a..f53702ef93d3 100644 --- a/cppu/source/helper/purpenv/Proxy.hxx +++ b/cppu/source/helper/purpenv/Proxy.hxx @@ -72,7 +72,7 @@ public: }; -extern "C" void SAL_CALL Proxy_free(uno_ExtEnvironment * pEnv, void * pProxy) SAL_THROW_EXTERN_C(); +extern "C" void Proxy_free(uno_ExtEnvironment * pEnv, void * pProxy) SAL_THROW_EXTERN_C(); #endif diff --git a/cppu/source/helper/purpenv/helper_purpenv_Environment.cxx b/cppu/source/helper/purpenv/helper_purpenv_Environment.cxx index 4143e4838515..8d24442faa11 100644 --- a/cppu/source/helper/purpenv/helper_purpenv_Environment.cxx +++ b/cppu/source/helper/purpenv/helper_purpenv_Environment.cxx @@ -28,32 +28,32 @@ #include <osl/interlck.h> extern "C" { -typedef void SAL_CALL EnvFun_P (uno_Environment *); -typedef void SAL_CALL EnvFun_PP_P(uno_Environment ** ppHardEnv, uno_Environment *); -typedef void SAL_CALL ExtEnv_registerProxyInterface (uno_ExtEnvironment *, +typedef void EnvFun_P (uno_Environment *); +typedef void EnvFun_PP_P(uno_Environment ** ppHardEnv, uno_Environment *); +typedef void ExtEnv_registerProxyInterface (uno_ExtEnvironment *, void ** ppProxy, uno_freeProxyFunc freeProxy, rtl_uString * pOId, typelib_InterfaceTypeDescription * pTypeDescr); -typedef void SAL_CALL ExtEnv_revokeInterface (uno_ExtEnvironment *, +typedef void ExtEnv_revokeInterface (uno_ExtEnvironment *, void * pInterface); -typedef void SAL_CALL ExtEnv_getObjectIdentifier (uno_ExtEnvironment *, +typedef void ExtEnv_getObjectIdentifier (uno_ExtEnvironment *, rtl_uString **, void *); -typedef void SAL_CALL ExtEnv_getRegisteredInterface (uno_ExtEnvironment *, +typedef void ExtEnv_getRegisteredInterface (uno_ExtEnvironment *, void **, rtl_uString *, typelib_InterfaceTypeDescription *); -typedef void SAL_CALL ExtEnv_getRegisteredInterfaces(uno_ExtEnvironment *, +typedef void ExtEnv_getRegisteredInterfaces(uno_ExtEnvironment *, void *** pppInterfaces, sal_Int32 * pnLen, uno_memAlloc memAlloc); -typedef void SAL_CALL ExtEnv_computeObjectIdentifier(uno_ExtEnvironment *, +typedef void ExtEnv_computeObjectIdentifier(uno_ExtEnvironment *, rtl_uString ** ppOId, void * pInterface); -typedef void SAL_CALL ExtEnv_acquireInterface (uno_ExtEnvironment *, +typedef void ExtEnv_acquireInterface (uno_ExtEnvironment *, void * pInterface); -typedef void SAL_CALL ExtEnv_releaseInterface (uno_ExtEnvironment *, +typedef void ExtEnv_releaseInterface (uno_ExtEnvironment *, void * pInterface); } @@ -116,38 +116,38 @@ protected: }; extern "C" { -static void SAL_CALL s_acquire(uno_Environment * pEnv) //SAL_THROW_EXTERN_C() +static void s_acquire(uno_Environment * pEnv) //SAL_THROW_EXTERN_C() { Base * pBase = static_cast<Base *>(pEnv->pReserved); pBase->acquire(); } -static void SAL_CALL s_release(uno_Environment * pEnv) SAL_THROW_EXTERN_C() +static void s_release(uno_Environment * pEnv) SAL_THROW_EXTERN_C() { Base * pBase = static_cast<Base *>(pEnv->pReserved); pBase->release(); } -static void SAL_CALL s_harden(uno_Environment ** ppHardEnv, uno_Environment * pEnv) SAL_THROW_EXTERN_C() +static void s_harden(uno_Environment ** ppHardEnv, uno_Environment * pEnv) SAL_THROW_EXTERN_C() { Base * pBase = static_cast<Base *>(pEnv->pReserved); pBase->harden(ppHardEnv); } -static void SAL_CALL s_acquireWeak(uno_Environment * pEnv) SAL_THROW_EXTERN_C() +static void s_acquireWeak(uno_Environment * pEnv) SAL_THROW_EXTERN_C() { Base * pBase = static_cast<Base *>(pEnv->pReserved); pBase->acquireWeak(); } -static void SAL_CALL s_releaseWeak(uno_Environment * pEnv) SAL_THROW_EXTERN_C() +static void s_releaseWeak(uno_Environment * pEnv) SAL_THROW_EXTERN_C() { Base * pBase = static_cast<Base *>(pEnv->pReserved); pBase->releaseWeak(); } -static void SAL_CALL s_registerProxyInterface(uno_ExtEnvironment * pExtEnv, +static void s_registerProxyInterface(uno_ExtEnvironment * pExtEnv, void ** ppProxy, uno_freeProxyFunc freeProxy, rtl_uString * pOId, @@ -157,13 +157,13 @@ static void SAL_CALL s_registerProxyInterface(uno_ExtEnvironment pBase->registerProxyInterface(ppProxy, freeProxy, pOId, pTypeDescr); } -static void SAL_CALL s_revokeInterface(uno_ExtEnvironment * pExtEnv, void * pInterface) +static void s_revokeInterface(uno_ExtEnvironment * pExtEnv, void * pInterface) { Base * pBase = static_cast<Base *>(pExtEnv->aBase.pReserved); pBase->revokeInterface(pInterface); } -static void SAL_CALL s_getObjectIdentifier(uno_ExtEnvironment * pExtEnv, +static void s_getObjectIdentifier(uno_ExtEnvironment * pExtEnv, rtl_uString ** ppOId, void * pInterface) { @@ -171,7 +171,7 @@ static void SAL_CALL s_getObjectIdentifier(uno_ExtEnvironment * pExtEnv, pBase->getObjectIdentifier(pInterface, reinterpret_cast<rtl::OUString *>(ppOId)); } -static void SAL_CALL s_getRegisteredInterface(uno_ExtEnvironment * pExtEnv, +static void s_getRegisteredInterface(uno_ExtEnvironment * pExtEnv, void ** ppInterface, rtl_uString * pOId, typelib_InterfaceTypeDescription * pTypeDescr) @@ -180,7 +180,7 @@ static void SAL_CALL s_getRegisteredInterface(uno_ExtEnvironment * pExtEnv, pBase->getRegisteredInterface(ppInterface, pOId, pTypeDescr); } -static void SAL_CALL s_getRegisteredInterfaces(uno_ExtEnvironment * pExtEnv, +static void s_getRegisteredInterfaces(uno_ExtEnvironment * pExtEnv, void *** pppInterface, sal_Int32 * pnLen, uno_memAlloc memAlloc) @@ -189,7 +189,7 @@ static void SAL_CALL s_getRegisteredInterfaces(uno_ExtEnvironment * pExtEnv, pBase->getRegisteredInterfaces(pppInterface, pnLen, memAlloc); } -static void SAL_CALL s_computeObjectIdentifier(uno_ExtEnvironment * pExtEnv, +static void s_computeObjectIdentifier(uno_ExtEnvironment * pExtEnv, rtl_uString ** ppOId, void * pInterface) { @@ -197,12 +197,12 @@ static void SAL_CALL s_computeObjectIdentifier(uno_ExtEnvironment * pExtEnv, pBase->computeObjectIdentifier(pInterface, reinterpret_cast<rtl::OUString *>(ppOId)); } -static void SAL_CALL s_acquireInterface(uno_ExtEnvironment * pExtEnv, void * pInterface) { +static void s_acquireInterface(uno_ExtEnvironment * pExtEnv, void * pInterface) { Base * pBase = static_cast<Base *>(pExtEnv->aBase.pReserved); pBase->acquireInterface(pInterface); } -static void SAL_CALL s_releaseInterface(uno_ExtEnvironment * pExtEnv, void * pInterface) { +static void s_releaseInterface(uno_ExtEnvironment * pExtEnv, void * pInterface) { Base * pBase = static_cast<Base *>(pExtEnv->aBase.pReserved); pBase->releaseInterface(pInterface); } diff --git a/cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx b/cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx index f065d3c7ecca..41a338f27a53 100644 --- a/cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx +++ b/cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx @@ -55,7 +55,7 @@ public: void release(); }; -static void SAL_CALL s_mapInterface( +static void s_mapInterface( uno_Mapping * puno_Mapping, void ** ppOut, void * pUnoI, @@ -69,14 +69,14 @@ static void SAL_CALL s_mapInterface( } extern "C" { -static void SAL_CALL s_acquire(uno_Mapping * puno_Mapping) +static void s_acquire(uno_Mapping * puno_Mapping) SAL_THROW_EXTERN_C() { Mapping * pMapping = static_cast<Mapping *>(puno_Mapping); pMapping->acquire(); } -static void SAL_CALL s_release(uno_Mapping * puno_Mapping) +static void s_release(uno_Mapping * puno_Mapping) SAL_THROW_EXTERN_C() { Mapping * pMapping = static_cast<Mapping * >(puno_Mapping); @@ -93,7 +93,7 @@ static void s_getIdentifier_v(va_list * pParam) pEnv->getObjectIdentifier(pEnv, ppOid, pUnoI); } -static void SAL_CALL s_free(uno_Mapping * puno_Mapping) +static void s_free(uno_Mapping * puno_Mapping) SAL_THROW_EXTERN_C() { Mapping * pMapping = static_cast<Mapping *>(puno_Mapping); diff --git a/cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx b/cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx index 048f393d6466..e0ce8b74aa27 100644 --- a/cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx +++ b/cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx @@ -98,7 +98,7 @@ static bool relatesToInterface(typelib_TypeDescription * pTypeDescr) return false; } -extern "C" { static void SAL_CALL s_Proxy_dispatch( +extern "C" { static void s_Proxy_dispatch( uno_Interface * pUnoI, typelib_TypeDescription const * pMemberType, void * pReturn, @@ -158,20 +158,20 @@ extern "C" { static void SAL_CALL s_Proxy_dispatch( ppException ); }} -extern "C" void SAL_CALL Proxy_free(SAL_UNUSED_PARAMETER uno_ExtEnvironment * /*pEnv*/, void * pProxy) SAL_THROW_EXTERN_C() +extern "C" void Proxy_free(SAL_UNUSED_PARAMETER uno_ExtEnvironment * /*pEnv*/, void * pProxy) SAL_THROW_EXTERN_C() { Proxy * pThis = static_cast<Proxy * >(static_cast<uno_Interface *>(pProxy)); delete pThis; } extern "C" { -static void SAL_CALL s_Proxy_acquire(uno_Interface * pUnoI) SAL_THROW_EXTERN_C() +static void s_Proxy_acquire(uno_Interface * pUnoI) SAL_THROW_EXTERN_C() { Proxy * pProxy = static_cast<Proxy *>(pUnoI); pProxy->acquire(); } -static void SAL_CALL s_Proxy_release(uno_Interface * pUnoI) SAL_THROW_EXTERN_C() +static void s_Proxy_release(uno_Interface * pUnoI) SAL_THROW_EXTERN_C() { Proxy * pProxy = static_cast<Proxy *>(pUnoI); pProxy->release(); diff --git a/cppu/source/threadpool/current.cxx b/cppu/source/threadpool/current.cxx index f0bb7e750a94..fa2545d05e1c 100644 --- a/cppu/source/threadpool/current.cxx +++ b/cppu/source/threadpool/current.cxx @@ -134,7 +134,7 @@ public: } }; -extern "C" void SAL_CALL delete_IdContainer( void * p ) +extern "C" void delete_IdContainer( void * p ) { if (p) { diff --git a/cppu/source/threadpool/jobqueue.hxx b/cppu/source/threadpool/jobqueue.hxx index 9dc20f3cd75e..abfdfa19d661 100644 --- a/cppu/source/threadpool/jobqueue.hxx +++ b/cppu/source/threadpool/jobqueue.hxx @@ -29,7 +29,7 @@ namespace cppu_threadpool { - extern "C" typedef void (SAL_CALL RequestFun)(void *); + extern "C" typedef void (RequestFun)(void *); struct Job { diff --git a/cppu/source/typelib/typelib.cxx b/cppu/source/typelib/typelib.cxx index 4ef5aaf18ac7..a99746ef0600 100644 --- a/cppu/source/typelib/typelib.cxx +++ b/cppu/source/typelib/typelib.cxx @@ -540,7 +540,7 @@ bool complete(typelib_TypeDescription ** ppTypeDescr, bool initTables) { } -extern "C" void SAL_CALL typelib_typedescription_newEmpty( +extern "C" void typelib_typedescription_newEmpty( typelib_TypeDescription ** ppRet, typelib_TypeClass eTypeClass, rtl_uString * pTypeName ) SAL_THROW_EXTERN_C() @@ -1605,7 +1605,7 @@ extern "C" sal_Bool SAL_CALL typelib_typedescription_equals( } -extern "C" sal_Int32 SAL_CALL typelib_typedescription_getAlignedUnoSize( +extern "C" sal_Int32 typelib_typedescription_getAlignedUnoSize( const typelib_TypeDescription * pTypeDescription, sal_Int32 nOffset, sal_Int32 & rMaxIntegralTypeSize ) SAL_THROW_EXTERN_C() @@ -2215,7 +2215,7 @@ extern "C" void SAL_CALL typelib_typedescriptionreference_getDescription( } -extern "C" void SAL_CALL typelib_typedescriptionreference_getByName( +extern "C" void typelib_typedescriptionreference_getByName( typelib_TypeDescriptionReference ** ppRet, rtl_uString const * pName ) SAL_THROW_EXTERN_C() { diff --git a/cppu/source/typelib/typelib.hxx b/cppu/source/typelib/typelib.hxx index 30f0f22c986c..b10b6eba8757 100644 --- a/cppu/source/typelib/typelib.hxx +++ b/cppu/source/typelib/typelib.hxx @@ -20,20 +20,20 @@ #ifndef INCLUDED_CPPU_SOURCE_TYPELIB_HXX #define INCLUDED_CPPU_SOURCE_TYPELIB_HXX -extern "C" sal_Int32 SAL_CALL typelib_typedescription_getAlignedUnoSize( +extern "C" sal_Int32 typelib_typedescription_getAlignedUnoSize( const typelib_TypeDescription * pTypeDescription, sal_Int32 nOffset, sal_Int32 & rMaxIntegralTypeSize ) SAL_THROW_EXTERN_C(); -extern "C" void SAL_CALL typelib_typedescription_newEmpty( +extern "C" void typelib_typedescription_newEmpty( typelib_TypeDescription ** ppRet, typelib_TypeClass eTypeClass, rtl_uString * pTypeName ) SAL_THROW_EXTERN_C(); -extern "C" void SAL_CALL typelib_typedescriptionreference_getByName( +extern "C" void typelib_typedescriptionreference_getByName( typelib_TypeDescriptionReference ** ppRet, rtl_uString const * pName ) SAL_THROW_EXTERN_C(); diff --git a/cppu/source/uno/IdentityMapping.cxx b/cppu/source/uno/IdentityMapping.cxx index 659c9cdc7385..36f0d15192c4 100644 --- a/cppu/source/uno/IdentityMapping.cxx +++ b/cppu/source/uno/IdentityMapping.cxx @@ -39,12 +39,12 @@ struct IdentityMapping : public uno_Mapping extern "C" { -static void SAL_CALL s_free(uno_Mapping * pMapping) +static void s_free(uno_Mapping * pMapping) { delete static_cast<IdentityMapping *>(pMapping); } -static void SAL_CALL s_acquire(uno_Mapping * pMapping) +static void s_acquire(uno_Mapping * pMapping) { static rtl::OUString s_purpose; @@ -59,13 +59,13 @@ static void SAL_CALL s_acquire(uno_Mapping * pMapping) } } -static void SAL_CALL s_release(uno_Mapping * pMapping) +static void s_release(uno_Mapping * pMapping) { if (!osl_atomic_decrement(&static_cast<IdentityMapping *>(pMapping )->m_nRef)) uno_revokeMapping(pMapping); } -static void SAL_CALL s_mapInterface(uno_Mapping * pMapping, +static void s_mapInterface(uno_Mapping * pMapping, void ** ppOut, void * pInterface, SAL_UNUSED_PARAMETER typelib_InterfaceTypeDescription * /*pInterfaceTypeDescr*/) diff --git a/cppu/source/uno/cascade_mapping.cxx b/cppu/source/uno/cascade_mapping.cxx index 81ef313cfcf3..60a8704e8347 100644 --- a/cppu/source/uno/cascade_mapping.cxx +++ b/cppu/source/uno/cascade_mapping.cxx @@ -54,19 +54,19 @@ public: }; extern "C" { -static void SAL_CALL s_acquire(uno_Mapping * mapping) +static void s_acquire(uno_Mapping * mapping) { MediatorMapping * pMediatorMapping = static_cast<MediatorMapping *>(mapping); pMediatorMapping->acquire(); } -static void SAL_CALL s_release(uno_Mapping * mapping) +static void s_release(uno_Mapping * mapping) { MediatorMapping * pMediatorMapping = static_cast<MediatorMapping *>(mapping); pMediatorMapping->release(); } -static void SAL_CALL s_mapInterface( +static void s_mapInterface( uno_Mapping * mapping, void ** ppOut, void * pInterface, @@ -144,7 +144,7 @@ void MediatorMapping::mapInterface( *ppOut = ret; } -extern "C" { static void SAL_CALL s_MediatorMapping_free(uno_Mapping * pMapping) +extern "C" { static void s_MediatorMapping_free(uno_Mapping * pMapping) SAL_THROW_EXTERN_C() { delete static_cast<MediatorMapping *>(pMapping); diff --git a/cppu/source/uno/lbenv.cxx b/cppu/source/uno/lbenv.cxx index 76bf88e6e002..8ca96dc0a7ae 100644 --- a/cppu/source/uno/lbenv.cxx +++ b/cppu/source/uno/lbenv.cxx @@ -226,7 +226,7 @@ extern "C" { -static void SAL_CALL defenv_registerInterface( +static void defenv_registerInterface( uno_ExtEnvironment * pEnv, void ** ppInterface, rtl_uString * pOId, typelib_InterfaceTypeDescription * pTypeDescr ) { @@ -273,7 +273,7 @@ static void SAL_CALL defenv_registerInterface( } -static void SAL_CALL defenv_registerProxyInterface( +static void defenv_registerProxyInterface( uno_ExtEnvironment * pEnv, void ** ppInterface, uno_freeProxyFunc freeProxy, rtl_uString * pOId, typelib_InterfaceTypeDescription * pTypeDescr ) { @@ -331,7 +331,7 @@ static void SAL_CALL defenv_registerProxyInterface( } -static void SAL_CALL s_stub_defenv_revokeInterface(va_list * pParam) +static void s_stub_defenv_revokeInterface(va_list * pParam) { uno_ExtEnvironment * pEnv = va_arg(*pParam, uno_ExtEnvironment *); void * pInterface = va_arg(*pParam, void *); @@ -418,13 +418,13 @@ static void SAL_CALL s_stub_defenv_revokeInterface(va_list * pParam) } } -static void SAL_CALL defenv_revokeInterface(uno_ExtEnvironment * pEnv, void * pInterface) +static void defenv_revokeInterface(uno_ExtEnvironment * pEnv, void * pInterface) { uno_Environment_invoke(&pEnv->aBase, s_stub_defenv_revokeInterface, pEnv, pInterface); } -static void SAL_CALL defenv_getObjectIdentifier( +static void defenv_getObjectIdentifier( uno_ExtEnvironment * pEnv, rtl_uString ** ppOId, void * pInterface ) { OSL_ENSURE( pEnv && ppOId && pInterface, "### null ptr!" ); @@ -454,7 +454,7 @@ static void SAL_CALL defenv_getObjectIdentifier( } -static void SAL_CALL defenv_getRegisteredInterface( +static void defenv_getRegisteredInterface( uno_ExtEnvironment * pEnv, void ** ppInterface, rtl_uString * pOId, typelib_InterfaceTypeDescription * pTypeDescr ) { @@ -484,7 +484,7 @@ static void SAL_CALL defenv_getRegisteredInterface( } -static void SAL_CALL defenv_getRegisteredInterfaces( +static void defenv_getRegisteredInterfaces( uno_ExtEnvironment * pEnv, void *** pppInterfaces, sal_Int32 * pnLen, uno_memAlloc memAlloc ) { @@ -510,7 +510,7 @@ static void SAL_CALL defenv_getRegisteredInterfaces( } -static void SAL_CALL defenv_acquire( uno_Environment * pEnv ) +static void defenv_acquire( uno_Environment * pEnv ) { uno_DefaultEnvironment * that = reinterpret_cast<uno_DefaultEnvironment *>(pEnv); osl_atomic_increment( &that->nWeakRef ); @@ -518,7 +518,7 @@ static void SAL_CALL defenv_acquire( uno_Environment * pEnv ) } -static void SAL_CALL defenv_release( uno_Environment * pEnv ) +static void defenv_release( uno_Environment * pEnv ) { uno_DefaultEnvironment * that = reinterpret_cast<uno_DefaultEnvironment *>(pEnv); if (! osl_atomic_decrement( &that->nRef )) @@ -539,14 +539,14 @@ static void SAL_CALL defenv_release( uno_Environment * pEnv ) } -static void SAL_CALL defenv_acquireWeak( uno_Environment * pEnv ) +static void defenv_acquireWeak( uno_Environment * pEnv ) { uno_DefaultEnvironment * that = reinterpret_cast<uno_DefaultEnvironment *>(pEnv); osl_atomic_increment( &that->nWeakRef ); } -static void SAL_CALL defenv_releaseWeak( uno_Environment * pEnv ) +static void defenv_releaseWeak( uno_Environment * pEnv ) { uno_DefaultEnvironment * that = reinterpret_cast<uno_DefaultEnvironment *>(pEnv); if (! osl_atomic_decrement( &that->nWeakRef )) @@ -556,7 +556,7 @@ static void SAL_CALL defenv_releaseWeak( uno_Environment * pEnv ) } -static void SAL_CALL defenv_harden( +static void defenv_harden( uno_Environment ** ppHardEnv, uno_Environment * pEnv ) { if (*ppHardEnv) @@ -584,7 +584,7 @@ static void SAL_CALL defenv_harden( } -static void SAL_CALL defenv_dispose( SAL_UNUSED_PARAMETER uno_Environment * ) +static void defenv_dispose( SAL_UNUSED_PARAMETER uno_Environment * ) { } } @@ -837,7 +837,7 @@ extern "C" { -static void SAL_CALL unoenv_computeObjectIdentifier( +static void unoenv_computeObjectIdentifier( uno_ExtEnvironment * pEnv, rtl_uString ** ppOId, void * pInterface ) { assert(pEnv && ppOId && pInterface && "### null ptr!"); @@ -872,7 +872,7 @@ static void SAL_CALL unoenv_computeObjectIdentifier( } -static void SAL_CALL unoenv_acquireInterface( +static void unoenv_acquireInterface( SAL_UNUSED_PARAMETER uno_ExtEnvironment *, void * pUnoI_ ) { uno_Interface * pUnoI = static_cast< uno_Interface * >(pUnoI_); @@ -880,7 +880,7 @@ static void SAL_CALL unoenv_acquireInterface( } -static void SAL_CALL unoenv_releaseInterface( +static void unoenv_releaseInterface( SAL_UNUSED_PARAMETER uno_ExtEnvironment *, void * pUnoI_ ) { uno_Interface * pUnoI = static_cast< uno_Interface * >(pUnoI_); diff --git a/cppu/source/uno/lbmap.cxx b/cppu/source/uno/lbmap.cxx index 74e167eb336c..4c8aa60895ab 100644 --- a/cppu/source/uno/lbmap.cxx +++ b/cppu/source/uno/lbmap.cxx @@ -197,12 +197,12 @@ struct uno_Mediate_Mapping : public uno_Mapping extern "C" { -static void SAL_CALL mediate_free( uno_Mapping * pMapping ) +static void mediate_free( uno_Mapping * pMapping ) { delete static_cast< uno_Mediate_Mapping * >( pMapping ); } -static void SAL_CALL mediate_acquire( uno_Mapping * pMapping ) +static void mediate_acquire( uno_Mapping * pMapping ) { if (1 == osl_atomic_increment( & static_cast< uno_Mediate_Mapping * >( pMapping )->nRef )) @@ -215,7 +215,7 @@ static void SAL_CALL mediate_acquire( uno_Mapping * pMapping ) } } -static void SAL_CALL mediate_release( uno_Mapping * pMapping ) +static void mediate_release( uno_Mapping * pMapping ) { if (! osl_atomic_decrement( & static_cast< uno_Mediate_Mapping * >( pMapping )->nRef )) @@ -224,7 +224,7 @@ static void SAL_CALL mediate_release( uno_Mapping * pMapping ) } } -static void SAL_CALL mediate_mapInterface( +static void mediate_mapInterface( uno_Mapping * pMapping, void ** ppOut, void * pInterface, typelib_InterfaceTypeDescription * pInterfaceTypeDescr ) diff --git a/cppuhelper/source/exc_thrower.cxx b/cppuhelper/source/exc_thrower.cxx index 4e39ae6c8b5a..9b0a060ef26b 100644 --- a/cppuhelper/source/exc_thrower.cxx +++ b/cppuhelper/source/exc_thrower.cxx @@ -65,12 +65,12 @@ extern "C" { -void SAL_CALL ExceptionThrower_acquire_release_nop( +void ExceptionThrower_acquire_release_nop( SAL_UNUSED_PARAMETER uno_Interface * ) {} -void SAL_CALL ExceptionThrower_dispatch( +void ExceptionThrower_dispatch( uno_Interface * pUnoI, typelib_TypeDescription const * pMemberType, void * pReturn, void * pArgs [], uno_Any ** ppException ) { diff --git a/cppuhelper/source/implbase_ex.cxx b/cppuhelper/source/implbase_ex.cxx index d01f61983a91..a3ee6708ca17 100644 --- a/cppuhelper/source/implbase_ex.cxx +++ b/cppuhelper/source/implbase_ex.cxx @@ -47,7 +47,7 @@ namespace cppu /** Shared mutex for implementation helper initialization. Not for public use. */ -::osl::Mutex & SAL_CALL getImplHelperInitMutex() +::osl::Mutex & getImplHelperInitMutex() { return theImplHelperInitMutex::get(); } diff --git a/cppuhelper/source/macro_expander.cxx b/cppuhelper/source/macro_expander.cxx index c0b2cda55fee..01971f695c03 100644 --- a/cppuhelper/source/macro_expander.cxx +++ b/cppuhelper/source/macro_expander.cxx @@ -167,7 +167,7 @@ OUString Bootstrap_MacroExpander::expandMacros( OUString const & exp ) } -Reference< XInterface > SAL_CALL service_create( +Reference< XInterface > service_create( SAL_UNUSED_PARAMETER Reference< XComponentContext > const & ) { return static_cast< ::cppu::OWeakObject * >( new Bootstrap_MacroExpander ); diff --git a/cppuhelper/source/servicemanager.hxx b/cppuhelper/source/servicemanager.hxx index 9838841403c1..2f7a749058bd 100644 --- a/cppuhelper/source/servicemanager.hxx +++ b/cppuhelper/source/servicemanager.hxx @@ -45,7 +45,7 @@ namespace cppuhelper { extern "C" { -typedef css::uno::XInterface * SAL_CALL ImplementationConstructorFn( +typedef css::uno::XInterface * ImplementationConstructorFn( css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &); } diff --git a/cppuhelper/source/tdmgr.cxx b/cppuhelper/source/tdmgr.cxx index f86dca136753..6a1ca23740b0 100644 --- a/cppuhelper/source/tdmgr.cxx +++ b/cppuhelper/source/tdmgr.cxx @@ -564,7 +564,7 @@ static typelib_TypeDescription * createCTD( extern "C" { -static void SAL_CALL typelib_callback( +static void typelib_callback( void * pContext, typelib_TypeDescription ** ppRet, rtl_uString * pTypeName ) { OSL_ENSURE( pContext && ppRet && pTypeName, "### null ptr!" ); diff --git a/cui/source/dialogs/colorpicker.cxx b/cui/source/dialogs/colorpicker.cxx index 2d9d0c4e53ed..8431201742fd 100644 --- a/cui/source/dialogs/colorpicker.cxx +++ b/cui/source/dialogs/colorpicker.cxx @@ -1406,17 +1406,17 @@ private: Reference<css::awt::XWindow> mxParent; }; -OUString SAL_CALL ColorPicker_getImplementationName() +OUString ColorPicker_getImplementationName() { return OUString( "com.sun.star.cui.ColorPicker" ); } -Reference< XInterface > SAL_CALL ColorPicker_createInstance( Reference< XComponentContext > const & ) +Reference< XInterface > ColorPicker_createInstance( Reference< XComponentContext > const & ) { return static_cast<XWeak*>( new ColorPicker ); } -Sequence< OUString > SAL_CALL ColorPicker_getSupportedServiceNames() +Sequence< OUString > ColorPicker_getSupportedServiceNames() { Sequence< OUString > seq { "com.sun.star.ui.dialogs.ColorPicker" }; return seq; diff --git a/cui/source/inc/colorpicker.hxx b/cui/source/inc/colorpicker.hxx index b2b24ba0d7c0..53f0fa611142 100644 --- a/cui/source/inc/colorpicker.hxx +++ b/cui/source/inc/colorpicker.hxx @@ -36,13 +36,13 @@ namespace com { namespace sun { namespace star { namespace uno { namespace cui { -OUString SAL_CALL ColorPicker_getImplementationName(); +OUString ColorPicker_getImplementationName(); -css::uno::Reference<css::uno::XInterface> SAL_CALL ColorPicker_createInstance( +css::uno::Reference<css::uno::XInterface> ColorPicker_createInstance( css::uno::Reference<css::uno::XComponentContext> const &); /// @throws css::uno::RuntimeException -css::uno::Sequence<OUString> SAL_CALL ColorPicker_getSupportedServiceNames(); +css::uno::Sequence<OUString> ColorPicker_getSupportedServiceNames(); } #endif diff --git a/cui/source/uno/services.cxx b/cui/source/uno/services.cxx index 34799d37bf8d..af06b9d07659 100644 --- a/cui/source/uno/services.cxx +++ b/cui/source/uno/services.cxx @@ -34,7 +34,7 @@ namespace }; } -extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL cui_component_getFactory( char const * implName, void * serviceManager, void * registryKey) +extern "C" SAL_DLLPUBLIC_EXPORT void * cui_component_getFactory( char const * implName, void * serviceManager, void * registryKey) { return cppu::component_getFactoryHelper(implName, serviceManager, registryKey, entries); } diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx index db702ab5b268..4ac176e343e4 100644 --- a/dbaccess/source/core/api/RowSet.cxx +++ b/dbaccess/source/core/api/RowSet.cxx @@ -94,7 +94,7 @@ using namespace ::com::sun::star::util; using namespace ::cppu; using namespace ::osl; -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_comp_dba_ORowSet_get_implementation(css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const &) { diff --git a/dbaccess/source/core/dataaccess/ComponentDefinition.cxx b/dbaccess/source/core/dataaccess/ComponentDefinition.cxx index dc76bfa4b39b..f3ed8e73e388 100644 --- a/dbaccess/source/core/dataaccess/ComponentDefinition.cxx +++ b/dbaccess/source/core/dataaccess/ComponentDefinition.cxx @@ -267,7 +267,7 @@ void OComponentDefinition::columnAppended( const Reference< XPropertySet >& _rxS } // namespace dbaccess -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_comp_dba_OComponentDefinition(css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const &) { diff --git a/dbaccess/source/core/dataaccess/commanddefinition.cxx b/dbaccess/source/core/dataaccess/commanddefinition.cxx index 6f78cfd4fe64..44d2011a83e2 100644 --- a/dbaccess/source/core/dataaccess/commanddefinition.cxx +++ b/dbaccess/source/core/dataaccess/commanddefinition.cxx @@ -122,7 +122,7 @@ void SAL_CALL OCommandDefinition::rename( const OUString& newName ) } // namespace dbaccess -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_comp_dba_OCommandDefinition(css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const &) { diff --git a/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx b/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx index f148e24c3ea0..9c652ceec9d1 100644 --- a/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx +++ b/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx @@ -253,7 +253,7 @@ struct Singleton: } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_dba_DataAccessDescriptorFactory( css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx b/dbaccess/source/core/dataaccess/databasedocument.cxx index aa0c22f1d87c..e5c34a8f53e7 100644 --- a/dbaccess/source/core/dataaccess/databasedocument.cxx +++ b/dbaccess/source/core/dataaccess/databasedocument.cxx @@ -2175,7 +2175,7 @@ OUString SAL_CALL ODatabaseDocument::getUntitledPrefix() } // namespace dbaccess -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_comp_dba_ODatabaseDocument(css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const &) { diff --git a/dbaccess/source/core/dataaccess/datasource.cxx b/dbaccess/source/core/dataaccess/datasource.cxx index 258a93ae1548..059a8f67a410 100644 --- a/dbaccess/source/core/dataaccess/datasource.cxx +++ b/dbaccess/source/core/dataaccess/datasource.cxx @@ -1311,7 +1311,7 @@ Reference< XInterface > ODatabaseSource::getThis() const } // namespace dbaccess -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_comp_dba_ODatabaseSource(css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const &) { diff --git a/dbaccess/source/core/misc/services.cxx b/dbaccess/source/core/misc/services.cxx index 6ba082d811a0..e1b3b5bef241 100644 --- a/dbaccess/source/core/misc/services.cxx +++ b/dbaccess/source/core/misc/services.cxx @@ -48,7 +48,7 @@ namespace dba{ }; } -extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL dba_component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void* dba_component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, void* pRegistryKey) diff --git a/dbaccess/source/ext/macromigration/dbmm_services.cxx b/dbaccess/source/ext/macromigration/dbmm_services.cxx index 1ced4c105042..2482e70722ce 100644 --- a/dbaccess/source/ext/macromigration/dbmm_services.cxx +++ b/dbaccess/source/ext/macromigration/dbmm_services.cxx @@ -20,7 +20,7 @@ #include <cppuhelper/factory.hxx> #include "macromigrationwizard.hxx" -extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL dbmm_component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void* dbmm_component_getFactory( const sal_Char* pImplementationName, SAL_UNUSED_PARAMETER void*, SAL_UNUSED_PARAMETER void* ) { diff --git a/dbaccess/source/filter/xml/dbloader2.cxx b/dbaccess/source/filter/xml/dbloader2.cxx index e43e45c34919..d7c8f18af9f6 100644 --- a/dbaccess/source/filter/xml/dbloader2.cxx +++ b/dbaccess/source/filter/xml/dbloader2.cxx @@ -215,7 +215,7 @@ Sequence< OUString > DBTypeDetection::getSupportedServiceNames_Static() throw( } // namespace dbaxml -extern "C" void SAL_CALL createRegistryInfo_DBTypeDetection() +extern "C" void createRegistryInfo_DBTypeDetection() { static ::dbaxml::OMultiInstanceAutoRegistration< ::dbaxml::DBTypeDetection > aAutoRegistration; } @@ -571,7 +571,7 @@ IMPL_LINK_NOARG( DBContentLoader, OnStartTableWizard, void*, void ) } -extern "C" void SAL_CALL createRegistryInfo_DBContentLoader2() +extern "C" void createRegistryInfo_DBContentLoader2() { static ::dbaxml::OMultiInstanceAutoRegistration< ::dbaxml::DBContentLoader > aAutoRegistration; } diff --git a/dbaccess/source/filter/xml/xmlExport.cxx b/dbaccess/source/filter/xml/xmlExport.cxx index f0df68fe23f0..1dbd082cd983 100644 --- a/dbaccess/source/filter/xml/xmlExport.cxx +++ b/dbaccess/source/filter/xml/xmlExport.cxx @@ -85,18 +85,18 @@ namespace dbaxml }; } -extern "C" void SAL_CALL createRegistryInfo_ODBFilterExport( ) +extern "C" void createRegistryInfo_ODBFilterExport( ) { static ::dbaxml::OMultiInstanceAutoRegistration< ::dbaxml::ODBExport > aAutoRegistration; } -extern "C" void SAL_CALL createRegistryInfo_OSettingsExport( ) +extern "C" void createRegistryInfo_OSettingsExport( ) { static ::dbaxml::OMultiInstanceAutoRegistration< ::dbaxml::ODBExportHelper > aAutoRegistration; } -extern "C" void SAL_CALL createRegistryInfo_OFullExport( ) +extern "C" void createRegistryInfo_OFullExport( ) { static ::dbaxml::OMultiInstanceAutoRegistration< ::dbaxml::ODBFullExportHelper > aAutoRegistration; } diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx b/dbaccess/source/filter/xml/xmlfilter.cxx index 64521cf1be35..f3980dcdb810 100644 --- a/dbaccess/source/filter/xml/xmlfilter.cxx +++ b/dbaccess/source/filter/xml/xmlfilter.cxx @@ -65,7 +65,7 @@ using namespace ::com::sun::star; -extern "C" void SAL_CALL createRegistryInfo_ODBFilter( ) +extern "C" void createRegistryInfo_ODBFilter( ) { static ::dbaxml::OMultiInstanceAutoRegistration< ::dbaxml::ODBFilter > aAutoRegistration; } diff --git a/dbaccess/source/filter/xml/xmlservices.cxx b/dbaccess/source/filter/xml/xmlservices.cxx index 329c2fbb3d8b..7e5051234889 100644 --- a/dbaccess/source/filter/xml/xmlservices.cxx +++ b/dbaccess/source/filter/xml/xmlservices.cxx @@ -26,7 +26,7 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::registry; -extern "C" void SAL_CALL createRegistryInfo_dbaxml() +extern "C" void createRegistryInfo_dbaxml() { static bool bInit = false; if (!bInit) @@ -41,7 +41,7 @@ extern "C" void SAL_CALL createRegistryInfo_dbaxml() } } -extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL dbaxml_component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void* dbaxml_component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, void* /*pRegistryKey*/) diff --git a/dbaccess/source/filter/xml/xmlservices.hxx b/dbaccess/source/filter/xml/xmlservices.hxx index 8176d8c0fb9b..66c8aa53cc74 100644 --- a/dbaccess/source/filter/xml/xmlservices.hxx +++ b/dbaccess/source/filter/xml/xmlservices.hxx @@ -26,12 +26,12 @@ extern "C" { -void SAL_CALL createRegistryInfo_DBContentLoader2(); -void SAL_CALL createRegistryInfo_DBTypeDetection(); -void SAL_CALL createRegistryInfo_ODBFilter(); -void SAL_CALL createRegistryInfo_ODBFilterExport(); -void SAL_CALL createRegistryInfo_OFullExport(); -void SAL_CALL createRegistryInfo_OSettingsExport(); +void createRegistryInfo_DBContentLoader2(); +void createRegistryInfo_DBTypeDetection(); +void createRegistryInfo_ODBFilter(); +void createRegistryInfo_ODBFilterExport(); +void createRegistryInfo_OFullExport(); +void createRegistryInfo_OSettingsExport(); } diff --git a/dbaccess/source/inc/registrationhelper.hxx b/dbaccess/source/inc/registrationhelper.hxx index fea7e3c21174..3cb4ce5b1521 100644 --- a/dbaccess/source/inc/registrationhelper.hxx +++ b/dbaccess/source/inc/registrationhelper.hxx @@ -21,7 +21,7 @@ #error "don't include this file directly! use dbu_reghelper.hxx instead!" #endif -typedef css::uno::Reference< css::lang::XSingleServiceFactory > (SAL_CALL *FactoryInstantiation) +typedef css::uno::Reference< css::lang::XSingleServiceFactory > (*FactoryInstantiation) ( const css::uno::Reference< css::lang::XMultiServiceFactory >& _rServiceManager, const OUString & _rComponentName, diff --git a/dbaccess/source/sdbtools/misc/sdbt_services.cxx b/dbaccess/source/sdbtools/misc/sdbt_services.cxx index 1e594ed958dd..40943501bf4d 100644 --- a/dbaccess/source/sdbtools/misc/sdbt_services.cxx +++ b/dbaccess/source/sdbtools/misc/sdbt_services.cxx @@ -23,7 +23,7 @@ using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::XInterface; -extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL sdbt_component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void* sdbt_component_getFactory( const sal_Char* pImplementationName, SAL_UNUSED_PARAMETER void*, SAL_UNUSED_PARAMETER void*) { Reference< XInterface > xRet; diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx index 951664a736d6..e181050ece55 100644 --- a/dbaccess/source/ui/app/AppController.cxx +++ b/dbaccess/source/ui/app/AppController.cxx @@ -125,7 +125,7 @@ #include <functional> -extern "C" void SAL_CALL createRegistryInfo_ODBApplication() +extern "C" void createRegistryInfo_ODBApplication() { static ::dbaui::OMultiInstanceAutoRegistration< ::dbaui::OApplicationController > aAutoRegistration; } diff --git a/dbaccess/source/ui/browser/dbloader.cxx b/dbaccess/source/ui/browser/dbloader.cxx index e390af10f487..e4ce425cc3d0 100644 --- a/dbaccess/source/ui/browser/dbloader.cxx +++ b/dbaccess/source/ui/browser/dbloader.cxx @@ -101,7 +101,7 @@ DBContentLoader::DBContentLoader(const Reference< XComponentContext >& _rxContex } -extern "C" void SAL_CALL createRegistryInfo_DBContentLoader() +extern "C" void createRegistryInfo_DBContentLoader() { static ::dbaui::OMultiInstanceAutoRegistration< DBContentLoader > aAutoRegistration; } diff --git a/dbaccess/source/ui/browser/exsrcbrw.cxx b/dbaccess/source/ui/browser/exsrcbrw.cxx index 93ce18f1972c..2064f344e5cf 100644 --- a/dbaccess/source/ui/browser/exsrcbrw.cxx +++ b/dbaccess/source/ui/browser/exsrcbrw.cxx @@ -45,7 +45,7 @@ using namespace ::com::sun::star::frame; using namespace dbaui; // SbaExternalSourceBrowser -extern "C" void SAL_CALL createRegistryInfo_OFormGridView() +extern "C" void createRegistryInfo_OFormGridView() { static OMultiInstanceAutoRegistration< SbaExternalSourceBrowser > aAutoRegistration; } diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx index 31939a46c5d1..2b534bc1cafa 100644 --- a/dbaccess/source/ui/browser/sbagrid.cxx +++ b/dbaccess/source/ui/browser/sbagrid.cxx @@ -105,7 +105,7 @@ using namespace ::dbtools; using namespace ::svx; using namespace ::svt; -extern "C" void SAL_CALL createRegistryInfo_SbaXGridControl() +extern "C" void createRegistryInfo_SbaXGridControl() { static OMultiInstanceAutoRegistration< SbaXGridControl > aAutoRegistration; } diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx index bae1e73070c5..a82590aeefe6 100644 --- a/dbaccess/source/ui/browser/unodatbr.cxx +++ b/dbaccess/source/ui/browser/unodatbr.cxx @@ -155,7 +155,7 @@ using namespace ::comphelper; using namespace ::svx; // SbaTableQueryBrowser -extern "C" void SAL_CALL createRegistryInfo_OBrowser() +extern "C" void createRegistryInfo_OBrowser() { static ::dbaui::OMultiInstanceAutoRegistration< ::dbaui::SbaTableQueryBrowser > aAutoRegistration; } diff --git a/dbaccess/source/ui/inc/uiservices.hxx b/dbaccess/source/ui/inc/uiservices.hxx index 4a2f7d1b062a..3bc1d53bf218 100644 --- a/dbaccess/source/ui/inc/uiservices.hxx +++ b/dbaccess/source/ui/inc/uiservices.hxx @@ -26,30 +26,30 @@ extern "C" { -void SAL_CALL createRegistryInfo_ComposerDialogs(); -void SAL_CALL createRegistryInfo_CopyTableWizard(); -void SAL_CALL createRegistryInfo_DBContentLoader(); -void SAL_CALL createRegistryInfo_LimitBoxController(); -void SAL_CALL createRegistryInfo_OAdvancedSettingsDialog(); -void SAL_CALL createRegistryInfo_OBrowser(); -void SAL_CALL createRegistryInfo_OColumnControl(); -void SAL_CALL createRegistryInfo_OColumnControlModel(); -void SAL_CALL createRegistryInfo_ODBApplication(); -void SAL_CALL createRegistryInfo_ODBTypeWizDialog(); -void SAL_CALL createRegistryInfo_ODBTypeWizDialogSetup(); -void SAL_CALL createRegistryInfo_ODataSourcePropertyDialog(); -void SAL_CALL createRegistryInfo_ODirectSQLDialog(); -void SAL_CALL createRegistryInfo_OFormGridView(); -void SAL_CALL createRegistryInfo_OInteractionHandler(); -void SAL_CALL createRegistryInfo_OQueryControl(); -void SAL_CALL createRegistryInfo_ORelationControl(); -void SAL_CALL createRegistryInfo_OSQLMessageDialog(); -void SAL_CALL createRegistryInfo_OTableControl(); -void SAL_CALL createRegistryInfo_OTableFilterDialog(); -void SAL_CALL createRegistryInfo_OTextConnectionSettingsDialog(); -void SAL_CALL createRegistryInfo_OUserSettingsDialog(); -void SAL_CALL createRegistryInfo_OViewControl(); -void SAL_CALL createRegistryInfo_SbaXGridControl(); +void createRegistryInfo_ComposerDialogs(); +void createRegistryInfo_CopyTableWizard(); +void createRegistryInfo_DBContentLoader(); +void createRegistryInfo_LimitBoxController(); +void createRegistryInfo_OAdvancedSettingsDialog(); +void createRegistryInfo_OBrowser(); +void createRegistryInfo_OColumnControl(); +void createRegistryInfo_OColumnControlModel(); +void createRegistryInfo_ODBApplication(); +void createRegistryInfo_ODBTypeWizDialog(); +void createRegistryInfo_ODBTypeWizDialogSetup(); +void createRegistryInfo_ODataSourcePropertyDialog(); +void createRegistryInfo_ODirectSQLDialog(); +void createRegistryInfo_OFormGridView(); +void createRegistryInfo_OInteractionHandler(); +void createRegistryInfo_OQueryControl(); +void createRegistryInfo_ORelationControl(); +void createRegistryInfo_OSQLMessageDialog(); +void createRegistryInfo_OTableControl(); +void createRegistryInfo_OTableFilterDialog(); +void createRegistryInfo_OTextConnectionSettingsDialog(); +void createRegistryInfo_OUserSettingsDialog(); +void createRegistryInfo_OViewControl(); +void createRegistryInfo_SbaXGridControl(); } diff --git a/dbaccess/source/ui/misc/uiservices.cxx b/dbaccess/source/ui/misc/uiservices.cxx index aabb6cfd9e6c..26eec900d1fd 100644 --- a/dbaccess/source/ui/misc/uiservices.cxx +++ b/dbaccess/source/ui/misc/uiservices.cxx @@ -26,7 +26,7 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::registry; -extern "C" void SAL_CALL createRegistryInfo_DBU() +extern "C" void createRegistryInfo_DBU() { static bool bInit = false; if (!bInit) @@ -59,7 +59,7 @@ extern "C" void SAL_CALL createRegistryInfo_DBU() } } -extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL dbu_component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void* dbu_component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, void* /*pRegistryKey*/) diff --git a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx index 51c2d2912b91..d2bfb7348d50 100644 --- a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx +++ b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx @@ -218,7 +218,7 @@ void LimitBoxController::dispatchCommand( } ///dbaui namespace -extern "C" void SAL_CALL createRegistryInfo_LimitBoxController() +extern "C" void createRegistryInfo_LimitBoxController() { static ::dbaui::OMultiInstanceAutoRegistration< ::dbaui::LimitBoxController > aAutoRegistration; } diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx index ea6e5777297f..4a4dc1f41436 100644 --- a/dbaccess/source/ui/querydesign/querycontroller.cxx +++ b/dbaccess/source/ui/querydesign/querycontroller.cxx @@ -85,7 +85,7 @@ #include <memory> #include <vector> -extern "C" void SAL_CALL createRegistryInfo_OQueryControl() +extern "C" void createRegistryInfo_OQueryControl() { static ::dbaui::OMultiInstanceAutoRegistration< ::dbaui::OQueryController > aAutoRegistration; } @@ -131,7 +131,7 @@ namespace dbaui }; } -extern "C" void SAL_CALL createRegistryInfo_OViewControl() +extern "C" void createRegistryInfo_OViewControl() { static ::dbaui::OMultiInstanceAutoRegistration< ::dbaui::OViewController > aAutoRegistration; } diff --git a/dbaccess/source/ui/relationdesign/RelationController.cxx b/dbaccess/source/ui/relationdesign/RelationController.cxx index 5bddac211f29..233ee361c776 100644 --- a/dbaccess/source/ui/relationdesign/RelationController.cxx +++ b/dbaccess/source/ui/relationdesign/RelationController.cxx @@ -72,7 +72,7 @@ #define MAX_THREADS 10 -extern "C" void SAL_CALL createRegistryInfo_ORelationControl() +extern "C" void createRegistryInfo_ORelationControl() { static ::dbaui::OMultiInstanceAutoRegistration< ::dbaui::ORelationController > aAutoRegistration; } diff --git a/dbaccess/source/ui/tabledesign/TableController.cxx b/dbaccess/source/ui/tabledesign/TableController.cxx index a1a2ff009904..772bcb8bc27a 100644 --- a/dbaccess/source/ui/tabledesign/TableController.cxx +++ b/dbaccess/source/ui/tabledesign/TableController.cxx @@ -69,7 +69,7 @@ #include <algorithm> #include <functional> -extern "C" void SAL_CALL createRegistryInfo_OTableControl() +extern "C" void createRegistryInfo_OTableControl() { static ::dbaui::OMultiInstanceAutoRegistration< ::dbaui::OTableController > aAutoRegistration; } diff --git a/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx b/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx index 935f6f6e0119..f82b414af681 100644 --- a/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx +++ b/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx @@ -127,7 +127,7 @@ namespace dbaui } // namespace dbaui -extern "C" void SAL_CALL createRegistryInfo_OAdvancedSettingsDialog() +extern "C" void createRegistryInfo_OAdvancedSettingsDialog() { static ::dbaui::OMultiInstanceAutoRegistration< ::dbaui::OAdvancedSettingsDialog > aAutoRegistration; } diff --git a/dbaccess/source/ui/uno/ColumnControl.cxx b/dbaccess/source/ui/uno/ColumnControl.cxx index e8006243ee64..720f0e40075c 100644 --- a/dbaccess/source/ui/uno/ColumnControl.cxx +++ b/dbaccess/source/ui/uno/ColumnControl.cxx @@ -26,7 +26,7 @@ #include <dbu_reghelper.hxx> #include <comphelper/processfactory.hxx> -extern "C" void SAL_CALL createRegistryInfo_OColumnControl() +extern "C" void createRegistryInfo_OColumnControl() { static ::dbaui::OMultiInstanceAutoRegistration< ::dbaui::OColumnControl> aAutoRegistration; } diff --git a/dbaccess/source/ui/uno/ColumnModel.cxx b/dbaccess/source/ui/uno/ColumnModel.cxx index cd249c4e1f01..389bf3e1e6da 100644 --- a/dbaccess/source/ui/uno/ColumnModel.cxx +++ b/dbaccess/source/ui/uno/ColumnModel.cxx @@ -30,7 +30,7 @@ #include <toolkit/helper/vclunohelper.hxx> #include <comphelper/property.hxx> -extern "C" void SAL_CALL createRegistryInfo_OColumnControlModel() +extern "C" void createRegistryInfo_OColumnControlModel() { static ::dbaui::OMultiInstanceAutoRegistration< ::dbaui::OColumnControlModel> aAutoRegistration; } diff --git a/dbaccess/source/ui/uno/DBTypeWizDlg.cxx b/dbaccess/source/ui/uno/DBTypeWizDlg.cxx index 6196d45154d9..355708d80624 100644 --- a/dbaccess/source/ui/uno/DBTypeWizDlg.cxx +++ b/dbaccess/source/ui/uno/DBTypeWizDlg.cxx @@ -25,7 +25,7 @@ using namespace dbaui; -extern "C" void SAL_CALL createRegistryInfo_ODBTypeWizDialog() +extern "C" void createRegistryInfo_ODBTypeWizDialog() { static OMultiInstanceAutoRegistration< ODBTypeWizDialog > aAutoRegistration; } diff --git a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx index 33d58789da88..d13cb0827cf7 100644 --- a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx +++ b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx @@ -30,7 +30,7 @@ using namespace dbaui; -extern "C" void SAL_CALL createRegistryInfo_ODBTypeWizDialogSetup() +extern "C" void createRegistryInfo_ODBTypeWizDialogSetup() { static OMultiInstanceAutoRegistration< ODBTypeWizDialogSetup > aAutoRegistration; } diff --git a/dbaccess/source/ui/uno/TableFilterDlg.cxx b/dbaccess/source/ui/uno/TableFilterDlg.cxx index 876f5106228d..c5420fa10a49 100644 --- a/dbaccess/source/ui/uno/TableFilterDlg.cxx +++ b/dbaccess/source/ui/uno/TableFilterDlg.cxx @@ -25,7 +25,7 @@ using namespace dbaui; -extern "C" void SAL_CALL createRegistryInfo_OTableFilterDialog() +extern "C" void createRegistryInfo_OTableFilterDialog() { static OMultiInstanceAutoRegistration< OTableFilterDialog > aAutoRegistration; } diff --git a/dbaccess/source/ui/uno/UserSettingsDlg.cxx b/dbaccess/source/ui/uno/UserSettingsDlg.cxx index ffd199a77a1a..e340956961bb 100644 --- a/dbaccess/source/ui/uno/UserSettingsDlg.cxx +++ b/dbaccess/source/ui/uno/UserSettingsDlg.cxx @@ -25,7 +25,7 @@ using namespace dbaui; -extern "C" void SAL_CALL createRegistryInfo_OUserSettingsDialog() +extern "C" void createRegistryInfo_OUserSettingsDialog() { static OMultiInstanceAutoRegistration< OUserSettingsDialog > aAutoRegistration; } diff --git a/dbaccess/source/ui/uno/admindlg.cxx b/dbaccess/source/ui/uno/admindlg.cxx index b126b2942332..530cd12f7b81 100644 --- a/dbaccess/source/ui/uno/admindlg.cxx +++ b/dbaccess/source/ui/uno/admindlg.cxx @@ -25,7 +25,7 @@ using namespace dbaui; -extern "C" void SAL_CALL createRegistryInfo_ODataSourcePropertyDialog() +extern "C" void createRegistryInfo_ODataSourcePropertyDialog() { static OMultiInstanceAutoRegistration< ODataSourcePropertyDialog > aAutoRegistration; } diff --git a/dbaccess/source/ui/uno/composerdialogs.cxx b/dbaccess/source/ui/uno/composerdialogs.cxx index f6f059220613..5b2aa150563b 100644 --- a/dbaccess/source/ui/uno/composerdialogs.cxx +++ b/dbaccess/source/ui/uno/composerdialogs.cxx @@ -30,7 +30,7 @@ #include <tools/diagnose_ex.h> #include <osl/diagnose.h> -extern "C" void SAL_CALL createRegistryInfo_ComposerDialogs() +extern "C" void createRegistryInfo_ComposerDialogs() { static ::dbaui::OMultiInstanceAutoRegistration< ::dbaui::RowsetOrderDialog > aOrderDialogRegistration; static ::dbaui::OMultiInstanceAutoRegistration< ::dbaui::RowsetFilterDialog > aFilterDialogRegistration; diff --git a/dbaccess/source/ui/uno/copytablewizard.cxx b/dbaccess/source/ui/uno/copytablewizard.cxx index a1b141a919ba..43abd33ce95b 100644 --- a/dbaccess/source/ui/uno/copytablewizard.cxx +++ b/dbaccess/source/ui/uno/copytablewizard.cxx @@ -1549,7 +1549,7 @@ void CopyTableWizard::executedDialog( sal_Int16 _nExecutionResult ) } // namespace dbaui -extern "C" void SAL_CALL createRegistryInfo_CopyTableWizard() +extern "C" void createRegistryInfo_CopyTableWizard() { static ::dbaui::OMultiInstanceAutoRegistration< ::dbaui::CopyTableWizard > aAutoRegistration; } diff --git a/dbaccess/source/ui/uno/dbinteraction.cxx b/dbaccess/source/ui/uno/dbinteraction.cxx index 639966a713a3..b6371ad59eb8 100644 --- a/dbaccess/source/ui/uno/dbinteraction.cxx +++ b/dbaccess/source/ui/uno/dbinteraction.cxx @@ -40,7 +40,7 @@ #include <UITools.hxx> #include <comphelper/processfactory.hxx> -extern "C" void SAL_CALL createRegistryInfo_OInteractionHandler() +extern "C" void createRegistryInfo_OInteractionHandler() { static ::dbaui::OMultiInstanceAutoRegistration< ::dbaui::SQLExceptionInteractionHandler > aSQLExceptionInteractionHandler_AutoRegistration; static ::dbaui::OMultiInstanceAutoRegistration< ::dbaui::LegacyInteractionHandler > aLegacyInteractionHandler_AutoRegistration; diff --git a/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx b/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx index 849c66ae9a37..4c4034334b0f 100644 --- a/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx +++ b/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx @@ -255,7 +255,7 @@ namespace dbaui } // namespace dbaui -extern "C" void SAL_CALL createRegistryInfo_OTextConnectionSettingsDialog() +extern "C" void createRegistryInfo_OTextConnectionSettingsDialog() { static ::dbaui::OMultiInstanceAutoRegistration< ::dbaui::OTextConnectionSettingsDialog > aAutoRegistration; } diff --git a/dbaccess/source/ui/uno/unoDirectSql.cxx b/dbaccess/source/ui/uno/unoDirectSql.cxx index 003a8eece5bb..5f7163dc7d88 100644 --- a/dbaccess/source/ui/uno/unoDirectSql.cxx +++ b/dbaccess/source/ui/uno/unoDirectSql.cxx @@ -32,7 +32,7 @@ #include <tools/diagnose_ex.h> #include <comphelper/processfactory.hxx> -extern "C" void SAL_CALL createRegistryInfo_ODirectSQLDialog() +extern "C" void createRegistryInfo_ODirectSQLDialog() { static ::dbaui::OMultiInstanceAutoRegistration< ::dbaui::ODirectSQLDialog > aAutoRegistration; } diff --git a/dbaccess/source/ui/uno/unosqlmessage.cxx b/dbaccess/source/ui/uno/unosqlmessage.cxx index 1f20c8baabe3..8b01455fdd11 100644 --- a/dbaccess/source/ui/uno/unosqlmessage.cxx +++ b/dbaccess/source/ui/uno/unosqlmessage.cxx @@ -34,7 +34,7 @@ using namespace dbtools; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::sdb; -extern "C" void SAL_CALL createRegistryInfo_OSQLMessageDialog() +extern "C" void createRegistryInfo_OSQLMessageDialog() { static OMultiInstanceAutoRegistration< OSQLMessageDialog > aAutoRegistration; } diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx index 5b60248f6a7a..afcdba68629f 100644 --- a/desktop/source/app/officeipcthread.cxx +++ b/desktop/source/app/officeipcthread.cxx @@ -298,7 +298,7 @@ void ImplPostProcessDocumentsEvent( ProcessDocumentsRequest* pEvent ) Application::PostUserEvent( LINK( nullptr, ProcessEventsClass_Impl, ProcessDocumentsEvent ), pEvent ); } -oslSignalAction SAL_CALL SalMainPipeExchangeSignal_impl(SAL_UNUSED_PARAMETER void* /*pData*/, oslSignalInfo* pInfo) +oslSignalAction SalMainPipeExchangeSignal_impl(SAL_UNUSED_PARAMETER void* /*pData*/, oslSignalInfo* pInfo) { if( pInfo->Signal == osl_Signal_Terminate ) RequestHandler::SetDowning(); diff --git a/desktop/source/app/officeipcthread.hxx b/desktop/source/app/officeipcthread.hxx index 4450e98aebdb..4634aef87590 100644 --- a/desktop/source/app/officeipcthread.hxx +++ b/desktop/source/app/officeipcthread.hxx @@ -39,7 +39,7 @@ namespace desktop { -oslSignalAction SAL_CALL SalMainPipeExchangeSignal_impl(void* /*pData*/, oslSignalInfo* pInfo); +oslSignalAction SalMainPipeExchangeSignal_impl(void* /*pData*/, oslSignalInfo* pInfo); // A request for the current office // that was given by command line or by IPC pipe communication. diff --git a/desktop/source/deployment/dp_services.cxx b/desktop/source/deployment/dp_services.cxx index 18c2f882c721..ba642fdbff10 100644 --- a/desktop/source/deployment/dp_services.cxx +++ b/desktop/source/deployment/dp_services.cxx @@ -27,7 +27,7 @@ namespace sdecl = comphelper::service_decl; extern "C" { -SAL_DLLPUBLIC_EXPORT void * SAL_CALL deployment_component_getFactory( +SAL_DLLPUBLIC_EXPORT void * deployment_component_getFactory( sal_Char const * pImplName, void *, void *) { return sdecl::component_getFactoryHelper( diff --git a/desktop/source/deployment/gui/dp_gui_service.cxx b/desktop/source/deployment/gui/dp_gui_service.cxx index 489a0dd8497f..c3d7638c00fa 100644 --- a/desktop/source/deployment/gui/dp_gui_service.cxx +++ b/desktop/source/deployment/gui/dp_gui_service.cxx @@ -315,7 +315,7 @@ sdecl::ServiceDecl const updateDecl( extern "C" { -SAL_DLLPUBLIC_EXPORT void * SAL_CALL deploymentgui_component_getFactory( +SAL_DLLPUBLIC_EXPORT void * deploymentgui_component_getFactory( sal_Char const * pImplName, void *, void *) { return sdecl::component_getFactoryHelper( diff --git a/desktop/source/deployment/inc/dp_registry.hxx b/desktop/source/deployment/inc/dp_registry.hxx index 7a3eda34f08a..43746ddfc642 100644 --- a/desktop/source/deployment/inc/dp_registry.hxx +++ b/desktop/source/deployment/inc/dp_registry.hxx @@ -32,7 +32,7 @@ namespace com { namespace sun { namespace star { namespace dp_registry { -css::uno::Reference<css::deployment::XPackageRegistry> SAL_CALL create( +css::uno::Reference<css::deployment::XPackageRegistry> create( OUString const & context, OUString const & cachePath, css::uno::Reference<css::uno::XComponentContext> const & xComponentContext); diff --git a/desktop/source/deployment/registry/dp_registry.cxx b/desktop/source/deployment/registry/dp_registry.cxx index a14b0fe6bbf2..09180c066a83 100644 --- a/desktop/source/deployment/registry/dp_registry.cxx +++ b/desktop/source/deployment/registry/dp_registry.cxx @@ -528,7 +528,7 @@ PackageRegistryImpl::getSupportedPackageTypes() } // anon namespace -Reference<deployment::XPackageRegistry> SAL_CALL create( +Reference<deployment::XPackageRegistry> create( OUString const & context, OUString const & cachePath, Reference<XComponentContext> const & xComponentContext ) diff --git a/desktop/source/migration/services/basicmigration.cxx b/desktop/source/migration/services/basicmigration.cxx index dc0c47d0be05..1b407adba228 100644 --- a/desktop/source/migration/services/basicmigration.cxx +++ b/desktop/source/migration/services/basicmigration.cxx @@ -208,7 +208,7 @@ namespace migration // component operations - Reference< XInterface > SAL_CALL BasicMigration_create( + Reference< XInterface > BasicMigration_create( Reference< XComponentContext > const & ) { return static_cast< lang::XTypeProvider * >( new BasicMigration() ); diff --git a/desktop/source/migration/services/basicmigration.hxx b/desktop/source/migration/services/basicmigration.hxx index d2d18463b297..8a0c45f664e1 100644 --- a/desktop/source/migration/services/basicmigration.hxx +++ b/desktop/source/migration/services/basicmigration.hxx @@ -37,9 +37,9 @@ namespace migration { - OUString SAL_CALL BasicMigration_getImplementationName(); - css::uno::Sequence< OUString > SAL_CALL BasicMigration_getSupportedServiceNames(); - css::uno::Reference< css::uno::XInterface > SAL_CALL BasicMigration_create( + OUString BasicMigration_getImplementationName(); + css::uno::Sequence< OUString > BasicMigration_getSupportedServiceNames(); + css::uno::Reference< css::uno::XInterface > BasicMigration_create( css::uno::Reference< css::uno::XComponentContext > const & xContext ); diff --git a/desktop/source/migration/services/cexports.cxx b/desktop/source/migration/services/cexports.cxx index 9877705130c4..a56f0dae9458 100644 --- a/desktop/source/migration/services/cexports.cxx +++ b/desktop/source/migration/services/cexports.cxx @@ -50,7 +50,7 @@ extern "C" }; -SAL_DLLPUBLIC_EXPORT void * SAL_CALL migrationoo2_component_getFactory( +SAL_DLLPUBLIC_EXPORT void * migrationoo2_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { return ::cppu::component_getFactoryHelper( diff --git a/desktop/source/migration/services/cexportsoo3.cxx b/desktop/source/migration/services/cexportsoo3.cxx index eecb5ee929dc..a53884760d0b 100644 --- a/desktop/source/migration/services/cexportsoo3.cxx +++ b/desktop/source/migration/services/cexportsoo3.cxx @@ -35,7 +35,7 @@ extern "C" }; -SAL_DLLPUBLIC_EXPORT void * SAL_CALL migrationoo3_component_getFactory( +SAL_DLLPUBLIC_EXPORT void * migrationoo3_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { return ::cppu::component_getFactoryHelper( diff --git a/desktop/source/migration/services/oo3extensionmigration.cxx b/desktop/source/migration/services/oo3extensionmigration.cxx index b8672ee44c7d..4510c93d2831 100644 --- a/desktop/source/migration/services/oo3extensionmigration.cxx +++ b/desktop/source/migration/services/oo3extensionmigration.cxx @@ -429,7 +429,7 @@ void TmpRepositoryCommandEnv::pop() // component operations -Reference< XInterface > SAL_CALL OO3ExtensionMigration_create( +Reference< XInterface > OO3ExtensionMigration_create( Reference< XComponentContext > const & ctx ) { return static_cast< lang::XTypeProvider * >( new OO3ExtensionMigration( diff --git a/desktop/source/migration/services/oo3extensionmigration.hxx b/desktop/source/migration/services/oo3extensionmigration.hxx index c237f54020d3..62eb936dccdb 100644 --- a/desktop/source/migration/services/oo3extensionmigration.hxx +++ b/desktop/source/migration/services/oo3extensionmigration.hxx @@ -46,9 +46,9 @@ class INetURLObject; namespace migration { - OUString SAL_CALL OO3ExtensionMigration_getImplementationName(); - css::uno::Sequence< OUString > SAL_CALL OO3ExtensionMigration_getSupportedServiceNames(); - css::uno::Reference< css::uno::XInterface > SAL_CALL OO3ExtensionMigration_create( + OUString OO3ExtensionMigration_getImplementationName(); + css::uno::Sequence< OUString > OO3ExtensionMigration_getSupportedServiceNames(); + css::uno::Reference< css::uno::XInterface > OO3ExtensionMigration_create( css::uno::Reference< css::uno::XComponentContext > const & xContext ); diff --git a/desktop/source/migration/services/wordbookmigration.cxx b/desktop/source/migration/services/wordbookmigration.cxx index 1830c65a362c..ab2264e4d683 100644 --- a/desktop/source/migration/services/wordbookmigration.cxx +++ b/desktop/source/migration/services/wordbookmigration.cxx @@ -242,7 +242,7 @@ bool IsUserWordbook( const OUString& rFile ) // component operations - Reference< XInterface > SAL_CALL WordbookMigration_create( + Reference< XInterface > WordbookMigration_create( Reference< XComponentContext > const & ) { return static_cast< lang::XTypeProvider * >( new WordbookMigration() ); diff --git a/desktop/source/migration/services/wordbookmigration.hxx b/desktop/source/migration/services/wordbookmigration.hxx index 4fd535b1738b..81a60f7ee3c8 100644 --- a/desktop/source/migration/services/wordbookmigration.hxx +++ b/desktop/source/migration/services/wordbookmigration.hxx @@ -37,9 +37,9 @@ namespace migration { - OUString SAL_CALL WordbookMigration_getImplementationName(); - css::uno::Sequence< OUString > SAL_CALL WordbookMigration_getSupportedServiceNames(); - css::uno::Reference< css::uno::XInterface > SAL_CALL WordbookMigration_create( + OUString WordbookMigration_getImplementationName(); + css::uno::Sequence< OUString > WordbookMigration_getSupportedServiceNames(); + css::uno::Reference< css::uno::XInterface > WordbookMigration_create( css::uno::Reference< css::uno::XComponentContext > const & xContext ); diff --git a/desktop/source/offacc/acceptor.cxx b/desktop/source/offacc/acceptor.cxx index 80c9a7cc722a..6244b79e2c4e 100644 --- a/desktop/source/offacc/acceptor.cxx +++ b/desktop/source/offacc/acceptor.cxx @@ -259,7 +259,7 @@ extern "C" { using namespace desktop; -SAL_DLLPUBLIC_EXPORT void * SAL_CALL offacc_component_getFactory(char const *pImplementationName, void *pServiceManager, void *) +SAL_DLLPUBLIC_EXPORT void * offacc_component_getFactory(char const *pImplementationName, void *pServiceManager, void *) { void* pReturn = nullptr ; if ( pImplementationName && pServiceManager ) diff --git a/desktop/source/splash/services_spl.cxx b/desktop/source/splash/services_spl.cxx index 7993b09f56eb..dfa8728fd0d3 100644 --- a/desktop/source/splash/services_spl.cxx +++ b/desktop/source/splash/services_spl.cxx @@ -46,7 +46,7 @@ static cppu::ImplementationEntry const services[] = { } -extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL spl_component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * spl_component_getFactory( char const * pImplName, void * pServiceManager, void * pRegistryKey) { return cppu::component_getFactoryHelper( diff --git a/desktop/source/splash/splash.hxx b/desktop/source/splash/splash.hxx index 813e17248a12..1561308dbb90 100644 --- a/desktop/source/splash/splash.hxx +++ b/desktop/source/splash/splash.hxx @@ -35,12 +35,12 @@ namespace com { namespace sun { namespace star { namespace desktop { namespace splash { -css::uno::Reference< css::uno::XInterface > SAL_CALL +css::uno::Reference< css::uno::XInterface > create( css::uno::Reference< css::uno::XComponentContext > const & ); -OUString SAL_CALL getImplementationName(); +OUString getImplementationName(); -css::uno::Sequence< OUString > SAL_CALL +css::uno::Sequence< OUString > getSupportedServiceNames(); } } diff --git a/desktop/source/splash/unxsplash.hxx b/desktop/source/splash/unxsplash.hxx index faf4233a9bef..d4ca29fd1be4 100644 --- a/desktop/source/splash/unxsplash.hxx +++ b/desktop/source/splash/unxsplash.hxx @@ -65,9 +65,9 @@ public: } /// @throws css::uno::Exception -css::uno::Reference< css::uno::XInterface > SAL_CALL UnxSplash_createInstance(const css::uno::Reference< css::uno::XComponentContext > & xCtx ); +css::uno::Reference< css::uno::XInterface > UnxSplash_createInstance(const css::uno::Reference< css::uno::XComponentContext > & xCtx ); OUString UnxSplash_getImplementationName(); -css::uno::Sequence< OUString > SAL_CALL UnxSplash_getSupportedServiceNames() throw (); +css::uno::Sequence< OUString > UnxSplash_getSupportedServiceNames() throw (); #endif // INCLUDED_DESKTOP_SOURCE_SPLASH_UNXSPLASH_HXX diff --git a/drawinglayer/source/drawinglayeruno/drawinglayeruno.cxx b/drawinglayer/source/drawinglayeruno/drawinglayeruno.cxx index d78eac190e1a..d6c1023c10ba 100644 --- a/drawinglayer/source/drawinglayeruno/drawinglayeruno.cxx +++ b/drawinglayer/source/drawinglayeruno/drawinglayeruno.cxx @@ -32,7 +32,7 @@ using namespace ::com::sun::star; extern "C" { - SAL_DLLPUBLIC_EXPORT void* SAL_CALL drawinglayer_component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* /* pRegistryKey */ ) + SAL_DLLPUBLIC_EXPORT void* drawinglayer_component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* /* pRegistryKey */ ) { uno::Reference< lang::XSingleServiceFactory > xFactory; void* pRet = nullptr; diff --git a/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx b/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx index 6549bb070f2e..85788ad978b3 100644 --- a/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx +++ b/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx @@ -91,7 +91,7 @@ namespace drawinglayer return OUString( "drawinglayer::unorenderer::XPrimitive2DRenderer" ); } - uno::Reference< uno::XInterface > SAL_CALL XPrimitive2DRenderer_createInstance(const uno::Reference< lang::XMultiServiceFactory >&) + uno::Reference< uno::XInterface > XPrimitive2DRenderer_createInstance(const uno::Reference< lang::XMultiServiceFactory >&) { return static_cast< ::cppu::OWeakObject* >(new XPrimitive2DRenderer); } diff --git a/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.hxx b/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.hxx index 58584f61486e..935d5fcc2581 100644 --- a/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.hxx +++ b/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.hxx @@ -34,12 +34,12 @@ namespace com { namespace sun { namespace star { namespace drawinglayer { namespace unorenderer { -css::uno::Sequence<OUString> SAL_CALL +css::uno::Sequence<OUString> XPrimitive2DRenderer_getSupportedServiceNames(); -OUString SAL_CALL XPrimitive2DRenderer_getImplementationName(); +OUString XPrimitive2DRenderer_getImplementationName(); -css::uno::Reference<css::uno::XInterface> SAL_CALL +css::uno::Reference<css::uno::XInterface> XPrimitive2DRenderer_createInstance( css::uno::Reference<css::lang::XMultiServiceFactory> const &); diff --git a/dtrans/source/cnttype/mcnttfactory.cxx b/dtrans/source/cnttype/mcnttfactory.cxx index eddb3fc2cd83..c4069d6798ae 100644 --- a/dtrans/source/cnttype/mcnttfactory.cxx +++ b/dtrans/source/cnttype/mcnttfactory.cxx @@ -31,7 +31,7 @@ using namespace com::sun::star::datatransfer; namespace { - Sequence< OUString > SAL_CALL MimeContentTypeFactory_getSupportedServiceNames( ) + Sequence< OUString > MimeContentTypeFactory_getSupportedServiceNames( ) { Sequence< OUString > aRet { "com.sun.star.datatransfer.MimeContentTypeFactory" }; return aRet; diff --git a/dtrans/source/cnttype/mctfentry.cxx b/dtrans/source/cnttype/mctfentry.cxx index 2f77baab7031..7c9e39b93a67 100644 --- a/dtrans/source/cnttype/mctfentry.cxx +++ b/dtrans/source/cnttype/mctfentry.cxx @@ -37,7 +37,7 @@ namespace // @param rServiceManager - service manager, useful if the component needs other uno services // so we should give it to every UNO-Implementation component - Reference< XInterface > SAL_CALL createInstance( const Reference< XMultiServiceFactory >& ) + Reference< XInterface > createInstance( const Reference< XMultiServiceFactory >& ) { return Reference< XInterface >( static_cast< XMimeContentTypeFactory* >( new CMimeContentTypeFactory() ) ); } @@ -49,7 +49,7 @@ extern "C" // component_getFactory // returns a factory to create XFilePicker-Services -SAL_DLLPUBLIC_EXPORT void* SAL_CALL mcnttype_component_getFactory( const sal_Char* pImplName, void* pSrvManager, void* /*pRegistryKey*/ ) +SAL_DLLPUBLIC_EXPORT void* mcnttype_component_getFactory( const sal_Char* pImplName, void* pSrvManager, void* /*pRegistryKey*/ ) { void* pRet = nullptr; diff --git a/editeng/source/uno/unofield.cxx b/editeng/source/uno/unofield.cxx index 0f439e9a4f9e..1d76f285edf6 100644 --- a/editeng/source/uno/unofield.cxx +++ b/editeng/source/uno/unofield.cxx @@ -902,7 +902,7 @@ sal_Bool SAL_CALL SvxUnoTextField::supportsService( const OUString& ServiceName return cppu::supportsService( this, ServiceName ); } -uno::Reference< uno::XInterface > SAL_CALL SvxUnoTextCreateTextField( const OUString& ServiceSpecifier ) +uno::Reference< uno::XInterface > SvxUnoTextCreateTextField( const OUString& ServiceSpecifier ) { uno::Reference< uno::XInterface > xRet; diff --git a/embeddedobj/source/commonembedding/register.cxx b/embeddedobj/source/commonembedding/register.cxx index 25da0944e68c..ec29cad223d7 100644 --- a/embeddedobj/source/commonembedding/register.cxx +++ b/embeddedobj/source/commonembedding/register.cxx @@ -29,7 +29,7 @@ using namespace ::com::sun::star; extern "C" { -SAL_DLLPUBLIC_EXPORT void * SAL_CALL embobj_component_getFactory( +SAL_DLLPUBLIC_EXPORT void * embobj_component_getFactory( const sal_Char * pImplName, void * pServiceManager, SAL_UNUSED_PARAMETER void * /*pRegistryKey*/ ) { diff --git a/embeddedobj/source/msole/oleregister.cxx b/embeddedobj/source/msole/oleregister.cxx index 5d01379c7870..0c655496a1b9 100644 --- a/embeddedobj/source/msole/oleregister.cxx +++ b/embeddedobj/source/msole/oleregister.cxx @@ -32,7 +32,7 @@ using namespace ::com::sun::star; extern "C" { -SAL_DLLPUBLIC_EXPORT void * SAL_CALL emboleobj_component_getFactory( +SAL_DLLPUBLIC_EXPORT void * emboleobj_component_getFactory( const sal_Char * pImplName, void * pServiceManager, SAL_UNUSED_PARAMETER void * /*pRegistryKey*/ ) { diff --git a/emfio/source/emfuno/emfuno.cxx b/emfio/source/emfuno/emfuno.cxx index b027c5fe3cc2..1bf9e098d414 100644 --- a/emfio/source/emfuno/emfuno.cxx +++ b/emfio/source/emfuno/emfuno.cxx @@ -36,7 +36,7 @@ static cppu::ImplementationEntry const services[] = { } -extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL emfio_component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * emfio_component_getFactory( char const * pImplName, void * pServiceManager, void * pRegistryKey) { return cppu::component_getFactoryHelper( diff --git a/emfio/source/emfuno/xemfparser.cxx b/emfio/source/emfuno/xemfparser.cxx index 63b88811e28f..7d0870025fa3 100644 --- a/emfio/source/emfuno/xemfparser.cxx +++ b/emfio/source/emfuno/xemfparser.cxx @@ -95,7 +95,7 @@ namespace emfio return OUString( "emfio::emfreader::XEmfParser" ); } - uno::Reference< uno::XInterface > SAL_CALL XEmfParser_createInstance(const uno::Reference< uno::XComponentContext >& context) + uno::Reference< uno::XInterface > XEmfParser_createInstance(const uno::Reference< uno::XComponentContext >& context) { return static_cast< ::cppu::OWeakObject* >(new XEmfParser(context)); } diff --git a/emfio/source/emfuno/xemfparser.hxx b/emfio/source/emfuno/xemfparser.hxx index da78322028dc..d68e1e681d51 100644 --- a/emfio/source/emfuno/xemfparser.hxx +++ b/emfio/source/emfuno/xemfparser.hxx @@ -35,12 +35,12 @@ namespace com { namespace sun { namespace star { namespace emfio { namespace emfreader { -css::uno::Reference< css::uno::XInterface > SAL_CALL +css::uno::Reference< css::uno::XInterface > XEmfParser_createInstance( css::uno::Reference< css::uno::XComponentContext > const &); -OUString SAL_CALL XEmfParser_getImplementationName(); +OUString XEmfParser_getImplementationName(); -css::uno::Sequence< OUString > SAL_CALL +css::uno::Sequence< OUString > XEmfParser_getSupportedServiceNames(); } } diff --git a/eventattacher/source/eventattacher.cxx b/eventattacher/source/eventattacher.cxx index 4862049ea14b..aad3cce70981 100644 --- a/eventattacher/source/eventattacher.cxx +++ b/eventattacher/source/eventattacher.cxx @@ -275,7 +275,7 @@ EventAttacherImpl::EventAttacherImpl( const Reference< XComponentContext >& rxCo } /// @throws Exception -Reference< XInterface > SAL_CALL EventAttacherImpl_CreateInstance( const Reference< XMultiServiceFactory >& rSMgr ) +Reference< XInterface > EventAttacherImpl_CreateInstance( const Reference< XMultiServiceFactory >& rSMgr ) { XEventAttacher *pEventAttacher = static_cast<XEventAttacher*>(new EventAttacherImpl( comphelper::getComponentContext(rSMgr) )); @@ -855,7 +855,7 @@ Sequence< Reference<XEventListener> > EventAttacherImpl::attachMultipleEventList extern "C" { -SAL_DLLPUBLIC_EXPORT void * SAL_CALL evtatt_component_getFactory( +SAL_DLLPUBLIC_EXPORT void * evtatt_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * ) { void * pRet = nullptr; diff --git a/extensions/source/abpilot/unodialogabp.cxx b/extensions/source/abpilot/unodialogabp.cxx index 43bf22986392..1c1eeaaca233 100644 --- a/extensions/source/abpilot/unodialogabp.cxx +++ b/extensions/source/abpilot/unodialogabp.cxx @@ -145,7 +145,7 @@ namespace abp } // namespace abp -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * org_openoffice_comp_abp_OAddressBookSourcePilot( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) diff --git a/extensions/source/bibliography/bibload.cxx b/extensions/source/bibliography/bibload.cxx index ee7ef3df942e..bcc2c0be4f6c 100644 --- a/extensions/source/bibliography/bibload.cxx +++ b/extensions/source/bibliography/bibload.cxx @@ -128,7 +128,7 @@ public: static Sequence<OUString> SAL_CALL getSupportedServiceNames_Static() throw( ); /// @throws Exception - friend Reference< XInterface > SAL_CALL BibliographyLoader_CreateInstance( const Reference< XMultiServiceFactory > & rSMgr ); + friend Reference< XInterface > BibliographyLoader_CreateInstance( const Reference< XMultiServiceFactory > & rSMgr ); // XLoader virtual void SAL_CALL load(const Reference< XFrame > & aFrame, const OUString& aURL, @@ -152,7 +152,7 @@ BibliographyLoader::~BibliographyLoader() } -Reference< XInterface > SAL_CALL BibliographyLoader_CreateInstance( const Reference< XMultiServiceFactory > & /*rSMgr*/ ) +Reference< XInterface > BibliographyLoader_CreateInstance( const Reference< XMultiServiceFactory > & /*rSMgr*/ ) { return *(new BibliographyLoader); } @@ -190,7 +190,7 @@ Sequence< OUString > BibliographyLoader::getSupportedServiceNames_Static() throw extern "C" { - SAL_DLLPUBLIC_EXPORT void * SAL_CALL bib_component_getFactory( + SAL_DLLPUBLIC_EXPORT void * bib_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) { void * pRet = nullptr; diff --git a/extensions/source/config/ldap/componentdef.cxx b/extensions/source/config/ldap/componentdef.cxx index 2795146649d0..e8abd45fe248 100644 --- a/extensions/source/config/ldap/componentdef.cxx +++ b/extensions/source/config/ldap/componentdef.cxx @@ -24,7 +24,7 @@ using namespace extensions::config::ldap ; -static uno::Reference<uno::XInterface> SAL_CALL createLdapUserProfileBe( +static uno::Reference<uno::XInterface> createLdapUserProfileBe( const uno::Reference<uno::XComponentContext>& aContext) { return * new LdapUserProfileBe(aContext) ; } @@ -44,7 +44,7 @@ static const cppu::ImplementationEntry kImplementations_entries[] = } ; -extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL ldapbe2_component_getFactory(const sal_Char *aImplementationName, +extern "C" SAL_DLLPUBLIC_EXPORT void * ldapbe2_component_getFactory(const sal_Char *aImplementationName, void *aServiceManager, void *aRegistryKey) { return cppu::component_getFactoryHelper(aImplementationName, diff --git a/extensions/source/dbpilots/dbpservices.cxx b/extensions/source/dbpilots/dbpservices.cxx index 18846e96ae2b..bba456bfa4fd 100644 --- a/extensions/source/dbpilots/dbpservices.cxx +++ b/extensions/source/dbpilots/dbpservices.cxx @@ -24,7 +24,7 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::registry; -extern "C" void SAL_CALL dbp_initializeModule() +extern "C" void dbp_initializeModule() { static bool s_bInit = false; if (!s_bInit) @@ -37,7 +37,7 @@ extern "C" void SAL_CALL dbp_initializeModule() } -extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL dbp_component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void* dbp_component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, void* /*pRegistryKey*/) diff --git a/extensions/source/dbpilots/dbpservices.hxx b/extensions/source/dbpilots/dbpservices.hxx index bdc6cbcb6690..655c818501c7 100644 --- a/extensions/source/dbpilots/dbpservices.hxx +++ b/extensions/source/dbpilots/dbpservices.hxx @@ -26,9 +26,9 @@ extern "C" { -void SAL_CALL createRegistryInfo_OGridWizard(); -void SAL_CALL createRegistryInfo_OGroupBoxWizard(); -void SAL_CALL createRegistryInfo_OListComboWizard(); +void createRegistryInfo_OGridWizard(); +void createRegistryInfo_OGroupBoxWizard(); +void createRegistryInfo_OListComboWizard(); } diff --git a/extensions/source/dbpilots/wizardservices.cxx b/extensions/source/dbpilots/wizardservices.cxx index 02caf4a82089..09a2b7e2ee78 100644 --- a/extensions/source/dbpilots/wizardservices.cxx +++ b/extensions/source/dbpilots/wizardservices.cxx @@ -27,21 +27,21 @@ #include "gridwizard.hxx" // the registration methods -extern "C" void SAL_CALL createRegistryInfo_OGroupBoxWizard() +extern "C" void createRegistryInfo_OGroupBoxWizard() { static compmodule::OMultiInstanceAutoRegistration< ::dbp::OUnoAutoPilot< ::dbp::OGroupBoxWizard, ::dbp::OGroupBoxSI > > aAutoRegistration; } -extern "C" void SAL_CALL createRegistryInfo_OListComboWizard() +extern "C" void createRegistryInfo_OListComboWizard() { static compmodule::OMultiInstanceAutoRegistration< ::dbp::OUnoAutoPilot< ::dbp::OListComboWizard, ::dbp::OListComboSI > > aAutoRegistration; } -extern "C" void SAL_CALL createRegistryInfo_OGridWizard() +extern "C" void createRegistryInfo_OGridWizard() { static compmodule::OMultiInstanceAutoRegistration< ::dbp::OUnoAutoPilot< ::dbp::OGridWizard, ::dbp::OGridSI > diff --git a/extensions/source/inc/componentmodule.hxx b/extensions/source/inc/componentmodule.hxx index 51fc499ffe24..e8cf0206d560 100644 --- a/extensions/source/inc/componentmodule.hxx +++ b/extensions/source/inc/componentmodule.hxx @@ -38,7 +38,7 @@ namespace compmodule { -typedef css::uno::Reference< css::lang::XSingleServiceFactory > (SAL_CALL *FactoryInstantiation) +typedef css::uno::Reference< css::lang::XSingleServiceFactory > (*FactoryInstantiation) ( const css::uno::Reference< css::lang::XMultiServiceFactory >& _rServiceManager, const OUString & _rComponentName, diff --git a/extensions/source/logging/consolehandler.cxx b/extensions/source/logging/consolehandler.cxx index 8db97dd1b350..cf74e46e1332 100644 --- a/extensions/source/logging/consolehandler.cxx +++ b/extensions/source/logging/consolehandler.cxx @@ -249,7 +249,7 @@ namespace logging } // namespace logging -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_extensions_ConsoleHandler( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &arguments) diff --git a/extensions/source/logging/csvformatter.cxx b/extensions/source/logging/csvformatter.cxx index 249dac535365..d5e439850023 100644 --- a/extensions/source/logging/csvformatter.cxx +++ b/extensions/source/logging/csvformatter.cxx @@ -311,7 +311,7 @@ namespace logging } // namespace logging -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_extensions_CsvFormatter( css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) diff --git a/extensions/source/logging/filehandler.cxx b/extensions/source/logging/filehandler.cxx index 87bf330d50b5..697953dd2ec3 100644 --- a/extensions/source/logging/filehandler.cxx +++ b/extensions/source/logging/filehandler.cxx @@ -345,7 +345,7 @@ namespace logging } // namespace logging -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_extensions_FileHandler( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &arguments) diff --git a/extensions/source/logging/logger.cxx b/extensions/source/logging/logger.cxx index f528c847701c..937a5bc822dc 100644 --- a/extensions/source/logging/logger.cxx +++ b/extensions/source/logging/logger.cxx @@ -270,7 +270,7 @@ struct Singleton: } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_extensions_LoggerPool( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) diff --git a/extensions/source/logging/plaintextformatter.cxx b/extensions/source/logging/plaintextformatter.cxx index 40c7c7156c06..3ea3ebca8918 100644 --- a/extensions/source/logging/plaintextformatter.cxx +++ b/extensions/source/logging/plaintextformatter.cxx @@ -139,7 +139,7 @@ namespace logging } // namespace logging -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_extensions_PlainTextFormatter( css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) diff --git a/extensions/source/propctrlr/MasterDetailLinkDialog.cxx b/extensions/source/propctrlr/MasterDetailLinkDialog.cxx index 02cb66f53a5c..812d4e345d64 100644 --- a/extensions/source/propctrlr/MasterDetailLinkDialog.cxx +++ b/extensions/source/propctrlr/MasterDetailLinkDialog.cxx @@ -21,7 +21,7 @@ #include "formlinkdialog.hxx" #include "pcrservices.hxx" - extern "C" void SAL_CALL createRegistryInfo_MasterDetailLinkDialog() + extern "C" void createRegistryInfo_MasterDetailLinkDialog() { ::pcr::OAutoRegistration< ::pcr::MasterDetailLinkDialog > aAutoRegistration; } diff --git a/extensions/source/propctrlr/buttonnavigationhandler.cxx b/extensions/source/propctrlr/buttonnavigationhandler.cxx index 93e9572b77d0..bf37fffc4aaa 100644 --- a/extensions/source/propctrlr/buttonnavigationhandler.cxx +++ b/extensions/source/propctrlr/buttonnavigationhandler.cxx @@ -25,7 +25,7 @@ #include <com/sun/star/form/inspection/FormComponentPropertyHandler.hpp> -extern "C" void SAL_CALL createRegistryInfo_ButtonNavigationHandler() +extern "C" void createRegistryInfo_ButtonNavigationHandler() { ::pcr::ButtonNavigationHandler::registerImplementation(); } diff --git a/extensions/source/propctrlr/cellbindinghandler.cxx b/extensions/source/propctrlr/cellbindinghandler.cxx index bb3ce64bd8f1..29f5ed30a791 100644 --- a/extensions/source/propctrlr/cellbindinghandler.cxx +++ b/extensions/source/propctrlr/cellbindinghandler.cxx @@ -30,7 +30,7 @@ #include <tools/debug.hxx> -extern "C" void SAL_CALL createRegistryInfo_CellBindingPropertyHandler() +extern "C" void createRegistryInfo_CellBindingPropertyHandler() { ::pcr::CellBindingPropertyHandler::registerImplementation(); } diff --git a/extensions/source/propctrlr/controlfontdialog.cxx b/extensions/source/propctrlr/controlfontdialog.cxx index a598665b29e2..a007d2600a0a 100644 --- a/extensions/source/propctrlr/controlfontdialog.cxx +++ b/extensions/source/propctrlr/controlfontdialog.cxx @@ -25,7 +25,7 @@ #include "pcrcommon.hxx" #include "pcrservices.hxx" -extern "C" void SAL_CALL createRegistryInfo_OControlFontDialog() +extern "C" void createRegistryInfo_OControlFontDialog() { ::pcr::OAutoRegistration< ::pcr::OControlFontDialog > aAutoRegistration; } diff --git a/extensions/source/propctrlr/defaultforminspection.cxx b/extensions/source/propctrlr/defaultforminspection.cxx index 13f7ca368e4e..765c50b274bf 100644 --- a/extensions/source/propctrlr/defaultforminspection.cxx +++ b/extensions/source/propctrlr/defaultforminspection.cxx @@ -31,7 +31,7 @@ #include <sal/macros.h> -extern "C" void SAL_CALL createRegistryInfo_DefaultFormComponentInspectorModel() +extern "C" void createRegistryInfo_DefaultFormComponentInspectorModel() { ::pcr::OAutoRegistration< ::pcr::DefaultFormComponentInspectorModel > aAutoRegistration; } diff --git a/extensions/source/propctrlr/defaulthelpprovider.cxx b/extensions/source/propctrlr/defaulthelpprovider.cxx index 9af9b892ff23..f4efb7b92993 100644 --- a/extensions/source/propctrlr/defaulthelpprovider.cxx +++ b/extensions/source/propctrlr/defaulthelpprovider.cxx @@ -31,7 +31,7 @@ #include <tools/diagnose_ex.h> -extern "C" void SAL_CALL createRegistryInfo_DefaultHelpProvider() +extern "C" void createRegistryInfo_DefaultHelpProvider() { ::pcr::OAutoRegistration< ::pcr::DefaultHelpProvider > aAutoRegistration; } diff --git a/extensions/source/propctrlr/editpropertyhandler.cxx b/extensions/source/propctrlr/editpropertyhandler.cxx index e8da2ca83a3a..87610f0450cd 100644 --- a/extensions/source/propctrlr/editpropertyhandler.cxx +++ b/extensions/source/propctrlr/editpropertyhandler.cxx @@ -30,7 +30,7 @@ #define TEXTTYPE_RICHTEXT 2 -extern "C" void SAL_CALL createRegistryInfo_EditPropertyHandler() +extern "C" void createRegistryInfo_EditPropertyHandler() { ::pcr::EditPropertyHandler::registerImplementation(); } diff --git a/extensions/source/propctrlr/eformspropertyhandler.cxx b/extensions/source/propctrlr/eformspropertyhandler.cxx index 4ed56c0ff3fb..f93e49bc0898 100644 --- a/extensions/source/propctrlr/eformspropertyhandler.cxx +++ b/extensions/source/propctrlr/eformspropertyhandler.cxx @@ -35,7 +35,7 @@ #include <functional> -extern "C" void SAL_CALL createRegistryInfo_EFormsPropertyHandler() +extern "C" void createRegistryInfo_EFormsPropertyHandler() { ::pcr::EFormsPropertyHandler::registerImplementation(); } diff --git a/extensions/source/propctrlr/eventhandler.cxx b/extensions/source/propctrlr/eventhandler.cxx index e3112138f5a5..7b35e6e79edb 100644 --- a/extensions/source/propctrlr/eventhandler.cxx +++ b/extensions/source/propctrlr/eventhandler.cxx @@ -72,7 +72,7 @@ #include <iterator> #include <o3tl/functional.hxx> -extern "C" void SAL_CALL createRegistryInfo_EventHandler() +extern "C" void createRegistryInfo_EventHandler() { ::pcr::OAutoRegistration< ::pcr::EventHandler > aAutoRegistration; } diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx index d1b0bca65e97..37255b5275c2 100644 --- a/extensions/source/propctrlr/formcomponenthandler.cxx +++ b/extensions/source/propctrlr/formcomponenthandler.cxx @@ -106,7 +106,7 @@ #define GRAPHOBJ_URLPREFIX "vnd.sun.star.GraphicObject:" -extern "C" void SAL_CALL createRegistryInfo_FormComponentPropertyHandler() +extern "C" void createRegistryInfo_FormComponentPropertyHandler() { ::pcr::FormComponentPropertyHandler::registerImplementation(); } diff --git a/extensions/source/propctrlr/formcontroller.cxx b/extensions/source/propctrlr/formcontroller.cxx index b01833515b4c..a6afe300d830 100644 --- a/extensions/source/propctrlr/formcontroller.cxx +++ b/extensions/source/propctrlr/formcontroller.cxx @@ -30,7 +30,7 @@ #include <toolkit/helper/vclunohelper.hxx> -extern "C" void SAL_CALL createRegistryInfo_FormController() +extern "C" void createRegistryInfo_FormController() { ::pcr::OAutoRegistration< ::pcr::FormController > aFormControllerRegistration; ::pcr::OAutoRegistration< ::pcr::DialogController > aDialogControllerRegistration; diff --git a/extensions/source/propctrlr/formgeometryhandler.cxx b/extensions/source/propctrlr/formgeometryhandler.cxx index dedd555dea19..05b63a8e9faf 100644 --- a/extensions/source/propctrlr/formgeometryhandler.cxx +++ b/extensions/source/propctrlr/formgeometryhandler.cxx @@ -804,7 +804,7 @@ namespace pcr } // namespace pcr -extern "C" void SAL_CALL createRegistryInfo_FormGeometryHandler() +extern "C" void createRegistryInfo_FormGeometryHandler() { ::pcr::FormGeometryHandler::registerImplementation(); } diff --git a/extensions/source/propctrlr/genericpropertyhandler.cxx b/extensions/source/propctrlr/genericpropertyhandler.cxx index 88d109d24f41..2cfa948a9787 100644 --- a/extensions/source/propctrlr/genericpropertyhandler.cxx +++ b/extensions/source/propctrlr/genericpropertyhandler.cxx @@ -42,7 +42,7 @@ #include <algorithm> #include <o3tl/functional.hxx> -extern "C" void SAL_CALL createRegistryInfo_GenericPropertyHandler() +extern "C" void createRegistryInfo_GenericPropertyHandler() { ::pcr::OAutoRegistration< ::pcr::GenericPropertyHandler > aAutoRegistration; } diff --git a/extensions/source/propctrlr/objectinspectormodel.cxx b/extensions/source/propctrlr/objectinspectormodel.cxx index 06b30c914f22..9a295b5e3d73 100644 --- a/extensions/source/propctrlr/objectinspectormodel.cxx +++ b/extensions/source/propctrlr/objectinspectormodel.cxx @@ -220,7 +220,7 @@ namespace pcr } // namespace pcr -extern "C" void SAL_CALL createRegistryInfo_ObjectInspectorModel() +extern "C" void createRegistryInfo_ObjectInspectorModel() { ::pcr::OAutoRegistration< ::pcr::ObjectInspectorModel > aObjectInspectorModelRegistration; } diff --git a/extensions/source/propctrlr/pcrservices.cxx b/extensions/source/propctrlr/pcrservices.cxx index 0985d4c91ac1..1ef0353ae1c6 100644 --- a/extensions/source/propctrlr/pcrservices.cxx +++ b/extensions/source/propctrlr/pcrservices.cxx @@ -25,7 +25,7 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::registry; -extern "C" void SAL_CALL pcr_initializeModule() +extern "C" void pcr_initializeModule() { static bool s_bInit = false; if (!s_bInit) @@ -54,7 +54,7 @@ extern "C" void SAL_CALL pcr_initializeModule() } -extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL pcr_component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void* pcr_component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, SAL_UNUSED_PARAMETER void* /*pRegistryKey*/) diff --git a/extensions/source/propctrlr/pcrservices.hxx b/extensions/source/propctrlr/pcrservices.hxx index 68dbd88c7e86..73cd86b9487b 100644 --- a/extensions/source/propctrlr/pcrservices.hxx +++ b/extensions/source/propctrlr/pcrservices.hxx @@ -26,25 +26,25 @@ extern "C" { -void SAL_CALL createRegistryInfo_ButtonNavigationHandler(); -void SAL_CALL createRegistryInfo_CellBindingPropertyHandler(); -void SAL_CALL createRegistryInfo_DefaultFormComponentInspectorModel(); -void SAL_CALL createRegistryInfo_DefaultHelpProvider(); -void SAL_CALL createRegistryInfo_EFormsPropertyHandler(); -void SAL_CALL createRegistryInfo_EditPropertyHandler(); -void SAL_CALL createRegistryInfo_EventHandler(); -void SAL_CALL createRegistryInfo_FormComponentPropertyHandler(); -void SAL_CALL createRegistryInfo_FormController(); -void SAL_CALL createRegistryInfo_FormGeometryHandler(); -void SAL_CALL createRegistryInfo_GenericPropertyHandler(); -void SAL_CALL createRegistryInfo_MasterDetailLinkDialog(); -void SAL_CALL createRegistryInfo_OControlFontDialog(); -void SAL_CALL createRegistryInfo_OPropertyBrowserController(); -void SAL_CALL createRegistryInfo_OTabOrderDialog(); -void SAL_CALL createRegistryInfo_ObjectInspectorModel(); -void SAL_CALL createRegistryInfo_StringRepresentation(); -void SAL_CALL createRegistryInfo_SubmissionPropertyHandler(); -void SAL_CALL createRegistryInfo_XSDValidationPropertyHandler(); +void createRegistryInfo_ButtonNavigationHandler(); +void createRegistryInfo_CellBindingPropertyHandler(); +void createRegistryInfo_DefaultFormComponentInspectorModel(); +void createRegistryInfo_DefaultHelpProvider(); +void createRegistryInfo_EFormsPropertyHandler(); +void createRegistryInfo_EditPropertyHandler(); +void createRegistryInfo_EventHandler(); +void createRegistryInfo_FormComponentPropertyHandler(); +void createRegistryInfo_FormController(); +void createRegistryInfo_FormGeometryHandler(); +void createRegistryInfo_GenericPropertyHandler(); +void createRegistryInfo_MasterDetailLinkDialog(); +void createRegistryInfo_OControlFontDialog(); +void createRegistryInfo_OPropertyBrowserController(); +void createRegistryInfo_OTabOrderDialog(); +void createRegistryInfo_ObjectInspectorModel(); +void createRegistryInfo_StringRepresentation(); +void createRegistryInfo_SubmissionPropertyHandler(); +void createRegistryInfo_XSDValidationPropertyHandler(); } diff --git a/extensions/source/propctrlr/pcrunodialogs.cxx b/extensions/source/propctrlr/pcrunodialogs.cxx index c90b99edcd86..011777176463 100644 --- a/extensions/source/propctrlr/pcrunodialogs.cxx +++ b/extensions/source/propctrlr/pcrunodialogs.cxx @@ -28,7 +28,7 @@ #include "taborder.hxx" #include "pcrcommon.hxx" -extern "C" void SAL_CALL createRegistryInfo_OTabOrderDialog() +extern "C" void createRegistryInfo_OTabOrderDialog() { ::pcr::OAutoRegistration< ::pcr::OTabOrderDialog > aAutoRegistration; } diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx index a3e7cc1f3a8c..4fb6c295faef 100644 --- a/extensions/source/propctrlr/propcontroller.cxx +++ b/extensions/source/propctrlr/propcontroller.cxx @@ -57,7 +57,7 @@ // !!! outside the namespace !!! -extern "C" void SAL_CALL createRegistryInfo_OPropertyBrowserController() +extern "C" void createRegistryInfo_OPropertyBrowserController() { ::pcr::OAutoRegistration< ::pcr::OPropertyBrowserController > aAutoRegistration; } diff --git a/extensions/source/propctrlr/stringrepresentation.cxx b/extensions/source/propctrlr/stringrepresentation.cxx index bfc1936f0ff4..492721abedbb 100644 --- a/extensions/source/propctrlr/stringrepresentation.cxx +++ b/extensions/source/propctrlr/stringrepresentation.cxx @@ -51,9 +51,9 @@ namespace comp_StringRepresentation { using namespace ::com::sun::star; // component and service helper functions: -OUString SAL_CALL _getImplementationName(); -uno::Sequence< OUString > SAL_CALL _getSupportedServiceNames(); -uno::Reference< uno::XInterface > SAL_CALL _create( uno::Reference< uno::XComponentContext > const & context ); +OUString _getImplementationName(); +uno::Sequence< OUString > _getSupportedServiceNames(); +uno::Reference< uno::XInterface > _create( uno::Reference< uno::XComponentContext > const & context ); } // closing component helper namespace @@ -611,18 +611,18 @@ bool StringRepresentation::convertStringToGenericValue( const OUString& _rString // component helper namespace namespace comp_StringRepresentation { -OUString SAL_CALL _getImplementationName() { +OUString _getImplementationName() { return OUString( "StringRepresentation"); } -uno::Sequence< OUString > SAL_CALL _getSupportedServiceNames() +uno::Sequence< OUString > _getSupportedServiceNames() { uno::Sequence< OUString > s { "com.sun.star.inspection.StringRepresentation" }; return s; } -uno::Reference< uno::XInterface > SAL_CALL _create( +uno::Reference< uno::XInterface > _create( const uno::Reference< uno::XComponentContext > & context) { return static_cast< ::cppu::OWeakObject * >(new pcr::StringRepresentation(context)); @@ -631,7 +631,7 @@ uno::Reference< uno::XInterface > SAL_CALL _create( } // closing component helper namespace -extern "C" void SAL_CALL createRegistryInfo_StringRepresentation() +extern "C" void createRegistryInfo_StringRepresentation() { ::pcr::PcrModule::getInstance().registerImplementation( comp_StringRepresentation::_getImplementationName(), diff --git a/extensions/source/propctrlr/submissionhandler.cxx b/extensions/source/propctrlr/submissionhandler.cxx index 8c53f83a7c01..853659bd5b3f 100644 --- a/extensions/source/propctrlr/submissionhandler.cxx +++ b/extensions/source/propctrlr/submissionhandler.cxx @@ -35,7 +35,7 @@ #include <rtl/ustrbuf.hxx> -extern "C" void SAL_CALL createRegistryInfo_SubmissionPropertyHandler() +extern "C" void createRegistryInfo_SubmissionPropertyHandler() { ::pcr::SubmissionPropertyHandler::registerImplementation(); } diff --git a/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx b/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx index de22c3c9ac8d..84a7e0d99a90 100644 --- a/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx +++ b/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx @@ -49,7 +49,7 @@ #include <limits> -extern "C" void SAL_CALL createRegistryInfo_XSDValidationPropertyHandler() +extern "C" void createRegistryInfo_XSDValidationPropertyHandler() { ::pcr::XSDValidationPropertyHandler::registerImplementation(); } diff --git a/extensions/source/scanner/scanner.cxx b/extensions/source/scanner/scanner.cxx index 3fdf09c18e8f..e03cf30e9737 100644 --- a/extensions/source/scanner/scanner.cxx +++ b/extensions/source/scanner/scanner.cxx @@ -22,7 +22,7 @@ #include <cppuhelper/supportsservice.hxx> -Reference< XInterface > SAL_CALL ScannerManager_CreateInstance( const Reference< css::lang::XMultiServiceFactory >& /*rxFactory*/ ) +Reference< XInterface > ScannerManager_CreateInstance( const Reference< css::lang::XMultiServiceFactory >& /*rxFactory*/ ) { return *( new ScannerManager() ); } diff --git a/extensions/source/scanner/scanner.hxx b/extensions/source/scanner/scanner.hxx index d0bea52c2d8e..9ae7821af3c0 100644 --- a/extensions/source/scanner/scanner.hxx +++ b/extensions/source/scanner/scanner.hxx @@ -82,7 +82,7 @@ public: }; /// @throws Exception -Reference< XInterface > SAL_CALL ScannerManager_CreateInstance( const Reference< css::lang::XMultiServiceFactory >& rxFactory ); +Reference< XInterface > ScannerManager_CreateInstance( const Reference< css::lang::XMultiServiceFactory >& rxFactory ); #endif diff --git a/extensions/source/scanner/scnserv.cxx b/extensions/source/scanner/scnserv.cxx index f728ff809d32..d790bb9522fe 100644 --- a/extensions/source/scanner/scnserv.cxx +++ b/extensions/source/scanner/scnserv.cxx @@ -26,7 +26,7 @@ using namespace com::sun::star::registry; -extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL scn_component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* /*pRegistryKey*/ ) +extern "C" SAL_DLLPUBLIC_EXPORT void* scn_component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* /*pRegistryKey*/ ) { Reference< css::lang::XSingleServiceFactory > xFactory; void* pRet = nullptr; diff --git a/extensions/source/update/check/updatecheckjob.cxx b/extensions/source/update/check/updatecheckjob.cxx index 09161454e880..b8eda1da01c6 100644 --- a/extensions/source/update/check/updatecheckjob.cxx +++ b/extensions/source/update/check/updatecheckjob.cxx @@ -297,7 +297,7 @@ void SAL_CALL UpdateCheckJob::notifyTermination( lang::EventObject const & ) } // anonymous namespace -static uno::Reference<uno::XInterface> SAL_CALL +static uno::Reference<uno::XInterface> createJobInstance(const uno::Reference<uno::XComponentContext>& xContext) { css::uno::Reference<css::frame::XDesktop2> desktop( @@ -308,7 +308,7 @@ createJobInstance(const uno::Reference<uno::XComponentContext>& xContext) } -static uno::Reference<uno::XInterface> SAL_CALL +static uno::Reference<uno::XInterface> createConfigInstance(const uno::Reference<uno::XComponentContext>& xContext) { return *UpdateCheckConfig::get(xContext, *UpdateCheck::get()); @@ -337,7 +337,7 @@ static const cppu::ImplementationEntry kImplementations_entries[] = } ; -extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL updchk_component_getFactory(const sal_Char *pszImplementationName, void *pServiceManager, void *pRegistryKey) +extern "C" SAL_DLLPUBLIC_EXPORT void * updchk_component_getFactory(const sal_Char *pszImplementationName, void *pServiceManager, void *pRegistryKey) { return cppu::component_getFactoryHelper( pszImplementationName, diff --git a/extensions/source/update/feed/updatefeed.cxx b/extensions/source/update/feed/updatefeed.cxx index b660eff706b1..e1d846ba8546 100644 --- a/extensions/source/update/feed/updatefeed.cxx +++ b/extensions/source/update/feed/updatefeed.cxx @@ -771,7 +771,7 @@ UpdateInformationProvider::supportsService( OUString const & serviceName ) } // anonymous namespace -static uno::Reference<uno::XInterface> SAL_CALL +static uno::Reference<uno::XInterface> createInstance(uno::Reference<uno::XComponentContext> const & xContext) { return UpdateInformationProvider::createInstance(xContext); @@ -792,7 +792,7 @@ static const cppu::ImplementationEntry kImplementations_entries[] = } ; -extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL updatefeed_component_getFactory(const sal_Char *pszImplementationName, void *pServiceManager, void *pRegistryKey) +extern "C" SAL_DLLPUBLIC_EXPORT void * updatefeed_component_getFactory(const sal_Char *pszImplementationName, void *pServiceManager, void *pRegistryKey) { return cppu::component_getFactoryHelper( pszImplementationName, diff --git a/extensions/source/update/ui/updatecheckui.cxx b/extensions/source/update/ui/updatecheckui.cxx index cdd17d77433d..ebfa1bf42a4d 100644 --- a/extensions/source/update/ui/updatecheckui.cxx +++ b/extensions/source/update/ui/updatecheckui.cxx @@ -895,7 +895,7 @@ void BubbleWindow::RecalcTextRects() } // anonymous namespace -static uno::Reference<uno::XInterface> SAL_CALL +static uno::Reference<uno::XInterface> createInstance(const uno::Reference<uno::XComponentContext>& xContext) { SolarMutexGuard aGuard; @@ -917,7 +917,7 @@ static const cppu::ImplementationEntry kImplementations_entries[] = } ; -extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL updchkui_component_getFactory(const sal_Char *pszImplementationName, void *pServiceManager, void *pRegistryKey) +extern "C" SAL_DLLPUBLIC_EXPORT void * updchkui_component_getFactory(const sal_Char *pszImplementationName, void *pServiceManager, void *pRegistryKey) { return cppu::component_getFactoryHelper( pszImplementationName, diff --git a/filter/source/config/cache/registration.cxx b/filter/source/config/cache/registration.cxx index e847faa1a228..38cd72c3efd1 100644 --- a/filter/source/config/cache/registration.cxx +++ b/filter/source/config/cache/registration.cxx @@ -32,7 +32,7 @@ namespace filter{ namespace config{ -extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT void* filterconfig1_component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, void* /* pRegistryKey */ ) diff --git a/filter/source/flash/swfdialog.cxx b/filter/source/flash/swfdialog.cxx index 104fc60022c2..aabf1bf9c91b 100644 --- a/filter/source/flash/swfdialog.cxx +++ b/filter/source/flash/swfdialog.cxx @@ -47,14 +47,14 @@ OUString SWFDialog_getImplementationName () } -Sequence< OUString > SAL_CALL SWFDialog_getSupportedServiceNames() +Sequence< OUString > SWFDialog_getSupportedServiceNames() { Sequence<OUString> aRet { SERVICE_NAME }; return aRet; } -Reference< XInterface > SAL_CALL SWFDialog_createInstance( const Reference< XMultiServiceFactory > & rSMgr) +Reference< XInterface > SWFDialog_createInstance( const Reference< XMultiServiceFactory > & rSMgr) { return static_cast<cppu::OWeakObject*>(new SWFDialog( comphelper::getComponentContext(rSMgr) )); } diff --git a/filter/source/flash/swffilter.cxx b/filter/source/flash/swffilter.cxx index 4c8f8a5654d1..029c84930937 100644 --- a/filter/source/flash/swffilter.cxx +++ b/filter/source/flash/swffilter.cxx @@ -486,13 +486,13 @@ OUString FlashExportFilter_getImplementationName () return OUString ( "com.sun.star.comp.Impress.FlashExportFilter" ); } -Sequence< OUString > SAL_CALL FlashExportFilter_getSupportedServiceNames( ) +Sequence< OUString > FlashExportFilter_getSupportedServiceNames( ) { Sequence<OUString> aRet { "com.sun.star.document.ExportFilter" }; return aRet; } -Reference< XInterface > SAL_CALL FlashExportFilter_createInstance( const Reference< XMultiServiceFactory > & rSMgr) +Reference< XInterface > FlashExportFilter_createInstance( const Reference< XMultiServiceFactory > & rSMgr) { return static_cast<cppu::OWeakObject*>(new FlashExportFilter( comphelper::getComponentContext(rSMgr) )); } diff --git a/filter/source/flash/swfuno.cxx b/filter/source/flash/swfuno.cxx index 87c45602c8a0..d9b18294e575 100644 --- a/filter/source/flash/swfuno.cxx +++ b/filter/source/flash/swfuno.cxx @@ -32,7 +32,7 @@ using namespace ::swf; extern "C" { -SAL_DLLPUBLIC_EXPORT void * SAL_CALL flash_component_getFactory( +SAL_DLLPUBLIC_EXPORT void * flash_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /* pRegistryKey */ ) { void * pRet = nullptr; diff --git a/filter/source/flash/swfuno.hxx b/filter/source/flash/swfuno.hxx index e1a0fd7243e7..caa304868509 100644 --- a/filter/source/flash/swfuno.hxx +++ b/filter/source/flash/swfuno.hxx @@ -41,11 +41,11 @@ namespace swf { OUString FlashExportFilter_getImplementationName(); /// @throws css::uno::RuntimeException -css::uno::Sequence<OUString> SAL_CALL +css::uno::Sequence<OUString> FlashExportFilter_getSupportedServiceNames(); /// @throws css::uno::Exception -css::uno::Reference<css::uno::XInterface> SAL_CALL +css::uno::Reference<css::uno::XInterface> FlashExportFilter_createInstance( css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr); @@ -55,10 +55,10 @@ FlashExportFilter_createInstance( OUString SWFDialog_getImplementationName (); /// @throws css::uno::RuntimeException -css::uno::Sequence<OUString> SAL_CALL SWFDialog_getSupportedServiceNames(); +css::uno::Sequence<OUString> SWFDialog_getSupportedServiceNames(); /// @throws css::uno::Exception -css::uno::Reference<css::uno::XInterface> SAL_CALL SWFDialog_createInstance( +css::uno::Reference<css::uno::XInterface> SWFDialog_createInstance( css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr); #endif diff --git a/filter/source/graphic/Services.cxx b/filter/source/graphic/Services.cxx index e32ef6e98948..a7abd8828844 100644 --- a/filter/source/graphic/Services.cxx +++ b/filter/source/graphic/Services.cxx @@ -29,7 +29,7 @@ const comphelper::service_decl::ServiceDecl graphicExportFilter( "com.sun.star.document.ExportFilter" ); -extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL graphicfilter_component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void* graphicfilter_component_getFactory( sal_Char const* pImplementationName, void*, void*) { if ( rtl_str_compare (pImplementationName, GRAPHIC_EXPORT_FILTER_SERVICE) == 0 ) diff --git a/filter/source/graphicfilter/egif/egif.cxx b/filter/source/graphicfilter/egif/egif.cxx index db6838f6a288..aed662ba4cbd 100644 --- a/filter/source/graphicfilter/egif/egif.cxx +++ b/filter/source/graphicfilter/egif/egif.cxx @@ -541,7 +541,7 @@ void GIFWriter::WriteTerminator() } -extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT bool egiGraphicExport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pConfigItem ) { GIFWriter aWriter(rStream); diff --git a/filter/source/graphicfilter/eps/eps.cxx b/filter/source/graphicfilter/eps/eps.cxx index 694998345361..55965ae6f3ba 100644 --- a/filter/source/graphicfilter/eps/eps.cxx +++ b/filter/source/graphicfilter/eps/eps.cxx @@ -2657,7 +2657,7 @@ bool PSWriter::ImplGetBoundingBox( double* nNumb, sal_uInt8* pSource, sal_uLong //================== GraphicExport - the exported function =================== -extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT bool epsGraphicExport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* pFilterConfigItem ) { PSWriter aPSWriter; diff --git a/filter/source/graphicfilter/etiff/etiff.cxx b/filter/source/graphicfilter/etiff/etiff.cxx index f02985fc1658..1a10eb540b38 100644 --- a/filter/source/graphicfilter/etiff/etiff.cxx +++ b/filter/source/graphicfilter/etiff/etiff.cxx @@ -572,7 +572,7 @@ void TIFFWriter::EndCompression() } -extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT bool etiGraphicExport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pFilterConfigItem ) { TIFFWriter aWriter(rStream); diff --git a/filter/source/graphicfilter/icgm/cgm.cxx b/filter/source/graphicfilter/icgm/cgm.cxx index 31c583900e1f..a421b93500cf 100644 --- a/filter/source/graphicfilter/icgm/cgm.cxx +++ b/filter/source/graphicfilter/icgm/cgm.cxx @@ -710,7 +710,7 @@ bool CGM::Write( SvStream& rIStm ) }; // GraphicImport - the exported function -extern "C" SAL_DLLPUBLIC_EXPORT sal_uInt32 SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT sal_uInt32 ImportCGM(SvStream& rIn, uno::Reference< frame::XModel > const & rXModel, css::uno::Reference<css::task::XStatusIndicator> const & aXStatInd) { diff --git a/filter/source/graphicfilter/idxf/idxf.cxx b/filter/source/graphicfilter/idxf/idxf.cxx index be458003df8d..80abdd8a8470 100644 --- a/filter/source/graphicfilter/idxf/idxf.cxx +++ b/filter/source/graphicfilter/idxf/idxf.cxx @@ -29,7 +29,7 @@ class FilterConfigItem; //================== GraphicImport - the exported function ================ -extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT bool idxGraphicImport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* ) { DXFRepresentation aDXF; diff --git a/filter/source/graphicfilter/ieps/ieps.cxx b/filter/source/graphicfilter/ieps/ieps.cxx index 9c8e73b5d520..f9ad7d49cd76 100644 --- a/filter/source/graphicfilter/ieps/ieps.cxx +++ b/filter/source/graphicfilter/ieps/ieps.cxx @@ -562,7 +562,7 @@ void MakePreview(sal_uInt8* pBuf, sal_uInt32 nBytesRead, //================== GraphicImport - the exported function ================ -extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT bool ipsGraphicImport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* ) { if ( rStream.GetError() ) diff --git a/filter/source/graphicfilter/ios2met/ios2met.cxx b/filter/source/graphicfilter/ios2met/ios2met.cxx index 0fde944a6fd7..b737ac664d14 100644 --- a/filter/source/graphicfilter/ios2met/ios2met.cxx +++ b/filter/source/graphicfilter/ios2met/ios2met.cxx @@ -2764,7 +2764,7 @@ void OS2METReader::ReadOS2MET( SvStream & rStreamOS2MET, GDIMetaFile & rGDIMetaF //================== GraphicImport - the exported function ================ -extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT bool imeGraphicImport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* ) { OS2METReader aOS2METReader; diff --git a/filter/source/graphicfilter/ipbm/ipbm.cxx b/filter/source/graphicfilter/ipbm/ipbm.cxx index 4b230af5c0d5..c0476adbbd5e 100644 --- a/filter/source/graphicfilter/ipbm/ipbm.cxx +++ b/filter/source/graphicfilter/ipbm/ipbm.cxx @@ -535,7 +535,7 @@ bool PBMReader::ImplReadBody() //================== GraphicImport - the exported function ================ -extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT bool ipbGraphicImport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* ) { PBMReader aPBMReader(rStream); diff --git a/filter/source/graphicfilter/ipcd/ipcd.cxx b/filter/source/graphicfilter/ipcd/ipcd.cxx index d4a49be998e4..5adaf3e7d911 100644 --- a/filter/source/graphicfilter/ipcd/ipcd.cxx +++ b/filter/source/graphicfilter/ipcd/ipcd.cxx @@ -359,7 +359,7 @@ void PCDReader::ReadImage() //================== GraphicImport - the exported Function ================ -extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT bool icdGraphicImport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* pConfigItem ) { PCDReader aPCDReader(rStream); diff --git a/filter/source/graphicfilter/ipcx/ipcx.cxx b/filter/source/graphicfilter/ipcx/ipcx.cxx index fed075ed131b..38c6d54664c2 100644 --- a/filter/source/graphicfilter/ipcx/ipcx.cxx +++ b/filter/source/graphicfilter/ipcx/ipcx.cxx @@ -390,7 +390,7 @@ void PCXReader::ImplReadPalette( sal_uLong nCol ) //================== GraphicImport - the exported function ================ -extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT bool ipxGraphicImport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* ) { PCXReader aPCXReader(rStream); diff --git a/filter/source/graphicfilter/ipict/ipict.cxx b/filter/source/graphicfilter/ipict/ipict.cxx index 67292c76a46b..a661c9a2e9a5 100644 --- a/filter/source/graphicfilter/ipict/ipict.cxx +++ b/filter/source/graphicfilter/ipict/ipict.cxx @@ -2012,7 +2012,7 @@ void ReadPictFile(SvStream &rStreamPict, GDIMetaFile& rGDIMetaFile) //================== GraphicImport - the exported function ================ -extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT bool iptGraphicImport( SvStream& rIStm, Graphic & rGraphic, FilterConfigItem* ) { GDIMetaFile aMTF; diff --git a/filter/source/graphicfilter/ipsd/ipsd.cxx b/filter/source/graphicfilter/ipsd/ipsd.cxx index 21214a799657..29718b67119c 100644 --- a/filter/source/graphicfilter/ipsd/ipsd.cxx +++ b/filter/source/graphicfilter/ipsd/ipsd.cxx @@ -752,7 +752,7 @@ bool PSDReader::ImplReadBody() //================== GraphicImport - the exported function ================ -extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT bool ipdGraphicImport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* ) { PSDReader aPSDReader(rStream); diff --git a/filter/source/graphicfilter/iras/iras.cxx b/filter/source/graphicfilter/iras/iras.cxx index 4c878be321f7..ac75b2a77bd3 100644 --- a/filter/source/graphicfilter/iras/iras.cxx +++ b/filter/source/graphicfilter/iras/iras.cxx @@ -380,7 +380,7 @@ sal_uInt8 RASReader::ImplGetByte() //================== GraphicImport - the exported function ================ -extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT bool iraGraphicImport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* ) { RASReader aRASReader(rStream); diff --git a/filter/source/graphicfilter/itga/itga.cxx b/filter/source/graphicfilter/itga/itga.cxx index 6eaafe722932..10681f221085 100644 --- a/filter/source/graphicfilter/itga/itga.cxx +++ b/filter/source/graphicfilter/itga/itga.cxx @@ -786,7 +786,7 @@ bool TGAReader::ImplReadPalette() //================== GraphicImport - the exported function ================ -extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT bool itgGraphicImport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* ) { TGAReader aTGAReader(rStream); diff --git a/filter/source/graphicfilter/itiff/itiff.cxx b/filter/source/graphicfilter/itiff/itiff.cxx index 8752e9dd98b4..a9c875e2287d 100644 --- a/filter/source/graphicfilter/itiff/itiff.cxx +++ b/filter/source/graphicfilter/itiff/itiff.cxx @@ -1557,7 +1557,7 @@ bool TIFFReader::ReadTIFF(SvStream & rTIFF, Graphic & rGraphic ) //================== GraphicImport - the exported function ================ -extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT bool itiGraphicImport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* ) { TIFFReader aTIFFReader; diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx index 2cdb6f9ab674..578c368dcfe7 100644 --- a/filter/source/msfilter/escherex.cxx +++ b/filter/source/msfilter/escherex.cxx @@ -271,7 +271,7 @@ EscherProperties EscherPropertyContainer::GetOpts() const return aVector; } -extern "C" int SAL_CALL EscherPropSortFunc( const void* p1, const void* p2 ) +extern "C" int EscherPropSortFunc( const void* p1, const void* p2 ) { sal_Int16 nID1 = static_cast<EscherPropSortStruct const *>(p1)->nPropId &~0xc000; sal_Int16 nID2 = static_cast<EscherPropSortStruct const *>(p2)->nPropId &~0xc000; diff --git a/filter/source/msfilter/msvbahelper.cxx b/filter/source/msfilter/msvbahelper.cxx index 0951cc87c8a1..286a352705bc 100644 --- a/filter/source/msfilter/msvbahelper.cxx +++ b/filter/source/msfilter/msvbahelper.cxx @@ -509,7 +509,7 @@ OUString VBAMacroResolver_getImplementationName() return OUString( "com.sun.star.comp.vba.VBAMacroResolver" ); } -uno::Reference< uno::XInterface > SAL_CALL VBAMacroResolver_createInstance( const uno::Reference< uno::XComponentContext >& ) +uno::Reference< uno::XInterface > VBAMacroResolver_createInstance( const uno::Reference< uno::XComponentContext >& ) { return static_cast< ::cppu::OWeakObject* >( new VBAMacroResolver ); } diff --git a/filter/source/msfilter/services.cxx b/filter/source/msfilter/services.cxx index 9ef19e882e23..ba3a7b066b65 100644 --- a/filter/source/msfilter/services.cxx +++ b/filter/source/msfilter/services.cxx @@ -37,7 +37,7 @@ static ::cppu::ImplementationEntry const spServices[] = } // namespace -extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL msfilter_component_getFactory( const char* pImplName, void* pServiceManager, void* pRegistryKey ) +extern "C" SAL_DLLPUBLIC_EXPORT void* msfilter_component_getFactory( const char* pImplName, void* pServiceManager, void* pRegistryKey ) { return ::cppu::component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey, spServices ); } diff --git a/filter/source/odfflatxml/OdfFlatXml.cxx b/filter/source/odfflatxml/OdfFlatXml.cxx index aab5ec7adec4..9a7881e24c88 100644 --- a/filter/source/odfflatxml/OdfFlatXml.cxx +++ b/filter/source/odfflatxml/OdfFlatXml.cxx @@ -215,7 +215,7 @@ Reference< XInterface > SAL_CALL OdfFlatXml::impl_createInstance(const Reference } -extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT void* odfflatxml_component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, void* /* pRegistryKey */ ) diff --git a/filter/source/pdf/pdfdialog.cxx b/filter/source/pdf/pdfdialog.cxx index 47573daaaf60..fcd66f01a56b 100644 --- a/filter/source/pdf/pdfdialog.cxx +++ b/filter/source/pdf/pdfdialog.cxx @@ -39,14 +39,14 @@ OUString PDFDialog_getImplementationName () } -Sequence< OUString > SAL_CALL PDFDialog_getSupportedServiceNames() +Sequence< OUString > PDFDialog_getSupportedServiceNames() { Sequence<OUString> aRet { SERVICE_NAME }; return aRet; } -Reference< XInterface > SAL_CALL PDFDialog_createInstance( const Reference< XMultiServiceFactory > & rSMgr) +Reference< XInterface > PDFDialog_createInstance( const Reference< XMultiServiceFactory > & rSMgr) { return static_cast<cppu::OWeakObject*>(new PDFDialog( comphelper::getComponentContext(rSMgr) )); } diff --git a/filter/source/pdf/pdfdialog.hxx b/filter/source/pdf/pdfdialog.hxx index 31316434882c..671db03ed6fa 100644 --- a/filter/source/pdf/pdfdialog.hxx +++ b/filter/source/pdf/pdfdialog.hxx @@ -67,9 +67,9 @@ public: /// @throws RuntimeException OUString PDFDialog_getImplementationName (); /// @throws RuntimeException -Sequence< OUString > SAL_CALL PDFDialog_getSupportedServiceNames(); +Sequence< OUString > PDFDialog_getSupportedServiceNames(); /// @throws Exception -Reference< XInterface > SAL_CALL PDFDialog_createInstance( const Reference< XMultiServiceFactory > & rSMgr); +Reference< XInterface > PDFDialog_createInstance( const Reference< XMultiServiceFactory > & rSMgr); #endif // INCLUDED_FILTER_SOURCE_PDF_PDFDIALOG_HXX diff --git a/filter/source/pdf/pdffilter.cxx b/filter/source/pdf/pdffilter.cxx index 2a32408bb0c3..d20a2d3acd98 100644 --- a/filter/source/pdf/pdffilter.cxx +++ b/filter/source/pdf/pdffilter.cxx @@ -202,14 +202,14 @@ OUString PDFFilter_getImplementationName () } -Sequence< OUString > SAL_CALL PDFFilter_getSupportedServiceNames( ) +Sequence< OUString > PDFFilter_getSupportedServiceNames( ) { Sequence<OUString> aRet { "com.sun.star.document.PDFFilter" }; return aRet; } -Reference< XInterface > SAL_CALL PDFFilter_createInstance( const Reference< XMultiServiceFactory > & rSMgr) +Reference< XInterface > PDFFilter_createInstance( const Reference< XMultiServiceFactory > & rSMgr) { return static_cast<cppu::OWeakObject*>(new PDFFilter( comphelper::getComponentContext(rSMgr) )); } diff --git a/filter/source/pdf/pdffilter.hxx b/filter/source/pdf/pdffilter.hxx index 7fedeaffa4fe..5e1db495249e 100644 --- a/filter/source/pdf/pdffilter.hxx +++ b/filter/source/pdf/pdffilter.hxx @@ -85,11 +85,11 @@ public: OUString PDFFilter_getImplementationName (); /// @throws RuntimeException -Sequence< OUString > SAL_CALL PDFFilter_getSupportedServiceNames( ); +Sequence< OUString > PDFFilter_getSupportedServiceNames( ); /// @throws Exception Reference< XInterface > -SAL_CALL PDFFilter_createInstance( const Reference< XMultiServiceFactory > & rSMgr); +PDFFilter_createInstance( const Reference< XMultiServiceFactory > & rSMgr); #endif // INCLUDED_FILTER_SOURCE_PDF_PDFFILTER_HXX diff --git a/filter/source/pdf/pdfinteract.cxx b/filter/source/pdf/pdfinteract.cxx index c416e2c1f5c9..a704fbf3f7ba 100644 --- a/filter/source/pdf/pdfinteract.cxx +++ b/filter/source/pdf/pdfinteract.cxx @@ -68,14 +68,14 @@ OUString PDFInteractionHandler_getImplementationName () } -Sequence< OUString > SAL_CALL PDFInteractionHandler_getSupportedServiceNames( ) +Sequence< OUString > PDFInteractionHandler_getSupportedServiceNames( ) { Sequence<OUString> aRet { "com.sun.star.filter.pdfexport.PDFExportInteractionHandler" }; return aRet; } -Reference< XInterface > SAL_CALL PDFInteractionHandler_createInstance( const Reference< XMultiServiceFactory > & ) +Reference< XInterface > PDFInteractionHandler_createInstance( const Reference< XMultiServiceFactory > & ) { return static_cast<cppu::OWeakObject*>(new PDFInteractionHandler); } diff --git a/filter/source/pdf/pdfinteract.hxx b/filter/source/pdf/pdfinteract.hxx index 06bd82fb7262..0795558c084e 100644 --- a/filter/source/pdf/pdfinteract.hxx +++ b/filter/source/pdf/pdfinteract.hxx @@ -56,11 +56,11 @@ public: OUString PDFInteractionHandler_getImplementationName (); /// @throws RuntimeException -Sequence< OUString > SAL_CALL PDFInteractionHandler_getSupportedServiceNames( ); +Sequence< OUString > PDFInteractionHandler_getSupportedServiceNames( ); /// @throws Exception Reference< XInterface > -SAL_CALL PDFInteractionHandler_createInstance( const Reference< XMultiServiceFactory > & rSMgr); +PDFInteractionHandler_createInstance( const Reference< XMultiServiceFactory > & rSMgr); #endif // INCLUDED_FILTER_SOURCE_PDF_PDFINTERACT_HXX diff --git a/filter/source/pdf/pdfuno.cxx b/filter/source/pdf/pdfuno.cxx index 4a72f57bb0cc..8dad87097afa 100644 --- a/filter/source/pdf/pdfuno.cxx +++ b/filter/source/pdf/pdfuno.cxx @@ -33,7 +33,7 @@ using namespace ::com::sun::star::registry; extern "C" { - SAL_DLLPUBLIC_EXPORT void* SAL_CALL pdffilter_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) + SAL_DLLPUBLIC_EXPORT void* pdffilter_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) { OUString aImplName( OUString::createFromAscii( pImplName ) ); void* pRet = nullptr; diff --git a/filter/source/storagefilterdetect/fdcomp.cxx b/filter/source/storagefilterdetect/fdcomp.cxx index 36c64b12e292..9a281e540efb 100644 --- a/filter/source/storagefilterdetect/fdcomp.cxx +++ b/filter/source/storagefilterdetect/fdcomp.cxx @@ -26,7 +26,7 @@ static cppu::ImplementationEntry const services[] = { } -extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL storagefd_component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * storagefd_component_getFactory( char const * pImplName, void * pServiceManager, void * pRegistryKey) { return cppu::component_getFactoryHelper( diff --git a/filter/source/svg/svgdialog.cxx b/filter/source/svg/svgdialog.cxx index 9c282498ebb2..fcaaa05f24eb 100644 --- a/filter/source/svg/svgdialog.cxx +++ b/filter/source/svg/svgdialog.cxx @@ -46,14 +46,14 @@ OUString SVGDialog_getImplementationName () } -Sequence< OUString > SAL_CALL SVGDialog_getSupportedServiceNames() +Sequence< OUString > SVGDialog_getSupportedServiceNames() { Sequence< OUString > aRet { SVG_DIALOG_SERVICE_NAME }; return aRet; } -Reference< XInterface > SAL_CALL SVGDialog_createInstance( const Reference< XMultiServiceFactory > & rSMgr ) +Reference< XInterface > SVGDialog_createInstance( const Reference< XMultiServiceFactory > & rSMgr ) { return static_cast< cppu::OWeakObject* >( new SVGDialog( comphelper::getComponentContext(rSMgr) ) ); } diff --git a/filter/source/svg/svgdialog.hxx b/filter/source/svg/svgdialog.hxx index 92d3d0432938..ed4bcbee343f 100644 --- a/filter/source/svg/svgdialog.hxx +++ b/filter/source/svg/svgdialog.hxx @@ -74,11 +74,11 @@ public: OUString SVGDialog_getImplementationName (); /// @throws css::uno::RuntimeException -css::uno::Sequence< OUString > SAL_CALL SVGDialog_getSupportedServiceNames( ); +css::uno::Sequence< OUString > SVGDialog_getSupportedServiceNames( ); /// @throws css::uno::Exception css::uno::Reference< css::uno::XInterface > - SAL_CALL SVGDialog_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr); + SVGDialog_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr); #endif // INCLUDED_FILTER_SOURCE_SVG_SVGDIALOG_HXX diff --git a/filter/source/svg/svgfilter.cxx b/filter/source/svg/svgfilter.cxx index cba3d3210ad9..c689eebee5e0 100644 --- a/filter/source/svg/svgfilter.cxx +++ b/filter/source/svg/svgfilter.cxx @@ -398,7 +398,7 @@ namespace sdecl = comphelper::service_decl; "com.sun.star.svg.SVGWriter" ); // The C shared lib entry points -extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL svgfilter_component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void* svgfilter_component_getFactory( sal_Char const* pImplName, void*, void*) { if ( rtl_str_compare (pImplName, SVG_FILTER_IMPL_NAME) == 0 ) diff --git a/filter/source/t602/filterenv.cxx b/filter/source/t602/filterenv.cxx index 73dda29993d8..11af8a6690a5 100644 --- a/filter/source/t602/filterenv.cxx +++ b/filter/source/t602/filterenv.cxx @@ -33,7 +33,7 @@ using namespace T602ImportFilter; extern "C" { -SAL_DLLPUBLIC_EXPORT void * SAL_CALL t602filter_component_getFactory( +SAL_DLLPUBLIC_EXPORT void * t602filter_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /* pRegistryKey */ ) { void * pRet = nullptr; diff --git a/filter/source/t602/t602filter.cxx b/filter/source/t602/t602filter.cxx index 36f6bc6da996..38ca6230bb70 100644 --- a/filter/source/t602/t602filter.cxx +++ b/filter/source/t602/t602filter.cxx @@ -871,7 +871,7 @@ OUString T602ImportFilter_getImplementationName () return OUString ( "com.sun.star.comp.Writer.T602ImportFilter" ); } -Sequence< OUString > SAL_CALL T602ImportFilter_getSupportedServiceNames( ) +Sequence< OUString > T602ImportFilter_getSupportedServiceNames( ) { Sequence < OUString > aRet(2); OUString* pArray = aRet.getArray(); @@ -880,7 +880,7 @@ Sequence< OUString > SAL_CALL T602ImportFilter_getSupportedServiceNames( ) return aRet; } -Reference< XInterface > SAL_CALL T602ImportFilter_createInstance( const Reference< XMultiServiceFactory > & rSMgr) +Reference< XInterface > T602ImportFilter_createInstance( const Reference< XMultiServiceFactory > & rSMgr) { return static_cast<cppu::OWeakObject*>(new T602ImportFilter( rSMgr )); } @@ -1141,20 +1141,20 @@ OUString T602ImportFilterDialog_getImplementationName () return OUString ( "com.sun.star.comp.Writer.T602ImportFilterDialog" ); } -Sequence< OUString > SAL_CALL T602ImportFilterDialog_getSupportedServiceNames( ) +Sequence< OUString > T602ImportFilterDialog_getSupportedServiceNames( ) { Sequence<OUString> aRet { "com.sun.star.ui.dialogs.FilterOptionsDialog" }; return aRet; } -Reference< XInterface > SAL_CALL T602ImportFilterDialog_createInstance( const Reference< XMultiServiceFactory > & ) +Reference< XInterface > T602ImportFilterDialog_createInstance( const Reference< XMultiServiceFactory > & ) { return static_cast<cppu::OWeakObject*>(new T602ImportFilterDialog); } } -extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImport602(SvStream &rStream) +extern "C" SAL_DLLPUBLIC_EXPORT bool TestImport602(SvStream &rStream) { css::uno::Reference<io::XInputStream> xStream(new utl::OSeekableInputStreamWrapper(rStream)); rtl::Reference<T602ImportFilter::T602ImportFilter> aImport( diff --git a/filter/source/t602/t602filter.hxx b/filter/source/t602/t602filter.hxx index 63bd0335614f..22abefa78838 100644 --- a/filter/source/t602/t602filter.hxx +++ b/filter/source/t602/t602filter.hxx @@ -254,21 +254,21 @@ private: OUString T602ImportFilter_getImplementationName(); /// @throws css::uno::RuntimeException -css::uno::Sequence< OUString > SAL_CALL T602ImportFilter_getSupportedServiceNames( ); +css::uno::Sequence< OUString > T602ImportFilter_getSupportedServiceNames( ); /// @throws css::uno::Exception css::uno::Reference< css::uno::XInterface > -SAL_CALL T602ImportFilter_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr); +T602ImportFilter_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr); /// @throws css::uno::RuntimeException OUString T602ImportFilterDialog_getImplementationName(); /// @throws css::uno::RuntimeException -css::uno::Sequence< OUString > SAL_CALL T602ImportFilterDialog_getSupportedServiceNames( ); +css::uno::Sequence< OUString > T602ImportFilterDialog_getSupportedServiceNames( ); /// @throws css::uno::Exception css::uno::Reference< css::uno::XInterface > -SAL_CALL T602ImportFilterDialog_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr); +T602ImportFilterDialog_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr); } diff --git a/filter/source/textfilterdetect/filterdetect.cxx b/filter/source/textfilterdetect/filterdetect.cxx index ee93d28ddbed..d2f8fb0bd54c 100644 --- a/filter/source/textfilterdetect/filterdetect.cxx +++ b/filter/source/textfilterdetect/filterdetect.cxx @@ -225,7 +225,7 @@ uno::Sequence<OUString> SAL_CALL PlainTextFilterDetect::getSupportedServiceNames return PlainTextFilterDetect_getSupportedServiceNames(); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_comp_filters_PlainTextFilterDetect_get_implementation(css::uno::XComponentContext* , css::uno::Sequence<css::uno::Any> const &) { diff --git a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx index ffe7684c7431..5db591bcf53e 100644 --- a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx +++ b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx @@ -325,7 +325,7 @@ OUString XmlFilterAdaptor_getImplementationName () return OUString( "com.sun.star.comp.Writer.XmlFilterAdaptor" ); } -Sequence< OUString > SAL_CALL XmlFilterAdaptor_getSupportedServiceNames( ) +Sequence< OUString > XmlFilterAdaptor_getSupportedServiceNames( ) { Sequence < OUString > aRet(2); OUString* pArray = aRet.getArray(); @@ -334,7 +334,7 @@ Sequence< OUString > SAL_CALL XmlFilterAdaptor_getSupportedServiceNames( ) return aRet; } -Reference< XInterface > SAL_CALL XmlFilterAdaptor_createInstance( const Reference< XMultiServiceFactory > & rSMgr) +Reference< XInterface > XmlFilterAdaptor_createInstance( const Reference< XMultiServiceFactory > & rSMgr) { return static_cast<cppu::OWeakObject*>(new XmlFilterAdaptor( comphelper::getComponentContext(rSMgr) )); } diff --git a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx index a0512a34d864..78a4fbad6369 100644 --- a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx +++ b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx @@ -108,12 +108,12 @@ public: OUString XmlFilterAdaptor_getImplementationName(); /// @throws css::uno::RuntimeException -css::uno::Sequence< OUString > SAL_CALL XmlFilterAdaptor_getSupportedServiceNames( ); +css::uno::Sequence< OUString > XmlFilterAdaptor_getSupportedServiceNames( ); /// @throws css::uno::Exception css::uno::Reference< css::uno::XInterface > -SAL_CALL XmlFilterAdaptor_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr); +XmlFilterAdaptor_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr); #endif diff --git a/filter/source/xmlfilteradaptor/genericfilter.cxx b/filter/source/xmlfilteradaptor/genericfilter.cxx index c2bebaaec1b8..91bda6f47728 100644 --- a/filter/source/xmlfilteradaptor/genericfilter.cxx +++ b/filter/source/xmlfilteradaptor/genericfilter.cxx @@ -29,7 +29,7 @@ using namespace ::com::sun::star::registry; extern "C" { -SAL_DLLPUBLIC_EXPORT void * SAL_CALL xmlfa_component_getFactory( +SAL_DLLPUBLIC_EXPORT void * xmlfa_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /* pRegistryKey */ ) { void * pRet = nullptr; diff --git a/filter/source/xmlfilterdetect/fdcomp.cxx b/filter/source/xmlfilterdetect/fdcomp.cxx index 3b975cc05d31..1cbec9680402 100644 --- a/filter/source/xmlfilterdetect/fdcomp.cxx +++ b/filter/source/xmlfilterdetect/fdcomp.cxx @@ -36,7 +36,7 @@ static cppu::ImplementationEntry const services[] = { } -extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL xmlfd_component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * xmlfd_component_getFactory( char const * pImplName, void * pServiceManager, void * pRegistryKey) { return cppu::component_getFactoryHelper( diff --git a/filter/source/xmlfilterdetect/filterdetect.hxx b/filter/source/xmlfilterdetect/filterdetect.hxx index 5db916d76e5e..77d716387f90 100644 --- a/filter/source/xmlfilterdetect/filterdetect.hxx +++ b/filter/source/xmlfilterdetect/filterdetect.hxx @@ -56,11 +56,11 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; }; -OUString SAL_CALL FilterDetect_getImplementationName(); +OUString FilterDetect_getImplementationName(); -css::uno::Sequence< OUString > SAL_CALL FilterDetect_getSupportedServiceNames(); +css::uno::Sequence< OUString > FilterDetect_getSupportedServiceNames(); -css::uno::Reference< css::uno::XInterface > SAL_CALL +css::uno::Reference< css::uno::XInterface > FilterDetect_createInstance( css::uno::Reference< css::uno::XComponentContext > const & context); diff --git a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx index 60b08704e95d..807d01138b04 100644 --- a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx +++ b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx @@ -170,14 +170,14 @@ OUString XMLFilterDialogComponent_getImplementationName() } /// @throws RuntimeException -Sequence< OUString > SAL_CALL XMLFilterDialogComponent_getSupportedServiceNames() +Sequence< OUString > XMLFilterDialogComponent_getSupportedServiceNames() { Sequence< OUString > aSupported { "com.sun.star.ui.dialogs.XSLTFilterDialog" }; return aSupported; } /// @throws Exception -Reference< XInterface > SAL_CALL XMLFilterDialogComponent_createInstance( const Reference< XMultiServiceFactory > & rSMgr) +Reference< XInterface > XMLFilterDialogComponent_createInstance( const Reference< XMultiServiceFactory > & rSMgr) { return static_cast<OWeakObject*>(new XMLFilterDialogComponent( comphelper::getComponentContext(rSMgr) )); } @@ -324,7 +324,7 @@ void SAL_CALL XMLFilterDialogComponent::initialize( const Sequence< Any >& aArgu extern "C" { -SAL_DLLPUBLIC_EXPORT void * SAL_CALL xsltdlg_component_getFactory( +SAL_DLLPUBLIC_EXPORT void * xsltdlg_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /* pRegistryKey */ ) { void * pRet = nullptr; diff --git a/filter/source/xsltfilter/XSLTFilter.cxx b/filter/source/xsltfilter/XSLTFilter.cxx index 75d5febb8799..811ad6458d8b 100644 --- a/filter/source/xsltfilter/XSLTFilter.cxx +++ b/filter/source/xsltfilter/XSLTFilter.cxx @@ -539,13 +539,13 @@ namespace XSLT #define TRANSFORMER_SERVICE_NAME "com.sun.star.xml.xslt.XSLTTransformer" #define TRANSFORMER_IMPL_NAME "com.sun.star.comp.documentconversion.LibXSLTTransformer" - static css::uno::Reference<XInterface> SAL_CALL + static css::uno::Reference<XInterface> CreateTransformerInstance(const css::uno::Reference<XMultiServiceFactory> &r) { return css::uno::Reference<XInterface> (static_cast<OWeakObject *>(new LibXSLTTransformer( comphelper::getComponentContext(r) ))); } - static css::uno::Reference<XInterface> SAL_CALL + static css::uno::Reference<XInterface> CreateFilterInstance(const css::uno::Reference<XMultiServiceFactory> &r) { return css::uno::Reference<XInterface> (static_cast<OWeakObject *>(new XSLTFilter( comphelper::getComponentContext(r) ))); @@ -557,7 +557,7 @@ using namespace XSLT; extern "C" { - SAL_DLLPUBLIC_EXPORT void * SAL_CALL xsltfilter_component_getFactory(const sal_Char * pImplName, + SAL_DLLPUBLIC_EXPORT void * xsltfilter_component_getFactory(const sal_Char * pImplName, void * pServiceManager, void * /* pRegistryKey */) { void * pRet = nullptr; diff --git a/forms/source/component/Button.cxx b/forms/source/component/Button.cxx index 99d076c3096a..3b2ed0b99972 100644 --- a/forms/source/component/Button.cxx +++ b/forms/source/component/Button.cxx @@ -749,14 +749,14 @@ void SAL_CALL OButtonControl::releaseDispatchProviderInterceptor( const Referenc } // namespace frm -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_form_OButtonModel_get_implementation(css::uno::XComponentContext* component, css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new frm::OButtonModel(component)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_form_OButtonControl_get_implementation(css::uno::XComponentContext* component, css::uno::Sequence<css::uno::Any> const &) { diff --git a/forms/source/component/CheckBox.cxx b/forms/source/component/CheckBox.cxx index 94c206033028..a0b0e24c82ab 100644 --- a/forms/source/component/CheckBox.cxx +++ b/forms/source/component/CheckBox.cxx @@ -266,14 +266,14 @@ bool OCheckBoxModel::commitControlValueToDbColumn( bool /*_bPostReset*/ ) } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_form_OCheckBoxModel_get_implementation(css::uno::XComponentContext* component, css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new frm::OCheckBoxModel(component)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_form_OCheckBoxControl_get_implementation(css::uno::XComponentContext* component, css::uno::Sequence<css::uno::Any> const &) { diff --git a/forms/source/component/ComboBox.cxx b/forms/source/component/ComboBox.cxx index 4db71e5b604d..5df2b3572de8 100644 --- a/forms/source/component/ComboBox.cxx +++ b/forms/source/component/ComboBox.cxx @@ -893,14 +893,14 @@ css::uno::Sequence<OUString> SAL_CALL OComboBoxControl::getSupportedServiceNames } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_form_OComboBoxModel_get_implementation(css::uno::XComponentContext* component, css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new frm::OComboBoxModel(component)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_form_OComboBoxControl_get_implementation(css::uno::XComponentContext* component, css::uno::Sequence<css::uno::Any> const &) { diff --git a/forms/source/component/Currency.cxx b/forms/source/component/Currency.cxx index 793940f17229..441b7b526d7c 100644 --- a/forms/source/component/Currency.cxx +++ b/forms/source/component/Currency.cxx @@ -224,14 +224,14 @@ void OCurrencyModel::resetNoBroadcast() } // namespace frm -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_form_OCurrencyModel_get_implementation(css::uno::XComponentContext* component, css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new frm::OCurrencyModel(component)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_form_OCurrencyControl_get_implementation(css::uno::XComponentContext* component, css::uno::Sequence<css::uno::Any> const &) { diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx index 5f8fe4d15c88..2c154ac795b8 100644 --- a/forms/source/component/DatabaseForm.cxx +++ b/forms/source/component/DatabaseForm.cxx @@ -4040,7 +4040,7 @@ void SAL_CALL ODatabaseForm::setName(const OUString& aName) } // namespace frm -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_comp_forms_ODatabaseForm_get_implementation(css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const &) { diff --git a/forms/source/component/Date.cxx b/forms/source/component/Date.cxx index 117533ed7b5a..e8596a0136ab 100644 --- a/forms/source/component/Date.cxx +++ b/forms/source/component/Date.cxx @@ -311,14 +311,14 @@ Sequence< Type > ODateModel::getSupportedBindingTypes() } // namespace frm -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_form_ODateModel_get_implementation(css::uno::XComponentContext* component, css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new frm::ODateModel(component)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_form_ODateControl_get_implementation(css::uno::XComponentContext* component, css::uno::Sequence<css::uno::Any> const &) { diff --git a/forms/source/component/Edit.cxx b/forms/source/component/Edit.cxx index 0b5dc04019a9..ae7c1fac25e5 100644 --- a/forms/source/component/Edit.cxx +++ b/forms/source/component/Edit.cxx @@ -694,14 +694,14 @@ Any OEditModel::getDefaultForReset() const } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_form_OEditModel_get_implementation(css::uno::XComponentContext* component, css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new frm::OEditModel(component)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_form_OEditControl_get_implementation(css::uno::XComponentContext* component, css::uno::Sequence<css::uno::Any> const &) { diff --git a/forms/source/component/File.cxx b/forms/source/component/File.cxx index 7b796897cde5..ed304deb4b2d 100644 --- a/forms/source/component/File.cxx +++ b/forms/source/component/File.cxx @@ -266,7 +266,7 @@ void OFileControlModel::removeResetListener(const Reference<XResetListener>& _rx } // namespace frm -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_form_OFileControlModel_get_implementation(css::uno::XComponentContext* component, css::uno::Sequence<css::uno::Any> const &) { diff --git a/forms/source/component/Filter.cxx b/forms/source/component/Filter.cxx index 537ee2b5a60a..4bca83480512 100644 --- a/forms/source/component/Filter.cxx +++ b/forms/source/component/Filter.cxx @@ -887,7 +887,7 @@ namespace frm } } // namespace frm -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_comp_forms_OFilterControl_get_implementation(css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const &) { diff --git a/forms/source/component/FixedText.cxx b/forms/source/component/FixedText.cxx index a734433d559b..a144518e488f 100644 --- a/forms/source/component/FixedText.cxx +++ b/forms/source/component/FixedText.cxx @@ -108,7 +108,7 @@ void SAL_CALL OFixedTextModel::read(const Reference<XObjectInputStream>& _rxInSt } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_form_OFixedTextModel_get_implementation(css::uno::XComponentContext* component, css::uno::Sequence<css::uno::Any> const &) { diff --git a/forms/source/component/FormattedField.cxx b/forms/source/component/FormattedField.cxx index c84c219cc309..acd0ad6ea05d 100644 --- a/forms/source/component/FormattedField.cxx +++ b/forms/source/component/FormattedField.cxx @@ -1006,7 +1006,7 @@ void OFormattedModel::resetNoBroadcast() } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_form_OFormattedControl_get_implementation(css::uno::XComponentContext* component, css::uno::Sequence<css::uno::Any> const &) { diff --git a/forms/source/component/FormattedFieldWrapper.cxx b/forms/source/component/FormattedFieldWrapper.cxx index 88b33c0d0e37..ac206428700f 100644 --- a/forms/source/component/FormattedFieldWrapper.cxx +++ b/forms/source/component/FormattedFieldWrapper.cxx @@ -342,7 +342,7 @@ void OFormattedFieldWrapper::ensureAggregate() osl_atomic_decrement(&m_refCount); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_form_OFormattedFieldWrapper_get_implementation(css::uno::XComponentContext* component, css::uno::Sequence<css::uno::Any> const &) { @@ -352,7 +352,7 @@ com_sun_star_form_OFormattedFieldWrapper_get_implementation(css::uno::XComponent return inst.get(); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_comp_forms_OFormattedFieldWrapper_ForcedFormatted_get_implementation(css::uno::XComponentContext* component, css::uno::Sequence<css::uno::Any> const &) { diff --git a/forms/source/component/FormsCollection.cxx b/forms/source/component/FormsCollection.cxx index a9e49f9f8ca0..567725d926e6 100644 --- a/forms/source/component/FormsCollection.cxx +++ b/forms/source/component/FormsCollection.cxx @@ -138,7 +138,7 @@ css::uno::Reference<css::uno::XInterface> OFormsCollection::getParent() return m_xParent; } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_form_OFormsCollection_get_implementation(css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const &) { diff --git a/forms/source/component/Grid.cxx b/forms/source/component/Grid.cxx index 522c0de7c94a..2bcce028a6c6 100644 --- a/forms/source/component/Grid.cxx +++ b/forms/source/component/Grid.cxx @@ -990,7 +990,7 @@ void OGridControlModel::read(const Reference<XObjectInputStream>& _rxInStream) } -extern "C" SAL_DLLPUBLIC_EXPORT XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT XInterface* com_sun_star_form_OGridControlModel_get_implementation(XComponentContext* component, Sequence<Any> const &) { diff --git a/forms/source/component/GroupBox.cxx b/forms/source/component/GroupBox.cxx index 46d79c00a793..7e727c21436e 100644 --- a/forms/source/component/GroupBox.cxx +++ b/forms/source/component/GroupBox.cxx @@ -139,7 +139,7 @@ css::uno::Sequence<OUString> SAL_CALL OGroupBoxControl::getSupportedServiceNames } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_form_OGroupBoxModel_get_implementation(css::uno::XComponentContext* component, css::uno::Sequence<css::uno::Any> const &) { @@ -147,7 +147,7 @@ com_sun_star_form_OGroupBoxModel_get_implementation(css::uno::XComponentContext* } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_form_OGroupBoxControl_get_implementation(css::uno::XComponentContext* component, css::uno::Sequence<css::uno::Any> const &) { diff --git a/forms/source/component/Hidden.cxx b/forms/source/component/Hidden.cxx index d8507313a9e2..d5a1b8fe7853 100644 --- a/forms/source/component/Hidden.cxx +++ b/forms/source/component/Hidden.cxx @@ -160,7 +160,7 @@ void SAL_CALL OHiddenModel::read(const Reference<XObjectInputStream>& _rxInStrea } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_form_OHiddenModel_get_implementation(css::uno::XComponentContext* component, css::uno::Sequence<css::uno::Any> const &) { diff --git a/forms/source/component/ImageButton.cxx b/forms/source/component/ImageButton.cxx index cb3979ecca88..e4212c5ed46f 100644 --- a/forms/source/component/ImageButton.cxx +++ b/forms/source/component/ImageButton.cxx @@ -222,14 +222,14 @@ void SAL_CALL OImageButtonControl::mouseExited(const awt::MouseEvent& /*e*/) } // namespace frm -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_form_OImageButtonModel_get_implementation(css::uno::XComponentContext* component, css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new frm::OImageButtonModel(component)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_form_OImageButtonControl_get_implementation(css::uno::XComponentContext* component, css::uno::Sequence<css::uno::Any> const &) { diff --git a/forms/source/component/ImageControl.cxx b/forms/source/component/ImageControl.cxx index 277631c96a2c..fb9cfb41f062 100644 --- a/forms/source/component/ImageControl.cxx +++ b/forms/source/component/ImageControl.cxx @@ -976,14 +976,14 @@ void SAL_CALL OImageControlControl::mouseExited(const awt::MouseEvent& /*e*/) } // namespace frm -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_form_OImageControlModel_get_implementation(css::uno::XComponentContext* component, css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new frm::OImageControlModel(component)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_form_OImageControlControl_get_implementation(css::uno::XComponentContext* component, css::uno::Sequence<css::uno::Any> const &) { diff --git a/forms/source/component/ListBox.cxx b/forms/source/component/ListBox.cxx index fd889c9d667d..83b30b5a130b 100644 --- a/forms/source/component/ListBox.cxx +++ b/forms/source/component/ListBox.cxx @@ -2204,14 +2204,14 @@ namespace frm } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_form_OListBoxModel_get_implementation(css::uno::XComponentContext* component, css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new frm::OListBoxModel(component)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_form_OListBoxControl_get_implementation(css::uno::XComponentContext* component, css::uno::Sequence<css::uno::Any> const &) { diff --git a/forms/source/component/Numeric.cxx b/forms/source/component/Numeric.cxx index f537cff50bc5..73170bea426a 100644 --- a/forms/source/component/Numeric.cxx +++ b/forms/source/component/Numeric.cxx @@ -173,14 +173,14 @@ void ONumericModel::resetNoBroadcast() } // namespace frm -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_form_ONumericModel_get_implementation(css::uno::XComponentContext* component, css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new frm::ONumericModel(component)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_form_ONumericControl_get_implementation(css::uno::XComponentContext* component, css::uno::Sequence<css::uno::Any> const &) { diff --git a/forms/source/component/Pattern.cxx b/forms/source/component/Pattern.cxx index 1f92f6218c68..049bba3d6858 100644 --- a/forms/source/component/Pattern.cxx +++ b/forms/source/component/Pattern.cxx @@ -207,14 +207,14 @@ void OPatternModel::resetNoBroadcast() } // namespace frm -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_form_OPatternModel_get_implementation(css::uno::XComponentContext* component, css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new frm::OPatternModel(component)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_form_OPatternControl_get_implementation(css::uno::XComponentContext* component, css::uno::Sequence<css::uno::Any> const &) { diff --git a/forms/source/component/RadioButton.cxx b/forms/source/component/RadioButton.cxx index 8946a49d4554..45cabba88362 100644 --- a/forms/source/component/RadioButton.cxx +++ b/forms/source/component/RadioButton.cxx @@ -379,14 +379,14 @@ bool ORadioButtonModel::commitControlValueToDbColumn( bool /*_bPostReset*/ ) } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_form_ORadioButtonModel_get_implementation(css::uno::XComponentContext* component, css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new frm::ORadioButtonModel(component)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_form_ORadioButtonControl_get_implementation(css::uno::XComponentContext* component, css::uno::Sequence<css::uno::Any> const &) { diff --git a/forms/source/component/Time.cxx b/forms/source/component/Time.cxx index f54e160c038c..3e580c8451c2 100644 --- a/forms/source/component/Time.cxx +++ b/forms/source/component/Time.cxx @@ -303,14 +303,14 @@ Sequence< Type > OTimeModel::getSupportedBindingTypes() } // namespace frm -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_form_OTimeModel_get_implementation(css::uno::XComponentContext* component, css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new frm::OTimeModel(component)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_form_OTimeControl_get_implementation(css::uno::XComponentContext* component, css::uno::Sequence<css::uno::Any> const &) { diff --git a/forms/source/component/imgprod.cxx b/forms/source/component/imgprod.cxx index cfa5e528afcc..f322c94403d0 100644 --- a/forms/source/component/imgprod.cxx +++ b/forms/source/component/imgprod.cxx @@ -518,7 +518,7 @@ void ImageProducer::initialize( const css::uno::Sequence< css::uno::Any >& aArgu } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_form_ImageProducer_get_implementation(css::uno::XComponentContext*, css::uno::Sequence<css::uno::Any> const &) { diff --git a/forms/source/component/navigationbar.cxx b/forms/source/component/navigationbar.cxx index 4762f805274c..66b31fc05835 100644 --- a/forms/source/component/navigationbar.cxx +++ b/forms/source/component/navigationbar.cxx @@ -449,7 +449,7 @@ namespace frm } // namespace frm -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_comp_form_ONavigationBarModel_get_implementation(css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const &) { diff --git a/forms/source/component/scrollbar.cxx b/forms/source/component/scrollbar.cxx index 52cce8bc3522..3cacdbdb8ace 100644 --- a/forms/source/component/scrollbar.cxx +++ b/forms/source/component/scrollbar.cxx @@ -295,7 +295,7 @@ namespace frm } // namespace frm -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_comp_forms_OScrollBarModel_get_implementation(css::uno::XComponentContext* component, css::uno::Sequence<css::uno::Any> const &) { diff --git a/forms/source/component/spinbutton.cxx b/forms/source/component/spinbutton.cxx index 7c257dd21544..a666ccf88d81 100644 --- a/forms/source/component/spinbutton.cxx +++ b/forms/source/component/spinbutton.cxx @@ -249,7 +249,7 @@ namespace frm } // namespace frm -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_comp_forms_OSpinButtonModel_get_implementation(css::uno::XComponentContext* component, css::uno::Sequence<css::uno::Any> const &) { diff --git a/forms/source/richtext/richtextcontrol.cxx b/forms/source/richtext/richtextcontrol.cxx index 2bef6b43fb43..08238d452db8 100644 --- a/forms/source/richtext/richtextcontrol.cxx +++ b/forms/source/richtext/richtextcontrol.cxx @@ -653,7 +653,7 @@ namespace frm } // namespace frm -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_comp_form_ORichTextControl_get_implementation(css::uno::XComponentContext*, css::uno::Sequence<css::uno::Any> const &) { diff --git a/forms/source/richtext/richtextmodel.cxx b/forms/source/richtext/richtextmodel.cxx index b0a6318e45ea..493338eacbff 100644 --- a/forms/source/richtext/richtextmodel.cxx +++ b/forms/source/richtext/richtextmodel.cxx @@ -602,7 +602,7 @@ namespace frm } // namespace frm -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_comp_forms_ORichTextModel_get_implementation(css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const &) { diff --git a/forms/source/runtime/formoperations.cxx b/forms/source/runtime/formoperations.cxx index 4ae5e1c691d1..08c225893873 100644 --- a/forms/source/runtime/formoperations.cxx +++ b/forms/source/runtime/formoperations.cxx @@ -1752,7 +1752,7 @@ namespace frm } // namespace frm -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_comp_forms_FormOperations_get_implementation(css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const &) { diff --git a/forms/source/solar/component/navbarcontrol.cxx b/forms/source/solar/component/navbarcontrol.cxx index 545cb444d821..54a88b9bcd1c 100644 --- a/forms/source/solar/component/navbarcontrol.cxx +++ b/forms/source/solar/component/navbarcontrol.cxx @@ -488,7 +488,7 @@ namespace frm } // namespace frm -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_comp_form_ONavigationBarControl_get_implementation (css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const &) { diff --git a/forms/source/xforms/model.cxx b/forms/source/xforms/model.cxx index 1ac41a3f47c2..c714d5b053dc 100644 --- a/forms/source/xforms/model.cxx +++ b/forms/source/xforms/model.cxx @@ -632,7 +632,7 @@ css::uno::Sequence<OUString> Model::getSupportedServiceNames() return css::uno::Sequence<OUString>{"com.sun.star.xforms.Model"}; } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_form_Model_get_implementation(css::uno::XComponentContext*, css::uno::Sequence<css::uno::Any> const &) { diff --git a/forms/source/xforms/xforms_services.cxx b/forms/source/xforms/xforms_services.cxx index 9c6081abe2af..b6f39fe5ae69 100644 --- a/forms/source/xforms/xforms_services.cxx +++ b/forms/source/xforms/xforms_services.cxx @@ -49,7 +49,7 @@ class Implementation: } -extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface* com_sun_star_form_XForms_get_implementation(uno::XComponentContext*, uno::Sequence<uno::Any> const &) { diff --git a/forms/source/xforms/xpathlib/extension.cxx b/forms/source/xforms/xpathlib/extension.cxx index fd97a359d3c6..576d8d957e9e 100644 --- a/forms/source/xforms/xpathlib/extension.cxx +++ b/forms/source/xforms/xpathlib/extension.cxx @@ -62,7 +62,7 @@ void SAL_CALL CLibxml2XFormsExtension::initialize(const Sequence< Any >& aSequen } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_comp_xml_xpath_XFormsExtension_get_implementation(css::uno::XComponentContext*, css::uno::Sequence<css::uno::Any> const &) { diff --git a/formula/source/core/api/services.cxx b/formula/source/core/api/services.cxx index 2b346244898c..9010ee8be870 100644 --- a/formula/source/core/api/services.cxx +++ b/formula/source/core/api/services.cxx @@ -42,7 +42,7 @@ cppu::ImplementationEntry entries[] = { extern "C" { -SAL_DLLPUBLIC_EXPORT void * SAL_CALL for_component_getFactory( +SAL_DLLPUBLIC_EXPORT void * for_component_getFactory( char const * implName, void * serviceManager, void * registryKey) { return cppu::component_getFactoryHelper( diff --git a/fpicker/source/office/fps_office.cxx b/fpicker/source/office/fps_office.cxx index de0f3123bec7..ed8313c67dbd 100644 --- a/fpicker/source/office/fps_office.cxx +++ b/fpicker/source/office/fps_office.cxx @@ -50,7 +50,7 @@ static const cppu::ImplementationEntry g_entries[] = extern "C" { -SAL_DLLPUBLIC_EXPORT void * SAL_CALL fps_office_component_getFactory( +SAL_DLLPUBLIC_EXPORT void * fps_office_component_getFactory( const sal_Char * pImplementationName, void * pServiceManager, void * pRegistryKey) { return cppu::component_getFactoryHelper ( diff --git a/framework/source/accelerators/documentacceleratorconfiguration.cxx b/framework/source/accelerators/documentacceleratorconfiguration.cxx index 651b6d0ed4a9..d6160e19d4d2 100644 --- a/framework/source/accelerators/documentacceleratorconfiguration.cxx +++ b/framework/source/accelerators/documentacceleratorconfiguration.cxx @@ -188,7 +188,7 @@ void DocumentAcceleratorConfiguration::fillCache() } // namespace framework -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_framework_DocumentAcceleratorConfiguration_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &arguments) diff --git a/framework/source/accelerators/globalacceleratorconfiguration.cxx b/framework/source/accelerators/globalacceleratorconfiguration.cxx index 08e861f0778b..36691cb3f2d7 100644 --- a/framework/source/accelerators/globalacceleratorconfiguration.cxx +++ b/framework/source/accelerators/globalacceleratorconfiguration.cxx @@ -129,7 +129,7 @@ struct Singleton: } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_framework_GlobalAcceleratorConfiguration_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) diff --git a/framework/source/accelerators/moduleacceleratorconfiguration.cxx b/framework/source/accelerators/moduleacceleratorconfiguration.cxx index fe02406cd39f..699de38760b4 100644 --- a/framework/source/accelerators/moduleacceleratorconfiguration.cxx +++ b/framework/source/accelerators/moduleacceleratorconfiguration.cxx @@ -149,7 +149,7 @@ void ModuleAcceleratorConfiguration::fillCache() } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_framework_ModuleAcceleratorConfiguration_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &arguments) diff --git a/framework/source/fwe/classes/sfxhelperfunctions.cxx b/framework/source/fwe/classes/sfxhelperfunctions.cxx index fd2684b4991a..1fb1abead10c 100644 --- a/framework/source/fwe/classes/sfxhelperfunctions.cxx +++ b/framework/source/fwe/classes/sfxhelperfunctions.cxx @@ -35,7 +35,7 @@ using namespace ::com::sun::star::frame; namespace framework { -pfunc_setToolBoxControllerCreator SAL_CALL SetToolBoxControllerCreator( pfunc_setToolBoxControllerCreator pSetToolBoxControllerCreator ) +pfunc_setToolBoxControllerCreator SetToolBoxControllerCreator( pfunc_setToolBoxControllerCreator pSetToolBoxControllerCreator ) { ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); pfunc_setToolBoxControllerCreator pOldSetToolBoxControllerCreator = pToolBoxControllerCreator; @@ -43,7 +43,7 @@ pfunc_setToolBoxControllerCreator SAL_CALL SetToolBoxControllerCreator( pfunc_se return pOldSetToolBoxControllerCreator; } -svt::ToolboxController* SAL_CALL CreateToolBoxController( const Reference< XFrame >& rFrame, ToolBox* pToolbox, unsigned short nID, const OUString& aCommandURL ) +svt::ToolboxController* CreateToolBoxController( const Reference< XFrame >& rFrame, ToolBox* pToolbox, unsigned short nID, const OUString& aCommandURL ) { pfunc_setToolBoxControllerCreator pFactory = nullptr; { @@ -57,7 +57,7 @@ svt::ToolboxController* SAL_CALL CreateToolBoxController( const Reference< XFram return nullptr; } -pfunc_setStatusBarControllerCreator SAL_CALL SetStatusBarControllerCreator( pfunc_setStatusBarControllerCreator pSetStatusBarControllerCreator ) +pfunc_setStatusBarControllerCreator SetStatusBarControllerCreator( pfunc_setStatusBarControllerCreator pSetStatusBarControllerCreator ) { ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); pfunc_setStatusBarControllerCreator pOldSetStatusBarControllerCreator = pSetStatusBarControllerCreator; @@ -65,7 +65,7 @@ pfunc_setStatusBarControllerCreator SAL_CALL SetStatusBarControllerCreator( pfun return pOldSetStatusBarControllerCreator; } -svt::StatusbarController* SAL_CALL CreateStatusBarController( const Reference< XFrame >& rFrame, StatusBar* pStatusBar, unsigned short nID, const OUString& aCommandURL ) +svt::StatusbarController* CreateStatusBarController( const Reference< XFrame >& rFrame, StatusBar* pStatusBar, unsigned short nID, const OUString& aCommandURL ) { pfunc_setStatusBarControllerCreator pFactory = nullptr; { @@ -79,7 +79,7 @@ svt::StatusbarController* SAL_CALL CreateStatusBarController( const Reference< X return nullptr; } -pfunc_getRefreshToolbars SAL_CALL SetRefreshToolbars( pfunc_getRefreshToolbars pNewRefreshToolbarsFunc ) +pfunc_getRefreshToolbars SetRefreshToolbars( pfunc_getRefreshToolbars pNewRefreshToolbarsFunc ) { ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); pfunc_getRefreshToolbars pOldFunc = pRefreshToolbars; @@ -88,7 +88,7 @@ pfunc_getRefreshToolbars SAL_CALL SetRefreshToolbars( pfunc_getRefreshToolbars p return pOldFunc; } -void SAL_CALL RefreshToolbars( css::uno::Reference< css::frame::XFrame > const & rFrame ) +void RefreshToolbars( css::uno::Reference< css::frame::XFrame > const & rFrame ) { pfunc_getRefreshToolbars pCallback = nullptr; { @@ -100,7 +100,7 @@ void SAL_CALL RefreshToolbars( css::uno::Reference< css::frame::XFrame > const & (*pCallback)( rFrame ); } -pfunc_createDockingWindow SAL_CALL SetDockingWindowCreator( pfunc_createDockingWindow pNewCreateDockingWindow ) +pfunc_createDockingWindow SetDockingWindowCreator( pfunc_createDockingWindow pNewCreateDockingWindow ) { ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); pfunc_createDockingWindow pOldFunc = pCreateDockingWindow; @@ -109,7 +109,7 @@ pfunc_createDockingWindow SAL_CALL SetDockingWindowCreator( pfunc_createDockingW return pOldFunc; } -void SAL_CALL CreateDockingWindow( const css::uno::Reference< css::frame::XFrame >& rFrame, const OUString& rResourceURL ) +void CreateDockingWindow( const css::uno::Reference< css::frame::XFrame >& rFrame, const OUString& rResourceURL ) { pfunc_createDockingWindow pFactory = nullptr; { @@ -121,7 +121,7 @@ void SAL_CALL CreateDockingWindow( const css::uno::Reference< css::frame::XFrame (*pFactory)( rFrame, rResourceURL ); } -pfunc_isDockingWindowVisible SAL_CALL SetIsDockingWindowVisible( pfunc_isDockingWindowVisible pNewIsDockingWindowVisible) +pfunc_isDockingWindowVisible SetIsDockingWindowVisible( pfunc_isDockingWindowVisible pNewIsDockingWindowVisible) { ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); pfunc_isDockingWindowVisible pOldFunc = pIsDockingWindowVisible; @@ -130,7 +130,7 @@ pfunc_isDockingWindowVisible SAL_CALL SetIsDockingWindowVisible( pfunc_isDocking return pOldFunc; } -bool SAL_CALL IsDockingWindowVisible( const css::uno::Reference< css::frame::XFrame >& rFrame, const OUString& rResourceURL ) +bool IsDockingWindowVisible( const css::uno::Reference< css::frame::XFrame >& rFrame, const OUString& rResourceURL ) { pfunc_isDockingWindowVisible pCall = nullptr; { diff --git a/framework/source/helper/statusindicatorfactory.cxx b/framework/source/helper/statusindicatorfactory.cxx index 627a3b2735fe..fc4e04283fdf 100644 --- a/framework/source/helper/statusindicatorfactory.cxx +++ b/framework/source/helper/statusindicatorfactory.cxx @@ -557,7 +557,7 @@ void StatusIndicatorFactory::impl_stopWakeUpThread() } // namespace framework -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_framework_StatusIndicatorFactory_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) diff --git a/framework/source/jobs/jobdispatch.cxx b/framework/source/jobs/jobdispatch.cxx index 85bf876140a3..3840630ccea6 100644 --- a/framework/source/jobs/jobdispatch.cxx +++ b/framework/source/jobs/jobdispatch.cxx @@ -488,7 +488,7 @@ void SAL_CALL JobDispatch::removeStatusListener( /*IN*/ const css::uno::Referenc } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_framework_jobs_JobDispatch_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) diff --git a/framework/source/jobs/jobexecutor.cxx b/framework/source/jobs/jobexecutor.cxx index 23977920ee36..7c9d70479120 100644 --- a/framework/source/jobs/jobexecutor.cxx +++ b/framework/source/jobs/jobexecutor.cxx @@ -411,7 +411,7 @@ struct Singleton: } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_framework_JobExecutor_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx index 2012ee2576bb..3c43acb8e9d4 100644 --- a/framework/source/layoutmanager/layoutmanager.cxx +++ b/framework/source/layoutmanager/layoutmanager.cxx @@ -3076,7 +3076,7 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL LayoutManager::getPropertySet } // namespace framework -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_framework_LayoutManager_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) diff --git a/framework/source/services/ContextChangeEventMultiplexer.cxx b/framework/source/services/ContextChangeEventMultiplexer.cxx index 59eca7c933a6..596242d654f7 100644 --- a/framework/source/services/ContextChangeEventMultiplexer.cxx +++ b/framework/source/services/ContextChangeEventMultiplexer.cxx @@ -384,7 +384,7 @@ static Hook g_hook; } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * org_apache_openoffice_comp_framework_ContextChangeEventMultiplexer_get_implementation( css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx index 0309f91bc9da..dd93c89d10d3 100644 --- a/framework/source/services/autorecovery.cxx +++ b/framework/source/services/autorecovery.cxx @@ -4263,7 +4263,7 @@ struct Singleton: } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_framework_AutoRecovery_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx index 5fc7a7fc4ce7..b7fc1a152ed3 100644 --- a/framework/source/services/desktop.cxx +++ b/framework/source/services/desktop.cxx @@ -1823,7 +1823,7 @@ Instance & getInstance(css::uno::Reference<css::uno::XComponentContext> const& x } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_framework_Desktop_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx index 04441dc5c84c..a1dacfb93ff9 100644 --- a/framework/source/services/frame.cxx +++ b/framework/source/services/frame.cxx @@ -3303,7 +3303,7 @@ void Frame::impl_checkMenuCloser() } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_framework_Frame_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) diff --git a/framework/source/services/modulemanager.cxx b/framework/source/services/modulemanager.cxx index 2df0088a1c89..bf4a153ec3ee 100644 --- a/framework/source/services/modulemanager.cxx +++ b/framework/source/services/modulemanager.cxx @@ -363,7 +363,7 @@ struct Singleton: } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_framework_ModuleManager_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) diff --git a/framework/source/services/pathsettings.cxx b/framework/source/services/pathsettings.cxx index 26bd6bfae718..c16a5b1e95cd 100644 --- a/framework/source/services/pathsettings.cxx +++ b/framework/source/services/pathsettings.cxx @@ -1495,7 +1495,7 @@ struct Singleton: } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_framework_PathSettings_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) diff --git a/framework/source/services/sessionlistener.cxx b/framework/source/services/sessionlistener.cxx index e47dae89135d..cee04dd3b3b3 100644 --- a/framework/source/services/sessionlistener.cxx +++ b/framework/source/services/sessionlistener.cxx @@ -404,7 +404,7 @@ void SessionListener::doQuit() } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_frame_SessionListener_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx index ce7e0b4491ae..72bcfb940b69 100644 --- a/framework/source/services/substitutepathvars.cxx +++ b/framework/source/services/substitutepathvars.cxx @@ -705,7 +705,7 @@ struct Singleton: } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_framework_PathSubstitution_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) diff --git a/framework/source/services/taskcreatorsrv.cxx b/framework/source/services/taskcreatorsrv.cxx index b6f6a7ff1920..26708477a502 100644 --- a/framework/source/services/taskcreatorsrv.cxx +++ b/framework/source/services/taskcreatorsrv.cxx @@ -361,7 +361,7 @@ struct Singleton: } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_framework_TaskCreator_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) diff --git a/framework/source/services/urltransformer.cxx b/framework/source/services/urltransformer.cxx index 623754f87c2c..493acda1fa4c 100644 --- a/framework/source/services/urltransformer.cxx +++ b/framework/source/services/urltransformer.cxx @@ -309,7 +309,7 @@ OUString SAL_CALL URLTransformer::getPresentation( const css::util::URL& aURL, } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_framework_URLTransformer_get_implementation( css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) diff --git a/framework/source/uiconfiguration/imagemanager.cxx b/framework/source/uiconfiguration/imagemanager.cxx index 225b51231d05..1884dec9d5eb 100644 --- a/framework/source/uiconfiguration/imagemanager.cxx +++ b/framework/source/uiconfiguration/imagemanager.cxx @@ -178,7 +178,7 @@ sal_Bool SAL_CALL ImageManager::isReadOnly() } // namespace framework -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_framework_ImageManager_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) diff --git a/framework/source/uiconfiguration/moduleuicfgsupplier.cxx b/framework/source/uiconfiguration/moduleuicfgsupplier.cxx index d10f944a876c..e451113d9aa1 100644 --- a/framework/source/uiconfiguration/moduleuicfgsupplier.cxx +++ b/framework/source/uiconfiguration/moduleuicfgsupplier.cxx @@ -197,7 +197,7 @@ struct Singleton: } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_framework_ModuleUIConfigurationManagerSupplier_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) diff --git a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx index 12867b100403..49f3db5ca722 100644 --- a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx +++ b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx @@ -1668,7 +1668,7 @@ void ModuleUIConfigurationManager::implts_notifyContainerListener( const ui::Con } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_framework_ModuleUIConfigurationManager_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &arguments) diff --git a/framework/source/uiconfiguration/uicategorydescription.cxx b/framework/source/uiconfiguration/uicategorydescription.cxx index 5250811477d9..89287f145567 100644 --- a/framework/source/uiconfiguration/uicategorydescription.cxx +++ b/framework/source/uiconfiguration/uicategorydescription.cxx @@ -405,7 +405,7 @@ struct Singleton: } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_framework_UICategoryDescription_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) diff --git a/framework/source/uiconfiguration/uiconfigurationmanager.cxx b/framework/source/uiconfiguration/uiconfigurationmanager.cxx index 01c4becd60ff..45dd1bf4e00a 100644 --- a/framework/source/uiconfiguration/uiconfigurationmanager.cxx +++ b/framework/source/uiconfiguration/uiconfigurationmanager.cxx @@ -1394,7 +1394,7 @@ void UIConfigurationManager::implts_notifyContainerListener( const Configuration } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_framework_UIConfigurationManager_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) diff --git a/framework/source/uiconfiguration/windowstateconfiguration.cxx b/framework/source/uiconfiguration/windowstateconfiguration.cxx index 9b0523e48b16..257d2f978125 100644 --- a/framework/source/uiconfiguration/windowstateconfiguration.cxx +++ b/framework/source/uiconfiguration/windowstateconfiguration.cxx @@ -1405,7 +1405,7 @@ struct Singleton: } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_framework_WindowStateConfiguration_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) diff --git a/framework/source/uielement/controlmenucontroller.cxx b/framework/source/uielement/controlmenucontroller.cxx index 38c99e7caf2a..a2e6ff54edaa 100644 --- a/framework/source/uielement/controlmenucontroller.cxx +++ b/framework/source/uielement/controlmenucontroller.cxx @@ -359,7 +359,7 @@ void SAL_CALL ControlMenuController::initialize( const Sequence< Any >& aArgumen } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_framework_ControlMenuController_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) diff --git a/framework/source/uielement/langselectionstatusbarcontroller.cxx b/framework/source/uielement/langselectionstatusbarcontroller.cxx index 625436d4cd2b..e2084c782172 100644 --- a/framework/source/uielement/langselectionstatusbarcontroller.cxx +++ b/framework/source/uielement/langselectionstatusbarcontroller.cxx @@ -358,7 +358,7 @@ void SAL_CALL LangSelectionStatusbarController::statusChanged( const FeatureStat } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_framework_LangSelectionStatusbarController_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) diff --git a/framework/source/uielement/objectmenucontroller.cxx b/framework/source/uielement/objectmenucontroller.cxx index 627ae94114c4..d868d33aa138 100644 --- a/framework/source/uielement/objectmenucontroller.cxx +++ b/framework/source/uielement/objectmenucontroller.cxx @@ -145,7 +145,7 @@ void SAL_CALL ObjectMenuController::statusChanged( const FeatureStateEvent& Even } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_framework_ObjectMenuController_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) diff --git a/framework/source/uielement/popuptoolbarcontroller.cxx b/framework/source/uielement/popuptoolbarcontroller.cxx index 675fe07f9ec2..3a2065fa6578 100644 --- a/framework/source/uielement/popuptoolbarcontroller.cxx +++ b/framework/source/uielement/popuptoolbarcontroller.cxx @@ -811,7 +811,7 @@ void NewToolbarController::setItemImage( const OUString &rCommand ) } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_framework_GenericPopupToolbarController_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &args) @@ -819,7 +819,7 @@ com_sun_star_comp_framework_GenericPopupToolbarController_get_implementation( return cppu::acquire(new GenericPopupToolbarController(context, args)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_framework_SaveToolbarController_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) @@ -827,7 +827,7 @@ com_sun_star_comp_framework_SaveToolbarController_get_implementation( return cppu::acquire(new SaveToolbarController(context)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * org_apache_openoffice_comp_framework_NewToolbarController_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) diff --git a/framework/source/uielement/recentfilesmenucontroller.cxx b/framework/source/uielement/recentfilesmenucontroller.cxx index 763862240844..aa2beac0cd25 100644 --- a/framework/source/uielement/recentfilesmenucontroller.cxx +++ b/framework/source/uielement/recentfilesmenucontroller.cxx @@ -378,7 +378,7 @@ void SAL_CALL RecentFilesMenuController::dispatch( } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_framework_RecentFilesMenuController_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &args) diff --git a/framework/source/uielement/resourcemenucontroller.cxx b/framework/source/uielement/resourcemenucontroller.cxx index 735b5ae64d65..ec8d173ecf08 100644 --- a/framework/source/uielement/resourcemenucontroller.cxx +++ b/framework/source/uielement/resourcemenucontroller.cxx @@ -442,7 +442,7 @@ OUString SaveAsMenuController::getImplementationName() } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_framework_ResourceMenuController_get_implementation( css::uno::XComponentContext* context, css::uno::Sequence< css::uno::Any > const & args ) @@ -450,7 +450,7 @@ com_sun_star_comp_framework_ResourceMenuController_get_implementation( return cppu::acquire( new ResourceMenuController( context, args, false ) ); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_framework_ToolbarAsMenuController_get_implementation( css::uno::XComponentContext* context, css::uno::Sequence< css::uno::Any > const & args ) @@ -458,7 +458,7 @@ com_sun_star_comp_framework_ToolbarAsMenuController_get_implementation( return cppu::acquire( new ResourceMenuController( context, args, true ) ); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_framework_SaveAsMenuController_get_implementation( css::uno::XComponentContext* context, css::uno::Sequence< css::uno::Any > const & args ) diff --git a/framework/source/uielement/subtoolbarcontroller.cxx b/framework/source/uielement/subtoolbarcontroller.cxx index e712dd3801a5..52dfdd4b7975 100644 --- a/framework/source/uielement/subtoolbarcontroller.cxx +++ b/framework/source/uielement/subtoolbarcontroller.cxx @@ -431,7 +431,7 @@ css::uno::Sequence< OUString > SubToolBarController::getSupportedServiceNames() return {"com.sun.star.frame.ToolbarController"}; } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_framework_SubToolBarController_get_implementation( css::uno::XComponentContext*, css::uno::Sequence<css::uno::Any> const & rxArgs ) diff --git a/framework/source/uielement/thesaurusmenucontroller.cxx b/framework/source/uielement/thesaurusmenucontroller.cxx index d5eeca206f1f..6ce5bca1d141 100644 --- a/framework/source/uielement/thesaurusmenucontroller.cxx +++ b/framework/source/uielement/thesaurusmenucontroller.cxx @@ -154,7 +154,7 @@ css::uno::Sequence< OUString > ThesaurusMenuController::getSupportedServiceNames return { "com.sun.star.frame.PopupMenuController" }; } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_framework_ThesaurusMenuController_get_implementation( css::uno::XComponentContext* xContext, css::uno::Sequence< css::uno::Any > const & ) diff --git a/framework/source/uielement/uicommanddescription.cxx b/framework/source/uielement/uicommanddescription.cxx index ab76bdca2e76..4b5734d52566 100644 --- a/framework/source/uielement/uicommanddescription.cxx +++ b/framework/source/uielement/uicommanddescription.cxx @@ -737,7 +737,7 @@ struct Singleton: } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_framework_UICommandDescription_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) diff --git a/framework/source/uifactory/addonstoolbarfactory.cxx b/framework/source/uifactory/addonstoolbarfactory.cxx index 520525366a5c..fd0106bfc2e4 100644 --- a/framework/source/uifactory/addonstoolbarfactory.cxx +++ b/framework/source/uifactory/addonstoolbarfactory.cxx @@ -208,7 +208,7 @@ Reference< XUIElement > SAL_CALL AddonsToolBarFactory::createUIElement( } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_framework_AddonsToolBarFactory_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) diff --git a/framework/source/uifactory/menubarfactory.cxx b/framework/source/uifactory/menubarfactory.cxx index 4612f53bc81d..b8218a5379b1 100644 --- a/framework/source/uifactory/menubarfactory.cxx +++ b/framework/source/uifactory/menubarfactory.cxx @@ -162,7 +162,7 @@ void MenuBarFactory::CreateUIElement(const OUString& ResourceURL } // namespace framework -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_framework_MenuBarFactory_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) diff --git a/framework/source/uifactory/statusbarfactory.cxx b/framework/source/uifactory/statusbarfactory.cxx index 1644e8447d73..085062afd0f2 100644 --- a/framework/source/uifactory/statusbarfactory.cxx +++ b/framework/source/uifactory/statusbarfactory.cxx @@ -76,7 +76,7 @@ Reference< XUIElement > SAL_CALL StatusBarFactory::createUIElement( } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_framework_StatusBarFactory_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) diff --git a/framework/source/uifactory/toolbarfactory.cxx b/framework/source/uifactory/toolbarfactory.cxx index 6e6391ec994e..cc44bfb58360 100644 --- a/framework/source/uifactory/toolbarfactory.cxx +++ b/framework/source/uifactory/toolbarfactory.cxx @@ -75,7 +75,7 @@ Reference< XUIElement > SAL_CALL ToolBarFactory::createUIElement( } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_framework_ToolBarFactory_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) diff --git a/framework/source/uifactory/uicontrollerfactory.cxx b/framework/source/uifactory/uicontrollerfactory.cxx index a13c654f19a5..8603ad0e3643 100644 --- a/framework/source/uifactory/uicontrollerfactory.cxx +++ b/framework/source/uifactory/uicontrollerfactory.cxx @@ -369,7 +369,7 @@ struct StatusbarControllerFactorySingleton: } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_framework_PopupMenuControllerFactory_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) @@ -378,7 +378,7 @@ com_sun_star_comp_framework_PopupMenuControllerFactory_get_implementation( PopupMenuControllerFactorySingleton::get(context).instance.get())); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_framework_ToolBarControllerFactory_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) @@ -387,7 +387,7 @@ com_sun_star_comp_framework_ToolBarControllerFactory_get_implementation( ToolbarControllerFactorySingleton::get(context).instance.get())); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_framework_StatusBarControllerFactory_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) diff --git a/framework/source/uifactory/uielementfactorymanager.cxx b/framework/source/uifactory/uielementfactorymanager.cxx index a3b33637ca8a..f8d56dff3eab 100644 --- a/framework/source/uifactory/uielementfactorymanager.cxx +++ b/framework/source/uifactory/uielementfactorymanager.cxx @@ -560,7 +560,7 @@ struct Singleton: } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_framework_UIElementFactoryManager_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) diff --git a/framework/source/uifactory/windowcontentfactorymanager.cxx b/framework/source/uifactory/windowcontentfactorymanager.cxx index ad96f9a63bf7..f8911939dc6b 100644 --- a/framework/source/uifactory/windowcontentfactorymanager.cxx +++ b/framework/source/uifactory/windowcontentfactorymanager.cxx @@ -211,7 +211,7 @@ struct Singleton: } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_framework_WindowContentFactoryManager_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) diff --git a/hwpfilter/source/hwpreader.cxx b/hwpfilter/source/hwpreader.cxx index d1005e4cf1ee..1762efdb141a 100644 --- a/hwpfilter/source/hwpreader.cxx +++ b/hwpfilter/source/hwpreader.cxx @@ -116,7 +116,7 @@ HwpReader::~HwpReader() { } -extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportHWP(SvStream &rStream) +extern "C" SAL_DLLPUBLIC_EXPORT bool TestImportHWP(SvStream &rStream) { try { diff --git a/hwpfilter/source/hwpreader.hxx b/hwpfilter/source/hwpreader.hxx index fa9a1fcf8f8c..bf823d5e12e3 100644 --- a/hwpfilter/source/hwpreader.hxx +++ b/hwpfilter/source/hwpreader.hxx @@ -291,7 +291,7 @@ Sequence< OUString> HwpImportFilter::getSupportedServiceNames() extern "C" { - SAL_DLLPUBLIC_EXPORT void * SAL_CALL hwp_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * ) + SAL_DLLPUBLIC_EXPORT void * hwp_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * ) { void * pRet = nullptr; diff --git a/i18npool/source/breakiterator/breakiteratorImpl.cxx b/i18npool/source/breakiterator/breakiteratorImpl.cxx index 1ac3fd64af53..0f5cb29dfa84 100644 --- a/i18npool/source/breakiterator/breakiteratorImpl.cxx +++ b/i18npool/source/breakiterator/breakiteratorImpl.cxx @@ -122,7 +122,7 @@ Boundary SAL_CALL BreakIteratorImpl::nextWord( const OUString& Text, sal_Int32 n return result; } -static inline bool SAL_CALL isCJK( const Locale& rLocale ) { +static inline bool isCJK( const Locale& rLocale ) { return rLocale.Language == "zh" || rLocale.Language == "ja" || rLocale.Language == "ko"; } @@ -252,7 +252,7 @@ sal_Int16 SAL_CALL BreakIteratorImpl::getScriptType( const OUString& Text, sal_I /** Increments/decrements position first, then obtains character. @return current position, may be -1 or text length if string was consumed. */ -static sal_Int32 SAL_CALL iterateCodePoints(const OUString& Text, sal_Int32 &nStartPos, sal_Int32 inc, sal_uInt32& ch) { +static sal_Int32 iterateCodePoints(const OUString& Text, sal_Int32 &nStartPos, sal_Int32 inc, sal_uInt32& ch) { sal_Int32 nLen = Text.getLength(); if (nStartPos + inc < 0 || nStartPos + inc >= nLen) { ch = 0; @@ -634,7 +634,7 @@ BreakIteratorImpl::getSupportedServiceNames() } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_i18n_BreakIterator_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) diff --git a/i18npool/source/breakiterator/breakiterator_th.cxx b/i18npool/source/breakiterator/breakiterator_th.cxx index 6e304cabd728..36ced38daba8 100644 --- a/i18npool/source/breakiterator/breakiterator_th.cxx +++ b/i18npool/source/breakiterator/breakiterator_th.cxx @@ -79,7 +79,7 @@ static const sal_Int16 thaiCompRel[MAX_CT][MAX_CT] = { const sal_uInt32 is_ST_COM = (1<<CT_CTRL)|(1<<CT_NON)|(1<<CT_CONS)|(1<<CT_TONE); -static sal_uInt16 SAL_CALL getCombState(const sal_Unicode *text, sal_Int32 pos) +static sal_uInt16 getCombState(const sal_Unicode *text, sal_Int32 pos) { sal_uInt16 ch1 = getCharType(text[pos]); sal_uInt16 ch2 = getCharType(text[pos+1]); @@ -95,7 +95,7 @@ static sal_uInt16 SAL_CALL getCombState(const sal_Unicode *text, sal_Int32 pos) } -static sal_Int32 SAL_CALL getACell(const sal_Unicode *text, sal_Int32 pos, sal_Int32 len) +static sal_Int32 getACell(const sal_Unicode *text, sal_Int32 pos, sal_Int32 len) { sal_uInt32 curr = 1; for (; pos + 1 < len && getCombState(text, pos) == ST_COM; curr++, pos++) {} diff --git a/i18npool/source/breakiterator/breakiterator_unicode.cxx b/i18npool/source/breakiterator/breakiterator_unicode.cxx index 3ed048b02253..a81a80e153ba 100644 --- a/i18npool/source/breakiterator/breakiterator_unicode.cxx +++ b/i18npool/source/breakiterator/breakiterator_unicode.cxx @@ -609,7 +609,7 @@ BreakIterator_Unicode::getSupportedServiceNames() } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_i18n_BreakIterator_Unicode_get_implementation( css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) diff --git a/i18npool/source/breakiterator/xdictionary.cxx b/i18npool/source/breakiterator/xdictionary.cxx index 5653021fc13a..6ee5256328df 100644 --- a/i18npool/source/breakiterator/xdictionary.cxx +++ b/i18npool/source/breakiterator/xdictionary.cxx @@ -37,7 +37,7 @@ namespace i18npool { #elif !defined DISABLE_DYNLOADING -extern "C" { static void SAL_CALL thisModule() {} } +extern "C" { static void thisModule() {} } #else diff --git a/i18npool/source/calendar/calendar_gregorian.cxx b/i18npool/source/calendar/calendar_gregorian.cxx index 4d6d0ff279b3..712eeb1ff6d7 100644 --- a/i18npool/source/calendar/calendar_gregorian.cxx +++ b/i18npool/source/calendar/calendar_gregorian.cxx @@ -612,7 +612,7 @@ Calendar_gregorian::isValid() // NatNum3 NatNum3/3/3/3 NatNum3/3/3/3 NatNum3/3/3/3 NatNum3/3/3/3 // NatNum4 NatNum9/9/11/11 -static sal_Int16 SAL_CALL NatNumForCalendar(const css::lang::Locale& aLocale, +static sal_Int16 NatNumForCalendar(const css::lang::Locale& aLocale, sal_Int32 nCalendarDisplayCode, sal_Int16 nNativeNumberMode, sal_Int16 value ) { bool isShort = ((nCalendarDisplayCode == CalendarDisplayCode::SHORT_YEAR || @@ -645,7 +645,7 @@ static sal_Int16 SAL_CALL NatNumForCalendar(const css::lang::Locale& aLocale, return nNativeNumberMode; } -static sal_Int32 SAL_CALL DisplayCode2FieldIndex(sal_Int32 nCalendarDisplayCode) +static sal_Int32 DisplayCode2FieldIndex(sal_Int32 nCalendarDisplayCode) { switch( nCalendarDisplayCode ) { case CalendarDisplayCode::SHORT_DAY: diff --git a/i18npool/source/characterclassification/cclass_unicode.cxx b/i18npool/source/characterclassification/cclass_unicode.cxx index 12e7d6b1e398..00f84d5b5472 100644 --- a/i18npool/source/characterclassification/cclass_unicode.cxx +++ b/i18npool/source/characterclassification/cclass_unicode.cxx @@ -296,7 +296,7 @@ Sequence< OUString > SAL_CALL cclass_Unicode::getSupportedServiceNames() } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_i18n_CharacterClassification_Unicode_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) diff --git a/i18npool/source/characterclassification/characterclassificationImpl.cxx b/i18npool/source/characterclassification/characterclassificationImpl.cxx index 8e925653e9ab..ccccbe432bf9 100644 --- a/i18npool/source/characterclassification/characterclassificationImpl.cxx +++ b/i18npool/source/characterclassification/characterclassificationImpl.cxx @@ -208,7 +208,7 @@ CharacterClassificationImpl::getSupportedServiceNames() } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_i18n_CharacterClassification_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) diff --git a/i18npool/source/characterclassification/unoscripttypedetector.cxx b/i18npool/source/characterclassification/unoscripttypedetector.cxx index fbc2ab8ea3f5..aab05b8c2c93 100644 --- a/i18npool/source/characterclassification/unoscripttypedetector.cxx +++ b/i18npool/source/characterclassification/unoscripttypedetector.cxx @@ -81,7 +81,7 @@ UnoScriptTypeDetector::getSupportedServiceNames() return aRet; } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_i18n_ScriptTypeDetector_get_implementation( css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) diff --git a/i18npool/source/collator/collatorImpl.cxx b/i18npool/source/collator/collatorImpl.cxx index 1f6de90d125e..b9eed0230c40 100644 --- a/i18npool/source/collator/collatorImpl.cxx +++ b/i18npool/source/collator/collatorImpl.cxx @@ -228,7 +228,7 @@ CollatorImpl::getSupportedServiceNames() } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_i18n_Collator_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) diff --git a/i18npool/source/collator/collator_unicode.cxx b/i18npool/source/collator/collator_unicode.cxx index 22b7ed9ae492..71bc4ed84d1e 100644 --- a/i18npool/source/collator/collator_unicode.cxx +++ b/i18npool/source/collator/collator_unicode.cxx @@ -127,7 +127,7 @@ Collator_Unicode::compareString( const OUString& str1, const OUString& str2) #ifndef DISABLE_DYNLOADING -extern "C" { static void SAL_CALL thisModule() {} } +extern "C" { static void thisModule() {} } #endif diff --git a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx index 861d58f8e7cc..7eef17dddd1a 100644 --- a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx +++ b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx @@ -1064,7 +1064,7 @@ Sequence< OUString > DefaultNumberingProvider::getSupportedServiceNames() } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_text_DefaultNumberingProvider_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) diff --git a/i18npool/source/indexentry/indexentrysupplier_asian.cxx b/i18npool/source/indexentry/indexentrysupplier_asian.cxx index 8020648ecc5b..b535fd934884 100644 --- a/i18npool/source/indexentry/indexentrysupplier_asian.cxx +++ b/i18npool/source/indexentry/indexentrysupplier_asian.cxx @@ -29,7 +29,7 @@ namespace i18npool { #ifndef DISABLE_DYNLOADING -extern "C" { static void SAL_CALL thisModule() {} } +extern "C" { static void thisModule() {} } #endif diff --git a/i18npool/source/inputchecker/inputsequencechecker.cxx b/i18npool/source/inputchecker/inputsequencechecker.cxx index fc92cea926c0..5cd1edcd6178 100644 --- a/i18npool/source/inputchecker/inputsequencechecker.cxx +++ b/i18npool/source/inputchecker/inputsequencechecker.cxx @@ -156,7 +156,7 @@ InputSequenceCheckerImpl::getSupportedServiceNames() } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_i18n_InputSequenceChecker_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) diff --git a/i18npool/source/inputchecker/inputsequencechecker_th.cxx b/i18npool/source/inputchecker/inputsequencechecker_th.cxx index bc2fbe239808..c01d4ff35089 100644 --- a/i18npool/source/inputchecker/inputsequencechecker_th.cxx +++ b/i18npool/source/inputchecker/inputsequencechecker_th.cxx @@ -62,7 +62,7 @@ bool const TAC_Composible[3][5] = { /* Mode 2 */ {true, true, false, false, true} // STRICT = 2 }; -static bool SAL_CALL check(sal_Unicode ch1, sal_Unicode ch2, sal_Int16 inputCheckMode) +static bool check(sal_Unicode ch1, sal_Unicode ch2, sal_Int16 inputCheckMode) { sal_Int16 composible_class; switch (TAC_celltype_inputcheck[getCharType(ch1)][getCharType(ch2)]) { diff --git a/i18npool/source/localedata/localedata.cxx b/i18npool/source/localedata/localedata.cxx index 64c619466dfa..9d67a151fed2 100644 --- a/i18npool/source/localedata/localedata.cxx +++ b/i18npool/source/localedata/localedata.cxx @@ -38,10 +38,10 @@ using namespace com::sun::star::uno; using namespace com::sun::star::lang; using namespace com::sun::star; -typedef sal_Unicode** (SAL_CALL * MyFunc_Type)( sal_Int16&); -typedef sal_Unicode const *** (SAL_CALL * MyFunc_Type2)( sal_Int16&, sal_Int16& ); -typedef sal_Unicode const **** (SAL_CALL * MyFunc_Type3)( sal_Int16&, sal_Int16&, sal_Int16& ); -typedef sal_Unicode const * const * (SAL_CALL * MyFunc_FormatCode)( sal_Int16&, sal_Unicode const *&, sal_Unicode const *& ); +typedef sal_Unicode** (* MyFunc_Type)( sal_Int16&); +typedef sal_Unicode const *** (* MyFunc_Type2)( sal_Int16&, sal_Int16& ); +typedef sal_Unicode const **** (* MyFunc_Type3)( sal_Int16&, sal_Int16&, sal_Int16& ); +typedef sal_Unicode const * const * (* MyFunc_FormatCode)( sal_Int16&, sal_Unicode const *&, sal_Unicode const *& ); #ifndef DISABLE_DYNLOADING @@ -466,7 +466,7 @@ LocaleDataImpl::getLocaleItem2( const Locale& rLocale ) #ifndef DISABLE_DYNLOADING -extern "C" { static void SAL_CALL thisModule() {} } +extern "C" { static void thisModule() {} } #endif @@ -1641,7 +1641,7 @@ OUString LocaleDataImpl::getFirstLocaleServiceName( const css::lang::Locale & rL } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_i18n_LocaleDataImpl_get_implementation( css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) diff --git a/i18npool/source/nativenumber/nativenumbersupplier.cxx b/i18npool/source/nativenumber/nativenumbersupplier.cxx index f3b2b6786324..3c528e2f895e 100644 --- a/i18npool/source/nativenumber/nativenumbersupplier.cxx +++ b/i18npool/source/nativenumber/nativenumbersupplier.cxx @@ -58,12 +58,12 @@ typedef struct { namespace i18npool { -OUString SAL_CALL getHebrewNativeNumberString(const OUString& aNumberString, bool useGeresh); +OUString getHebrewNativeNumberString(const OUString& aNumberString, bool useGeresh); -OUString SAL_CALL getCyrillicNativeNumberString(const OUString& aNumberString); +OUString getCyrillicNativeNumberString(const OUString& aNumberString); /// @throws RuntimeException -OUString SAL_CALL AsciiToNativeChar( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, +OUString AsciiToNativeChar( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, Sequence< sal_Int32 >& offset, bool useOffset, sal_Int16 number ) { const sal_Unicode *src = inStr.getStr() + startPos; @@ -91,7 +91,7 @@ OUString SAL_CALL AsciiToNativeChar( const OUString& inStr, sal_Int32 startPos, return OUString(newStr, SAL_NO_ACQUIRE); // take ownership } -bool SAL_CALL AsciiToNative_numberMaker(const sal_Unicode *str, sal_Int32 begin, sal_Int32 len, +bool AsciiToNative_numberMaker(const sal_Unicode *str, sal_Int32 begin, sal_Int32 len, sal_Unicode *dst, sal_Int32& count, sal_Int16 multiChar_index, Sequence< sal_Int32 >& offset, bool useOffset, sal_Int32 startPos, const Number *number, const sal_Unicode* numberChar) { @@ -163,7 +163,7 @@ bool SAL_CALL AsciiToNative_numberMaker(const sal_Unicode *str, sal_Int32 begin, } /// @throws RuntimeException -OUString SAL_CALL AsciiToNative( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, +OUString AsciiToNative( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, Sequence< sal_Int32 >& offset, bool useOffset, const Number* number ) { OUString aRet; @@ -250,7 +250,7 @@ OUString SAL_CALL AsciiToNative( const OUString& inStr, sal_Int32 startPos, sal_ } return aRet; } -static void SAL_CALL NativeToAscii_numberMaker(sal_Int16 max, sal_Int16 prev, const sal_Unicode *str, +static void NativeToAscii_numberMaker(sal_Int16 max, sal_Int16 prev, const sal_Unicode *str, sal_Int32& i, sal_Int32 nCount, sal_Unicode *dst, sal_Int32& count, Sequence< sal_Int32 >& offset, bool useOffset, OUString& numberChar, OUString& multiplierChar) { @@ -300,7 +300,7 @@ static void SAL_CALL NativeToAscii_numberMaker(sal_Int16 max, sal_Int16 prev, co } /// @throws RuntimeException -static OUString SAL_CALL NativeToAscii(const OUString& inStr, +static OUString NativeToAscii(const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, Sequence< sal_Int32 >& offset, bool useOffset ) { OUString aRet; @@ -511,7 +511,7 @@ static const sal_Int16 natnum2[] = { }; static const sal_Int16 sizeof_natnum2 = SAL_N_ELEMENTS(natnum2); -static sal_Int16 SAL_CALL getLanguageNumber( const Locale& rLocale) +static sal_Int16 getLanguageNumber( const Locale& rLocale) { // return zh_TW for TW, HK and MO, return zh_CN for other zh locales. if (rLocale.Language == "zh") return MsLangId::isTraditionalChinese(rLocale) ? 1 : 0; @@ -881,7 +881,7 @@ void makeHebrewNumber(sal_Int64 value, OUStringBuffer& output, bool isLast, bool } } -OUString SAL_CALL getHebrewNativeNumberString(const OUString& aNumberString, bool useGeresh) +OUString getHebrewNativeNumberString(const OUString& aNumberString, bool useGeresh) { sal_Int64 value = 0; sal_Int32 i, count = 0, len = aNumberString.getLength(); @@ -1000,7 +1000,7 @@ void makeCyrillicNumber(sal_Int64 value, OUStringBuffer& output, bool addTitlo) } } -OUString SAL_CALL getCyrillicNativeNumberString(const OUString& aNumberString) +OUString getCyrillicNativeNumberString(const OUString& aNumberString) { sal_Int64 value = 0; sal_Int32 i, count = 0, len = aNumberString.getLength(); @@ -1054,7 +1054,7 @@ NativeNumberSupplierService::getSupportedServiceNames() } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_i18n_NativeNumberSupplier_get_implementation( css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) diff --git a/i18npool/source/numberformatcode/numberformatcode.cxx b/i18npool/source/numberformatcode/numberformatcode.cxx index 1ffafe63fa8c..ac8454caf9d8 100644 --- a/i18npool/source/numberformatcode/numberformatcode.cxx +++ b/i18npool/source/numberformatcode/numberformatcode.cxx @@ -262,7 +262,7 @@ NumberFormatCodeMapper::getSupportedServiceNames() return aRet; } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_i18n_NumberFormatCodeMapper_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) diff --git a/i18npool/source/ordinalsuffix/ordinalsuffix.cxx b/i18npool/source/ordinalsuffix/ordinalsuffix.cxx index a3e7d4ab6e8e..1a63dcb2e6fd 100644 --- a/i18npool/source/ordinalsuffix/ordinalsuffix.cxx +++ b/i18npool/source/ordinalsuffix/ordinalsuffix.cxx @@ -154,7 +154,7 @@ Sequence< OUString > SAL_CALL OrdinalSuffixService::getSupportedServiceNames() } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_i18n_OrdinalSuffix_get_implementation( css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) diff --git a/i18npool/source/registerservices/registerservices.cxx b/i18npool/source/registerservices/registerservices.cxx index ce73552f04f4..fe731e736331 100644 --- a/i18npool/source/registerservices/registerservices.cxx +++ b/i18npool/source/registerservices/registerservices.cxx @@ -86,7 +86,7 @@ using namespace i18npool; } typedef uno::Reference< - uno::XInterface > (SAL_CALL *FN_CreateInstance)( + uno::XInterface > (*FN_CreateInstance)( const uno::Reference< lang::XMultiServiceFactory >& ); @@ -560,7 +560,7 @@ static const struct InstancesArray { extern "C" { -SAL_DLLPUBLIC_EXPORT void* SAL_CALL i18npool_component_getFactory( const sal_Char* sImplementationName, void* _pServiceManager, SAL_UNUSED_PARAMETER void* /*_pRegistryKey*/ ) +SAL_DLLPUBLIC_EXPORT void* i18npool_component_getFactory( const sal_Char* sImplementationName, void* _pServiceManager, SAL_UNUSED_PARAMETER void* /*_pRegistryKey*/ ) { void* pRet = nullptr; diff --git a/i18npool/source/search/textsearch.cxx b/i18npool/source/search/textsearch.cxx index 6eef20d8aafb..67eded1643ab 100644 --- a/i18npool/source/search/textsearch.cxx +++ b/i18npool/source/search/textsearch.cxx @@ -1566,7 +1566,7 @@ TextSearch::getSupportedServiceNames() } css::uno::Reference< css::uno::XInterface > -SAL_CALL TextSearch_CreateInstance( +TextSearch_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& rxMSF ) { @@ -1578,7 +1578,7 @@ SAL_CALL TextSearch_CreateInstance( extern "C" { -SAL_DLLPUBLIC_EXPORT void* SAL_CALL +SAL_DLLPUBLIC_EXPORT void* i18nsearch_component_getFactory( const sal_Char* sImplementationName, void* _pServiceManager, SAL_UNUSED_PARAMETER void* ) diff --git a/i18npool/source/textconversion/textconversion.cxx b/i18npool/source/textconversion/textconversion.cxx index fe5ac7eba6be..149aaf3b1b4a 100644 --- a/i18npool/source/textconversion/textconversion.cxx +++ b/i18npool/source/textconversion/textconversion.cxx @@ -27,7 +27,7 @@ namespace i18npool { #ifndef DISABLE_DYNLOADING -extern "C" { static void SAL_CALL thisModule() {} } +extern "C" { static void thisModule() {} } #endif diff --git a/i18npool/source/textconversion/textconversionImpl.cxx b/i18npool/source/textconversion/textconversionImpl.cxx index 7a9d02942ca8..ea81ff3f19c7 100644 --- a/i18npool/source/textconversion/textconversionImpl.cxx +++ b/i18npool/source/textconversion/textconversionImpl.cxx @@ -124,7 +124,7 @@ TextConversionImpl::getSupportedServiceNames() } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_i18n_TextConversion_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) diff --git a/i18npool/source/textconversion/textconversion_ko.cxx b/i18npool/source/textconversion/textconversion_ko.cxx index 64be16109db5..eb2be10f8cb9 100644 --- a/i18npool/source/textconversion/textconversion_ko.cxx +++ b/i18npool/source/textconversion/textconversion_ko.cxx @@ -79,7 +79,7 @@ TextConversion_ko::TextConversion_ko( const Reference < XComponentContext >& xCo } } -sal_Int16 SAL_CALL checkScriptType(sal_Unicode c) +sal_Int16 checkScriptType(sal_Unicode c) { typedef struct { UBlockCode from; diff --git a/i18npool/source/textconversion/textconversion_zh.cxx b/i18npool/source/textconversion/textconversion_zh.cxx index e856b225c917..192b0996b765 100644 --- a/i18npool/source/textconversion/textconversion_zh.cxx +++ b/i18npool/source/textconversion/textconversion_zh.cxx @@ -43,7 +43,7 @@ TextConversion_zh::TextConversion_zh( const Reference < XComponentContext >& xCo xCDL = ConversionDictionaryList::create(xContext); } -sal_Unicode SAL_CALL getOneCharConversion(sal_Unicode ch, const sal_Unicode* Data, const sal_uInt16* Index) +sal_Unicode getOneCharConversion(sal_Unicode ch, const sal_Unicode* Data, const sal_uInt16* Index) { if (Data && Index) { sal_Unicode address = Index[ch>>8]; diff --git a/i18npool/source/transliteration/ignoreKana.cxx b/i18npool/source/transliteration/ignoreKana.cxx index 2217aed56b09..97a6875d760a 100644 --- a/i18npool/source/transliteration/ignoreKana.cxx +++ b/i18npool/source/transliteration/ignoreKana.cxx @@ -53,7 +53,7 @@ ignoreKana::transliterateChar2Char( sal_Unicode inChar) } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_i18n_Transliteration_IGNORE_KANA_get_implementation( css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) diff --git a/i18npool/source/transliteration/ignoreWidth.cxx b/i18npool/source/transliteration/ignoreWidth.cxx index c2a6f756d3dc..2317d2f00e24 100644 --- a/i18npool/source/transliteration/ignoreWidth.cxx +++ b/i18npool/source/transliteration/ignoreWidth.cxx @@ -53,7 +53,7 @@ ignoreWidth::transliterateChar2Char( sal_Unicode inChar) } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_i18n_Transliteration_IGNORE_WIDTH_get_implementation( css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) diff --git a/i18npool/source/transliteration/textToPronounce_zh.cxx b/i18npool/source/transliteration/textToPronounce_zh.cxx index e9322a6adc01..6baf434f5e7e 100644 --- a/i18npool/source/transliteration/textToPronounce_zh.cxx +++ b/i18npool/source/transliteration/textToPronounce_zh.cxx @@ -154,7 +154,7 @@ TextToChuyin_zh_TW::TextToChuyin_zh_TW() : #ifndef DISABLE_DYNLOADING -extern "C" { static void SAL_CALL thisModule() {} } +extern "C" { static void thisModule() {} } TextToPronounce_zh::TextToPronounce_zh(const sal_Char* func_name) { diff --git a/i18npool/source/transliteration/transliterationImpl.cxx b/i18npool/source/transliteration/transliterationImpl.cxx index ea3e84075784..7209a9ccd48b 100644 --- a/i18npool/source/transliteration/transliterationImpl.cxx +++ b/i18npool/source/transliteration/transliterationImpl.cxx @@ -660,7 +660,7 @@ TransliterationImpl::getSupportedServiceNames() } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_i18n_Transliteration_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) diff --git a/i18npool/source/transliteration/transliteration_caseignore.cxx b/i18npool/source/transliteration/transliteration_caseignore.cxx index 6242aa7be12d..8ef525b6e698 100644 --- a/i18npool/source/transliteration/transliteration_caseignore.cxx +++ b/i18npool/source/transliteration/transliteration_caseignore.cxx @@ -142,7 +142,7 @@ Transliteration_caseignore::compare( } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_i18n_Transliteration_IGNORE_CASE_get_implementation( css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) diff --git a/i18nutil/source/utility/casefolding.cxx b/i18nutil/source/utility/casefolding.cxx index 5754bb4353b8..cc5eda68e8ee 100644 --- a/i18nutil/source/utility/casefolding.cxx +++ b/i18nutil/source/utility/casefolding.cxx @@ -120,7 +120,7 @@ Mapping& casefolding::getValue(const sal_Unicode* str, sal_Int32 pos, sal_Int32 return dummy; } -inline bool SAL_CALL +inline bool is_ja_voice_sound_mark(sal_Unicode& current, sal_Unicode next) { sal_Unicode c = 0; diff --git a/idlc/inc/astexpression.hxx b/idlc/inc/astexpression.hxx index 53c9ff934556..9dac7e79cc10 100644 --- a/idlc/inc/astexpression.hxx +++ b/idlc/inc/astexpression.hxx @@ -84,7 +84,7 @@ struct AstExprValue ExprType et; }; -const sal_Char* SAL_CALL exprTypeToString(ExprType t); +const sal_Char* exprTypeToString(ExprType t); class AstExpression final { diff --git a/idlc/inc/idlc.hxx b/idlc/inc/idlc.hxx index 99efb291b1f0..881078303e4a 100644 --- a/idlc/inc/idlc.hxx +++ b/idlc/inc/idlc.hxx @@ -150,8 +150,8 @@ bool isFileUrl(const OString& fileName); OString convertToAbsoluteSystemPath(const OString& fileName); OString convertToFileUrl(const OString& fileName); -Idlc* SAL_CALL idlc(); -Idlc* SAL_CALL setIdlc(Options* pOptions); +Idlc* idlc(); +Idlc* setIdlc(Options* pOptions); AstDeclaration const * resolveTypedefs(AstDeclaration const * type); diff --git a/idlc/inc/idlctypes.hxx b/idlc/inc/idlctypes.hxx index 8f6f799f11ff..6d013f834e75 100644 --- a/idlc/inc/idlctypes.hxx +++ b/idlc/inc/idlctypes.hxx @@ -36,8 +36,8 @@ class AstDeclaration; typedef std::list< AstDeclaration* > DeclList; class AstScope; -AstDeclaration* SAL_CALL scopeAsDecl(AstScope* pScope); -AstScope* SAL_CALL declAsScope(AstDeclaration* pDecl); +AstDeclaration* scopeAsDecl(AstScope* pScope); +AstScope* declAsScope(AstDeclaration* pDecl); #ifdef _MSC_VER #pragma warning( disable : 4541 ) diff --git a/idlc/source/astexpression.cxx b/idlc/source/astexpression.cxx index 5da3616e1c00..f63663badbaa 100644 --- a/idlc/source/astexpression.cxx +++ b/idlc/source/astexpression.cxx @@ -1045,7 +1045,7 @@ OString AstExpression::toString() } // Convert the type of an AST_Expression to a char * -const sal_Char* SAL_CALL exprTypeToString(ExprType t) +const sal_Char* exprTypeToString(ExprType t) { switch (t) { diff --git a/idlc/source/idlc.cxx b/idlc/source/idlc.cxx index c7042d7a87ba..008e1aaa3e91 100644 --- a/idlc/source/idlc.cxx +++ b/idlc/source/idlc.cxx @@ -40,7 +40,7 @@ #include <algorithm> -AstDeclaration* SAL_CALL scopeAsDecl(AstScope* pScope) +AstDeclaration* scopeAsDecl(AstScope* pScope) { if (pScope == nullptr) return nullptr; @@ -69,7 +69,7 @@ AstDeclaration* SAL_CALL scopeAsDecl(AstScope* pScope) } } -AstScope* SAL_CALL declAsScope(AstDeclaration* pDecl) +AstScope* declAsScope(AstDeclaration* pDecl) { if (pDecl == nullptr) return nullptr; @@ -98,7 +98,7 @@ AstScope* SAL_CALL declAsScope(AstDeclaration* pDecl) } } -static void SAL_CALL predefineXInterface(AstModule* pRoot) +static void predefineXInterface(AstModule* pRoot) { // define the modules com::sun::star::uno AstModule* pParentScope = pRoot; @@ -146,7 +146,7 @@ static void SAL_CALL predefineXInterface(AstModule* pRoot) pInterface->addMember(pOp); } -static void SAL_CALL initializePredefinedTypes(AstModule* pRoot) +static void initializePredefinedTypes(AstModule* pRoot) { if ( pRoot ) { @@ -348,12 +348,12 @@ Idlc::dumpDeps(OString const& rDepFile, OString const& rTarget) static Idlc* pStaticIdlc = nullptr; -Idlc* SAL_CALL idlc() +Idlc* idlc() { return pStaticIdlc; } -Idlc* SAL_CALL setIdlc(Options* pOptions) +Idlc* setIdlc(Options* pOptions) { delete pStaticIdlc; pStaticIdlc = new Idlc(pOptions); 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 ); } diff --git a/io/source/TextInputStream/TextInputStream.cxx b/io/source/TextInputStream/TextInputStream.cxx index f2f12e0e1781..66ff058f5037 100644 --- a/io/source/TextInputStream/TextInputStream.cxx +++ b/io/source/TextInputStream/TextInputStream.cxx @@ -389,7 +389,7 @@ Reference< XInputStream > OTextInputStream::getInputStream() } -Reference< XInterface > SAL_CALL TextInputStream_CreateInstance( +Reference< XInterface > TextInputStream_CreateInstance( SAL_UNUSED_PARAMETER const Reference< XComponentContext > &) { return Reference < XInterface >( static_cast<OWeakObject *>(new OTextInputStream()) ); diff --git a/io/source/TextOutputStream/TextOutputStream.cxx b/io/source/TextOutputStream/TextOutputStream.cxx index d33cc9d3b6c7..1f859720f8ae 100644 --- a/io/source/TextOutputStream/TextOutputStream.cxx +++ b/io/source/TextOutputStream/TextOutputStream.cxx @@ -222,7 +222,7 @@ Reference< XOutputStream > OTextOutputStream::getOutputStream() } -Reference< XInterface > SAL_CALL TextOutputStream_CreateInstance( +Reference< XInterface > TextOutputStream_CreateInstance( SAL_UNUSED_PARAMETER const Reference< XComponentContext > &) { return Reference < XInterface >( static_cast<OWeakObject *>(new OTextOutputStream()) ); diff --git a/io/source/acceptor/acceptor.cxx b/io/source/acceptor/acceptor.cxx index 126fe95bf60a..e27b83acd290 100644 --- a/io/source/acceptor/acceptor.cxx +++ b/io/source/acceptor/acceptor.cxx @@ -252,7 +252,7 @@ namespace io_acceptor return OUString( IMPLEMENTATION_NAME ); } - Reference< XInterface > SAL_CALL acceptor_CreateInstance( const Reference< XComponentContext > & xCtx) + Reference< XInterface > acceptor_CreateInstance( const Reference< XComponentContext > & xCtx) { return Reference < XInterface >( static_cast<OWeakObject *>(new OAcceptor(xCtx)) ); } diff --git a/io/source/connector/connector.cxx b/io/source/connector/connector.cxx index 38763906527e..9de568b3f0b8 100644 --- a/io/source/connector/connector.cxx +++ b/io/source/connector/connector.cxx @@ -188,7 +188,7 @@ namespace stoc_connector return connector_getSupportedServiceNames(); } - Reference< XInterface > SAL_CALL connector_CreateInstance( const Reference< XComponentContext > & xCtx) + Reference< XInterface > connector_CreateInstance( const Reference< XComponentContext > & xCtx) { return Reference < XInterface >( static_cast<OWeakObject *>(new OConnector(xCtx)) ); } diff --git a/io/source/services.cxx b/io/source/services.cxx index 597ce753a61c..f28540058b0d 100644 --- a/io/source/services.cxx +++ b/io/source/services.cxx @@ -94,7 +94,7 @@ static const struct ImplementationEntry g_entries[] = {nullptr, nullptr, nullptr, nullptr, nullptr, 0} }; -extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL io_component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * io_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , g_entries ); diff --git a/io/source/services.hxx b/io/source/services.hxx index 479ac31a698b..a7bed2533ac8 100644 --- a/io/source/services.hxx +++ b/io/source/services.hxx @@ -32,67 +32,67 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::registry; namespace io_acceptor{ - Reference< XInterface > SAL_CALL acceptor_CreateInstance( const Reference< XComponentContext > & xCtx); + Reference< XInterface > acceptor_CreateInstance( const Reference< XComponentContext > & xCtx); OUString acceptor_getImplementationName(); Sequence< OUString > acceptor_getSupportedServiceNames(); } namespace stoc_connector { - Reference< XInterface > SAL_CALL connector_CreateInstance( const Reference< XComponentContext > & xCtx); + Reference< XInterface > connector_CreateInstance( const Reference< XComponentContext > & xCtx); OUString connector_getImplementationName(); Sequence< OUString > connector_getSupportedServiceNames(); } namespace io_TextInputStream { - Reference< XInterface > SAL_CALL TextInputStream_CreateInstance(SAL_UNUSED_PARAMETER const Reference< XComponentContext > &); + Reference< XInterface > TextInputStream_CreateInstance(SAL_UNUSED_PARAMETER const Reference< XComponentContext > &); OUString TextInputStream_getImplementationName(); Sequence< OUString > TextInputStream_getSupportedServiceNames(); } namespace io_TextOutputStream { - Reference< XInterface > SAL_CALL TextOutputStream_CreateInstance(SAL_UNUSED_PARAMETER const Reference< XComponentContext > &); + Reference< XInterface > TextOutputStream_CreateInstance(SAL_UNUSED_PARAMETER const Reference< XComponentContext > &); OUString TextOutputStream_getImplementationName(); Sequence< OUString > TextOutputStream_getSupportedServiceNames(); } namespace io_stm { /// @throws Exception - Reference< XInterface > SAL_CALL OPipeImpl_CreateInstance( const Reference< XComponentContext > & rSMgr ); + Reference< XInterface > OPipeImpl_CreateInstance( const Reference< XComponentContext > & rSMgr ); OUString OPipeImpl_getImplementationName(); Sequence<OUString> OPipeImpl_getSupportedServiceNames(); /// @throws Exception - Reference< XInterface > SAL_CALL ODataInputStream_CreateInstance( const Reference< XComponentContext > & rSMgr ); + Reference< XInterface > ODataInputStream_CreateInstance( const Reference< XComponentContext > & rSMgr ); OUString ODataInputStream_getImplementationName(); Sequence<OUString> ODataInputStream_getSupportedServiceNames(); /// @throws Exception - Reference< XInterface > SAL_CALL ODataOutputStream_CreateInstance( const Reference< XComponentContext > & rSMgr ); + Reference< XInterface > ODataOutputStream_CreateInstance( const Reference< XComponentContext > & rSMgr ); OUString ODataOutputStream_getImplementationName(); Sequence<OUString> ODataOutputStream_getSupportedServiceNames(); /// @throws Exception - Reference< XInterface > SAL_CALL OMarkableOutputStream_CreateInstance( const Reference< XComponentContext > & rSMgr ); + Reference< XInterface > OMarkableOutputStream_CreateInstance( const Reference< XComponentContext > & rSMgr ); OUString OMarkableOutputStream_getImplementationName(); Sequence<OUString> OMarkableOutputStream_getSupportedServiceNames(); /// @throws Exception - Reference< XInterface > SAL_CALL OMarkableInputStream_CreateInstance( const Reference< XComponentContext > & rSMgr ); + Reference< XInterface > OMarkableInputStream_CreateInstance( const Reference< XComponentContext > & rSMgr ); OUString OMarkableInputStream_getImplementationName() ; Sequence<OUString> OMarkableInputStream_getSupportedServiceNames(); /// @throws Exception - Reference< XInterface > SAL_CALL OObjectOutputStream_CreateInstance( const Reference< XComponentContext > & rSMgr ); + Reference< XInterface > OObjectOutputStream_CreateInstance( const Reference< XComponentContext > & rSMgr ); OUString OObjectOutputStream_getImplementationName(); Sequence<OUString> OObjectOutputStream_getSupportedServiceNames(); /// @throws Exception - Reference< XInterface > SAL_CALL OObjectInputStream_CreateInstance( const Reference< XComponentContext > & rSMgr ); + Reference< XInterface > OObjectInputStream_CreateInstance( const Reference< XComponentContext > & rSMgr ); OUString OObjectInputStream_getImplementationName() ; Sequence<OUString> OObjectInputStream_getSupportedServiceNames(); /// @throws Exception - Reference< XInterface > SAL_CALL OPumpImpl_CreateInstance( const Reference< XComponentContext > & rSMgr ); + Reference< XInterface > OPumpImpl_CreateInstance( const Reference< XComponentContext > & rSMgr ); OUString OPumpImpl_getImplementationName(); Sequence<OUString> OPumpImpl_getSupportedServiceNames(); } diff --git a/io/source/stm/odata.cxx b/io/source/stm/odata.cxx index bfd6a92a20a7..f9204069f559 100644 --- a/io/source/stm/odata.cxx +++ b/io/source/stm/odata.cxx @@ -410,7 +410,7 @@ Sequence< OUString > ODataInputStream::getSupportedServiceNames() * ****/ -Reference< XInterface > SAL_CALL ODataInputStream_CreateInstance( +Reference< XInterface > ODataInputStream_CreateInstance( SAL_UNUSED_PARAMETER const Reference < XComponentContext > & ) { ODataInputStream *p = new ODataInputStream; @@ -726,7 +726,7 @@ Sequence< OUString > ODataOutputStream::getSupportedServiceNames() return ODataOutputStream_getSupportedServiceNames(); } -Reference< XInterface > SAL_CALL ODataOutputStream_CreateInstance( +Reference< XInterface > ODataOutputStream_CreateInstance( SAL_UNUSED_PARAMETER const Reference < XComponentContext > & ) { ODataOutputStream *p = new ODataOutputStream; @@ -976,7 +976,7 @@ sal_Int32 OObjectOutputStream::offsetToMark(sal_Int32 nMark) } -Reference< XInterface > SAL_CALL OObjectOutputStream_CreateInstance( +Reference< XInterface > OObjectOutputStream_CreateInstance( SAL_UNUSED_PARAMETER const Reference < XComponentContext > & ) { OObjectOutputStream *p = new OObjectOutputStream; @@ -1259,7 +1259,7 @@ Sequence< OUString > OObjectInputStream::getSupportedServiceNames() return OObjectInputStream_getSupportedServiceNames(); } -Reference< XInterface > SAL_CALL OObjectInputStream_CreateInstance( const Reference < XComponentContext > & rCtx ) +Reference< XInterface > OObjectInputStream_CreateInstance( const Reference < XComponentContext > & rCtx ) { OObjectInputStream *p = new OObjectInputStream( rCtx ); return Reference< XInterface> ( static_cast< OWeakObject * >(p) ); diff --git a/io/source/stm/omark.cxx b/io/source/stm/omark.cxx index 7792e548c66b..fa0e0ae2cb80 100644 --- a/io/source/stm/omark.cxx +++ b/io/source/stm/omark.cxx @@ -368,7 +368,7 @@ Sequence< OUString > OMarkableOutputStream::getSupportedServiceNames() * external binding * *------------------------*/ -Reference< XInterface > SAL_CALL OMarkableOutputStream_CreateInstance( +Reference< XInterface > OMarkableOutputStream_CreateInstance( SAL_UNUSED_PARAMETER const Reference < XComponentContext > & ) { OMarkableOutputStream *p = new OMarkableOutputStream( ); @@ -778,7 +778,7 @@ Sequence< OUString > OMarkableInputStream::getSupportedServiceNames() * external binding * *------------------------*/ -Reference < XInterface > SAL_CALL OMarkableInputStream_CreateInstance( +Reference < XInterface > OMarkableInputStream_CreateInstance( SAL_UNUSED_PARAMETER const Reference < XComponentContext > & ) { OMarkableInputStream *p = new OMarkableInputStream( ); diff --git a/io/source/stm/opipe.cxx b/io/source/stm/opipe.cxx index a382f41304c8..afdc92feef54 100644 --- a/io/source/stm/opipe.cxx +++ b/io/source/stm/opipe.cxx @@ -352,7 +352,7 @@ Sequence< OUString > OPipeImpl::getSupportedServiceNames() */ -Reference < XInterface > SAL_CALL OPipeImpl_CreateInstance( +Reference < XInterface > OPipeImpl_CreateInstance( SAL_UNUSED_PARAMETER const Reference < XComponentContext > & ) { OPipeImpl *p = new OPipeImpl; diff --git a/io/source/stm/opump.cxx b/io/source/stm/opump.cxx index 0f2bc2422a7a..0bcccef819ae 100644 --- a/io/source/stm/opump.cxx +++ b/io/source/stm/opump.cxx @@ -442,7 +442,7 @@ Sequence< OUString > Pump::getSupportedServiceNames() } -Reference< XInterface > SAL_CALL OPumpImpl_CreateInstance( +Reference< XInterface > OPumpImpl_CreateInstance( SAL_UNUSED_PARAMETER const Reference< XComponentContext > & ) { return Reference< XInterface >( *new Pump ); diff --git a/javaunohelper/source/preload.cxx b/javaunohelper/source/preload.cxx index 2e4964bab575..d491e9b4dbfb 100644 --- a/javaunohelper/source/preload.cxx +++ b/javaunohelper/source/preload.cxx @@ -43,7 +43,7 @@ static javaunohelper::detail::Func_getFactory * s_getFactory; static javaunohelper::detail::Func_bootstrap * s_bootstrap; static bool s_inited = false; -extern "C" { static void SAL_CALL thisModule() {} } +extern "C" { static void thisModule() {} } static bool inited_juhx( JNIEnv * jni_env ) diff --git a/lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx b/lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx index 06798c5ebd2c..8aa3c2e5e4aa 100644 --- a/lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx +++ b/lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx @@ -712,7 +712,7 @@ OUString Hyphenator::makeInitCap(const OUString& aTerm, CharClass const * pCC) } /// @throws Exception -Reference< XInterface > SAL_CALL Hyphenator_CreateInstance( +Reference< XInterface > Hyphenator_CreateInstance( const Reference< XMultiServiceFactory > & /*rSMgr*/ ) { Reference< XInterface > xService = static_cast<cppu::OWeakObject*>(new Hyphenator); @@ -837,7 +837,7 @@ Sequence< OUString > Hyphenator::getSupportedServiceNames_Static() extern "C" { -SAL_DLLPUBLIC_EXPORT void * SAL_CALL hyphen_component_getFactory( +SAL_DLLPUBLIC_EXPORT void * hyphen_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) { void * pRet = nullptr; diff --git a/lingucomponent/source/languageguessing/guesslang.cxx b/lingucomponent/source/languageguessing/guesslang.cxx index 3d1ebacd1360..930b1cd1c13f 100644 --- a/lingucomponent/source/languageguessing/guesslang.cxx +++ b/lingucomponent/source/languageguessing/guesslang.cxx @@ -336,7 +336,7 @@ Sequence<OUString> SAL_CALL LangGuess_Impl::getSupportedServiceNames_Static( ) * Function to create a new component instance; is needed by factory helper implementation. * @param xMgr service manager to if the components needs other component instances */ -Reference< XInterface > SAL_CALL LangGuess_Impl_create( +Reference< XInterface > LangGuess_Impl_create( Reference< XComponentContext > const & ) { return static_cast< ::cppu::OWeakObject * >( new LangGuess_Impl ); @@ -357,7 +357,7 @@ static const struct ::cppu::ImplementationEntry s_component_entries [] = extern "C" { -SAL_DLLPUBLIC_EXPORT void * SAL_CALL guesslang_component_getFactory( +SAL_DLLPUBLIC_EXPORT void * guesslang_component_getFactory( sal_Char const * implName, void * xMgr, void * xRegistry ) { diff --git a/lingucomponent/source/spellcheck/spell/sspellimp.cxx b/lingucomponent/source/spellcheck/spell/sspellimp.cxx index 4e64e42ce34e..192e4e2a3bb7 100644 --- a/lingucomponent/source/spellcheck/spell/sspellimp.cxx +++ b/lingucomponent/source/spellcheck/spell/sspellimp.cxx @@ -540,7 +540,7 @@ Reference< XSpellAlternatives > SAL_CALL SpellChecker::spell( } /// @throws Exception -Reference< XInterface > SAL_CALL SpellChecker_CreateInstance( +Reference< XInterface > SpellChecker_CreateInstance( const Reference< XMultiServiceFactory > & /*rSMgr*/ ) { @@ -666,7 +666,7 @@ Sequence< OUString > SpellChecker::getSupportedServiceNames_Static() extern "C" { -SAL_DLLPUBLIC_EXPORT void * SAL_CALL spell_component_getFactory( +SAL_DLLPUBLIC_EXPORT void * spell_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) { void * pRet = nullptr; diff --git a/lingucomponent/source/thesaurus/libnth/nthesimp.cxx b/lingucomponent/source/thesaurus/libnth/nthesimp.cxx index fd0e5cda95f4..723d06617381 100644 --- a/lingucomponent/source/thesaurus/libnth/nthesimp.cxx +++ b/lingucomponent/source/thesaurus/libnth/nthesimp.cxx @@ -512,7 +512,7 @@ Sequence < Reference < css::linguistic2::XMeaning > > SAL_CALL Thesaurus::queryM } /// @throws Exception -Reference< XInterface > SAL_CALL Thesaurus_CreateInstance( +Reference< XInterface > Thesaurus_CreateInstance( const Reference< XMultiServiceFactory > & /*rSMgr*/ ) { Reference< XInterface > xService = static_cast<cppu::OWeakObject*>(new Thesaurus); @@ -639,7 +639,7 @@ Sequence< OUString > Thesaurus::getSupportedServiceNames_Static() extern "C" { -SAL_DLLPUBLIC_EXPORT void * SAL_CALL lnth_component_getFactory( +SAL_DLLPUBLIC_EXPORT void * lnth_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) { void * pRet = nullptr; diff --git a/linguistic/source/convdiclist.cxx b/linguistic/source/convdiclist.cxx index 335589d6a8d0..ca57f4aa373d 100644 --- a/linguistic/source/convdiclist.cxx +++ b/linguistic/source/convdiclist.cxx @@ -558,13 +558,13 @@ uno::Sequence< OUString > ConvDicList::getSupportedServiceNames_Static() } /// @throws css::uno::Exception -uno::Reference< uno::XInterface > SAL_CALL ConvDicList_CreateInstance( +uno::Reference< uno::XInterface > ConvDicList_CreateInstance( const uno::Reference< XMultiServiceFactory > & /*rSMgr*/ ) { return StaticConvDicList::get(); } -void * SAL_CALL ConvDicList_getFactory( +void * ConvDicList_getFactory( const sal_Char * pImplName, XMultiServiceFactory * pServiceManager ) { diff --git a/linguistic/source/dlistimp.cxx b/linguistic/source/dlistimp.cxx index 1c4d71187fa1..b2a63d6e9480 100644 --- a/linguistic/source/dlistimp.cxx +++ b/linguistic/source/dlistimp.cxx @@ -359,7 +359,7 @@ sal_Int32 DicList::GetDicPos(const uno::Reference< XDictionary > &xDic) } /// @throws Exception -uno::Reference< XInterface > SAL_CALL +uno::Reference< XInterface > DicList_CreateInstance( const uno::Reference< XMultiServiceFactory > & /*rSMgr*/ ) { uno::Reference< XInterface > xService = static_cast<cppu::OWeakObject *>(new DicList); @@ -703,7 +703,7 @@ uno::Sequence< OUString > DicList::getSupportedServiceNames_Static() throw() return aSNS; } -void * SAL_CALL DicList_getFactory( const sal_Char * pImplName, +void * DicList_getFactory( const sal_Char * pImplName, XMultiServiceFactory * pServiceManager ) { void * pRet = nullptr; diff --git a/linguistic/source/gciterator.cxx b/linguistic/source/gciterator.cxx index aed7f1d28249..4ecfffa8603b 100644 --- a/linguistic/source/gciterator.cxx +++ b/linguistic/source/gciterator.cxx @@ -1122,14 +1122,14 @@ static uno::Sequence< OUString > GrammarCheckingIterator_getSupportedServiceName } /// @throws uno::Exception -static uno::Reference< uno::XInterface > SAL_CALL GrammarCheckingIterator_createInstance( +static uno::Reference< uno::XInterface > GrammarCheckingIterator_createInstance( const uno::Reference< lang::XMultiServiceFactory > & /*rxSMgr*/ ) { return static_cast< ::cppu::OWeakObject * >(new GrammarCheckingIterator()); } -void * SAL_CALL GrammarCheckingIterator_getFactory( +void * GrammarCheckingIterator_getFactory( const sal_Char *pImplName, lang::XMultiServiceFactory *pServiceManager ) { diff --git a/linguistic/source/hhconvdic.cxx b/linguistic/source/hhconvdic.cxx index fab215f92284..2e8969b0dff6 100644 --- a/linguistic/source/hhconvdic.cxx +++ b/linguistic/source/hhconvdic.cxx @@ -56,7 +56,7 @@ using namespace i18n; // from i18npool/source/textconversion/textconversion_ko.cxx /// @throws RuntimeException -sal_Int16 SAL_CALL checkScriptType(sal_Unicode c) +sal_Int16 checkScriptType(sal_Unicode c) { UErrorCode status = U_ZERO_ERROR; diff --git a/linguistic/source/lngopt.cxx b/linguistic/source/lngopt.cxx index 66f97b161f80..aa003349c7d2 100644 --- a/linguistic/source/lngopt.cxx +++ b/linguistic/source/lngopt.cxx @@ -209,7 +209,7 @@ void LinguProps::launchEvent( const PropertyChangeEvent &rEvt ) const } /// @throws Exception -Reference< XInterface > SAL_CALL LinguProps_CreateInstance( +Reference< XInterface > LinguProps_CreateInstance( const Reference< XMultiServiceFactory > & /*rSMgr*/ ) { Reference< XInterface > xService = static_cast<cppu::OWeakObject*>(new LinguProps); @@ -449,7 +449,7 @@ Locale LinguProps::getPropertyLocale(const OUString& aPropertyName) return b; } -void * SAL_CALL LinguProps_getFactory( const sal_Char * pImplName, +void * LinguProps_getFactory( const sal_Char * pImplName, XMultiServiceFactory *pServiceManager ) { void * pRet = nullptr; diff --git a/linguistic/source/lngreg.cxx b/linguistic/source/lngreg.cxx index 203bcc00af14..671aecc0f54b 100644 --- a/linguistic/source/lngreg.cxx +++ b/linguistic/source/lngreg.cxx @@ -31,7 +31,7 @@ using namespace com::sun::star::registry; extern "C" { -SAL_DLLPUBLIC_EXPORT void * SAL_CALL lng_component_getFactory( +SAL_DLLPUBLIC_EXPORT void * lng_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) { void * pRet = diff --git a/linguistic/source/lngreg.hxx b/linguistic/source/lngreg.hxx index fb6800ab1c8d..129b0e95c498 100644 --- a/linguistic/source/lngreg.hxx +++ b/linguistic/source/lngreg.hxx @@ -28,31 +28,31 @@ namespace com { namespace sun { namespace star { namespace lang { class XMultiServiceFactory; } } } } -extern void * SAL_CALL LngSvcMgr_getFactory +extern void * LngSvcMgr_getFactory ( const sal_Char * pImplName, css::lang::XMultiServiceFactory * pServiceManager ); -extern void * SAL_CALL DicList_getFactory +extern void * DicList_getFactory ( const sal_Char * pImplName, css::lang::XMultiServiceFactory * pServiceManager ); -void * SAL_CALL LinguProps_getFactory +void * LinguProps_getFactory ( const sal_Char * pImplName, css::lang::XMultiServiceFactory * pServiceManager ); -extern void * SAL_CALL ConvDicList_getFactory +extern void * ConvDicList_getFactory ( const sal_Char * pImplName, css::lang::XMultiServiceFactory * pServiceManager ); -extern void * SAL_CALL GrammarCheckingIterator_getFactory +extern void * GrammarCheckingIterator_getFactory ( const sal_Char * pImplName, css::lang::XMultiServiceFactory * pServiceManager diff --git a/linguistic/source/lngsvcmgr.cxx b/linguistic/source/lngsvcmgr.cxx index b028a9f1cadf..c15c72e4f5e5 100644 --- a/linguistic/source/lngsvcmgr.cxx +++ b/linguistic/source/lngsvcmgr.cxx @@ -1961,14 +1961,14 @@ uno::Sequence< OUString > LngSvcMgr::getSupportedServiceNames_Static() } /// @throws uno::Exception -uno::Reference< uno::XInterface > SAL_CALL LngSvcMgr_CreateInstance( +uno::Reference< uno::XInterface > LngSvcMgr_CreateInstance( const uno::Reference< lang::XMultiServiceFactory > & /*rSMgr*/ ) { uno::Reference< uno::XInterface > xService = static_cast<cppu::OWeakObject*>(new LngSvcMgr); return xService; } -void * SAL_CALL LngSvcMgr_getFactory( +void * LngSvcMgr_getFactory( const sal_Char * pImplName, lang::XMultiServiceFactory * pServiceManager ) { diff --git a/linguistic/source/misc.cxx b/linguistic/source/misc.cxx index 847353c5372c..585aaba16468 100644 --- a/linguistic/source/misc.cxx +++ b/linguistic/source/misc.cxx @@ -604,7 +604,7 @@ bool IsUpper( const OUString &rText, sal_Int32 nPos, sal_Int32 nLen, LanguageTyp && !(nFlags & KCharacterType::LOWER); } -CapType SAL_CALL capitalType(const OUString& aTerm, CharClass const * pCC) +CapType capitalType(const OUString& aTerm, CharClass const * pCC) { sal_Int32 tlen = aTerm.getLength(); if (pCC && tlen) diff --git a/lotuswordpro/source/filter/LotusWordProImportFilter.cxx b/lotuswordpro/source/filter/LotusWordProImportFilter.cxx index a6d3418352d7..726ea2c1d54d 100644 --- a/lotuswordpro/source/filter/LotusWordProImportFilter.cxx +++ b/lotuswordpro/source/filter/LotusWordProImportFilter.cxx @@ -76,7 +76,7 @@ bool LotusWordProImportFilter::importImpl( const Sequence< css::beans::PropertyV } -extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportLWP(SvStream &rStream) +extern "C" SAL_DLLPUBLIC_EXPORT bool TestImportLWP(SvStream &rStream) { uno::Reference< XDocumentHandler > xHandler; return ReadWordproFile(rStream, xHandler) == 0; @@ -162,7 +162,7 @@ Sequence<OUString> SAL_CALL LotusWordProImportFilter::getSupportedServiceNames() return { "com.sun.star.document.ImportFilter", "com.sun.star.document.ExtendedTypeDetection" }; } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * LotusWordProImportFilter_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) diff --git a/mysqlc/source/mysqlc_driver.cxx b/mysqlc/source/mysqlc_driver.cxx index 319fc963cc39..c4e0ba2f7a60 100644 --- a/mysqlc/source/mysqlc_driver.cxx +++ b/mysqlc/source/mysqlc_driver.cxx @@ -100,7 +100,7 @@ Sequence< rtl::OUString > SAL_CALL MysqlCDriver::getSupportedServiceNames() } #ifndef SYSTEM_MYSQL_CPPCONN -extern "C" { static void SAL_CALL thisModule() {} } +extern "C" { static void thisModule() {} } #endif void MysqlCDriver::impl_initCppConn_lck_throw() @@ -256,7 +256,7 @@ namespace connectivity namespace mysqlc { -Reference< XInterface > SAL_CALL MysqlCDriver_CreateInstance(const Reference< XMultiServiceFactory >& _rxFactory) +Reference< XInterface > MysqlCDriver_CreateInstance(const Reference< XMultiServiceFactory >& _rxFactory) { return(*(new MysqlCDriver(_rxFactory))); } diff --git a/mysqlc/source/mysqlc_driver.hxx b/mysqlc/source/mysqlc_driver.hxx index 7649fc51539e..0a8337d9b347 100644 --- a/mysqlc/source/mysqlc_driver.hxx +++ b/mysqlc/source/mysqlc_driver.hxx @@ -49,12 +49,12 @@ namespace connectivity using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; /// @throws Exception - Reference< css::uno::XInterface > SAL_CALL MysqlCDriver_CreateInstance(const Reference< css::lang::XMultiServiceFactory >& _rxFactory); + Reference< css::uno::XInterface > MysqlCDriver_CreateInstance(const Reference< css::lang::XMultiServiceFactory >& _rxFactory); typedef ::cppu::WeakComponentImplHelper2< css::sdbc::XDriver, css::lang::XServiceInfo > ODriver_BASE; - typedef void* (SAL_CALL * OMysqlCConnection_CreateInstanceFunction)(void* _pDriver); + typedef void* (* OMysqlCConnection_CreateInstanceFunction)(void* _pDriver); class MysqlCDriver : public ODriver_BASE { diff --git a/mysqlc/source/mysqlc_services.cxx b/mysqlc/source/mysqlc_services.cxx index df98a405510b..262859aec953 100644 --- a/mysqlc/source/mysqlc_services.cxx +++ b/mysqlc/source/mysqlc_services.cxx @@ -29,7 +29,7 @@ using ::com::sun::star::uno::Sequence; using ::com::sun::star::lang::XSingleServiceFactory; using ::com::sun::star::lang::XMultiServiceFactory; -typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc) +typedef Reference< XSingleServiceFactory > (*createFactoryFunc) ( const Reference< XMultiServiceFactory > & rServiceManager, const rtl::OUString & rComponentName, @@ -71,7 +71,7 @@ struct ProviderRequest void* getProvider() const { return xRet.get(); } }; -extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void* component_getFactory( const sal_Char * pImplementationName, void * pServiceManager, void * /* pRegistryKey */) @@ -96,7 +96,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( return pRet; }; -extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT void component_getImplementationEnvironment( char const ** ppEnvTypeName, uno_Environment **) { diff --git a/odk/qa/checkapi/checkapi.cxx b/odk/qa/checkapi/checkapi.cxx index 9018deb9147c..95cac2c042bf 100644 --- a/odk/qa/checkapi/checkapi.cxx +++ b/odk/qa/checkapi/checkapi.cxx @@ -29,7 +29,7 @@ #include <allheaders.hxx> CPPUNIT_PLUGIN_IMPLEMENT(); -extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL firstfunc(sal_Bool) +extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool firstfunc(sal_Bool) { return true; } diff --git a/oox/inc/services.hxx b/oox/inc/services.hxx index ae57c562839e..59e490ad5f43 100644 --- a/oox/inc/services.hxx +++ b/oox/inc/services.hxx @@ -24,52 +24,52 @@ namespace oox { namespace core { - extern OUString SAL_CALL FastTokenHandler_getImplementationName(); - extern css::uno::Sequence< OUString > SAL_CALL FastTokenHandler_getSupportedServiceNames(); + extern OUString FastTokenHandler_getImplementationName(); + extern css::uno::Sequence< OUString > FastTokenHandler_getSupportedServiceNames(); /// @throws css::uno::Exception - extern css::uno::Reference< css::uno::XInterface > SAL_CALL FastTokenHandler_createInstance( + extern css::uno::Reference< css::uno::XInterface > FastTokenHandler_createInstance( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); } namespace core { - extern OUString SAL_CALL FilterDetect_getImplementationName(); - extern css::uno::Sequence< OUString > SAL_CALL FilterDetect_getSupportedServiceNames(); + extern OUString FilterDetect_getImplementationName(); + extern css::uno::Sequence< OUString > FilterDetect_getSupportedServiceNames(); /// @throws css::uno::Exception - extern css::uno::Reference< css::uno::XInterface > SAL_CALL FilterDetect_createInstance( + extern css::uno::Reference< css::uno::XInterface > FilterDetect_createInstance( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); } namespace docprop { - extern OUString SAL_CALL DocumentPropertiesImport_getImplementationName(); - extern css::uno::Sequence< OUString > SAL_CALL DocumentPropertiesImport_getSupportedServiceNames(); + extern OUString DocumentPropertiesImport_getImplementationName(); + extern css::uno::Sequence< OUString > DocumentPropertiesImport_getSupportedServiceNames(); /// @throws css::uno::Exception - extern css::uno::Reference< css::uno::XInterface > SAL_CALL DocumentPropertiesImport_createInstance( + extern css::uno::Reference< css::uno::XInterface > DocumentPropertiesImport_createInstance( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); } namespace ppt { - extern OUString SAL_CALL PowerPointImport_getImplementationName(); - extern css::uno::Sequence< OUString > SAL_CALL PowerPointImport_getSupportedServiceNames(); + extern OUString PowerPointImport_getImplementationName(); + extern css::uno::Sequence< OUString > PowerPointImport_getSupportedServiceNames(); /// @throws css::uno::Exception - extern css::uno::Reference< css::uno::XInterface > SAL_CALL PowerPointImport_createInstance( + extern css::uno::Reference< css::uno::XInterface > PowerPointImport_createInstance( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); } namespace ppt { - extern OUString SAL_CALL QuickDiagrammingImport_getImplementationName(); - extern css::uno::Sequence< OUString > SAL_CALL QuickDiagrammingImport_getSupportedServiceNames(); + extern OUString QuickDiagrammingImport_getImplementationName(); + extern css::uno::Sequence< OUString > QuickDiagrammingImport_getSupportedServiceNames(); /// @throws css::uno::Exception - extern css::uno::Reference< css::uno::XInterface > SAL_CALL QuickDiagrammingImport_createInstance( + extern css::uno::Reference< css::uno::XInterface > QuickDiagrammingImport_createInstance( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); } namespace ppt { - extern OUString SAL_CALL QuickDiagrammingLayout_getImplementationName(); - extern css::uno::Sequence< OUString > SAL_CALL QuickDiagrammingLayout_getSupportedServiceNames(); + extern OUString QuickDiagrammingLayout_getImplementationName(); + extern css::uno::Sequence< OUString > QuickDiagrammingLayout_getSupportedServiceNames(); /// @throws css::uno::Exception - extern css::uno::Reference< css::uno::XInterface > SAL_CALL QuickDiagrammingLayout_createInstance( + extern css::uno::Reference< css::uno::XInterface > QuickDiagrammingLayout_createInstance( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); } namespace shape { - extern OUString SAL_CALL ShapeContextHandler_getImplementationName(); - extern css::uno::Sequence< OUString > SAL_CALL ShapeContextHandler_getSupportedServiceNames(); + extern OUString ShapeContextHandler_getImplementationName(); + extern css::uno::Sequence< OUString > ShapeContextHandler_getSupportedServiceNames(); /// @throws css::uno::Exception - extern css::uno::Reference< css::uno::XInterface > SAL_CALL ShapeContextHandler_createInstance( + extern css::uno::Reference< css::uno::XInterface > ShapeContextHandler_createInstance( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); } } diff --git a/oox/source/core/fasttokenhandler.cxx b/oox/source/core/fasttokenhandler.cxx index ee03144e2e9e..7709c6c5a25a 100644 --- a/oox/source/core/fasttokenhandler.cxx +++ b/oox/source/core/fasttokenhandler.cxx @@ -31,18 +31,18 @@ namespace core { using namespace ::com::sun::star::uno; -OUString SAL_CALL FastTokenHandler_getImplementationName() +OUString FastTokenHandler_getImplementationName() { return OUString( "com.sun.star.comp.oox.core.FastTokenHandler" ); } -Sequence< OUString > SAL_CALL FastTokenHandler_getSupportedServiceNames() +Sequence< OUString > FastTokenHandler_getSupportedServiceNames() { Sequence<OUString> aServiceNames { "com.sun.star.xml.sax.FastTokenHandler" }; return aServiceNames; } -Reference< XInterface > SAL_CALL FastTokenHandler_createInstance( const Reference< XComponentContext >& /*rxContext*/ ) +Reference< XInterface > FastTokenHandler_createInstance( const Reference< XComponentContext >& /*rxContext*/ ) { return static_cast< ::cppu::OWeakObject* >( new FastTokenHandler ); } diff --git a/oox/source/core/filterdetect.cxx b/oox/source/core/filterdetect.cxx index 7bdd167fc922..1af982c07480 100644 --- a/oox/source/core/filterdetect.cxx +++ b/oox/source/core/filterdetect.cxx @@ -242,7 +242,7 @@ OUString FilterDetect_getImplementationName() } /* Helper for registry */ -Reference< XInterface > SAL_CALL FilterDetect_createInstance( const Reference< XComponentContext >& rxContext ) +Reference< XInterface > FilterDetect_createInstance( const Reference< XComponentContext >& rxContext ) { return static_cast< ::cppu::OWeakObject* >( new FilterDetect( rxContext ) ); } diff --git a/oox/source/core/services.cxx b/oox/source/core/services.cxx index 9c9bcc3cea5a..85489f2bca6a 100644 --- a/oox/source/core/services.cxx +++ b/oox/source/core/services.cxx @@ -49,7 +49,7 @@ static ::cppu::ImplementationEntry const spServices[] = } // namespace -extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL oox_component_getFactory( const char* pImplName, void* pServiceManager, void* pRegistryKey ) +extern "C" SAL_DLLPUBLIC_EXPORT void* oox_component_getFactory( const char* pImplName, void* pServiceManager, void* pRegistryKey ) { return ::cppu::component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey, spServices ); } diff --git a/oox/source/docprop/ooxmldocpropimport.cxx b/oox/source/docprop/ooxmldocpropimport.cxx index 057765f3ebc9..a15518b2eb75 100644 --- a/oox/source/docprop/ooxmldocpropimport.cxx +++ b/oox/source/docprop/ooxmldocpropimport.cxx @@ -44,18 +44,18 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; -OUString SAL_CALL DocumentPropertiesImport_getImplementationName() +OUString DocumentPropertiesImport_getImplementationName() { return OUString( "com.sun.star.comp.oox.docprop.DocumentPropertiesImporter" ); } -Sequence< OUString > SAL_CALL DocumentPropertiesImport_getSupportedServiceNames() +Sequence< OUString > DocumentPropertiesImport_getSupportedServiceNames() { Sequence<OUString> aServices { "com.sun.star.document.OOXMLDocumentPropertiesImporter" }; return aServices; } -Reference< XInterface > SAL_CALL DocumentPropertiesImport_createInstance( const Reference< XComponentContext >& rxContext ) +Reference< XInterface > DocumentPropertiesImport_createInstance( const Reference< XComponentContext >& rxContext ) { return static_cast< ::cppu::OWeakObject* >( new DocumentPropertiesImport( rxContext ) ); } diff --git a/oox/source/ppt/dgmimport.cxx b/oox/source/ppt/dgmimport.cxx index c9eb30a158cd..c10dc48a72ef 100644 --- a/oox/source/ppt/dgmimport.cxx +++ b/oox/source/ppt/dgmimport.cxx @@ -36,19 +36,19 @@ using namespace oox::core; namespace oox { namespace ppt { -OUString SAL_CALL QuickDiagrammingImport_getImplementationName() +OUString QuickDiagrammingImport_getImplementationName() { return OUString( "com.sun.star.comp.Impress.oox.QuickDiagrammingImport" ); } -uno::Sequence< OUString > SAL_CALL QuickDiagrammingImport_getSupportedServiceNames() +uno::Sequence< OUString > QuickDiagrammingImport_getSupportedServiceNames() { const OUString aServiceName = "com.sun.star.comp.ooxpptx.dgm.import"; const Sequence< OUString > aSeq( &aServiceName, 1 ); return aSeq; } -uno::Reference< uno::XInterface > SAL_CALL QuickDiagrammingImport_createInstance( const Reference< XComponentContext >& rxContext ) +uno::Reference< uno::XInterface > QuickDiagrammingImport_createInstance( const Reference< XComponentContext >& rxContext ) { return static_cast<cppu::OWeakObject*>(new QuickDiagrammingImport( rxContext )); } diff --git a/oox/source/ppt/dgmlayout.cxx b/oox/source/ppt/dgmlayout.cxx index 051af9c34104..c4ff54bcf492 100644 --- a/oox/source/ppt/dgmlayout.cxx +++ b/oox/source/ppt/dgmlayout.cxx @@ -43,19 +43,19 @@ using namespace ::oox::drawingml; namespace oox { namespace ppt { -OUString SAL_CALL QuickDiagrammingLayout_getImplementationName() +OUString QuickDiagrammingLayout_getImplementationName() { return OUString( "com.sun.star.comp.Impress.oox.QuickDiagrammingLayout" ); } -uno::Sequence< OUString > SAL_CALL QuickDiagrammingLayout_getSupportedServiceNames() +uno::Sequence< OUString > QuickDiagrammingLayout_getSupportedServiceNames() { const OUString aServiceName = "com.sun.star.comp.ooxpptx.dgm.layout"; const Sequence< OUString > aSeq( &aServiceName, 1 ); return aSeq; } -uno::Reference< uno::XInterface > SAL_CALL QuickDiagrammingLayout_createInstance( const Reference< XComponentContext >& rxContext ) +uno::Reference< uno::XInterface > QuickDiagrammingLayout_createInstance( const Reference< XComponentContext >& rxContext ) { return static_cast<cppu::OWeakObject*>(new QuickDiagrammingLayout( rxContext )); } diff --git a/oox/source/ppt/pptimport.cxx b/oox/source/ppt/pptimport.cxx index cd7e37fbf1d4..f8fb72526e06 100644 --- a/oox/source/ppt/pptimport.cxx +++ b/oox/source/ppt/pptimport.cxx @@ -52,12 +52,12 @@ using ::com::sun::star::lang::XComponent; namespace oox { namespace ppt { -OUString SAL_CALL PowerPointImport_getImplementationName() +OUString PowerPointImport_getImplementationName() { return OUString( "com.sun.star.comp.oox.ppt.PowerPointImport" ); } -uno::Sequence< OUString > SAL_CALL PowerPointImport_getSupportedServiceNames() +uno::Sequence< OUString > PowerPointImport_getSupportedServiceNames() { Sequence< OUString > aSeq( 2 ); aSeq[ 0 ] = "com.sun.star.document.ImportFilter"; @@ -65,7 +65,7 @@ uno::Sequence< OUString > SAL_CALL PowerPointImport_getSupportedServiceNames() return aSeq; } -uno::Reference< uno::XInterface > SAL_CALL PowerPointImport_createInstance( const Reference< XComponentContext >& rxContext ) +uno::Reference< uno::XInterface > PowerPointImport_createInstance( const Reference< XComponentContext >& rxContext ) { return static_cast< ::cppu::OWeakObject* >( new PowerPointImport( rxContext ) ); } diff --git a/oox/source/shape/ShapeContextHandler.cxx b/oox/source/shape/ShapeContextHandler.cxx index 019874b727be..b5e2f6dfc6e3 100644 --- a/oox/source/shape/ShapeContextHandler.cxx +++ b/oox/source/shape/ShapeContextHandler.cxx @@ -43,19 +43,19 @@ using namespace ::com::sun::star; using namespace core; using namespace drawingml; -OUString SAL_CALL ShapeContextHandler_getImplementationName() +OUString ShapeContextHandler_getImplementationName() { return OUString( "com.sun.star.comp.oox.ShapeContextHandler" ); } -uno::Sequence< OUString > SAL_CALL +uno::Sequence< OUString > ShapeContextHandler_getSupportedServiceNames() { uno::Sequence< OUString > s { "com.sun.star.xml.sax.FastShapeContextHandler" }; return s; } -uno::Reference< uno::XInterface > SAL_CALL +uno::Reference< uno::XInterface > ShapeContextHandler_createInstance( const uno::Reference< uno::XComponentContext > & context) { return static_cast< ::cppu::OWeakObject* >( new ShapeContextHandler(context) ); diff --git a/package/source/manifest/ManifestReader.cxx b/package/source/manifest/ManifestReader.cxx index 224766cdea7b..99849a54f533 100644 --- a/package/source/manifest/ManifestReader.cxx +++ b/package/source/manifest/ManifestReader.cxx @@ -79,7 +79,7 @@ Sequence< Sequence< PropertyValue > > SAL_CALL ManifestReader::readManifestSeque } // Component functions -Reference < XInterface > SAL_CALL ManifestReader_createInstance( Reference< XMultiServiceFactory > const & rServiceFactory ) +Reference < XInterface > ManifestReader_createInstance( Reference< XMultiServiceFactory > const & rServiceFactory ) { return *new ManifestReader( comphelper::getComponentContext(rServiceFactory) ); } diff --git a/package/source/manifest/ManifestWriter.cxx b/package/source/manifest/ManifestWriter.cxx index f475f05379f4..d349eaadeaa6 100644 --- a/package/source/manifest/ManifestWriter.cxx +++ b/package/source/manifest/ManifestWriter.cxx @@ -68,7 +68,7 @@ void SAL_CALL ManifestWriter::writeManifestSequence( const Reference< XOutputStr } // Component methods -Reference < XInterface > SAL_CALL ManifestWriter_createInstance( Reference< XMultiServiceFactory > const & rServiceFactory ) +Reference < XInterface > ManifestWriter_createInstance( Reference< XMultiServiceFactory > const & rServiceFactory ) { return *new ManifestWriter( comphelper::getComponentContext(rServiceFactory) ); } diff --git a/package/source/manifest/UnoRegister.cxx b/package/source/manifest/UnoRegister.cxx index 74149aa4038b..56b5ea47d038 100644 --- a/package/source/manifest/UnoRegister.cxx +++ b/package/source/manifest/UnoRegister.cxx @@ -39,7 +39,7 @@ using namespace ::com::sun::star::packages; * @param pRegistryKey registry data key to read and write component persistent data * @return a component factory (generic uno interface) */ -extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL package2_component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * package2_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) { void * pRet = nullptr; diff --git a/package/source/xstor/register.cxx b/package/source/xstor/register.cxx index 7f4e75ab1d9b..95490dd8865e 100644 --- a/package/source/xstor/register.cxx +++ b/package/source/xstor/register.cxx @@ -27,7 +27,7 @@ using namespace ::com::sun::star; extern "C" { -SAL_DLLPUBLIC_EXPORT void * SAL_CALL xstor_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) +SAL_DLLPUBLIC_EXPORT void * xstor_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) { void * pRet = nullptr; diff --git a/package/source/zippackage/ZipPackage.cxx b/package/source/zippackage/ZipPackage.cxx index ea2d7267e41c..9a762d445092 100644 --- a/package/source/zippackage/ZipPackage.cxx +++ b/package/source/zippackage/ZipPackage.cxx @@ -1604,7 +1604,7 @@ Sequence< ElementChange > SAL_CALL ZipPackage::getPendingChanges() * Function to create a new component instance; is needed by factory helper implementation. * @param xMgr service manager to if the components needs other component instances */ -uno::Reference < XInterface >SAL_CALL ZipPackage_createInstance( +uno::Reference < XInterface > ZipPackage_createInstance( const uno::Reference< XMultiServiceFactory > & xMgr ) { return uno::Reference< XInterface >( *new ZipPackage( comphelper::getComponentContext(xMgr) ) ); diff --git a/pyuno/inc/pyuno.hxx b/pyuno/inc/pyuno.hxx index 85c8ef9cdaff..e2d0c38de640 100644 --- a/pyuno/inc/pyuno.hxx +++ b/pyuno/inc/pyuno.hxx @@ -60,9 +60,9 @@ extern "C" LO_DLLPUBLIC_PYUNO #if PY_MAJOR_VERSION >= 3 - PyObject* SAL_CALL PyInit_pyuno(); + PyObject* PyInit_pyuno(); #else - void SAL_CALL initpyuno(); + void initpyuno(); #endif namespace pyuno diff --git a/pyuno/source/loader/pyuno_loader.cxx b/pyuno/source/loader/pyuno_loader.cxx index adbf6c88e098..437bac4eb455 100644 --- a/pyuno/source/loader/pyuno_loader.cxx +++ b/pyuno/source/loader/pyuno_loader.cxx @@ -273,7 +273,7 @@ static const struct cppu::ImplementationEntry g_entries[] = extern "C" { -SAL_DLLPUBLIC_EXPORT void * SAL_CALL pythonloader_component_getFactory( +SAL_DLLPUBLIC_EXPORT void * pythonloader_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { return cppu::component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , g_entries ); diff --git a/remotebridges/source/unourl_resolver/unourl_resolver.cxx b/remotebridges/source/unourl_resolver/unourl_resolver.cxx index 92019e5bac85..e753a4eb0bd9 100644 --- a/remotebridges/source/unourl_resolver/unourl_resolver.cxx +++ b/remotebridges/source/unourl_resolver/unourl_resolver.cxx @@ -129,7 +129,7 @@ Reference< XInterface > ResolverImpl::resolve( const OUString & rUnoUrl ) return xRet; } -static Reference< XInterface > SAL_CALL ResolverImpl_create( const Reference< XComponentContext > & xCtx ) +static Reference< XInterface > ResolverImpl_create( const Reference< XComponentContext > & xCtx ) { return Reference< XInterface >( *new ResolverImpl( xCtx ) ); } @@ -148,7 +148,7 @@ static const struct ImplementationEntry g_entries[] = { nullptr, nullptr, nullptr, nullptr, nullptr, 0 } }; -extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL uuresolver_component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * uuresolver_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , g_entries ); diff --git a/reportdesign/source/core/api/services.cxx b/reportdesign/source/core/api/services.cxx index 9b95f74627ad..745dea319d7e 100644 --- a/reportdesign/source/core/api/services.cxx +++ b/reportdesign/source/core/api/services.cxx @@ -66,7 +66,7 @@ cppu::ImplementationEntry entries[] = { extern "C" { -SAL_DLLPUBLIC_EXPORT void * SAL_CALL rpt_component_getFactory( +SAL_DLLPUBLIC_EXPORT void * rpt_component_getFactory( char const * implName, void * serviceManager, void * registryKey) { return cppu::component_getFactoryHelper( diff --git a/reportdesign/source/filter/xml/xmlservices.cxx b/reportdesign/source/filter/xml/xmlservices.cxx index 0fd09eea6058..33eda573f4b3 100644 --- a/reportdesign/source/filter/xml/xmlservices.cxx +++ b/reportdesign/source/filter/xml/xmlservices.cxx @@ -70,7 +70,7 @@ cppu::ImplementationEntry entries[] = { }; } -extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL rptxml_component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * rptxml_component_getFactory( char const * implName, void * serviceManager, void * registryKey) { return cppu::component_getFactoryHelper( diff --git a/reportdesign/source/ui/misc/rptuiservices.cxx b/reportdesign/source/ui/misc/rptuiservices.cxx index 0e62d8441e28..f5cc0b7c46d2 100644 --- a/reportdesign/source/ui/misc/rptuiservices.cxx +++ b/reportdesign/source/ui/misc/rptuiservices.cxx @@ -54,7 +54,7 @@ cppu::ImplementationEntry entries[] = { }; } -extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL rptui_component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * rptui_component_getFactory( char const * implName, void * serviceManager, void * registryKey) { return cppu::component_getFactoryHelper( diff --git a/sal/osl/all/compat.cxx b/sal/osl/all/compat.cxx index e562a853a951..dd47debea6ec 100644 --- a/sal/osl/all/compat.cxx +++ b/sal/osl/all/compat.cxx @@ -71,7 +71,7 @@ SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL osl_sendResourcePipe(oslPipe, oslSocket) } namespace { -typedef void (SAL_CALL * pfunc_osl_printDebugMessage)(char const *); +typedef void (* pfunc_osl_printDebugMessage)(char const *); } SAL_DLLPUBLIC_EXPORT pfunc_osl_printDebugMessage SAL_CALL osl_setDebugMessageFunc(pfunc_osl_printDebugMessage) { @@ -79,7 +79,7 @@ osl_setDebugMessageFunc(pfunc_osl_printDebugMessage) { } namespace { -typedef void (SAL_CALL * pfunc_osl_printDetailedDebugMessage)( +typedef void (* pfunc_osl_printDetailedDebugMessage)( char const *, sal_Int32, char const *); } SAL_DLLPUBLIC_EXPORT pfunc_osl_printDetailedDebugMessage SAL_CALL diff --git a/sal/osl/all/filepath.cxx b/sal/osl/all/filepath.cxx index 1b2bcace133f..7e8022f4f9e8 100644 --- a/sal/osl/all/filepath.cxx +++ b/sal/osl/all/filepath.cxx @@ -20,7 +20,7 @@ #include <osl/file.h> #include <rtl/ustring.h> -static sal_uInt32 SAL_CALL osl_defCalcTextWidth( rtl_uString *ustrText ) +static sal_uInt32 osl_defCalcTextWidth( rtl_uString *ustrText ) { return ustrText ? ustrText->length : 0; } diff --git a/sal/osl/unx/file_path_helper.cxx b/sal/osl/unx/file_path_helper.cxx index d042e5349aef..a5b5dd985511 100644 --- a/sal/osl/unx/file_path_helper.cxx +++ b/sal/osl/unx/file_path_helper.cxx @@ -37,7 +37,7 @@ inline const rtl::OUString FPH_LOCAL_DIR_ENTRY() inline const rtl::OUString FPH_PARENT_DIR_ENTRY() { return rtl::OUString(".."); } -void SAL_CALL osl_systemPathRemoveSeparator(rtl_uString* pustrPath) +void osl_systemPathRemoveSeparator(rtl_uString* pustrPath) { OSL_PRECOND(nullptr != pustrPath, "osl_systemPathRemoveSeparator: Invalid parameter"); if (pustrPath != nullptr) @@ -57,7 +57,7 @@ void SAL_CALL osl_systemPathRemoveSeparator(rtl_uString* pustrPath) } } -void SAL_CALL osl_systemPathEnsureSeparator(rtl_uString** ppustrPath) +void osl_systemPathEnsureSeparator(rtl_uString** ppustrPath) { OSL_PRECOND((nullptr != ppustrPath) && (nullptr != *ppustrPath), "osl_systemPathEnsureSeparator: Invalid parameter"); if ((ppustrPath != nullptr) && (*ppustrPath != nullptr)) @@ -78,13 +78,13 @@ void SAL_CALL osl_systemPathEnsureSeparator(rtl_uString** ppustrPath) } } -bool SAL_CALL osl_systemPathIsRelativePath(const rtl_uString* pustrPath) +bool osl_systemPathIsRelativePath(const rtl_uString* pustrPath) { OSL_PRECOND(nullptr != pustrPath, "osl_systemPathIsRelativePath: Invalid parameter"); return ((pustrPath == nullptr) || (pustrPath->length == 0) || (pustrPath->buffer[0] != FPH_CHAR_PATH_SEPARATOR)); } -void SAL_CALL osl_systemPathMakeAbsolutePath( +void osl_systemPathMakeAbsolutePath( const rtl_uString* pustrBasePath, const rtl_uString* pustrRelPath, rtl_uString** ppustrAbsolutePath) @@ -101,7 +101,7 @@ void SAL_CALL osl_systemPathMakeAbsolutePath( *ppustrAbsolutePath = base.pData; } -void SAL_CALL osl_systemPathGetFileNameOrLastDirectoryPart( +void osl_systemPathGetFileNameOrLastDirectoryPart( const rtl_uString* pustrPath, rtl_uString** ppustrFileNameOrLastDirPart) { @@ -123,7 +123,7 @@ void SAL_CALL osl_systemPathGetFileNameOrLastDirectoryPart( rtl_uString_assign(ppustrFileNameOrLastDirPart, last_part.pData); } -bool SAL_CALL osl_systemPathIsHiddenFileOrDirectoryEntry( +bool osl_systemPathIsHiddenFileOrDirectoryEntry( const rtl_uString* pustrPath) { OSL_PRECOND(nullptr != pustrPath, "osl_systemPathIsHiddenFileOrDirectoryEntry: Invalid parameter"); @@ -138,7 +138,7 @@ bool SAL_CALL osl_systemPathIsHiddenFileOrDirectoryEntry( !osl_systemPathIsLocalOrParentDirectoryEntry(fdp.pData)); } -bool SAL_CALL osl_systemPathIsLocalOrParentDirectoryEntry( +bool osl_systemPathIsLocalOrParentDirectoryEntry( const rtl_uString* pustrPath) { OSL_PRECOND(pustrPath, "osl_systemPathIsLocalOrParentDirectoryEntry: Invalid parameter"); @@ -218,7 +218,7 @@ private: const sal_Unicode* m_path_segment_end; }; -bool SAL_CALL osl_searchPath( +bool osl_searchPath( const rtl_uString* pustrFilePath, const rtl_uString* pustrSearchPathList, rtl_uString** ppustrPathFound) diff --git a/sal/osl/unx/file_path_helper.hxx b/sal/osl/unx/file_path_helper.hxx index 5639ce72563e..86c10ccabcf5 100644 --- a/sal/osl/unx/file_path_helper.hxx +++ b/sal/osl/unx/file_path_helper.hxx @@ -36,7 +36,7 @@ @returns nothing */ -void SAL_CALL osl_systemPathRemoveSeparator(rtl_uString* pustrPath); +void osl_systemPathRemoveSeparator(rtl_uString* pustrPath); /** Adds a trailing path separator to the given system path if not already there @@ -50,7 +50,7 @@ void SAL_CALL osl_systemPathRemoveSeparator(rtl_uString* pustrPath); @returns nothing */ -void SAL_CALL osl_systemPathEnsureSeparator(rtl_uString** ppustrPath); +void osl_systemPathEnsureSeparator(rtl_uString** ppustrPath); /** Returns true if the given path is a relative path and so starts not with '/' @@ -61,7 +61,7 @@ void SAL_CALL osl_systemPathEnsureSeparator(rtl_uString** ppustrPath); @retval sal_False the given path starts with a separator */ -bool SAL_CALL osl_systemPathIsRelativePath( +bool osl_systemPathIsRelativePath( const rtl_uString* pustrPath); /** @@ -83,7 +83,7 @@ bool SAL_CALL osl_systemPathIsRelativePath( NULL and *ppustrAbsolutePath must be 0 or point to a valid rtl_uString */ -void SAL_CALL osl_systemPathMakeAbsolutePath( +void osl_systemPathMakeAbsolutePath( const rtl_uString* pustrBasePath, const rtl_uString* pustrRelPath, rtl_uString** ppustrAbsolutePath); @@ -103,7 +103,7 @@ void SAL_CALL osl_systemPathMakeAbsolutePath( @returns nothing */ -void SAL_CALL osl_systemPathGetFileNameOrLastDirectoryPart( +void osl_systemPathGetFileNameOrLastDirectoryPart( const rtl_uString* pustrPath, rtl_uString** ppustrFileNameOrLastDirPart); @@ -115,7 +115,7 @@ void SAL_CALL osl_systemPathGetFileNameOrLastDirectoryPart( alone or doesn't start with a dot */ -bool SAL_CALL osl_systemPathIsHiddenFileOrDirectoryEntry( +bool osl_systemPathIsHiddenFileOrDirectoryEntry( const rtl_uString* pustrPath); /************************************************ @@ -133,7 +133,7 @@ bool SAL_CALL osl_systemPathIsHiddenFileOrDirectoryEntry( ************************************************/ -bool SAL_CALL osl_systemPathIsLocalOrParentDirectoryEntry( +bool osl_systemPathIsLocalOrParentDirectoryEntry( const rtl_uString* pustrPath); /************************************************ @@ -159,7 +159,7 @@ bool SAL_CALL osl_systemPathIsLocalOrParentDirectoryEntry( directory was found else sal_False ***********************************************/ -bool SAL_CALL osl_searchPath( +bool osl_searchPath( const rtl_uString* pustrFilePath, const rtl_uString* pustrSearchPathList, rtl_uString** ppustrPathFound); diff --git a/sal/osl/unx/pipe.cxx b/sal/osl/unx/pipe.cxx index e577e89608ba..f4eca10fbd08 100644 --- a/sal/osl/unx/pipe.cxx +++ b/sal/osl/unx/pipe.cxx @@ -39,7 +39,7 @@ #define PIPENAMEMASK "OSL_PIPE_%s" #define SECPIPENAMEMASK "OSL_PIPE_%s_%s" -oslPipe SAL_CALL osl_psz_createPipe(const sal_Char *pszPipeName, oslPipeOptions Options, oslSecurity Security); +oslPipe osl_psz_createPipe(const sal_Char *pszPipeName, oslPipeOptions Options, oslSecurity Security); static struct { @@ -158,7 +158,7 @@ cpyBootstrapSocketPath(sal_Char *name, size_t len) return bRet; } -oslPipe SAL_CALL osl_psz_createPipe(const sal_Char *pszPipeName, oslPipeOptions Options, +oslPipe osl_psz_createPipe(const sal_Char *pszPipeName, oslPipeOptions Options, oslSecurity Security) { int Flags; diff --git a/sal/osl/unx/process.cxx b/sal/osl/unx/process.cxx index 8f5578567d37..f65eb831c910 100644 --- a/sal/osl/unx/process.cxx +++ b/sal/osl/unx/process.cxx @@ -96,7 +96,7 @@ static oslMutex ChildListMutex; } //Anonymous namespace -oslProcessError SAL_CALL osl_psz_executeProcess(sal_Char *pszImageName, +oslProcessError osl_psz_executeProcess(sal_Char *pszImageName, sal_Char *pszArguments[], oslProcessOption Options, oslSecurity Security, @@ -565,7 +565,7 @@ oslProcessError SAL_CALL osl_executeProcess( ); } -oslProcessError SAL_CALL osl_psz_executeProcess(sal_Char *pszImageName, +oslProcessError osl_psz_executeProcess(sal_Char *pszImageName, sal_Char *pszArguments[], oslProcessOption Options, oslSecurity Security, diff --git a/sal/osl/unx/process_impl.cxx b/sal/osl/unx/process_impl.cxx index 494972b282fd..d4fd8b1d2aca 100644 --- a/sal/osl/unx/process_impl.cxx +++ b/sal/osl/unx/process_impl.cxx @@ -90,7 +90,7 @@ oslProcessError SAL_CALL bootstrap_getExecutableFile(rtl_uString ** ppFileURL) namespace { -oslProcessError SAL_CALL bootstrap_getExecutableFile(rtl_uString ** ppFileURL) +oslProcessError bootstrap_getExecutableFile(rtl_uString ** ppFileURL) { oslProcessError result = osl_Process_E_NotFound; diff --git a/sal/osl/unx/profile.cxx b/sal/osl/unx/profile.cxx index a3d029e94da2..fa44ea934e5f 100644 --- a/sal/osl/unx/profile.cxx +++ b/sal/osl/unx/profile.cxx @@ -130,7 +130,7 @@ static bool writeProfileImpl (osl_TFile* pFile); static osl_TFile* osl_openTmpProfileImpl(osl_TProfileImpl*); static bool osl_ProfileSwapProfileNames(osl_TProfileImpl*); static void osl_ProfileGenerateExtension(const sal_Char* pszFileName, const sal_Char* pszExtension, sal_Char* pszTmpName, int BufferMaxLen); -static oslProfile SAL_CALL osl_psz_openProfile(const sal_Char *pszProfileName, oslProfileOption Flags); +static oslProfile osl_psz_openProfile(const sal_Char *pszProfileName, oslProfileOption Flags); oslProfile SAL_CALL osl_openProfile(rtl_uString *ustrProfileName, oslProfileOption Options) { @@ -144,7 +144,7 @@ oslProfile SAL_CALL osl_openProfile(rtl_uString *ustrProfileName, oslProfileOpti : nullptr; } -static oslProfile SAL_CALL osl_psz_openProfile(const sal_Char *pszProfileName, oslProfileOption Flags) +static oslProfile osl_psz_openProfile(const sal_Char *pszProfileName, oslProfileOption Flags) { osl_TFile* pFile; osl_TProfileImpl* pProfile; diff --git a/sal/osl/unx/secimpl.hxx b/sal/osl/unx/secimpl.hxx index 3d3e2938657d..fda1c421c5db 100644 --- a/sal/osl/unx/secimpl.hxx +++ b/sal/osl/unx/secimpl.hxx @@ -27,7 +27,7 @@ struct oslSecurityImpl { char m_buffer[1]; /* should be a C99 flexible array member */ }; -bool SAL_CALL osl_psz_getUserIdent(oslSecurity Security, sal_Char *pszIdent, sal_uInt32 nMax); +bool osl_psz_getUserIdent(oslSecurity Security, sal_Char *pszIdent, sal_uInt32 nMax); #endif diff --git a/sal/osl/unx/security.cxx b/sal/osl/unx/security.cxx index 9370fe608cf9..d0d9ed7132b4 100644 --- a/sal/osl/unx/security.cxx +++ b/sal/osl/unx/security.cxx @@ -47,9 +47,9 @@ #define getpwuid_r(uid, pwd, buf, buflen, result) (*(result) = getpwuid(uid), (*(result) ? (memcpy (buf, *(result), sizeof (struct passwd)), 0) : errno)) #endif -static bool SAL_CALL osl_psz_getUserName(oslSecurity Security, sal_Char* pszName, sal_uInt32 nMax); -static bool SAL_CALL osl_psz_getHomeDir(oslSecurity Security, sal_Char* pszDirectory, sal_uInt32 nMax); -static bool SAL_CALL osl_psz_getConfigDir(oslSecurity Security, sal_Char* pszDirectory, sal_uInt32 nMax); +static bool osl_psz_getUserName(oslSecurity Security, sal_Char* pszName, sal_uInt32 nMax); +static bool osl_psz_getHomeDir(oslSecurity Security, sal_Char* pszDirectory, sal_uInt32 nMax); +static bool osl_psz_getConfigDir(oslSecurity Security, sal_Char* pszDirectory, sal_uInt32 nMax); static bool sysconf_SC_GETPW_R_SIZE_MAX(std::size_t * value) { #if defined _SC_GETPW_R_SIZE_MAX @@ -169,7 +169,7 @@ sal_Bool SAL_CALL osl_getUserIdent(oslSecurity Security, rtl_uString **ustrIdent return bRet; } -bool SAL_CALL osl_psz_getUserIdent(oslSecurity Security, sal_Char *pszIdent, sal_uInt32 nMax) +bool osl_psz_getUserIdent(oslSecurity Security, sal_Char *pszIdent, sal_uInt32 nMax) { sal_Char buffer[32]; sal_Int32 nChr; @@ -208,7 +208,7 @@ sal_Bool SAL_CALL osl_getShortUserName(oslSecurity Security, rtl_uString **ustrN return osl_getUserName(Security, ustrName); // No domain name on unix } -static bool SAL_CALL osl_psz_getUserName(oslSecurity Security, sal_Char* pszName, sal_uInt32 nMax) +static bool osl_psz_getUserName(oslSecurity Security, sal_Char* pszName, sal_uInt32 nMax) { oslSecurityImpl *pSecImpl = static_cast<oslSecurityImpl *>(Security); @@ -239,7 +239,7 @@ sal_Bool SAL_CALL osl_getHomeDir(oslSecurity Security, rtl_uString **pustrDirect return bRet; } -static bool SAL_CALL osl_psz_getHomeDir(oslSecurity Security, sal_Char* pszDirectory, sal_uInt32 nMax) +static bool osl_psz_getHomeDir(oslSecurity Security, sal_Char* pszDirectory, sal_uInt32 nMax) { oslSecurityImpl *pSecImpl = static_cast<oslSecurityImpl *>(Security); @@ -351,7 +351,7 @@ sal_Bool SAL_CALL osl_getConfigDir(oslSecurity Security, rtl_uString **pustrDire #define DOT_CONFIG "/.config" -static bool SAL_CALL osl_psz_getConfigDir(oslSecurity Security, sal_Char* pszDirectory, sal_uInt32 nMax) +static bool osl_psz_getConfigDir(oslSecurity Security, sal_Char* pszDirectory, sal_uInt32 nMax) { sal_Char *pStr = getenv("XDG_CONFIG_HOME"); diff --git a/sal/osl/unx/socket.cxx b/sal/osl/unx/socket.cxx index 3633ee5bfd6c..7f2a6a43a2ae 100644 --- a/sal/osl/unx/socket.cxx +++ b/sal/osl/unx/socket.cxx @@ -251,34 +251,34 @@ static oslSocketError osl_SocketErrorFromNative(int nativeType) #define ERROR_FROM_NATIVE(y) osl_SocketErrorFromNative(y) -oslSocketAddr SAL_CALL osl_psz_createInetSocketAddr ( +oslSocketAddr osl_psz_createInetSocketAddr ( const sal_Char* pszDottedAddr, sal_Int32 Port); -oslHostAddr SAL_CALL osl_psz_createHostAddr ( +oslHostAddr osl_psz_createHostAddr ( const sal_Char *pszHostname, const oslSocketAddr Addr); -oslHostAddr SAL_CALL osl_psz_createHostAddrByName ( +oslHostAddr osl_psz_createHostAddrByName ( const sal_Char *pszHostname); -const sal_Char* SAL_CALL osl_psz_getHostnameOfHostAddr ( +const sal_Char* osl_psz_getHostnameOfHostAddr ( const oslHostAddr Addr); -oslSocketResult SAL_CALL osl_psz_getLocalHostname ( +oslSocketResult osl_psz_getLocalHostname ( sal_Char *pBuffer, sal_uInt32 nBufLen); -oslSocketAddr SAL_CALL osl_psz_resolveHostname ( +oslSocketAddr osl_psz_resolveHostname ( const sal_Char* pszHostname); -sal_Int32 SAL_CALL osl_psz_getServicePort ( +sal_Int32 osl_psz_getServicePort ( const sal_Char* pszServicename, const sal_Char* pszProtocol); -oslSocketResult SAL_CALL osl_psz_getHostnameOfSocketAddr ( +oslSocketResult osl_psz_getHostnameOfSocketAddr ( oslSocketAddr Addr, sal_Char *pBuffer, sal_uInt32 BufferSize); -oslSocketResult SAL_CALL osl_psz_getDottedInetAddrOfSocketAddr ( +oslSocketResult osl_psz_getDottedInetAddrOfSocketAddr ( oslSocketAddr Addr, sal_Char *pBuffer, sal_uInt32 BufferSize); -void SAL_CALL osl_psz_getLastSocketErrorDescription ( +void osl_psz_getLastSocketErrorDescription ( oslSocket Socket, sal_Char* pBuffer, sal_uInt32 BufferSize); static oslSocket createSocketImpl(int Socket) @@ -498,7 +498,7 @@ oslSocketAddr SAL_CALL osl_createInetSocketAddr ( return Addr; } -oslSocketAddr SAL_CALL osl_psz_createInetSocketAddr ( +oslSocketAddr osl_psz_createInetSocketAddr ( const sal_Char* pszDottedAddr, sal_Int32 Port) { @@ -706,7 +706,7 @@ oslHostAddr SAL_CALL osl_createHostAddr ( return HostAddr; } -oslHostAddr SAL_CALL osl_psz_createHostAddr ( +oslHostAddr osl_psz_createHostAddr ( const sal_Char *pszHostname, const oslSocketAddr pAddr) { @@ -763,7 +763,7 @@ oslHostAddr SAL_CALL osl_createHostAddrByName(rtl_uString *ustrHostname) return HostAddr; } -oslHostAddr SAL_CALL osl_psz_createHostAddrByName (const sal_Char *pszHostname) +oslHostAddr osl_psz_createHostAddrByName (const sal_Char *pszHostname) { struct hostent aHe; struct hostent *pHe; @@ -850,7 +850,7 @@ void SAL_CALL osl_getHostnameOfHostAddr ( rtl_uString_newFromAscii (ustrHostname, pHostname); } -const sal_Char* SAL_CALL osl_psz_getHostnameOfHostAddr (const oslHostAddr pAddr) +const sal_Char* osl_psz_getHostnameOfHostAddr (const oslHostAddr pAddr) { if (pAddr) return pAddr->pHostName; @@ -892,7 +892,7 @@ oslSocketResult SAL_CALL osl_getLocalHostname(rtl_uString **ustrLocalHostname) return Result; } -oslSocketResult SAL_CALL osl_psz_getLocalHostname ( +oslSocketResult osl_psz_getLocalHostname ( sal_Char *pBuffer, sal_uInt32 nBufLen) { static sal_Char LocalHostname[256] = ""; @@ -971,7 +971,7 @@ oslSocketAddr SAL_CALL osl_resolveHostname(rtl_uString *ustrHostname) return Addr; } -oslSocketAddr SAL_CALL osl_psz_resolveHostname(const sal_Char* pszHostname) +oslSocketAddr osl_psz_resolveHostname(const sal_Char* pszHostname) { struct oslHostAddrImpl *pAddr = osl_psz_createHostAddrByName(pszHostname); @@ -1030,7 +1030,7 @@ sal_Int32 SAL_CALL osl_getServicePort(rtl_uString *ustrServicename, rtl_uString return nPort; } -sal_Int32 SAL_CALL osl_psz_getServicePort(const sal_Char* pszServicename, +sal_Int32 osl_psz_getServicePort(const sal_Char* pszServicename, const sal_Char* pszProtocol) { struct servent* ps; @@ -1105,7 +1105,7 @@ oslSocketResult SAL_CALL osl_getHostnameOfSocketAddr(oslSocketAddr Addr, rtl_uSt return Result; } -oslSocketResult SAL_CALL osl_psz_getHostnameOfSocketAddr(oslSocketAddr pAddr, +oslSocketResult osl_psz_getHostnameOfSocketAddr(oslSocketAddr pAddr, sal_Char *pBuffer, sal_uInt32 BufferSize) { oslHostAddr pHostAddr= osl_createHostAddrByAddr(pAddr); @@ -1138,7 +1138,7 @@ oslSocketResult SAL_CALL osl_getDottedInetAddrOfSocketAddr(oslSocketAddr Addr, r } -oslSocketResult SAL_CALL osl_psz_getDottedInetAddrOfSocketAddr(oslSocketAddr pAddr, +oslSocketResult osl_psz_getDottedInetAddrOfSocketAddr(oslSocketAddr pAddr, sal_Char *pBuffer, sal_uInt32 BufferSize) { SAL_WARN_IF( !pAddr, "sal.osl", "undefined address" ); @@ -2146,7 +2146,7 @@ void SAL_CALL osl_getLastSocketErrorDescription(oslSocket Socket, rtl_uString ** rtl_uString_newFromAscii(ustrError,pszError); } -void SAL_CALL osl_psz_getLastSocketErrorDescription(oslSocket pSocket, sal_Char* pBuffer, sal_uInt32 BufferSize) +void osl_psz_getLastSocketErrorDescription(oslSocket pSocket, sal_Char* pBuffer, sal_uInt32 BufferSize) { /* make sure pBuffer will be a zero-terminated string even when strncpy has to cut */ pBuffer[BufferSize-1]= '\0'; diff --git a/sal/qa/osl/module/osl_Module_DLL.cxx b/sal/qa/osl/module/osl_Module_DLL.cxx index 0b22d7a3c4ad..b8d4885969cb 100644 --- a/sal/qa/osl/module/osl_Module_DLL.cxx +++ b/sal/qa/osl/module/osl_Module_DLL.cxx @@ -27,7 +27,7 @@ // But we instantiate a test plugin to fake the build process. CPPUNIT_PLUGIN_IMPLEMENT(); -extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL firstfunc( sal_Bool ) +extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool firstfunc( sal_Bool ) { return true; } diff --git a/sal/qa/osl/process/osl_Thread.cxx b/sal/qa/osl/process/osl_Thread.cxx index c6c016afb7e4..ae23a9ef41a0 100644 --- a/sal/qa/osl/process/osl_Thread.cxx +++ b/sal/qa/osl/process/osl_Thread.cxx @@ -1696,7 +1696,7 @@ namespace osl_Thread } // namespace osl_Thread // destroy function when the binding thread terminate -void SAL_CALL destroyCallback(void * data) +void destroyCallback(void * data) { delete[] static_cast<char *>(data); } diff --git a/sal/rtl/alloc_arena.cxx b/sal/rtl/alloc_arena.cxx index 8f9c64e0919e..ba28f6f532f0 100644 --- a/sal/rtl/alloc_arena.cxx +++ b/sal/rtl/alloc_arena.cxx @@ -58,12 +58,12 @@ rtl_arena_type * gp_default_arena = nullptr; namespace { -void * SAL_CALL rtl_machdep_alloc( +void * rtl_machdep_alloc( rtl_arena_type * pArena, sal_Size * pSize ); -void SAL_CALL rtl_machdep_free( +void rtl_machdep_free( rtl_arena_type * pArena, void * pAddr, sal_Size nSize @@ -999,7 +999,7 @@ void SAL_CALL rtl_arena_free ( namespace { -void * SAL_CALL rtl_machdep_alloc( +void * rtl_machdep_alloc( rtl_arena_type * pArena, sal_Size * pSize ) @@ -1049,7 +1049,7 @@ void * SAL_CALL rtl_machdep_alloc( return nullptr; } -void SAL_CALL rtl_machdep_free( +void rtl_machdep_free( rtl_arena_type * pArena, void * pAddr, sal_Size nSize diff --git a/sal/rtl/alloc_global.cxx b/sal/rtl/alloc_global.cxx index 47643f3ea74a..25e2c1ea78b6 100644 --- a/sal/rtl/alloc_global.cxx +++ b/sal/rtl/alloc_global.cxx @@ -72,7 +72,7 @@ static rtl_cache_type * g_alloc_table[RTL_MEMORY_CACHED_LIMIT >> RTL_MEMALIGN_SH static rtl_arena_type * gp_alloc_arena = nullptr; -void * SAL_CALL rtl_allocateMemory_CUSTOM(sal_Size n) SAL_THROW_EXTERN_C() +void * rtl_allocateMemory_CUSTOM(sal_Size n) SAL_THROW_EXTERN_C() { void * p = nullptr; if (n > 0) @@ -111,7 +111,7 @@ try_alloc: return p; } -void SAL_CALL rtl_freeMemory_CUSTOM (void * p) SAL_THROW_EXTERN_C() +void rtl_freeMemory_CUSTOM (void * p) SAL_THROW_EXTERN_C() { if (p) { @@ -125,7 +125,7 @@ void SAL_CALL rtl_freeMemory_CUSTOM (void * p) SAL_THROW_EXTERN_C() } } -void * SAL_CALL rtl_reallocateMemory_CUSTOM (void * p, sal_Size n) SAL_THROW_EXTERN_C() +void * rtl_reallocateMemory_CUSTOM (void * p, sal_Size n) SAL_THROW_EXTERN_C() { if (n > 0) { @@ -226,17 +226,17 @@ void rtl_memory_fini() #endif } -void * SAL_CALL rtl_allocateMemory_SYSTEM(sal_Size n) +void * rtl_allocateMemory_SYSTEM(sal_Size n) { return malloc (n); } -void SAL_CALL rtl_freeMemory_SYSTEM(void * p) +void rtl_freeMemory_SYSTEM(void * p) { free (p); } -void * SAL_CALL rtl_reallocateMemory_SYSTEM(void * p, sal_Size n) +void * rtl_reallocateMemory_SYSTEM(void * p, sal_Size n) { return realloc (p, n); } diff --git a/sal/rtl/cipher.cxx b/sal/rtl/cipher.cxx index 80e096f5a3a1..735b2eb0d1c0 100644 --- a/sal/rtl/cipher.cxx +++ b/sal/rtl/cipher.cxx @@ -82,18 +82,18 @@ } \ } -typedef rtlCipherError(SAL_CALL cipher_init_t) ( +typedef rtlCipherError(cipher_init_t) ( rtlCipher Cipher, rtlCipherDirection Direction, const sal_uInt8 *pKeyData, sal_Size nKeyLen, const sal_uInt8 *pArgData, sal_Size nArgLen); -typedef rtlCipherError(SAL_CALL cipher_update_t) ( +typedef rtlCipherError(cipher_update_t) ( rtlCipher Cipher, const void *pData, sal_Size nDatLen, sal_uInt8 *pBuffer, sal_Size nBufLen); -typedef void (SAL_CALL cipher_delete_t) (rtlCipher Cipher); +typedef void (cipher_delete_t) (rtlCipher Cipher); struct Cipher_Impl { diff --git a/sal/rtl/digest.cxx b/sal/rtl/digest.cxx index 85d7357ef6fc..4d4fb59ce3f4 100644 --- a/sal/rtl/digest.cxx +++ b/sal/rtl/digest.cxx @@ -40,15 +40,15 @@ *((c)++) = (sal_uInt8)(((l) >> 16) & 0xff), \ *((c)++) = (sal_uInt8)(((l) >> 24) & 0xff)) -typedef rtlDigestError (SAL_CALL Digest_init_t) ( +typedef rtlDigestError (Digest_init_t) ( void *ctx, const sal_uInt8 *Data, sal_uInt32 DatLen); -typedef void (SAL_CALL Digest_delete_t) (void *ctx); +typedef void (Digest_delete_t) (void *ctx); -typedef rtlDigestError (SAL_CALL Digest_update_t) ( +typedef rtlDigestError (Digest_update_t) ( void *ctx, const void *Data, sal_uInt32 DatLen); -typedef rtlDigestError (SAL_CALL Digest_get_t) ( +typedef rtlDigestError (Digest_get_t) ( void *ctx, sal_uInt8 *Buffer, sal_uInt32 BufLen); struct Digest_Impl diff --git a/sal/rtl/string.cxx b/sal/rtl/string.cxx index 8dbcee763a95..c7a868cb9957 100644 --- a/sal/rtl/string.cxx +++ b/sal/rtl/string.cxx @@ -189,7 +189,7 @@ static int rtl_ImplGetFastUTF8ByteLen( const sal_Unicode* pStr, sal_Int32 nLen ) /* ----------------------------------------------------------------------- */ -bool SAL_CALL rtl_impl_convertUStringToString(rtl_String ** pTarget, +bool rtl_impl_convertUStringToString(rtl_String ** pTarget, sal_Unicode const * pSource, sal_Int32 nLength, rtl_TextEncoding nEncoding, diff --git a/sal/textenc/textenc.cxx b/sal/textenc/textenc.cxx index 322a7c2b672e..ded8815a4e97 100644 --- a/sal/textenc/textenc.cxx +++ b/sal/textenc/textenc.cxx @@ -374,7 +374,7 @@ extern "C" { typedef ImplTextEncodingData const * TextEncodingFunction(rtl_TextEncoding); -void SAL_CALL thisModule() {} +void thisModule() {} }; diff --git a/salhelper/source/dynload.cxx b/salhelper/source/dynload.cxx index 7c9c9ce55612..b3a9e00322ae 100644 --- a/salhelper/source/dynload.cxx +++ b/salhelper/source/dynload.cxx @@ -23,7 +23,7 @@ namespace salhelper { -typedef void* (SAL_CALL *ApiInitFunction) (void); +typedef void* (*ApiInitFunction) (void); ORealDynamicLoader::ORealDynamicLoader(ORealDynamicLoader ** ppSetToZeroInDestructor_, const rtl::OUString& moduleName, diff --git a/salhelper/test/Symbols/samplelib.hxx b/salhelper/test/Symbols/samplelib.hxx index e2d956591bb5..d1213f6dea8b 100644 --- a/salhelper/test/Symbols/samplelib.hxx +++ b/salhelper/test/Symbols/samplelib.hxx @@ -24,18 +24,18 @@ struct SampleLib_Api { - sal_Int32 (SAL_CALL *funcA)( sal_Int32 ); - double (SAL_CALL *funcB)( double ); + sal_Int32 (*funcA)( sal_Int32 ); + double (*funcB)( double ); }; -typedef SampleLib_Api* (SAL_CALL *InitSampleLib_Api)(void); +typedef SampleLib_Api* (*InitSampleLib_Api)(void); #define SAMPLELIB_INIT_FUNCTION_NAME "initSampleLibApi" -sal_Int32 SAL_CALL funcA( sal_Int32 a); -double SAL_CALL funcB( double a); +sal_Int32 funcA( sal_Int32 a); +double funcB( double a); #endif diff --git a/salhelper/test/dynamicloader/samplelib.hxx b/salhelper/test/dynamicloader/samplelib.hxx index 06088646c1c4..7b65a0ceb182 100644 --- a/salhelper/test/dynamicloader/samplelib.hxx +++ b/salhelper/test/dynamicloader/samplelib.hxx @@ -24,12 +24,12 @@ struct SampleLib_Api { - sal_Int32 (SAL_CALL *funcA)( sal_Int32 ); - double (SAL_CALL *funcB)( double ); + sal_Int32 (*funcA)( sal_Int32 ); + double (*funcB)( double ); }; -typedef SampleLib_Api* (SAL_CALL *InitSampleLib_Api)(void); +typedef SampleLib_Api* (*InitSampleLib_Api)(void); #define SAMPLELIB_INIT_FUNCTION_NAME "initSampleLibApi" diff --git a/sax/source/expatwrap/sax_expat.cxx b/sax/source/expatwrap/sax_expat.cxx index 2c8466646c53..82f0e8d8210f 100644 --- a/sax/source/expatwrap/sax_expat.cxx +++ b/sax/source/expatwrap/sax_expat.cxx @@ -952,7 +952,7 @@ void SaxExpatParser_Impl::callbackEndCDATA( void *pvThis ) } // namespace -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_extensions_xml_sax_ParserExpat_get_implementation( css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) diff --git a/sax/source/expatwrap/saxwriter.cxx b/sax/source/expatwrap/saxwriter.cxx index 58d8591e7a27..f84a7301dcfe 100644 --- a/sax/source/expatwrap/saxwriter.cxx +++ b/sax/source/expatwrap/saxwriter.cxx @@ -1374,7 +1374,7 @@ void SAXWriter::unknown(const OUString& sString) } // namespace -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_extensions_xml_sax_Writer_get_implementation( css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) diff --git a/sax/source/fastparser/fastparser.cxx b/sax/source/fastparser/fastparser.cxx index 1aa8811366ea..0a2753cad4e2 100644 --- a/sax/source/fastparser/fastparser.cxx +++ b/sax/source/fastparser/fastparser.cxx @@ -1364,7 +1364,7 @@ uno::Sequence<OUString> FastSaxParser::getSupportedServiceNames() } // namespace sax_fastparser -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_extensions_xml_sax_FastParser_get_implementation( css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) diff --git a/sax/source/fastparser/legacyfastparser.cxx b/sax/source/fastparser/legacyfastparser.cxx index f7b41fea8817..458e91b2af89 100644 --- a/sax/source/fastparser/legacyfastparser.cxx +++ b/sax/source/fastparser/legacyfastparser.cxx @@ -379,7 +379,7 @@ Sequence< OUString > SaxLegacyFastParser::getSupportedServiceNames() } //namespace -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_extensions_xml_sax_LegacyFastParser_get_implementation( css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) diff --git a/sc/inc/appluno.hxx b/sc/inc/appluno.hxx index 8ae79b293bbd..58ec1563319c 100644 --- a/sc/inc/appluno.hxx +++ b/sc/inc/appluno.hxx @@ -33,7 +33,7 @@ #include <rtl/ustring.hxx> #include <sfx2/sfxmodelfactory.hxx> -css::uno::Reference<css::uno::XInterface> SAL_CALL +css::uno::Reference<css::uno::XInterface> ScSpreadsheetSettings_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory>& rSMgr ); css::uno::Reference<css::uno::XInterface> SAL_CALL @@ -44,37 +44,37 @@ css::uno::Reference<css::uno::XInterface> SAL_CALL const css::uno::Reference< css::lang::XMultiServiceFactory>& rSMgr ); // Calc document -css::uno::Sequence< OUString > SAL_CALL ScDocument_getSupportedServiceNames() throw(); -OUString SAL_CALL ScDocument_getImplementationName() throw(); +css::uno::Sequence< OUString > ScDocument_getSupportedServiceNames() throw(); +OUString ScDocument_getImplementationName() throw(); /// @throws css::uno::Exception -css::uno::Reference< css::uno::XInterface > SAL_CALL ScDocument_createInstance( +css::uno::Reference< css::uno::XInterface > ScDocument_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr, SfxModelFlags _nCreationFlags ); // Calc XML import -css::uno::Sequence< OUString > SAL_CALL ScXMLImport_getSupportedServiceNames() throw(); -OUString SAL_CALL ScXMLImport_getImplementationName() throw(); +css::uno::Sequence< OUString > ScXMLImport_getSupportedServiceNames() throw(); +OUString ScXMLImport_getImplementationName() throw(); /// @throws css::uno::Exception -css::uno::Reference< css::uno::XInterface > SAL_CALL ScXMLImport_createInstance( +css::uno::Reference< css::uno::XInterface > ScXMLImport_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr ); -css::uno::Sequence< OUString > SAL_CALL ScXMLImport_Meta_getSupportedServiceNames() throw(); -OUString SAL_CALL ScXMLImport_Meta_getImplementationName() throw(); +css::uno::Sequence< OUString > ScXMLImport_Meta_getSupportedServiceNames() throw(); +OUString ScXMLImport_Meta_getImplementationName() throw(); /// @throws css::uno::Exception -css::uno::Reference< css::uno::XInterface > SAL_CALL ScXMLImport_Meta_createInstance( +css::uno::Reference< css::uno::XInterface > ScXMLImport_Meta_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr ); -css::uno::Sequence< OUString > SAL_CALL ScXMLImport_Styles_getSupportedServiceNames() throw(); -OUString SAL_CALL ScXMLImport_Styles_getImplementationName() throw(); +css::uno::Sequence< OUString > ScXMLImport_Styles_getSupportedServiceNames() throw(); +OUString ScXMLImport_Styles_getImplementationName() throw(); /// @throws css::uno::Exception -css::uno::Reference< css::uno::XInterface > SAL_CALL ScXMLImport_Styles_createInstance( +css::uno::Reference< css::uno::XInterface > ScXMLImport_Styles_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr ); -css::uno::Sequence< OUString > SAL_CALL ScXMLImport_Content_getSupportedServiceNames() throw(); -OUString SAL_CALL ScXMLImport_Content_getImplementationName() throw(); +css::uno::Sequence< OUString > ScXMLImport_Content_getSupportedServiceNames() throw(); +OUString ScXMLImport_Content_getImplementationName() throw(); /// @throws css::uno::Exception -css::uno::Reference< css::uno::XInterface > SAL_CALL ScXMLImport_Content_createInstance( +css::uno::Reference< css::uno::XInterface > ScXMLImport_Content_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr ); -css::uno::Sequence< OUString > SAL_CALL ScXMLImport_Settings_getSupportedServiceNames() throw(); -OUString SAL_CALL ScXMLImport_Settings_getImplementationName() throw(); +css::uno::Sequence< OUString > ScXMLImport_Settings_getSupportedServiceNames() throw(); +OUString ScXMLImport_Settings_getImplementationName() throw(); /// @throws css::uno::Exception -css::uno::Reference< css::uno::XInterface > SAL_CALL ScXMLImport_Settings_createInstance( +css::uno::Reference< css::uno::XInterface > ScXMLImport_Settings_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr ); class ScSpreadsheetSettings : public cppu::WeakImplHelper< diff --git a/sc/inc/filter.hxx b/sc/inc/filter.hxx index 56e25f55b6e9..0af471c6440d 100644 --- a/sc/inc/filter.hxx +++ b/sc/inc/filter.hxx @@ -92,7 +92,7 @@ protected: // scfilt plugin symbol extern "C" { - SAL_DLLPUBLIC_EXPORT ScFormatFilterPlugin * SAL_CALL ScFilterCreate(); + SAL_DLLPUBLIC_EXPORT ScFormatFilterPlugin * ScFilterCreate(); } class ScFormatFilter { diff --git a/sc/inc/rangelst.hxx b/sc/inc/rangelst.hxx index d9f4067a3899..2071e8a66ff1 100644 --- a/sc/inc/rangelst.hxx +++ b/sc/inc/rangelst.hxx @@ -152,7 +152,7 @@ private: typedef tools::SvRef<ScRangePairList> ScRangePairListRef; extern "C" -int SAL_CALL ScRangePairList_QsortNameCompare( const void*, const void* ); +int ScRangePairList_QsortNameCompare( const void*, const void* ); #endif diff --git a/sc/inc/rangenam.hxx b/sc/inc/rangenam.hxx index b9fae7492d95..fb0335768eeb 100644 --- a/sc/inc/rangenam.hxx +++ b/sc/inc/rangenam.hxx @@ -189,7 +189,7 @@ inline bool ScRangeData::HasType( Type nType ) const return ( ( eType & nType ) == nType ); } -extern "C" int SAL_CALL ScRangeData_QsortNameCompare( const void*, const void* ); +extern "C" int ScRangeData_QsortNameCompare( const void*, const void* ); class ScRangeName { diff --git a/sc/source/core/tool/rangelst.cxx b/sc/source/core/tool/rangelst.cxx index 8f976819bd5b..bd2217556644 100644 --- a/sc/source/core/tool/rangelst.cxx +++ b/sc/source/core/tool/rangelst.cxx @@ -1353,7 +1353,7 @@ struct ScRangePairNameSort }; extern "C" -int SAL_CALL ScRangePairList_QsortNameCompare( const void* p1, const void* p2 ) +int ScRangePairList_QsortNameCompare( const void* p1, const void* p2 ) { const ScRangePairNameSort* ps1 = static_cast<const ScRangePairNameSort*>(p1); const ScRangePairNameSort* ps2 = static_cast<const ScRangePairNameSort*>(p2); diff --git a/sc/source/core/tool/rangenam.cxx b/sc/source/core/tool/rangenam.cxx index de12cc15cf6c..fd7de4b83fa5 100644 --- a/sc/source/core/tool/rangenam.cxx +++ b/sc/source/core/tool/rangenam.cxx @@ -639,7 +639,7 @@ void ScRangeData::InitCode() } extern "C" -int SAL_CALL ScRangeData_QsortNameCompare( const void* p1, const void* p2 ) +int ScRangeData_QsortNameCompare( const void* p1, const void* p2 ) { return (int) ScGlobal::GetCollator()->compareString( (*static_cast<const ScRangeData* const *>(p1))->GetName(), diff --git a/sc/source/filter/excel/excel.cxx b/sc/source/filter/excel/excel.cxx index 536207f2e00a..309179b69b6a 100644 --- a/sc/source/filter/excel/excel.cxx +++ b/sc/source/filter/excel/excel.cxx @@ -222,7 +222,7 @@ ErrCode ScFormatFilterPluginImpl::ScExportExcel5( SfxMedium& rMedium, ScDocument return eRet; } -extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportQPW(SvStream &rStream) +extern "C" SAL_DLLPUBLIC_EXPORT bool TestImportQPW(SvStream &rStream) { ScDLL::Init(); ScDocument aDocument; @@ -234,7 +234,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportQPW(SvStream &rStream) return ScFormatFilter::Get().ScImportQuattroPro(&rStream, &aDocument) == ERRCODE_NONE; } -extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportCalcRTF(SvStream &rStream) +extern "C" SAL_DLLPUBLIC_EXPORT bool TestImportCalcRTF(SvStream &rStream) { ScDLL::Init(); ScDocument aDocument; @@ -247,7 +247,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportCalcRTF(SvStream &rStrea return ScFormatFilter::Get().ScImportRTF(rStream, OUString(), &aDocument, aRange) == ERRCODE_NONE; } -extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportXLS(SvStream& rStream) +extern "C" SAL_DLLPUBLIC_EXPORT bool TestImportXLS(SvStream& rStream) { ScDLL::Init(); SfxMedium aMedium; @@ -281,7 +281,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportXLS(SvStream& rStream) return bRet; } -extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportWKS(SvStream& rStream) +extern "C" SAL_DLLPUBLIC_EXPORT bool TestImportWKS(SvStream& rStream) { ScDLL::Init(); SfxMedium aMedium; @@ -296,7 +296,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportWKS(SvStream& rStream) return ScFormatFilter::Get().ScImportLotus123(aMedium, &aDocument, RTL_TEXTENCODING_ASCII_US) == ERRCODE_NONE; } -extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportDIF(SvStream &rStream) +extern "C" SAL_DLLPUBLIC_EXPORT bool TestImportDIF(SvStream &rStream) { ScDLL::Init(); ScDocument aDocument; diff --git a/sc/source/filter/ftools/ftools.cxx b/sc/source/filter/ftools/ftools.cxx index 28a9a7ce539d..525b2eacebb2 100644 --- a/sc/source/filter/ftools/ftools.cxx +++ b/sc/source/filter/ftools/ftools.cxx @@ -358,7 +358,7 @@ ScOrcusFilters* ScFormatFilterPluginImpl::GetOrcusFilters() return &aImpl; } -ScFormatFilterPlugin * SAL_CALL ScFilterCreate() +ScFormatFilterPlugin * ScFilterCreate() { return new ScFormatFilterPluginImpl(); } diff --git a/sc/source/filter/oox/excelfilter.cxx b/sc/source/filter/oox/excelfilter.cxx index 171f5ff67cf7..989befcb6b51 100644 --- a/sc/source/filter/oox/excelfilter.cxx +++ b/sc/source/filter/oox/excelfilter.cxx @@ -183,7 +183,7 @@ OUString ExcelFilter::getImplementationName() } // namespace oox -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_comp_oox_xls_ExcelFilter_get_implementation(css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const &) { diff --git a/sc/source/filter/oox/ooxformulaparser.cxx b/sc/source/filter/oox/ooxformulaparser.cxx index 16a526dc3b12..639a9bf63900 100644 --- a/sc/source/filter/oox/ooxformulaparser.cxx +++ b/sc/source/filter/oox/ooxformulaparser.cxx @@ -166,7 +166,7 @@ OUString SAL_CALL OOXMLFormulaParser::printFormula( } // namespace oox -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_comp_oox_xls_FormulaParser_get_implementation(css::uno::XComponentContext*, css::uno::Sequence<css::uno::Any> const &) { diff --git a/sc/source/filter/orcus/filterdetect.cxx b/sc/source/filter/orcus/filterdetect.cxx index 861c351f0611..137585384e48 100644 --- a/sc/source/filter/orcus/filterdetect.cxx +++ b/sc/source/filter/orcus/filterdetect.cxx @@ -88,7 +88,7 @@ OUString OrcusFormatDetect::detect(css::uno::Sequence<css::beans::PropertyValue> } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_comp_sc_OrcusFormatDetect_get_implementation(css::uno::XComponentContext* , css::uno::Sequence<css::uno::Any> const &) { diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx index 294956f91daf..0781246233e7 100644 --- a/sc/source/filter/xml/xmlexprt.cxx +++ b/sc/source/filter/xml/xmlexprt.cxx @@ -242,61 +242,61 @@ OUString lcl_GetFormattedString(ScDocument* pDoc, ScRefCellValue& rCell, const S } // anonymous namespace -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* Calc_XMLExporter_get_implementation(css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new ScXMLExport(context, "com.sun.star.comp.Calc.XMLExporter", SvXMLExportFlags::ALL)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* Calc_XMLMetaExporter_get_implementation(css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new ScXMLExport(context, "com.sun.star.comp.Calc.XMLMetaExporter", SvXMLExportFlags::META)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* Calc_XMLStylesExporter_get_implementation(css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new ScXMLExport(context, "com.sun.star.comp.Calc.XMLStylesExporter", SvXMLExportFlags::STYLES|SvXMLExportFlags::MASTERSTYLES|SvXMLExportFlags::AUTOSTYLES|SvXMLExportFlags::FONTDECLS)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* Calc_XMLContentExporter_get_implementation(css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new ScXMLExport(context, "com.sun.star.comp.Calc.XMLContentExporter", SvXMLExportFlags::AUTOSTYLES|SvXMLExportFlags::CONTENT|SvXMLExportFlags::SCRIPTS|SvXMLExportFlags::FONTDECLS)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* Calc_XMLSettingsExporter_get_implementation(css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new ScXMLExport(context, "com.sun.star.comp.Calc.XMLSettingsExporter", SvXMLExportFlags::SETTINGS)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* Calc_XMLOasisExporter_get_implementation(css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new ScXMLExport(context, "com.sun.star.comp.Calc.XMLOasisExporter", SvXMLExportFlags::ALL|SvXMLExportFlags::OASIS)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* Calc_XMLOasisMetaExporter_get_implementation(css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new ScXMLExport(context, "com.sun.star.comp.Calc.XMLOasisMetaExporter", SvXMLExportFlags::META|SvXMLExportFlags::OASIS)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* Calc_XMLOasisStylesExporter_get_implementation(css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new ScXMLExport(context, "com.sun.star.comp.Calc.XMLOasisStylesExporter", SvXMLExportFlags::STYLES|SvXMLExportFlags::MASTERSTYLES|SvXMLExportFlags::AUTOSTYLES|SvXMLExportFlags::FONTDECLS|SvXMLExportFlags::OASIS)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* Calc_XMLOasisContentExporter_get_implementation(css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new ScXMLExport(context, "com.sun.star.comp.Calc.XMLOasisContentExporter", SvXMLExportFlags::AUTOSTYLES|SvXMLExportFlags::CONTENT|SvXMLExportFlags::SCRIPTS|SvXMLExportFlags::FONTDECLS|SvXMLExportFlags::OASIS)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* Calc_XMLOasisSettingsExporter_get_implementation(css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new ScXMLExport(context, "com.sun.star.comp.Calc.XMLOasisSettingsExporter", SvXMLExportFlags::SETTINGS|SvXMLExportFlags::OASIS)); diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx index b3f464b1def2..91ebc28bd1cb 100644 --- a/sc/source/filter/xml/xmlimprt.cxx +++ b/sc/source/filter/xml/xmlimprt.cxx @@ -107,90 +107,90 @@ using namespace com::sun::star; using namespace ::xmloff::token; using namespace ::formula; -OUString SAL_CALL ScXMLImport_getImplementationName() throw() +OUString ScXMLImport_getImplementationName() throw() { return OUString( "com.sun.star.comp.Calc.XMLOasisImporter" ); } -uno::Sequence< OUString > SAL_CALL ScXMLImport_getSupportedServiceNames() throw() +uno::Sequence< OUString > ScXMLImport_getSupportedServiceNames() throw() { const OUString aServiceName( ScXMLImport_getImplementationName() ); return uno::Sequence< OUString > ( &aServiceName, 1 ); } -uno::Reference< uno::XInterface > SAL_CALL ScXMLImport_createInstance( +uno::Reference< uno::XInterface > ScXMLImport_createInstance( const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) { // return (cppu::OWeakObject*)new ScXMLImport(IMPORT_ALL); return static_cast<cppu::OWeakObject*>(new ScXMLImport( comphelper::getComponentContext(rSMgr), ScXMLImport_getImplementationName(), SvXMLImportFlags::ALL )); } -OUString SAL_CALL ScXMLImport_Meta_getImplementationName() throw() +OUString ScXMLImport_Meta_getImplementationName() throw() { return OUString( "com.sun.star.comp.Calc.XMLOasisMetaImporter" ); } -uno::Sequence< OUString > SAL_CALL ScXMLImport_Meta_getSupportedServiceNames() throw() +uno::Sequence< OUString > ScXMLImport_Meta_getSupportedServiceNames() throw() { const OUString aServiceName( ScXMLImport_Meta_getImplementationName() ); return uno::Sequence< OUString > ( &aServiceName, 1 ); } -uno::Reference< uno::XInterface > SAL_CALL ScXMLImport_Meta_createInstance( +uno::Reference< uno::XInterface > ScXMLImport_Meta_createInstance( const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) { // return (cppu::OWeakObject*)new ScXMLImport(IMPORT_META); return static_cast<cppu::OWeakObject*>(new ScXMLImport( comphelper::getComponentContext(rSMgr), ScXMLImport_Meta_getImplementationName(), SvXMLImportFlags::META )); } -OUString SAL_CALL ScXMLImport_Styles_getImplementationName() throw() +OUString ScXMLImport_Styles_getImplementationName() throw() { return OUString( "com.sun.star.comp.Calc.XMLOasisStylesImporter" ); } -uno::Sequence< OUString > SAL_CALL ScXMLImport_Styles_getSupportedServiceNames() throw() +uno::Sequence< OUString > ScXMLImport_Styles_getSupportedServiceNames() throw() { const OUString aServiceName( ScXMLImport_Styles_getImplementationName() ); return uno::Sequence< OUString > ( &aServiceName, 1 ); } -uno::Reference< uno::XInterface > SAL_CALL ScXMLImport_Styles_createInstance( +uno::Reference< uno::XInterface > ScXMLImport_Styles_createInstance( const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) { // return (cppu::OWeakObject*)new ScXMLImport(SvXMLImportFlagsSTYLES|SvXMLImportFlags::AUTOSTYLES|SvXMLImportFlags::MASTERSTYLES|SvXMLImportFlags::FONTDECLS); return static_cast<cppu::OWeakObject*>(new ScXMLImport( comphelper::getComponentContext(rSMgr), ScXMLImport_Styles_getImplementationName(), SvXMLImportFlags::STYLES|SvXMLImportFlags::AUTOSTYLES|SvXMLImportFlags::MASTERSTYLES|SvXMLImportFlags::FONTDECLS)); } -OUString SAL_CALL ScXMLImport_Content_getImplementationName() throw() +OUString ScXMLImport_Content_getImplementationName() throw() { return OUString( "com.sun.star.comp.Calc.XMLOasisContentImporter" ); } -uno::Sequence< OUString > SAL_CALL ScXMLImport_Content_getSupportedServiceNames() throw() +uno::Sequence< OUString > ScXMLImport_Content_getSupportedServiceNames() throw() { const OUString aServiceName( ScXMLImport_Content_getImplementationName() ); return uno::Sequence< OUString > ( &aServiceName, 1 ); } -uno::Reference< uno::XInterface > SAL_CALL ScXMLImport_Content_createInstance( +uno::Reference< uno::XInterface > ScXMLImport_Content_createInstance( const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) { // return (cppu::OWeakObject*)new ScXMLImport(SvXMLImportFlags::META|SvXMLImportFlags::STYLES|SvXMLImportFlags::MASTERSTYLES|SvXMLImportFlags::AUTOSTYLES|SvXMLImportFlags::CONTENT|SvXMLImportFlags::SCRIPTS|SvXMLImportFlags::SETTINGS|SvXMLImportFlags::FONTDECLS); return static_cast<cppu::OWeakObject*>(new ScXMLImport( comphelper::getComponentContext(rSMgr), ScXMLImport_Content_getImplementationName(), SvXMLImportFlags::AUTOSTYLES|SvXMLImportFlags::CONTENT|SvXMLImportFlags::SCRIPTS|SvXMLImportFlags::FONTDECLS)); } -OUString SAL_CALL ScXMLImport_Settings_getImplementationName() throw() +OUString ScXMLImport_Settings_getImplementationName() throw() { return OUString( "com.sun.star.comp.Calc.XMLOasisSettingsImporter" ); } -uno::Sequence< OUString > SAL_CALL ScXMLImport_Settings_getSupportedServiceNames() throw() +uno::Sequence< OUString > ScXMLImport_Settings_getSupportedServiceNames() throw() { const OUString aServiceName( ScXMLImport_Settings_getImplementationName() ); return uno::Sequence< OUString > ( &aServiceName, 1 ); } -uno::Reference< uno::XInterface > SAL_CALL ScXMLImport_Settings_createInstance( +uno::Reference< uno::XInterface > ScXMLImport_Settings_createInstance( const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) { // return (cppu::OWeakObject*)new ScXMLImport(SvXMLImportFlags::SETTINGS); @@ -2055,7 +2055,7 @@ ScMyImpDetectiveOpArray* ScXMLImport::GetDetectiveOpArray() return pDetectiveOpArray; } -extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportFODS(SvStream &rStream) +extern "C" SAL_DLLPUBLIC_EXPORT bool TestImportFODS(SvStream &rStream) { ScDLL::Init(); @@ -2104,7 +2104,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportFODS(SvStream &rStream) return ret; } -extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportXLSX(SvStream &rStream) +extern "C" SAL_DLLPUBLIC_EXPORT bool TestImportXLSX(SvStream &rStream) { ScDLL::Init(); diff --git a/sc/source/ui/attrdlg/scabstdlg.cxx b/sc/source/ui/attrdlg/scabstdlg.cxx index f0582fa7d724..1f268b1af5c4 100644 --- a/sc/source/ui/attrdlg/scabstdlg.cxx +++ b/sc/source/ui/attrdlg/scabstdlg.cxx @@ -24,11 +24,11 @@ #include <osl/module.hxx> #include <rtl/ustrbuf.hxx> -typedef ScAbstractDialogFactory* (SAL_CALL *ScFuncPtrCreateDialogFactory)(); +typedef ScAbstractDialogFactory* (*ScFuncPtrCreateDialogFactory)(); #ifndef DISABLE_DYNLOADING -extern "C" { static void SAL_CALL thisModule() {} } +extern "C" { static void thisModule() {} } #else diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx index a5cea0179018..d69c7d6fd0cd 100644 --- a/sc/source/ui/docshell/docsh.cxx +++ b/sc/source/ui/docshell/docsh.cxx @@ -3241,7 +3241,7 @@ void ScDocShell::SetIsInUcalc() mbUcalcTest = true; } -extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportSLK(SvStream &rStream) +extern "C" SAL_DLLPUBLIC_EXPORT bool TestImportSLK(SvStream &rStream) { ScDLL::Init(); ScDocument aDocument; diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx index 88bab11ffb11..d2e2899454b7 100644 --- a/sc/source/ui/docshell/impex.cxx +++ b/sc/source/ui/docshell/impex.cxx @@ -2275,7 +2275,7 @@ bool ScImportExport::HTML2Doc( SvStream& rStrm, const OUString& rBaseURL ) #ifndef DISABLE_DYNLOADING -extern "C" { static void SAL_CALL thisModule() {} } +extern "C" { static void thisModule() {} } #else diff --git a/sc/source/ui/sidebar/ScPanelFactory.cxx b/sc/source/ui/sidebar/ScPanelFactory.cxx index f204e3685fb8..fcbe9a495a42 100644 --- a/sc/source/ui/sidebar/ScPanelFactory.cxx +++ b/sc/source/ui/sidebar/ScPanelFactory.cxx @@ -137,7 +137,7 @@ css::uno::Sequence<OUString> ScPanelFactory::getSupportedServiceNames() } } // end of namespace sc::sidebar -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* ScPanelFactory_get_implementation(css::uno::XComponentContext*, css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new sc::sidebar::ScPanelFactory()); diff --git a/sc/source/ui/unoobj/afmtuno.cxx b/sc/source/ui/unoobj/afmtuno.cxx index a6f8df946c86..4adf5aa937ec 100644 --- a/sc/source/ui/unoobj/afmtuno.cxx +++ b/sc/source/ui/unoobj/afmtuno.cxx @@ -173,7 +173,7 @@ ScAutoFormatsObj::~ScAutoFormatsObj() { } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* ScAutoFormatsObj_get_implementation(css::uno::XComponentContext*, css::uno::Sequence<css::uno::Any> const &) { SolarMutexGuard aGuard; diff --git a/sc/source/ui/unoobj/appluno.cxx b/sc/source/ui/unoobj/appluno.cxx index 064369bf05d8..2f94542b7875 100644 --- a/sc/source/ui/unoobj/appluno.cxx +++ b/sc/source/ui/unoobj/appluno.cxx @@ -95,7 +95,7 @@ SC_SIMPLE_SERVICE_INFO( ScSpreadsheetSettings, "stardiv.StarCalc.ScSpreadsheetSe extern "C" { -SAL_DLLPUBLIC_EXPORT void * SAL_CALL sc_component_getFactory( +SAL_DLLPUBLIC_EXPORT void * sc_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /* pRegistryKey */ ) { if (!pServiceManager) @@ -181,7 +181,7 @@ ScSpreadsheetSettings::~ScSpreadsheetSettings() { } -uno::Reference<uno::XInterface> SAL_CALL ScSpreadsheetSettings_CreateInstance( +uno::Reference<uno::XInterface> ScSpreadsheetSettings_CreateInstance( const uno::Reference<lang::XMultiServiceFactory>& /* rSMgr */ ) { SolarMutexGuard aGuard; @@ -455,7 +455,7 @@ ScRecentFunctionsObj::~ScRecentFunctionsObj() { } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* ScRecentFunctionsObj_get_implementation(css::uno::XComponentContext*, css::uno::Sequence<css::uno::Any> const &) { SolarMutexGuard aGuard; @@ -512,7 +512,7 @@ ScFunctionListObj::~ScFunctionListObj() { } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* ScFunctionListObj_get_implementation(css::uno::XComponentContext*, css::uno::Sequence<css::uno::Any> const &) { SolarMutexGuard aGuard; diff --git a/sc/source/ui/unoobj/exceldetect.cxx b/sc/source/ui/unoobj/exceldetect.cxx index 43e288c4bd7f..b4b6d4d85b06 100644 --- a/sc/source/ui/unoobj/exceldetect.cxx +++ b/sc/source/ui/unoobj/exceldetect.cxx @@ -192,7 +192,7 @@ OUString ScExcelBiffDetect::detect( uno::Sequence<beans::PropertyValue>& lDescri return aType; } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_comp_calc_ExcelBiffFormatDetector_get_implementation(css::uno::XComponentContext* /*context*/, css::uno::Sequence<css::uno::Any> const &) { diff --git a/sc/source/ui/unoobj/filtuno.cxx b/sc/source/ui/unoobj/filtuno.cxx index ee6e6ed3c265..5f1279807ec4 100644 --- a/sc/source/ui/unoobj/filtuno.cxx +++ b/sc/source/ui/unoobj/filtuno.cxx @@ -128,7 +128,7 @@ ScFilterOptionsObj::~ScFilterOptionsObj() { } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* Calc_FilterOptionsDialog_get_implementation(css::uno::XComponentContext*, css::uno::Sequence<css::uno::Any> const &) { SolarMutexGuard aGuard; diff --git a/sc/source/ui/unoobj/funcuno.cxx b/sc/source/ui/unoobj/funcuno.cxx index c0c4bebaef52..2069bfdd81ac 100644 --- a/sc/source/ui/unoobj/funcuno.cxx +++ b/sc/source/ui/unoobj/funcuno.cxx @@ -194,7 +194,7 @@ void ScFunctionAccess::Notify( SfxBroadcaster&, const SfxHint& rHint ) } } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* ScFunctionAcceess_get_implementation(css::uno::XComponentContext*, css::uno::Sequence<css::uno::Any> const &) { SolarMutexGuard aGuard; diff --git a/sc/source/ui/unoobj/scdetect.cxx b/sc/source/ui/unoobj/scdetect.cxx index 35458d103577..3741a8a17265 100644 --- a/sc/source/ui/unoobj/scdetect.cxx +++ b/sc/source/ui/unoobj/scdetect.cxx @@ -344,7 +344,7 @@ css::uno::Sequence<OUString> ScFilterDetect::getSupportedServiceNames() return seqServiceNames; } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_comp_calc_FormatDetector_get_implementation(css::uno::XComponentContext* /*context*/, css::uno::Sequence<css::uno::Any> const &) { diff --git a/sc/source/ui/unoobj/unodoc.cxx b/sc/source/ui/unoobj/unodoc.cxx index 469644dc5b3d..e632de65fa69 100644 --- a/sc/source/ui/unoobj/unodoc.cxx +++ b/sc/source/ui/unoobj/unodoc.cxx @@ -30,18 +30,18 @@ using namespace ::com::sun::star; -OUString SAL_CALL ScDocument_getImplementationName() throw() +OUString ScDocument_getImplementationName() throw() { return OUString( "com.sun.star.comp.Calc.SpreadsheetDocument" ); } -uno::Sequence< OUString > SAL_CALL ScDocument_getSupportedServiceNames() throw() +uno::Sequence< OUString > ScDocument_getSupportedServiceNames() throw() { uno::Sequence<OUString> aSeq { "com.sun.star.sheet.SpreadsheetDocument" }; return aSeq; } -uno::Reference< uno::XInterface > SAL_CALL ScDocument_createInstance( +uno::Reference< uno::XInterface > ScDocument_createInstance( const uno::Reference< lang::XMultiServiceFactory > & /* rSMgr */, SfxModelFlags _nCreationFlags ) { SolarMutexGuard aGuard; diff --git a/sc/source/ui/vba/service.cxx b/sc/source/ui/vba/service.cxx index 93d119831b42..562a6b3e0c1d 100644 --- a/sc/source/ui/vba/service.cxx +++ b/sc/source/ui/vba/service.cxx @@ -30,7 +30,7 @@ namespace sdecl = comphelper::service_decl; extern "C" { - SAL_DLLPUBLIC_EXPORT void * SAL_CALL vbaobj_component_getFactory( + SAL_DLLPUBLIC_EXPORT void * vbaobj_component_getFactory( const sal_Char * pImplName, void *, void *) { void* pRet = sdecl::component_getFactoryHelper( diff --git a/sc/source/ui/vba/vbaeventshelper.cxx b/sc/source/ui/vba/vbaeventshelper.cxx index 90297d1a922a..24ae774e4e92 100644 --- a/sc/source/ui/vba/vbaeventshelper.cxx +++ b/sc/source/ui/vba/vbaeventshelper.cxx @@ -903,7 +903,7 @@ uno::Any ScVbaEventsHelper::createWindow( const uno::Sequence< uno::Any >& rArgs return uno::Any( xWindow ); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * ScVbaEventsHelper_get_implementation( css::uno::XComponentContext * /*context*/, css::uno::Sequence<css::uno::Any> const &arguments) diff --git a/sc/source/ui/vba/vbaglobals.cxx b/sc/source/ui/vba/vbaglobals.cxx index 2898cbbd9d4d..189fe708f2f0 100644 --- a/sc/source/ui/vba/vbaglobals.cxx +++ b/sc/source/ui/vba/vbaglobals.cxx @@ -266,7 +266,7 @@ ScVbaGlobals::getServiceNames() return aServiceNames; } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * ScVbaGlobals_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &arguments) diff --git a/sc/source/ui/vba/vbatextframe.cxx b/sc/source/ui/vba/vbatextframe.cxx index c6aa6dd328c5..6c420fa9bc41 100644 --- a/sc/source/ui/vba/vbatextframe.cxx +++ b/sc/source/ui/vba/vbatextframe.cxx @@ -60,7 +60,7 @@ ScVbaTextFrame::getServiceNames() return aServiceNames; } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * ScVbaTextFrame_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &arguments) diff --git a/scaddins/source/analysis/analysis.cxx b/scaddins/source/analysis/analysis.cxx index 862bd2532a8d..6c6a94afdb42 100644 --- a/scaddins/source/analysis/analysis.cxx +++ b/scaddins/source/analysis/analysis.cxx @@ -41,7 +41,7 @@ using namespace ::com::sun::star; using namespace sca::analysis; using namespace std; -extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL analysis_component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void* analysis_component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* /*pRegistryKey*/ ) { void* pRet = nullptr; @@ -163,7 +163,7 @@ uno::Sequence< OUString > AnalysisAddIn::getSupportedServiceNames_Static() return aRet; } -uno::Reference< uno::XInterface > SAL_CALL AnalysisAddIn_CreateInstance( +uno::Reference< uno::XInterface > AnalysisAddIn_CreateInstance( const uno::Reference< lang::XMultiServiceFactory >& xServiceFact ) { return static_cast<cppu::OWeakObject*>(new AnalysisAddIn( comphelper::getComponentContext(xServiceFact) )); diff --git a/scaddins/source/analysis/analysis.hxx b/scaddins/source/analysis/analysis.hxx index 22e82cddfe15..f187836d4a02 100644 --- a/scaddins/source/analysis/analysis.hxx +++ b/scaddins/source/analysis/analysis.hxx @@ -41,7 +41,7 @@ namespace sca { namespace analysis { class ConvertDataList; } } -css::uno::Reference< css::uno::XInterface > SAL_CALL AnalysisAddIn_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& ); +css::uno::Reference< css::uno::XInterface > AnalysisAddIn_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& ); class AnalysisAddIn : public cppu::WeakImplHelper< diff --git a/scaddins/source/datefunc/datefunc.cxx b/scaddins/source/datefunc/datefunc.cxx index e46924f4c44c..5b6c804c54aa 100644 --- a/scaddins/source/datefunc/datefunc.cxx +++ b/scaddins/source/datefunc/datefunc.cxx @@ -87,7 +87,7 @@ void InitScaFuncDataList(ScaFuncDataList& rList) } // entry points for service registration / instantiation -uno::Reference< uno::XInterface > SAL_CALL ScaDateAddIn_CreateInstance( +uno::Reference< uno::XInterface > ScaDateAddIn_CreateInstance( const uno::Reference< lang::XMultiServiceFactory >& ) { return static_cast<cppu::OWeakObject*>(new ScaDateAddIn()); @@ -95,7 +95,7 @@ uno::Reference< uno::XInterface > SAL_CALL ScaDateAddIn_CreateInstance( extern "C" { -SAL_DLLPUBLIC_EXPORT void * SAL_CALL date_component_getFactory( +SAL_DLLPUBLIC_EXPORT void * date_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) { void* pRet = nullptr; diff --git a/scaddins/source/pricing/pricing.cxx b/scaddins/source/pricing/pricing.cxx index dd18d1f45970..d60e4516cbf4 100644 --- a/scaddins/source/pricing/pricing.cxx +++ b/scaddins/source/pricing/pricing.cxx @@ -90,7 +90,7 @@ void sca::pricing::InitScaFuncDataList(ScaFuncDataList& rList) } // entry points for service registration / instantiation -uno::Reference< uno::XInterface > SAL_CALL ScaPricingAddIn_CreateInstance( +uno::Reference< uno::XInterface > ScaPricingAddIn_CreateInstance( const uno::Reference< lang::XMultiServiceFactory >& ) { return static_cast<cppu::OWeakObject*>(new ScaPricingAddIn()); @@ -98,7 +98,7 @@ uno::Reference< uno::XInterface > SAL_CALL ScaPricingAddIn_CreateInstance( extern "C" { -SAL_DLLPUBLIC_EXPORT void * SAL_CALL pricing_component_getFactory( +SAL_DLLPUBLIC_EXPORT void * pricing_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) { void* pRet = nullptr; diff --git a/sccomp/source/solver/CoinMPSolver.cxx b/sccomp/source/solver/CoinMPSolver.cxx index 6c0bc881cce6..6f840a6edabe 100644 --- a/sccomp/source/solver/CoinMPSolver.cxx +++ b/sccomp/source/solver/CoinMPSolver.cxx @@ -352,7 +352,7 @@ void SAL_CALL CoinMPSolver::solve() CoinUnloadProblem( hProb ); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_Calc_CoinMPSolver_get_implementation( css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) diff --git a/sccomp/source/solver/LpsolveSolver.cxx b/sccomp/source/solver/LpsolveSolver.cxx index e3d0cd8d34d6..6ae23d261e10 100644 --- a/sccomp/source/solver/LpsolveSolver.cxx +++ b/sccomp/source/solver/LpsolveSolver.cxx @@ -324,7 +324,7 @@ void SAL_CALL LpsolveSolver::solve() delete_lp( lp ); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_Calc_LpsolveSolver_get_implementation( css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) diff --git a/sccomp/source/solver/SwarmSolver.cxx b/sccomp/source/solver/SwarmSolver.cxx index 295a4a7e7224..eba55c87da2f 100644 --- a/sccomp/source/solver/SwarmSolver.cxx +++ b/sccomp/source/solver/SwarmSolver.cxx @@ -576,7 +576,7 @@ void SAL_CALL SwarmSolver::solve() std::copy(aSolution.begin(), aSolution.end(), maSolution.begin()); } -extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface* com_sun_star_comp_Calc_SwarmSolver_get_implementation(uno::XComponentContext*, uno::Sequence<uno::Any> const&) { diff --git a/scripting/source/basprov/basprov.cxx b/scripting/source/basprov/basprov.cxx index 28cc4a48714a..17f67cece24e 100644 --- a/scripting/source/basprov/basprov.cxx +++ b/scripting/source/basprov/basprov.cxx @@ -483,7 +483,7 @@ namespace basprov // component operations - static Reference< XInterface > SAL_CALL create_BasicProviderImpl( + static Reference< XInterface > create_BasicProviderImpl( Reference< XComponentContext > const & xContext ) { return static_cast< lang::XTypeProvider * >( new BasicProviderImpl( xContext ) ); @@ -509,7 +509,7 @@ namespace basprov extern "C" { - SAL_DLLPUBLIC_EXPORT void * SAL_CALL basprov_component_getFactory( + SAL_DLLPUBLIC_EXPORT void * basprov_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { diff --git a/scripting/source/dlgprov/dlgprov.cxx b/scripting/source/dlgprov/dlgprov.cxx index df16f43ffe24..4de9c48308b4 100644 --- a/scripting/source/dlgprov/dlgprov.cxx +++ b/scripting/source/dlgprov/dlgprov.cxx @@ -65,18 +65,18 @@ using namespace ::sf_misc; namespace comp_DialogModelProvider { - OUString SAL_CALL _getImplementationName() + OUString _getImplementationName() { return OUString("com.sun.star.comp.scripting.DialogModelProvider"); } - uno::Sequence< OUString > SAL_CALL _getSupportedServiceNames() + uno::Sequence< OUString > _getSupportedServiceNames() { uno::Sequence< OUString > s { "com.sun.star.awt.UnoControlDialogModelProvider" }; return s; } - uno::Reference< uno::XInterface > SAL_CALL _create(const uno::Reference< uno::XComponentContext > & context) + uno::Reference< uno::XInterface > _create(const uno::Reference< uno::XComponentContext > & context) { return static_cast< ::cppu::OWeakObject * >(new dlgprov::DialogModelProvider(context)); } @@ -736,7 +736,7 @@ namespace dlgprov // component operations - static Reference< XInterface > SAL_CALL create_DialogProviderImpl( + static Reference< XInterface > create_DialogProviderImpl( Reference< XComponentContext > const & xContext ) { return static_cast< lang::XTypeProvider * >( new DialogProviderImpl( xContext ) ); @@ -759,7 +759,7 @@ namespace dlgprov extern "C" { - SAL_DLLPUBLIC_EXPORT void * SAL_CALL dlgprov_component_getFactory( + SAL_DLLPUBLIC_EXPORT void * dlgprov_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { diff --git a/scripting/source/dlgprov/dlgprov.hxx b/scripting/source/dlgprov/dlgprov.hxx index a5081da60a7d..521bf3f2e316 100644 --- a/scripting/source/dlgprov/dlgprov.hxx +++ b/scripting/source/dlgprov/dlgprov.hxx @@ -152,8 +152,8 @@ namespace dlgprov namespace comp_DialogModelProvider { // component and service helper functions: -OUString SAL_CALL _getImplementationName(); -css::uno::Sequence< OUString > SAL_CALL _getSupportedServiceNames(); +OUString _getImplementationName(); +css::uno::Sequence< OUString > _getSupportedServiceNames(); } // namespace comp_DialogModelProvider diff --git a/scripting/source/protocolhandler/scripthandler.cxx b/scripting/source/protocolhandler/scripthandler.cxx index 150ffa052509..b4313df5b8fb 100644 --- a/scripting/source/protocolhandler/scripthandler.cxx +++ b/scripting/source/protocolhandler/scripthandler.cxx @@ -472,7 +472,7 @@ const Reference< XMultiServiceFactory >& xServiceManager ) extern "C" { - SAL_DLLPUBLIC_EXPORT void* SAL_CALL protocolhandler_component_getFactory( const sal_Char * pImplementationName , + SAL_DLLPUBLIC_EXPORT void* protocolhandler_component_getFactory( const sal_Char * pImplementationName , void * pServiceManager , void * ) { diff --git a/scripting/source/provider/BrowseNodeFactoryImpl.cxx b/scripting/source/provider/BrowseNodeFactoryImpl.cxx index 49c51dba6c07..90be10172ba7 100644 --- a/scripting/source/provider/BrowseNodeFactoryImpl.cxx +++ b/scripting/source/provider/BrowseNodeFactoryImpl.cxx @@ -629,7 +629,7 @@ BrowseNodeFactoryImpl::getOrganizerHierarchy() // Namespace global methods for setting up BrowseNodeFactory service -Sequence< OUString > SAL_CALL +Sequence< OUString > bnf_getSupportedServiceNames( ) { OUString str_name( @@ -638,14 +638,14 @@ bnf_getSupportedServiceNames( ) return Sequence< OUString >( &str_name, 1 ); } -OUString SAL_CALL +OUString bnf_getImplementationName( ) { return OUString( "com.sun.star.script.browse.BrowseNodeFactory" ); } -Reference< XInterface > SAL_CALL +Reference< XInterface > bnf_create( Reference< XComponentContext > const & xComponentContext ) { return static_cast< ::cppu::OWeakObject * >( diff --git a/scripting/source/provider/MasterScriptProvider.cxx b/scripting/source/provider/MasterScriptProvider.cxx index 12c336caf84f..d82d70f3f1dd 100644 --- a/scripting/source/provider/MasterScriptProvider.cxx +++ b/scripting/source/provider/MasterScriptProvider.cxx @@ -708,7 +708,7 @@ Sequence< OUString > SAL_CALL MasterScriptProvider::getSupportedServiceNames( ) namespace scripting_runtimemgr { -Reference< XInterface > SAL_CALL sp_create( +Reference< XInterface > sp_create( const Reference< XComponentContext > & xCompC ) { return static_cast<cppu::OWeakObject *>(new ::func_provider::MasterScriptProvider( xCompC )); @@ -733,7 +733,7 @@ OUString sp_getImplementationName( ) } // ***** registration or ScriptingFrameworkURIHelper -Reference< XInterface > SAL_CALL urihelper_create( +Reference< XInterface > urihelper_create( const Reference< XComponentContext > & xCompC ) { return static_cast<cppu::OWeakObject *>( @@ -801,7 +801,7 @@ extern "C" * data * @return a component factory */ - SAL_DLLPUBLIC_EXPORT void * SAL_CALL scriptframe_component_getFactory( + SAL_DLLPUBLIC_EXPORT void * scriptframe_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) diff --git a/scripting/source/provider/MasterScriptProvider.hxx b/scripting/source/provider/MasterScriptProvider.hxx index 303418f94b3a..bb1ffe9306d8 100644 --- a/scripting/source/provider/MasterScriptProvider.hxx +++ b/scripting/source/provider/MasterScriptProvider.hxx @@ -127,17 +127,17 @@ private: OUString m_sCtxString; }; -OUString SAL_CALL mspf_getImplementationName() ; -css::uno::Reference< css::uno::XInterface > SAL_CALL mspf_create( css::uno::Reference< css::uno::XComponentContext > const & xComponentContext ); -css::uno::Sequence< OUString > SAL_CALL mspf_getSupportedServiceNames(); +OUString mspf_getImplementationName() ; +css::uno::Reference< css::uno::XInterface > mspf_create( css::uno::Reference< css::uno::XComponentContext > const & xComponentContext ); +css::uno::Sequence< OUString > mspf_getSupportedServiceNames(); } namespace browsenodefactory { -OUString SAL_CALL bnf_getImplementationName() ; -css::uno::Reference< css::uno::XInterface > SAL_CALL bnf_create( css::uno::Reference< css::uno::XComponentContext > const & xComponentContext ); -css::uno::Sequence< OUString > SAL_CALL bnf_getSupportedServiceNames(); +OUString bnf_getImplementationName() ; +css::uno::Reference< css::uno::XInterface > bnf_create( css::uno::Reference< css::uno::XComponentContext > const & xComponentContext ); +css::uno::Sequence< OUString > bnf_getSupportedServiceNames(); } #endif // INCLUDED_SCRIPTING_SOURCE_PROVIDER_MASTERSCRIPTPROVIDER_HXX diff --git a/scripting/source/provider/MasterScriptProviderFactory.cxx b/scripting/source/provider/MasterScriptProviderFactory.cxx index a805015d0c3e..f7798f8d195e 100644 --- a/scripting/source/provider/MasterScriptProviderFactory.cxx +++ b/scripting/source/provider/MasterScriptProviderFactory.cxx @@ -62,7 +62,7 @@ MasterScriptProviderFactory::getActiveMSPList() const return m_MSPList; } -Sequence< OUString > SAL_CALL mspf_getSupportedServiceNames( ) +Sequence< OUString > mspf_getSupportedServiceNames( ) { OUString str_name( "com.sun.star.script.provider.MasterScriptProviderFactory"); @@ -70,13 +70,13 @@ Sequence< OUString > SAL_CALL mspf_getSupportedServiceNames( ) return Sequence< OUString >( &str_name, 1 ); } -OUString SAL_CALL mspf_getImplementationName( ) +OUString mspf_getImplementationName( ) { return OUString( "com.sun.star.script.provider.MasterScriptProviderFactory"); } -Reference< XInterface > SAL_CALL +Reference< XInterface > mspf_create( Reference< XComponentContext > const & xComponentContext ) { return static_cast< ::cppu::OWeakObject * >( diff --git a/scripting/source/stringresource/stringresource.cxx b/scripting/source/stringresource/stringresource.cxx index 88becc349103..308b3ff57176 100644 --- a/scripting/source/stringresource/stringresource.cxx +++ b/scripting/source/stringresource/stringresource.cxx @@ -90,7 +90,7 @@ static OUString getImplementationName_StringResourceImpl() return OUString( "com.sun.star.comp.scripting.StringResource" ); } -static Reference< XInterface > SAL_CALL create_StringResourceImpl( +static Reference< XInterface > create_StringResourceImpl( Reference< XComponentContext > const & xContext ) { return static_cast< ::cppu::OWeakObject * >( new StringResourcePersistenceImpl( xContext ) ); @@ -2128,7 +2128,7 @@ static OUString getImplementationName_StringResourceWithStorageImpl() return OUString( "com.sun.star.comp.scripting.StringResourceWithStorage" ); } -static Reference< XInterface > SAL_CALL create_StringResourceWithStorageImpl( +static Reference< XInterface > create_StringResourceWithStorageImpl( Reference< XComponentContext > const & xContext ) { return static_cast< ::cppu::OWeakObject * >( new StringResourceWithStorageImpl( xContext ) ); @@ -2415,7 +2415,7 @@ static OUString getImplementationName_StringResourceWithLocationImpl() return OUString( "com.sun.star.comp.scripting.StringResourceWithLocation" ); } -static Reference< XInterface > SAL_CALL create_StringResourceWithLocationImpl( +static Reference< XInterface > create_StringResourceWithLocationImpl( Reference< XComponentContext > const & xContext ) { return static_cast< ::cppu::OWeakObject * >( new StringResourceWithLocationImpl( xContext ) ); @@ -2758,7 +2758,7 @@ static const struct ::cppu::ImplementationEntry s_component_entries [] = extern "C" { - SAL_DLLPUBLIC_EXPORT void * SAL_CALL stringresource_component_getFactory( + SAL_DLLPUBLIC_EXPORT void * stringresource_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { diff --git a/scripting/source/vbaevents/eventhelper.cxx b/scripting/source/vbaevents/eventhelper.cxx index 79e7bb88ab7a..ced2d021bc63 100644 --- a/scripting/source/vbaevents/eventhelper.cxx +++ b/scripting/source/vbaevents/eventhelper.cxx @@ -980,7 +980,7 @@ VBAToOOEventDescGen::getEventSupplier( const Reference< XInterface >& xControl, return xSupplier; } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* ooo_vba_EventListener_get_implementation(css::uno::XComponentContext*, css::uno::Sequence<css::uno::Any> const &) { @@ -988,7 +988,7 @@ ooo_vba_EventListener_get_implementation(css::uno::XComponentContext*, } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* ooo_vba_VBAToOOEventDesc_get_implementation(css::uno::XComponentContext*, css::uno::Sequence<css::uno::Any> const &) { diff --git a/sd/source/filter/cgm/sdcgmfilter.cxx b/sd/source/filter/cgm/sdcgmfilter.cxx index e2cbdb930f6f..f5b394f31f23 100644 --- a/sd/source/filter/cgm/sdcgmfilter.cxx +++ b/sd/source/filter/cgm/sdcgmfilter.cxx @@ -39,7 +39,7 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::task; using namespace ::com::sun::star::frame; -typedef sal_uInt32 ( SAL_CALL *ImportCGMPointer )(SvStream&, Reference< XModel > const &, Reference< XStatusIndicator > const &); +typedef sal_uInt32 ( *ImportCGMPointer )(SvStream&, Reference< XModel > const &, Reference< XStatusIndicator > const &); #ifdef DISABLE_DYNLOADING @@ -124,7 +124,7 @@ bool SdCGMFilter::Export() return false; } -extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportCGM(SvStream &rStream) +extern "C" SAL_DLLPUBLIC_EXPORT bool TestImportCGM(SvStream &rStream) { SdDLL::Init(); diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx index 2b3f76a41ebf..c49ad4ead574 100644 --- a/sd/source/filter/eppt/eppt.cxx +++ b/sd/source/filter/eppt/eppt.cxx @@ -1426,7 +1426,7 @@ bool PPTWriter::ImplWriteAtomEnding() // - exported function - -extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL ExportPPT( const std::vector< css::beans::PropertyValue >& rMediaData, +extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool ExportPPT( const std::vector< css::beans::PropertyValue >& rMediaData, tools::SvRef<SotStorage> const & rSvStorage, css::uno::Reference< css::frame::XModel > const & rXModel, css::uno::Reference< css::task::XStatusIndicator > const & rXStatInd, @@ -1439,7 +1439,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL ExportPPT( const std::vector< return bStatus; } -extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL SaveVBA( SfxObjectShell& rDocShell, SvMemoryStream*& pBas ) +extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SaveVBA( SfxObjectShell& rDocShell, SvMemoryStream*& pBas ) { tools::SvRef<SotStorage> xDest( new SotStorage( new SvMemoryStream(), true ) ); SvxImportMSVBasic aMSVBas( rDocShell, *xDest ); diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx b/sd/source/filter/eppt/pptx-epptooxml.cxx index 8e722aa6e90b..295d2c043aa8 100644 --- a/sd/source/filter/eppt/pptx-epptooxml.cxx +++ b/sd/source/filter/eppt/pptx-epptooxml.cxx @@ -2785,7 +2785,7 @@ OUString PowerPointExport::getImplementationName() } // UNO component -extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface* css_comp_Impress_oox_PowerPointExport(uno::XComponentContext* rxCtxt, uno::Sequence<css::uno::Any> const& rArguments) { diff --git a/sd/source/filter/html/HtmlOptionsDialog.cxx b/sd/source/filter/html/HtmlOptionsDialog.cxx index bc6f2e413e40..1716a2fd1625 100644 --- a/sd/source/filter/html/HtmlOptionsDialog.cxx +++ b/sd/source/filter/html/HtmlOptionsDialog.cxx @@ -212,7 +212,7 @@ void SdHtmlOptionsDialog::setSourceDocument( const Reference< XComponent >& xDoc } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_comp_draw_SdHtmlOptionsDialog_get_implementation(css::uno::XComponentContext*, css::uno::Sequence<css::uno::Any> const &) { diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx index 1852f0bfe8b9..5029b1ff6af2 100644 --- a/sd/source/filter/ppt/pptin.cxx +++ b/sd/source/filter/ppt/pptin.cxx @@ -2748,7 +2748,7 @@ ImplSdPPTImport::ReadFormControl( tools::SvRef<SotStorage>& rSrc1, css::uno::Ref } // exported function -extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL ImportPPT( +extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool ImportPPT( SdDrawDocument* pDocument, SvStream& rDocStream, SotStorage& rStorage, SfxMedium& rMedium ) { std::unique_ptr<SdPPTImport> pImport( new SdPPTImport( pDocument, rDocStream, rStorage, rMedium )); @@ -2756,7 +2756,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL ImportPPT( return bRet; } -extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportPPT(SvStream &rStream) +extern "C" SAL_DLLPUBLIC_EXPORT bool TestImportPPT(SvStream &rStream) { tools::SvRef<SotStorage> xStorage; try diff --git a/sd/source/filter/sdfilter.cxx b/sd/source/filter/sdfilter.cxx index b9ccfde38482..aeb1aec40853 100644 --- a/sd/source/filter/sdfilter.cxx +++ b/sd/source/filter/sdfilter.cxx @@ -59,7 +59,7 @@ OUString SdFilter::ImplGetFullLibraryName( const OUString& rLibraryName ) } #ifndef DISABLE_DYNLOADING -extern "C" { static void SAL_CALL thisModule() {} } +extern "C" { static void thisModule() {} } ::osl::Module* SdFilter::OpenLibrary( const OUString& rLibraryName ) { diff --git a/sd/source/filter/sdpptwrp.cxx b/sd/source/filter/sdpptwrp.cxx index ad86048323d7..df3f4da8d010 100644 --- a/sd/source/filter/sdpptwrp.cxx +++ b/sd/source/filter/sdpptwrp.cxx @@ -38,14 +38,14 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::task; using namespace ::com::sun::star::frame; -typedef sal_Bool ( SAL_CALL *ExportPPTPointer )( const std::vector< css::beans::PropertyValue >&, tools::SvRef<SotStorage> const&, +typedef sal_Bool ( *ExportPPTPointer )( const std::vector< css::beans::PropertyValue >&, tools::SvRef<SotStorage> const&, Reference< XModel > const &, Reference< XStatusIndicator > const &, SvMemoryStream*, sal_uInt32 nCnvrtFlags ); -typedef sal_Bool ( SAL_CALL *ImportPPTPointer )( SdDrawDocument*, SvStream&, SotStorage&, SfxMedium& ); +typedef sal_Bool ( *ImportPPTPointer )( SdDrawDocument*, SvStream&, SotStorage&, SfxMedium& ); -typedef sal_Bool ( SAL_CALL *SaveVBAPointer )( SfxObjectShell&, SvMemoryStream*& ); +typedef sal_Bool ( *SaveVBAPointer )( SfxObjectShell&, SvMemoryStream*& ); #ifdef DISABLE_DYNLOADING diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx index 3293e662a69d..da0c95bc12f3 100644 --- a/sd/source/filter/xml/sdxmlwrp.cxx +++ b/sd/source/filter/xml/sdxmlwrp.cxx @@ -1010,7 +1010,7 @@ bool SdXMLFilter::Export() return bDocRet; } -extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportFODP(SvStream &rStream) +extern "C" SAL_DLLPUBLIC_EXPORT bool TestImportFODP(SvStream &rStream) { SdDLL::Init(); @@ -1059,7 +1059,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportFODP(SvStream &rStream) return ret; } -extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportPPTX(SvStream &rStream) +extern "C" SAL_DLLPUBLIC_EXPORT bool TestImportPPTX(SvStream &rStream) { SdDLL::Init(); diff --git a/sd/source/ui/controller/displaymodecontroller.cxx b/sd/source/ui/controller/displaymodecontroller.cxx index 53642cff6d76..bac411ee621a 100644 --- a/sd/source/ui/controller/displaymodecontroller.cxx +++ b/sd/source/ui/controller/displaymodecontroller.cxx @@ -275,7 +275,7 @@ Sequence< OUString > SAL_CALL DisplayModeController::getSupportedServiceNames( } -extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* com_sun_star_comp_sd_DisplayModeController_get_implementation( css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const &) { diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx b/sd/source/ui/controller/slidelayoutcontroller.cxx index 82cc5ae0f06a..d414a5035779 100644 --- a/sd/source/ui/controller/slidelayoutcontroller.cxx +++ b/sd/source/ui/controller/slidelayoutcontroller.cxx @@ -381,14 +381,14 @@ Sequence< OUString > SAL_CALL SlideLayoutController::getSupportedServiceNames( } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_comp_sd_SlideLayoutController_get_implementation(css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new sd::SlideLayoutController(context, ".uno:AssignLayout", false)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_comp_sd_InsertSlideController_get_implementation(css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const &) { diff --git a/sd/source/ui/dlg/sdabstdlg.cxx b/sd/source/ui/dlg/sdabstdlg.cxx index cf61289997db..d5bed9b764fc 100644 --- a/sd/source/ui/dlg/sdabstdlg.cxx +++ b/sd/source/ui/dlg/sdabstdlg.cxx @@ -24,11 +24,11 @@ #include <osl/module.hxx> #include <rtl/ustring.hxx> -typedef SdAbstractDialogFactory* (SAL_CALL *SdFuncPtrCreateDialogFactory)(); +typedef SdAbstractDialogFactory* (*SdFuncPtrCreateDialogFactory)(); #ifndef DISABLE_DYNLOADING -extern "C" { static void SAL_CALL thisModule() {} } +extern "C" { static void thisModule() {} } #else diff --git a/sd/source/ui/framework/configuration/Configuration.cxx b/sd/source/ui/framework/configuration/Configuration.cxx index cf08236f80b3..a33291e1c998 100644 --- a/sd/source/ui/framework/configuration/Configuration.cxx +++ b/sd/source/ui/framework/configuration/Configuration.cxx @@ -318,7 +318,7 @@ bool AreConfigurationsEquivalent ( } } // end of namespace sd::framework -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_comp_Draw_framework_configuration_Configuration_get_implementation( css::uno::XComponentContext*, css::uno::Sequence<css::uno::Any> const &) diff --git a/sd/source/ui/framework/configuration/ConfigurationController.cxx b/sd/source/ui/framework/configuration/ConfigurationController.cxx index 9ad9a18feaa5..1f8bc4aec0fc 100644 --- a/sd/source/ui/framework/configuration/ConfigurationController.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationController.cxx @@ -539,7 +539,7 @@ ConfigurationController::Implementation::Implementation ( } } // end of namespace sd::framework -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_comp_Draw_framework_configuration_ConfigurationController_get_implementation( css::uno::XComponentContext*, css::uno::Sequence<css::uno::Any> const &) diff --git a/sd/source/ui/framework/configuration/ResourceId.cxx b/sd/source/ui/framework/configuration/ResourceId.cxx index ce3e368e1d21..3036438b9fae 100644 --- a/sd/source/ui/framework/configuration/ResourceId.cxx +++ b/sd/source/ui/framework/configuration/ResourceId.cxx @@ -507,7 +507,7 @@ void ResourceId::ParseResourceURL() } } // end of namespace sd::framework -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_comp_Draw_framework_ResourceID_get_implementation(css::uno::XComponentContext*, css::uno::Sequence<css::uno::Any> const &) { diff --git a/sd/source/ui/framework/factories/BasicPaneFactory.cxx b/sd/source/ui/framework/factories/BasicPaneFactory.cxx index 44c044c43a6a..1b02e63da18d 100644 --- a/sd/source/ui/framework/factories/BasicPaneFactory.cxx +++ b/sd/source/ui/framework/factories/BasicPaneFactory.cxx @@ -431,7 +431,7 @@ void BasicPaneFactory::ThrowIfDisposed() const } } // end of namespace sd::framework -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_comp_Draw_framework_BasicPaneFactory_get_implementation(css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const &) { diff --git a/sd/source/ui/framework/factories/BasicToolBarFactory.cxx b/sd/source/ui/framework/factories/BasicToolBarFactory.cxx index deecde4be59d..8445a64197ea 100644 --- a/sd/source/ui/framework/factories/BasicToolBarFactory.cxx +++ b/sd/source/ui/framework/factories/BasicToolBarFactory.cxx @@ -152,7 +152,7 @@ void BasicToolBarFactory::ThrowIfDisposed() const } } // end of namespace sd::framework -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_comp_Draw_framework_BasicToolBarFactory_get_implementation(css::uno::XComponentContext*, css::uno::Sequence<css::uno::Any> const &) { diff --git a/sd/source/ui/framework/factories/BasicViewFactory.cxx b/sd/source/ui/framework/factories/BasicViewFactory.cxx index cb187f86b83e..e7fd347f8699 100644 --- a/sd/source/ui/framework/factories/BasicViewFactory.cxx +++ b/sd/source/ui/framework/factories/BasicViewFactory.cxx @@ -524,7 +524,7 @@ void BasicViewFactory::ActivateCenterView ( } } // end of namespace sd::framework -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_comp_Draw_framework_BasicViewFactory_get_implementation(css::uno::XComponentContext*, css::uno::Sequence<css::uno::Any> const &) { diff --git a/sd/source/ui/framework/factories/PresentationFactory.cxx b/sd/source/ui/framework/factories/PresentationFactory.cxx index 4a8772ef4b3c..f36ee2f77fd4 100644 --- a/sd/source/ui/framework/factories/PresentationFactory.cxx +++ b/sd/source/ui/framework/factories/PresentationFactory.cxx @@ -210,7 +210,7 @@ void SAL_CALL PresentationFactoryProvider::initialize( } } // end of namespace sd::framework -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_comp_Draw_framework_PresentationFactoryProvider_get_implementation(css::uno::XComponentContext*, css::uno::Sequence<css::uno::Any> const &) { diff --git a/sd/source/ui/framework/module/ModuleController.cxx b/sd/source/ui/framework/module/ModuleController.cxx index 3352f100927f..e30d6bb1c1a5 100644 --- a/sd/source/ui/framework/module/ModuleController.cxx +++ b/sd/source/ui/framework/module/ModuleController.cxx @@ -255,7 +255,7 @@ void SAL_CALL ModuleController::initialize (const Sequence<Any>& aArguments) } } // end of namespace sd::framework -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_comp_Draw_framework_module_ModuleController_get_implementation( css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const &) diff --git a/sd/source/ui/inc/facreg.hxx b/sd/source/ui/inc/facreg.hxx index 58a4903a731b..7123b9f10315 100644 --- a/sd/source/ui/inc/facreg.hxx +++ b/sd/source/ui/inc/facreg.hxx @@ -28,17 +28,17 @@ namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } } -css::uno::Reference< css::uno::XInterface > SAL_CALL SdDrawingDocument_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & _rxFactory, SfxModelFlags _nCreationFlags ); +css::uno::Reference< css::uno::XInterface > SdDrawingDocument_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & _rxFactory, SfxModelFlags _nCreationFlags ); /// @throws css::uno::RuntimeException -OUString SAL_CALL SdDrawingDocument_getImplementationName(); +OUString SdDrawingDocument_getImplementationName(); /// @throws css::uno::RuntimeException -css::uno::Sequence< OUString > SAL_CALL SdDrawingDocument_getSupportedServiceNames(); +css::uno::Sequence< OUString >SdDrawingDocument_getSupportedServiceNames(); -css::uno::Reference< css::uno::XInterface > SAL_CALL SdPresentationDocument_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & _rxFactory, SfxModelFlags _nCreationFlags ); +css::uno::Reference< css::uno::XInterface > SdPresentationDocument_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & _rxFactory, SfxModelFlags _nCreationFlags ); /// @throws css::uno::RuntimeException -OUString SAL_CALL SdPresentationDocument_getImplementationName(); +OUString SdPresentationDocument_getImplementationName(); /// @throws css::uno::RuntimeException -css::uno::Sequence< OUString > SAL_CALL SdPresentationDocument_getSupportedServiceNames(); +css::uno::Sequence< OUString > SdPresentationDocument_getSupportedServiceNames(); #endif diff --git a/sd/source/ui/presenter/PresenterHelper.cxx b/sd/source/ui/presenter/PresenterHelper.cxx index 71f85ad3102b..629b7bdf3a3e 100644 --- a/sd/source/ui/presenter/PresenterHelper.cxx +++ b/sd/source/ui/presenter/PresenterHelper.cxx @@ -450,7 +450,7 @@ awt::Rectangle PresenterHelper::getWindowExtentsRelative ( } } // end of namespace ::sd::presenter -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_comp_Draw_PresenterHelper_get_implementation(css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const &) { diff --git a/sd/source/ui/presenter/PresenterPreviewCache.cxx b/sd/source/ui/presenter/PresenterPreviewCache.cxx index 1b6b166038e6..ea15e2808c86 100644 --- a/sd/source/ui/presenter/PresenterPreviewCache.cxx +++ b/sd/source/ui/presenter/PresenterPreviewCache.cxx @@ -359,7 +359,7 @@ void PresenterPreviewCache::PresenterCacheContext::CallListeners ( } } // end of namespace ::sd::presenter -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_comp_Draw_PresenterPreviewCache_get_implementation(css::uno::XComponentContext*, css::uno::Sequence<css::uno::Any> const &) { diff --git a/sd/source/ui/presenter/PresenterTextView.cxx b/sd/source/ui/presenter/PresenterTextView.cxx index e03e9e4bcc55..6d8ba55d7927 100644 --- a/sd/source/ui/presenter/PresenterTextView.cxx +++ b/sd/source/ui/presenter/PresenterTextView.cxx @@ -499,7 +499,7 @@ void PresenterTextView::Implementation::CheckTop() } } // end of namespace ::sd::presenter -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_comp_Draw_PresenterTextView_get_implementation(css::uno::XComponentContext*, css::uno::Sequence<css::uno::Any> const &) { diff --git a/sd/source/ui/presenter/SlideRenderer.cxx b/sd/source/ui/presenter/SlideRenderer.cxx index 56728640437a..9757b7d661a4 100644 --- a/sd/source/ui/presenter/SlideRenderer.cxx +++ b/sd/source/ui/presenter/SlideRenderer.cxx @@ -198,7 +198,7 @@ void SlideRenderer::ThrowIfDisposed() } } // end of namespace ::sd::presenter -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_comp_Draw_SlideRenderer_get_implementation(css::uno::XComponentContext*, css::uno::Sequence<css::uno::Any> const &) { diff --git a/sd/source/ui/sidebar/PanelFactory.cxx b/sd/source/ui/sidebar/PanelFactory.cxx index 49ef77abb6ca..67cc62b1392e 100644 --- a/sd/source/ui/sidebar/PanelFactory.cxx +++ b/sd/source/ui/sidebar/PanelFactory.cxx @@ -142,7 +142,7 @@ Reference<ui::XUIElement> SAL_CALL PanelFactory::createUIElement ( } } // end of namespace sd::sidebar -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* org_openoffice_comp_Draw_framework_PanelFactory_get_implementation(css::uno::XComponentContext* /*context*/, css::uno::Sequence<css::uno::Any> const &) { diff --git a/sd/source/ui/slidesorter/shell/SlideSorterService.cxx b/sd/source/ui/slidesorter/shell/SlideSorterService.cxx index df1b20bcc53c..aeb6110356fd 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorterService.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorterService.cxx @@ -405,7 +405,7 @@ void SlideSorterService::ThrowIfDisposed() } } // end of namespace ::sd::slidesorter -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_comp_Draw_SlideSorter_get_implementation(css::uno::XComponentContext* /*context*/, css::uno::Sequence<css::uno::Any> const &) { diff --git a/sd/source/ui/unoidl/UnoDocumentSettings.cxx b/sd/source/ui/unoidl/UnoDocumentSettings.cxx index 590c23125543..84a7ad50412f 100644 --- a/sd/source/ui/unoidl/UnoDocumentSettings.cxx +++ b/sd/source/ui/unoidl/UnoDocumentSettings.cxx @@ -122,7 +122,7 @@ namespace sd rtl::Reference<SdXImpressDocument> mxModel; }; - Reference< XInterface > SAL_CALL DocumentSettings_createInstance( SdXImpressDocument* pModel ) + Reference< XInterface > DocumentSettings_createInstance( SdXImpressDocument* pModel ) throw () { DBG_ASSERT( pModel, "I need a model for the DocumentSettings!" ); diff --git a/sd/source/ui/unoidl/UnoDocumentSettings.hxx b/sd/source/ui/unoidl/UnoDocumentSettings.hxx index 2519c5fd7cbc..fa405a33f0d4 100644 --- a/sd/source/ui/unoidl/UnoDocumentSettings.hxx +++ b/sd/source/ui/unoidl/UnoDocumentSettings.hxx @@ -26,7 +26,7 @@ class SdXImpressDocument; namespace sd { - css::uno::Reference< css::uno::XInterface > SAL_CALL DocumentSettings_createInstance( SdXImpressDocument* pDoc ) throw(); + css::uno::Reference< css::uno::XInterface > DocumentSettings_createInstance( SdXImpressDocument* pDoc ) throw(); } #endif diff --git a/sd/source/ui/unoidl/facreg.cxx b/sd/source/ui/unoidl/facreg.cxx index b4700f1d39b7..5ec60462575b 100644 --- a/sd/source/ui/unoidl/facreg.cxx +++ b/sd/source/ui/unoidl/facreg.cxx @@ -59,7 +59,7 @@ std::shared_ptr<FactoryMap> const & GetFactoryMap() extern "C" { -SAL_DLLPUBLIC_EXPORT void * SAL_CALL sd_component_getFactory( +SAL_DLLPUBLIC_EXPORT void * sd_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * ) diff --git a/sd/source/ui/unoidl/randomnode.cxx b/sd/source/ui/unoidl/randomnode.cxx index 966d1929cdcb..9ae03e5ac1ae 100644 --- a/sd/source/ui/unoidl/randomnode.cxx +++ b/sd/source/ui/unoidl/randomnode.cxx @@ -562,7 +562,7 @@ Sequence< OUString > RandomAnimationNode::getSupportedServiceNames() } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* RandomAnimationNode_get_implementation(css::uno::XComponentContext*, css::uno::Sequence<css::uno::Any> const &) { diff --git a/sd/source/ui/unoidl/sddetect.cxx b/sd/source/ui/unoidl/sddetect.cxx index 342bea38cdb0..2c4a2dbc62a2 100644 --- a/sd/source/ui/unoidl/sddetect.cxx +++ b/sd/source/ui/unoidl/sddetect.cxx @@ -152,7 +152,7 @@ Sequence< OUString > SAL_CALL SdFilterDetect::getSupportedServiceNames() } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_comp_draw_FormatDetector_get_implementation(css::uno::XComponentContext*, css::uno::Sequence<css::uno::Any> const &) { diff --git a/sd/source/ui/unoidl/unodoc.cxx b/sd/source/ui/unoidl/unodoc.cxx index 4394229aa24c..554be509cc18 100644 --- a/sd/source/ui/unoidl/unodoc.cxx +++ b/sd/source/ui/unoidl/unodoc.cxx @@ -32,12 +32,12 @@ using namespace ::com::sun::star; // com.sun.star.comp.Draw.DrawingDocument -OUString SAL_CALL SdDrawingDocument_getImplementationName() +OUString SdDrawingDocument_getImplementationName() { return OUString( "com.sun.star.comp.Draw.DrawingDocument" ); } -uno::Sequence< OUString > SAL_CALL SdDrawingDocument_getSupportedServiceNames() +uno::Sequence< OUString > SdDrawingDocument_getSupportedServiceNames() { uno::Sequence< OUString > aSeq( 2 ); aSeq[0] = "com.sun.star.drawing.DrawingDocument"; @@ -46,7 +46,7 @@ uno::Sequence< OUString > SAL_CALL SdDrawingDocument_getSupportedServiceNames() return aSeq; } -uno::Reference< uno::XInterface > SAL_CALL SdDrawingDocument_createInstance( +uno::Reference< uno::XInterface > SdDrawingDocument_createInstance( const uno::Reference< lang::XMultiServiceFactory > &, SfxModelFlags _nCreationFlags ) { SolarMutexGuard aGuard; @@ -61,12 +61,12 @@ uno::Reference< uno::XInterface > SAL_CALL SdDrawingDocument_createInstance( // com.sun.star.comp.Draw.PresentationDocument -OUString SAL_CALL SdPresentationDocument_getImplementationName() +OUString SdPresentationDocument_getImplementationName() { return OUString( "com.sun.star.comp.Draw.PresentationDocument" ); } -uno::Sequence< OUString > SAL_CALL SdPresentationDocument_getSupportedServiceNames() +uno::Sequence< OUString > SdPresentationDocument_getSupportedServiceNames() { uno::Sequence< OUString > aSeq( 2 ); aSeq[0] = "com.sun.star.drawing.DrawingDocumentFactory"; @@ -75,7 +75,7 @@ uno::Sequence< OUString > SAL_CALL SdPresentationDocument_getSupportedServiceNam return aSeq; } -uno::Reference< uno::XInterface > SAL_CALL SdPresentationDocument_createInstance( +uno::Reference< uno::XInterface > SdPresentationDocument_createInstance( const uno::Reference< lang::XMultiServiceFactory > &, SfxModelFlags _nCreationFlags ) { SolarMutexGuard aGuard; diff --git a/sd/source/ui/unoidl/unomodule.cxx b/sd/source/ui/unoidl/unomodule.cxx index a885545f17b8..425f3d074d40 100644 --- a/sd/source/ui/unoidl/unomodule.cxx +++ b/sd/source/ui/unoidl/unomodule.cxx @@ -125,7 +125,7 @@ uno::Sequence< OUString > SAL_CALL SdUnoModule::getSupportedServiceNames( ) } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_comp_Draw_DrawingModule_get_implementation(css::uno::XComponentContext* , css::uno::Sequence<css::uno::Any> const &) { diff --git a/sdext/source/minimizer/pppoptimizeruno.cxx b/sdext/source/minimizer/pppoptimizeruno.cxx index 42e77bdf27c8..08a97a7f52d7 100644 --- a/sdext/source/minimizer/pppoptimizeruno.cxx +++ b/sdext/source/minimizer/pppoptimizeruno.cxx @@ -29,7 +29,7 @@ using namespace ::com::sun::star::registry; extern "C" { - SAL_DLLPUBLIC_EXPORT void* SAL_CALL pptminimizer_component_getFactory( + SAL_DLLPUBLIC_EXPORT void* pptminimizer_component_getFactory( const sal_Char * pImplName, void * pServiceManager, SAL_UNUSED_PARAMETER void * /*pRegistryKey*/ ) { diff --git a/sdext/source/pdfimport/services.cxx b/sdext/source/pdfimport/services.cxx index 1f597a65701f..405f0ef5b269 100644 --- a/sdext/source/pdfimport/services.cxx +++ b/sdext/source/pdfimport/services.cxx @@ -73,7 +73,7 @@ namespace namespace { - typedef Reference< XInterface > (SAL_CALL * ComponentFactory)( const Reference< XComponentContext >& ); + typedef Reference< XInterface > (* ComponentFactory)( const Reference< XComponentContext >& ); struct ComponentDescription { @@ -109,7 +109,7 @@ namespace } } -extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL pdfimport_component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void* pdfimport_component_getFactory( const sal_Char* pImplementationName, SAL_UNUSED_PARAMETER void* /*pServiceManager*/, SAL_UNUSED_PARAMETER void* /*pRegistryKey*/ ) diff --git a/sdext/source/presenter/PresenterComponent.cxx b/sdext/source/presenter/PresenterComponent.cxx index 8b35e454cb9a..fc99cd56fceb 100644 --- a/sdext/source/presenter/PresenterComponent.cxx +++ b/sdext/source/presenter/PresenterComponent.cxx @@ -47,7 +47,7 @@ static const struct ImplementationEntry gServiceEntries[] = { nullptr, nullptr, nullptr, nullptr, nullptr, 0 } }; -extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL presenter_component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * presenter_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , gServiceEntries); diff --git a/sfx2/inc/fwkhelper.hxx b/sfx2/inc/fwkhelper.hxx index 7a65cdfbfbbd..d92deb0e7b29 100644 --- a/sfx2/inc/fwkhelper.hxx +++ b/sfx2/inc/fwkhelper.hxx @@ -27,7 +27,7 @@ #include <rtl/ustring.hxx> -SFX2_DLLPUBLIC void SAL_CALL RefreshToolbars( +SFX2_DLLPUBLIC void RefreshToolbars( css::uno::Reference< css::frame::XFrame > const & rFrame ); diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx index 6afc7fd27a70..d227a942b3ca 100644 --- a/sfx2/source/appl/app.cxx +++ b/sfx2/source/appl/app.cxx @@ -416,10 +416,10 @@ void SfxApplication::Invalidate( sal_uInt16 nId ) #ifndef DISABLE_DYNLOADING -typedef long (SAL_CALL *basicide_handle_basic_error)(void*); -typedef void (SAL_CALL *basicide_macro_organizer)(sal_Int16); +typedef long (*basicide_handle_basic_error)(void*); +typedef void (*basicide_macro_organizer)(sal_Int16); -extern "C" { static void SAL_CALL thisModule() {} } +extern "C" { static void thisModule() {} } #else diff --git a/sfx2/source/appl/appbaslib.cxx b/sfx2/source/appl/appbaslib.cxx index 5d8d4b707e97..bea8b516753d 100644 --- a/sfx2/source/appl/appbaslib.cxx +++ b/sfx2/source/appl/appbaslib.cxx @@ -165,7 +165,7 @@ bool SfxBasicManagerHolder::LegacyPsswdBinaryLimitExceeded( std::vector< OUStrin } // Service for application library container -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_sfx2_ApplicationDialogLibraryContainer_get_implementation( css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) @@ -177,7 +177,7 @@ com_sun_star_comp_sfx2_ApplicationDialogLibraryContainer_get_implementation( } // Service for application library container -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_sfx2_ApplicationScriptLibraryContainer_get_implementation( css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) diff --git a/sfx2/source/appl/appdispatchprovider.cxx b/sfx2/source/appl/appdispatchprovider.cxx index 2c284688afaa..3c36486e3b7a 100644 --- a/sfx2/source/appl/appdispatchprovider.cxx +++ b/sfx2/source/appl/appdispatchprovider.cxx @@ -236,7 +236,7 @@ Sequence< frame::DispatchInformation > SAL_CALL SfxAppDispatchProvider::getConfi } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_sfx2_AppDispatchProvider_get_implementation( css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx index 43f4131ddc5f..89c5570a42b8 100644 --- a/sfx2/source/appl/appinit.cxx +++ b/sfx2/source/appl/appinit.cxx @@ -153,7 +153,7 @@ typedef bool ( *PFunc_getSpecialCharsForEdit)( vcl::Window* i_pParent, const vcl #ifndef DISABLE_DYNLOADING -extern "C" { static void SAL_CALL thisModule() {} } +extern "C" { static void thisModule() {} } #else diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index 1e2a2ec4984c..abb52252ce8b 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -1180,9 +1180,9 @@ void SfxApplication::MiscState_Impl(SfxItemSet &rSet) #ifndef DISABLE_DYNLOADING -typedef rtl_uString* (SAL_CALL *basicide_choose_macro)(void*, void*, sal_Bool); +typedef rtl_uString* (*basicide_choose_macro)(void*, void*, sal_Bool); -extern "C" { static void SAL_CALL thisModule() {} } +extern "C" { static void thisModule() {} } #else diff --git a/sfx2/source/appl/fwkhelper.cxx b/sfx2/source/appl/fwkhelper.cxx index f37eee376bca..64e527c4f4bc 100644 --- a/sfx2/source/appl/fwkhelper.cxx +++ b/sfx2/source/appl/fwkhelper.cxx @@ -29,7 +29,7 @@ #include <workwin.hxx> #include <sfx2/frame.hxx> -void SAL_CALL RefreshToolbars( css::uno::Reference< css::frame::XFrame > const & xFrame ) +void RefreshToolbars( css::uno::Reference< css::frame::XFrame > const & xFrame ) { SolarMutexGuard aGuard; if ( xFrame.is() ) diff --git a/sfx2/source/appl/macroloader.cxx b/sfx2/source/appl/macroloader.cxx index 3d18c43a93fb..e8bb6baa31bb 100644 --- a/sfx2/source/appl/macroloader.cxx +++ b/sfx2/source/appl/macroloader.cxx @@ -333,7 +333,7 @@ ErrCode SfxMacroLoader::loadMacro( const OUString& rURL, css::uno::Any& rRetval, #endif } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_sfx2_SfxMacroLoader_get_implementation( css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &arguments) diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx index 595d612d0690..df323eeca6cc 100644 --- a/sfx2/source/appl/shutdownicon.cxx +++ b/sfx2/source/appl/shutdownicon.cxx @@ -80,7 +80,7 @@ using namespace ::sfx2; #ifdef ENABLE_QUICKSTART_APPLET # if !defined(_WIN32) && !defined(MACOSX) -extern "C" { static void SAL_CALL thisModule() {} } +extern "C" { static void thisModule() {} } # endif #endif @@ -848,7 +848,7 @@ struct Singleton: } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_desktop_QuickstartWrapper_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) diff --git a/sfx2/source/appl/xpackcreator.cxx b/sfx2/source/appl/xpackcreator.cxx index 82f19dfd30ed..f5b7f7edf289 100644 --- a/sfx2/source/appl/xpackcreator.cxx +++ b/sfx2/source/appl/xpackcreator.cxx @@ -166,7 +166,7 @@ uno::Sequence< OUString > SAL_CALL OPackageStructureCreator::getSupportedService } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_embed_PackageStructureCreator_get_implementation( css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx index b4606a7401ca..4fb228570b5e 100644 --- a/sfx2/source/control/dispatch.cxx +++ b/sfx2/source/control/dispatch.cxx @@ -1628,7 +1628,7 @@ void SfxDispatcher::SetSlotFilter(SfxSlotFilterState nEnable, GetBindings()->InvalidateAll(true); } -extern "C" int SAL_CALL SfxCompareSIDs_Impl(const void* pSmaller, const void* pBigger) +extern "C" int SfxCompareSIDs_Impl(const void* pSmaller, const void* pBigger) { return ( (long) *static_cast<sal_uInt16 const *>(pSmaller) ) - ( (long) *static_cast<sal_uInt16 const *>(pBigger) ); } diff --git a/sfx2/source/control/objface.cxx b/sfx2/source/control/objface.cxx index 64ad7fdcf29e..5a04d69f5f90 100644 --- a/sfx2/source/control/objface.cxx +++ b/sfx2/source/control/objface.cxx @@ -35,14 +35,14 @@ extern "C" { -static int SAL_CALL +static int SfxCompareSlots_qsort( const void* pSmaller, const void* pBigger ) { return ( (int) static_cast<SfxSlot const *>(pSmaller)->GetSlotId() ) - ( (int) static_cast<SfxSlot const *>(pBigger)->GetSlotId() ); } -static int SAL_CALL +static int SfxCompareSlots_bsearch( const void* pSmaller, const void* pBigger ) { return ( (int) *static_cast<sal_uInt16 const *>(pSmaller) ) - diff --git a/sfx2/source/dialog/backingcomp.cxx b/sfx2/source/dialog/backingcomp.cxx index ddad76bb09de..86b8519e71b9 100644 --- a/sfx2/source/dialog/backingcomp.cxx +++ b/sfx2/source/dialog/backingcomp.cxx @@ -762,7 +762,7 @@ void SAL_CALL BackingComp::removeStatusListener( const css::uno::Reference< css: } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_sfx2_BackingComp_get_implementation( css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx index 8478cba9306f..d54acfd7688f 100644 --- a/sfx2/source/dialog/dockwin.cxx +++ b/sfx2/source/dialog/dockwin.cxx @@ -326,7 +326,7 @@ static SfxWorkWindow* lcl_getWorkWindowFromXFrame( const uno::Reference< frame:: The string rDockingWindowName MUST BE a valid ID! The ID is pre-defined by a certain slot range located in sfxsids.hrc (currently SID_DOCKWIN_START = 9800). */ -void SAL_CALL SfxDockingWindowFactory( const uno::Reference< frame::XFrame >& rFrame, const OUString& rDockingWindowName ) +void SfxDockingWindowFactory( const uno::Reference< frame::XFrame >& rFrame, const OUString& rDockingWindowName ) { SolarMutexGuard aGuard; sal_uInt16 nID = sal_uInt16(rDockingWindowName.toInt32()); @@ -351,7 +351,7 @@ void SAL_CALL SfxDockingWindowFactory( const uno::Reference< frame::XFrame >& rF a special name. The string rDockingWindowName MUST BE a valid ID! The ID is pre-defined by a certain slot range located in sfxsids.hrc (currently SID_DOCKWIN_START = 9800). */ -bool SAL_CALL IsDockingWindowVisible( const uno::Reference< frame::XFrame >& rFrame, const OUString& rDockingWindowName ) +bool IsDockingWindowVisible( const uno::Reference< frame::XFrame >& rFrame, const OUString& rDockingWindowName ) { SolarMutexGuard aGuard; diff --git a/sfx2/source/doc/SfxDocumentMetaData.cxx b/sfx2/source/doc/SfxDocumentMetaData.cxx index 63cae375728b..369735ff79f3 100644 --- a/sfx2/source/doc/SfxDocumentMetaData.cxx +++ b/sfx2/source/doc/SfxDocumentMetaData.cxx @@ -420,7 +420,7 @@ bool isValidDateTime(const css::util::DateTime & i_rDateTime) return i_rDateTime.Month > 0; } -std::pair< OUString, OUString > SAL_CALL +std::pair< OUString, OUString > getQualifier(const char* i_name) { OUString nm = OUString::createFromAscii(i_name); sal_Int32 ix = nm.indexOf(u':'); @@ -433,7 +433,7 @@ getQualifier(const char* i_name) { // get namespace for standard qualified names // NB: only call this with statically known strings! -OUString SAL_CALL getNameSpace(const char* i_qname) throw () +OUString getNameSpace(const char* i_qname) throw () { assert(i_qname); const char * ns = ""; @@ -446,7 +446,7 @@ OUString SAL_CALL getNameSpace(const char* i_qname) throw () return OUString::createFromAscii(ns); } -bool SAL_CALL +bool textToDateOrDateTime(css::util::Date & io_rd, css::util::DateTime & io_rdt, bool & o_rIsDateTime, boost::optional<sal_Int16> & o_rTimeZone, const OUString& i_text) throw () @@ -461,7 +461,7 @@ textToDateOrDateTime(css::util::Date & io_rd, css::util::DateTime & io_rdt, } // convert string to date/time -bool SAL_CALL +bool textToDateTime(css::util::DateTime & io_rdt, const OUString& i_text) throw () { if (::sax::Converter::parseDateTime(io_rdt, i_text)) { @@ -473,7 +473,7 @@ textToDateTime(css::util::DateTime & io_rdt, const OUString& i_text) throw () } // convert string to date/time with default return value -css::util::DateTime SAL_CALL +css::util::DateTime textToDateTimeDefault(const OUString& i_text) throw () { css::util::DateTime dt; @@ -483,7 +483,7 @@ textToDateTimeDefault(const OUString& i_text) throw () } // convert date to string -OUString SAL_CALL +OUString dateToText(css::util::Date const& i_rd, sal_Int16 const*const pTimeZone) throw () { @@ -498,7 +498,7 @@ dateToText(css::util::Date const& i_rd, // convert date/time to string -OUString SAL_CALL +OUString dateTimeToText(css::util::DateTime const& i_rdt, sal_Int16 const*const pTimeZone = nullptr) throw () { @@ -546,7 +546,7 @@ OUString durationToText(css::util::Duration const& i_rDur) throw () } // convert duration to string -OUString SAL_CALL durationToText(sal_Int32 i_value) throw () +OUString durationToText(sal_Int32 i_value) throw () { css::util::Duration ud; ud.Days = static_cast<sal_Int16>(i_value / (24 * 3600)); @@ -597,7 +597,7 @@ SfxDocumentMetaData::getURLProperties( // return the text of the (hopefully unique, i.e., normalize first!) text // node _below_ the given node /// @throws css::uno::RuntimeException -OUString SAL_CALL +OUString getNodeText(const css::uno::Reference<css::xml::dom::XNode>& i_xNode) { if (!i_xNode.is()) @@ -816,7 +816,7 @@ SfxDocumentMetaData::setMetaList(const char* i_name, } // convert property list to string list and attribute list -std::pair<css::uno::Sequence< OUString>, AttrVector> SAL_CALL +std::pair<css::uno::Sequence< OUString>, AttrVector> propsToStrings(css::uno::Reference<css::beans::XPropertySet> const & i_xPropSet) { ::std::vector< OUString > values; @@ -2130,7 +2130,7 @@ void SfxDocumentMetaData::createUserDefined() } // closing anonymous implementation namespace -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * CompatWriterDocPropsImpl_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) @@ -2138,7 +2138,7 @@ CompatWriterDocPropsImpl_get_implementation( return cppu::acquire(new CompatWriterDocPropsImpl(context)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SfxDocumentMetaData_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx index ec5efdfa4884..eee0ac0363ac 100644 --- a/sfx2/source/doc/doctemplates.cxx +++ b/sfx2/source/doc/doctemplates.cxx @@ -2796,7 +2796,7 @@ void SfxURLRelocator_Impl::makeAbsoluteURL( OUString & rURL ) } } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_sfx2_DocumentTemplates_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) diff --git a/sfx2/source/doc/iframe.cxx b/sfx2/source/doc/iframe.cxx index fb1126b157c6..1d65791ff158 100644 --- a/sfx2/source/doc/iframe.cxx +++ b/sfx2/source/doc/iframe.cxx @@ -405,7 +405,7 @@ void SAL_CALL IFrameObject::setTitle( const OUString& ) } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_sfx2_IFrameObject_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &arguments) diff --git a/sfx2/source/doc/ownsubfilterservice.cxx b/sfx2/source/doc/ownsubfilterservice.cxx index 530d8b8c7d5f..42d02284f100 100644 --- a/sfx2/source/doc/ownsubfilterservice.cxx +++ b/sfx2/source/doc/ownsubfilterservice.cxx @@ -112,7 +112,7 @@ uno::Sequence< OUString > SAL_CALL OwnSubFilterService::getSupportedServiceNames } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_document_OwnSubFilter_get_implementation( css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &arguments) diff --git a/sfx2/source/notify/globalevents.cxx b/sfx2/source/notify/globalevents.cxx index 011d775fcd32..cb3b322a5f8f 100644 --- a/sfx2/source/notify/globalevents.cxx +++ b/sfx2/source/notify/globalevents.cxx @@ -432,7 +432,7 @@ struct Singleton: } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_sfx2_GlobalEventBroadcaster_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) diff --git a/sfx2/source/statbar/stbitem.cxx b/sfx2/source/statbar/stbitem.cxx index bfd6f3b0feb0..4e03ee9cb3d0 100644 --- a/sfx2/source/statbar/stbitem.cxx +++ b/sfx2/source/statbar/stbitem.cxx @@ -66,7 +66,7 @@ sal_uInt16 SfxStatusBarControl::convertAwtToVCLMouseButtons( sal_Int16 nAwtMouse } -svt::StatusbarController* SAL_CALL SfxStatusBarControllerFactory( +svt::StatusbarController* SfxStatusBarControllerFactory( const uno::Reference< frame::XFrame >& rFrame, StatusBar* pStatusBar, unsigned short nID, diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx index 4732b6bae239..aa850909e03d 100644 --- a/sfx2/source/toolbox/tbxitem.cxx +++ b/sfx2/source/toolbox/tbxitem.cxx @@ -118,7 +118,7 @@ static vcl::Window* GetTopMostParentSystemWindow( vcl::Window* pWindow ) return nullptr; } -svt::ToolboxController* SAL_CALL SfxToolBoxControllerFactory( const Reference< XFrame >& rFrame, ToolBox* pToolbox, unsigned short nID, const OUString& aCommandURL ) +svt::ToolboxController* SfxToolBoxControllerFactory( const Reference< XFrame >& rFrame, ToolBox* pToolbox, unsigned short nID, const OUString& aCommandURL ) { SolarMutexGuard aGuard; diff --git a/sfx2/source/view/classificationcontroller.cxx b/sfx2/source/view/classificationcontroller.cxx index ab0531fbb83d..81c4762c8403 100644 --- a/sfx2/source/view/classificationcontroller.cxx +++ b/sfx2/source/view/classificationcontroller.cxx @@ -360,7 +360,7 @@ void ClassificationControl::setCategoryStateFromPolicy(SfxClassificationHelper & } // namespace sfx2 -extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface* SAL_CALL com_sun_star_sfx2_ClassificationCategoriesController_get_implementation(uno::XComponentContext* pContext, const uno::Sequence<uno::Any>&) +extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface* com_sun_star_sfx2_ClassificationCategoriesController_get_implementation(uno::XComponentContext* pContext, const uno::Sequence<uno::Any>&) { return cppu::acquire(new sfx2::ClassificationCategoriesController(pContext)); } diff --git a/sfx2/source/view/frmload.cxx b/sfx2/source/view/frmload.cxx index a91543129e95..153ff8e16a10 100644 --- a/sfx2/source/view/frmload.cxx +++ b/sfx2/source/view/frmload.cxx @@ -775,7 +775,7 @@ Sequence< OUString > SAL_CALL SfxFrameLoader_Impl::getSupportedServiceNames() } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_office_FrameLoader_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) diff --git a/shell/source/backends/desktopbe/desktopbackend.cxx b/shell/source/backends/desktopbe/desktopbackend.cxx index f86ceb2ad413..1ce27ebbc8fb 100644 --- a/shell/source/backends/desktopbe/desktopbackend.cxx +++ b/shell/source/backends/desktopbe/desktopbackend.cxx @@ -53,12 +53,12 @@ namespace { -OUString SAL_CALL getDefaultImplementationName() { +OUString getDefaultImplementationName() { return OUString( "com.sun.star.comp.configuration.backend.DesktopBackend"); } -css::uno::Sequence< OUString > SAL_CALL getDefaultSupportedServiceNames() { +css::uno::Sequence< OUString > getDefaultSupportedServiceNames() { OUString name( "com.sun.star.configuration.backend.DesktopBackend"); return css::uno::Sequence< OUString >(&name, 1); @@ -287,7 +287,7 @@ css::uno::Reference< css::uno::XInterface > createBackend( } } -css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( +css::uno::Reference< css::uno::XInterface > createInstance( css::uno::Reference< css::uno::XComponentContext > const & context) { OUString desktop; @@ -321,7 +321,7 @@ static cppu::ImplementationEntry const services[] = { } -extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL desktopbe1_component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * desktopbe1_component_getFactory( char const * pImplName, void * pServiceManager, void * pRegistryKey) { return cppu::component_getFactoryHelper( diff --git a/shell/source/backends/localebe/localebecdef.cxx b/shell/source/backends/localebe/localebecdef.cxx index b377c28027d9..93d2bc45e012 100644 --- a/shell/source/backends/localebe/localebecdef.cxx +++ b/shell/source/backends/localebe/localebecdef.cxx @@ -26,7 +26,7 @@ namespace uno = com::sun::star::uno ; -static uno::Reference<uno::XInterface> SAL_CALL createLocaleBackend( +static uno::Reference<uno::XInterface> createLocaleBackend( SAL_UNUSED_PARAMETER const uno::Reference<uno::XComponentContext>&){ return * LocaleBackend::createInstance(); @@ -47,7 +47,7 @@ static const cppu::ImplementationEntry kImplementations_entries[] = } ; -extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL localebe1_component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * localebe1_component_getFactory( const sal_Char *aImplementationName, void *aServiceManager, void *aRegistryKey) { diff --git a/shell/source/cmdmail/cmdmailentry.cxx b/shell/source/cmdmail/cmdmailentry.cxx index 1e17dde9b3b4..217343612fe8 100644 --- a/shell/source/cmdmail/cmdmailentry.cxx +++ b/shell/source/cmdmail/cmdmailentry.cxx @@ -33,7 +33,7 @@ using com::sun::star::system::XSimpleMailClientSupplier; namespace { - Reference< XInterface > SAL_CALL createInstance( const Reference< XComponentContext >& xContext ) + Reference< XInterface > createInstance( const Reference< XComponentContext >& xContext ) { return Reference< XInterface >( static_cast< XSimpleMailClientSupplier* >( new CmdMailSuppl( xContext ) ) ); } @@ -42,7 +42,7 @@ namespace extern "C" { -SAL_DLLPUBLIC_EXPORT void* SAL_CALL cmdmail_component_getFactory( +SAL_DLLPUBLIC_EXPORT void* cmdmail_component_getFactory( const sal_Char* pImplName, SAL_UNUSED_PARAMETER void* /*pSrvManager*/, SAL_UNUSED_PARAMETER void* /*pRegistryKey*/ ) diff --git a/shell/source/cmdmail/cmdmailsuppl.cxx b/shell/source/cmdmail/cmdmailsuppl.cxx index 77285609648f..687bee4a09ff 100644 --- a/shell/source/cmdmail/cmdmailsuppl.cxx +++ b/shell/source/cmdmail/cmdmailsuppl.cxx @@ -55,7 +55,7 @@ using namespace com::sun::star::configuration; namespace { - Sequence< OUString > SAL_CALL Component_getSupportedServiceNames() + Sequence< OUString > Component_getSupportedServiceNames() { Sequence< OUString > aRet { "com.sun.star.system.SimpleCommandMail" }; return aRet; diff --git a/shell/source/sessioninstall/services.cxx b/shell/source/sessioninstall/services.cxx index bb86e036383a..fbb6641d8eb5 100644 --- a/shell/source/sessioninstall/services.cxx +++ b/shell/source/sessioninstall/services.cxx @@ -21,14 +21,14 @@ const sdecl::ServiceDecl SyncDbusSessionHelperServiceDecl( "org.freedesktop.PackageKit.SyncDbusSessionHelper"); extern "C" -SAL_DLLPUBLIC_EXPORT void* SAL_CALL losessioninstall_component_getFactory( sal_Char const* pImplName, +SAL_DLLPUBLIC_EXPORT void* losessioninstall_component_getFactory( sal_Char const* pImplName, void*, void* ) { return sdecl::component_getFactoryHelper( pImplName, {&SyncDbusSessionHelperServiceDecl} ); } extern "C" -SAL_DLLPUBLIC_EXPORT void* SAL_CALL sessioninstall_component_getFactory( sal_Char const* pImplName, void* pServiceManager, void* pRegistryKey ) +SAL_DLLPUBLIC_EXPORT void* sessioninstall_component_getFactory( sal_Char const* pImplName, void* pServiceManager, void* pRegistryKey ) { return losessioninstall_component_getFactory(pImplName, pServiceManager, pRegistryKey); } diff --git a/shell/source/unix/exec/shellexec.cxx b/shell/source/unix/exec/shellexec.cxx index 3411f2c446fe..d66a27668d06 100644 --- a/shell/source/unix/exec/shellexec.cxx +++ b/shell/source/unix/exec/shellexec.cxx @@ -51,7 +51,7 @@ using namespace cppu; namespace { - Sequence< OUString > SAL_CALL ShellExec_getSupportedServiceNames() + Sequence< OUString > ShellExec_getSupportedServiceNames() { Sequence< OUString > aRet { "com.sun.star.system.SystemShellExecute" }; return aRet; diff --git a/shell/source/unix/exec/shellexecentry.cxx b/shell/source/unix/exec/shellexecentry.cxx index bb6cd0c297fc..3b1792ef58db 100644 --- a/shell/source/unix/exec/shellexecentry.cxx +++ b/shell/source/unix/exec/shellexecentry.cxx @@ -31,7 +31,7 @@ using com::sun::star::system::XSystemShellExecute; namespace { - Reference< XInterface > SAL_CALL createInstance(const Reference< XComponentContext >& xContext) + Reference< XInterface > createInstance(const Reference< XComponentContext >& xContext) { return Reference< XInterface >( static_cast< XSystemShellExecute* >( new ShellExec(xContext) ) ); } @@ -40,7 +40,7 @@ namespace extern "C" { -SAL_DLLPUBLIC_EXPORT void* SAL_CALL syssh_component_getFactory( +SAL_DLLPUBLIC_EXPORT void* syssh_component_getFactory( const sal_Char* pImplName, SAL_UNUSED_PARAMETER void* /*pSrvManager*/, SAL_UNUSED_PARAMETER void* /*pRegistryKey*/ ) diff --git a/slideshow/source/engine/opengl/TransitionerImpl.cxx b/slideshow/source/engine/opengl/TransitionerImpl.cxx index 846b5ca8c0c0..f8018c0275e6 100644 --- a/slideshow/source/engine/opengl/TransitionerImpl.cxx +++ b/slideshow/source/engine/opengl/TransitionerImpl.cxx @@ -1334,7 +1334,7 @@ namespace sdecl = comphelper::service_decl; // The C shared lib entry points extern "C" -SAL_DLLPUBLIC_EXPORT void* SAL_CALL ogltrans_component_getFactory( sal_Char const* pImplName, +SAL_DLLPUBLIC_EXPORT void* ogltrans_component_getFactory( sal_Char const* pImplName, void*, void* ) { return sdecl::component_getFactoryHelper( pImplName, {&OGLTransitionFactoryDecl} ); diff --git a/slideshow/source/engine/slide/targetpropertiescreator.cxx b/slideshow/source/engine/slide/targetpropertiescreator.cxx index dc2006c462fb..0255f534815e 100644 --- a/slideshow/source/engine/slide/targetpropertiescreator.cxx +++ b/slideshow/source/engine/slide/targetpropertiescreator.cxx @@ -327,7 +327,7 @@ namespace internal }; } - uno::Sequence< animations::TargetProperties > SAL_CALL TargetPropertiesCreator::createTargetProperties + uno::Sequence< animations::TargetProperties > TargetPropertiesCreator::createTargetProperties ( const uno::Reference< animations::XAnimationNode >& xRootNode, bool bInitial diff --git a/slideshow/source/engine/slide/targetpropertiescreator.hxx b/slideshow/source/engine/slide/targetpropertiescreator.hxx index 24c7fafea63a..abde8a7349ee 100644 --- a/slideshow/source/engine/slide/targetpropertiescreator.hxx +++ b/slideshow/source/engine/slide/targetpropertiescreator.hxx @@ -35,7 +35,7 @@ namespace slideshow namespace TargetPropertiesCreator { /// Generate shape property list - set bInitial to true for initial slide state - uno::Sequence< animations::TargetProperties > SAL_CALL createTargetProperties( + uno::Sequence< animations::TargetProperties > createTargetProperties( const uno::Reference< animations::XAnimationNode >& rootNode, bool bInitial ); } diff --git a/slideshow/source/engine/slideshowimpl.cxx b/slideshow/source/engine/slideshowimpl.cxx index 18c2534ce541..0bc180ca589b 100644 --- a/slideshow/source/engine/slideshowimpl.cxx +++ b/slideshow/source/engine/slideshowimpl.cxx @@ -2393,7 +2393,7 @@ const sdecl::ServiceDecl slideShowDecl( // The C shared lib entry points extern "C" -SAL_DLLPUBLIC_EXPORT void* SAL_CALL slideshow_component_getFactory( sal_Char const* pImplName, +SAL_DLLPUBLIC_EXPORT void* slideshow_component_getFactory( sal_Char const* pImplName, void*, void* ) { return sdecl::component_getFactoryHelper( pImplName, {&slideShowDecl} ); diff --git a/sot/source/sdstor/storage.cxx b/sot/source/sdstor/storage.cxx index ac723c28e251..520de0629577 100644 --- a/sot/source/sdstor/storage.cxx +++ b/sot/source/sdstor/storage.cxx @@ -849,7 +849,7 @@ namespace } } -extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportOLE2(SvStream &rStream) +extern "C" SAL_DLLPUBLIC_EXPORT bool TestImportOLE2(SvStream &rStream) { try { diff --git a/sot/source/unoolestorage/xolesimplestorage.cxx b/sot/source/unoolestorage/xolesimplestorage.cxx index 269a8a5df5ae..5823378fc551 100644 --- a/sot/source/unoolestorage/xolesimplestorage.cxx +++ b/sot/source/unoolestorage/xolesimplestorage.cxx @@ -698,7 +698,7 @@ uno::Sequence< OUString > SAL_CALL OLESimpleStorage::getSupportedServiceNames() return { "com.sun.star.embed.OLESimpleStorage" }; } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_embed_OLESimpleStorage( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &arguments) diff --git a/starmath/source/detreg.cxx b/starmath/source/detreg.cxx index b5d3b8f2acb7..12a2428ba28c 100644 --- a/starmath/source/detreg.cxx +++ b/starmath/source/detreg.cxx @@ -27,7 +27,7 @@ using namespace ::com::sun::star::lang; extern "C" { -SAL_DLLPUBLIC_EXPORT void* SAL_CALL smd_component_getFactory( const sal_Char* pImplementationName, +SAL_DLLPUBLIC_EXPORT void* smd_component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, void* /*pRegistryKey*/ ) { diff --git a/starmath/source/mathmlexport.cxx b/starmath/source/mathmlexport.cxx index 5a4adc576f47..c25e7396d4ca 100644 --- a/starmath/source/mathmlexport.cxx +++ b/starmath/source/mathmlexport.cxx @@ -365,37 +365,37 @@ const uno::Sequence< sal_Int8 > & SmXMLExport::getUnoTunnelId() throw() return theSmXMLExportUnoTunnelId::get().getSeq(); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* Math_XMLExporter_get_implementation(css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new SmXMLExport(context, "com.sun.star.comp.Math.XMLExporter", SvXMLExportFlags::OASIS|SvXMLExportFlags::ALL)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* Math_XMLMetaExporter_get_implementation(css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new SmXMLExport(context, "com.sun.star.comp.Math.XMLMetaExporter", SvXMLExportFlags::META)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* Math_XMLOasisMetaExporter_get_implementation(css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new SmXMLExport(context, "com.sun.star.comp.Math.XMLOasisMetaExporter", SvXMLExportFlags::OASIS|SvXMLExportFlags::META)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* Math_XMLSettingsExporter_get_implementation(css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new SmXMLExport(context, "com.sun.star.comp.Math.XMLSettingsExporter", SvXMLExportFlags::SETTINGS)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* Math_XMLOasisSettingsExporter_get_implementation(css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new SmXMLExport(context, "com.sun.star.comp.Math.XMLOasisSettingsExporter", SvXMLExportFlags::OASIS|SvXMLExportFlags::SETTINGS)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* Math_XMLContentExporter_get_implementation(css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new SmXMLExport(context, "com.sun.star.comp.Math.XMLContentExporter", SvXMLExportFlags::OASIS|SvXMLExportFlags::CONTENT)); diff --git a/starmath/source/mathmlimport.cxx b/starmath/source/mathmlimport.cxx index 3697f23b3c4d..59fa00467b42 100644 --- a/starmath/source/mathmlimport.cxx +++ b/starmath/source/mathmlimport.cxx @@ -423,54 +423,54 @@ const uno::Sequence< sal_Int8 > & SmXMLImport::getUnoTunnelId() throw() return theSmXMLImportUnoTunnelId::get().getSeq(); } -OUString SAL_CALL SmXMLImport_getImplementationName() throw() +OUString SmXMLImport_getImplementationName() throw() { return OUString( "com.sun.star.comp.Math.XMLImporter" ); } -uno::Sequence< OUString > SAL_CALL SmXMLImport_getSupportedServiceNames() +uno::Sequence< OUString > SmXMLImport_getSupportedServiceNames() throw() { return uno::Sequence<OUString>{ IMPORT_SVC_NAME }; } -uno::Reference< uno::XInterface > SAL_CALL SmXMLImport_createInstance( +uno::Reference< uno::XInterface > SmXMLImport_createInstance( const uno::Reference< lang::XMultiServiceFactory > & rSMgr) { return static_cast<cppu::OWeakObject*>(new SmXMLImport(comphelper::getComponentContext(rSMgr), SmXMLImport_getImplementationName(), SvXMLImportFlags::ALL)); } -OUString SAL_CALL SmXMLImportMeta_getImplementationName() throw() +OUString SmXMLImportMeta_getImplementationName() throw() { return OUString( "com.sun.star.comp.Math.XMLOasisMetaImporter" ); } -uno::Sequence< OUString > SAL_CALL SmXMLImportMeta_getSupportedServiceNames() +uno::Sequence< OUString > SmXMLImportMeta_getSupportedServiceNames() throw() { return uno::Sequence<OUString>{ IMPORT_SVC_NAME }; } -uno::Reference< uno::XInterface > SAL_CALL SmXMLImportMeta_createInstance( +uno::Reference< uno::XInterface > SmXMLImportMeta_createInstance( const uno::Reference< lang::XMultiServiceFactory > & rSMgr) { return static_cast<cppu::OWeakObject*>(new SmXMLImport( comphelper::getComponentContext(rSMgr), SmXMLImportMeta_getImplementationName(), SvXMLImportFlags::META )); } -OUString SAL_CALL SmXMLImportSettings_getImplementationName() throw() +OUString SmXMLImportSettings_getImplementationName() throw() { return OUString( "com.sun.star.comp.Math.XMLOasisSettingsImporter" ); } -uno::Sequence< OUString > SAL_CALL SmXMLImportSettings_getSupportedServiceNames() +uno::Sequence< OUString > SmXMLImportSettings_getSupportedServiceNames() throw() { return uno::Sequence<OUString>{ IMPORT_SVC_NAME }; } -uno::Reference< uno::XInterface > SAL_CALL SmXMLImportSettings_createInstance( +uno::Reference< uno::XInterface > SmXMLImportSettings_createInstance( const uno::Reference< lang::XMultiServiceFactory > & rSMgr) { return static_cast<cppu::OWeakObject*>(new SmXMLImport( comphelper::getComponentContext(rSMgr), SmXMLImportSettings_getImplementationName(), SvXMLImportFlags::SETTINGS )); @@ -3115,7 +3115,7 @@ void SmXMLImport::SetConfigurationSettings(const Sequence<PropertyValue>& aConfP } } -extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportMML(SvStream &rStream) +extern "C" SAL_DLLPUBLIC_EXPORT bool TestImportMML(SvStream &rStream) { SmGlobals::ensure(); diff --git a/starmath/source/mathtype.cxx b/starmath/source/mathtype.cxx index c7016656a3e1..9c726cc67c08 100644 --- a/starmath/source/mathtype.cxx +++ b/starmath/source/mathtype.cxx @@ -3340,7 +3340,7 @@ void MathType::HandleText(SmNode *pNode) } } -extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportMathType(SvStream &rStream) +extern "C" SAL_DLLPUBLIC_EXPORT bool TestImportMathType(SvStream &rStream) { OUString sText; MathType aEquation(sText); diff --git a/starmath/source/register.cxx b/starmath/source/register.cxx index 946e8543afbe..e99038c3acb6 100644 --- a/starmath/source/register.cxx +++ b/starmath/source/register.cxx @@ -30,7 +30,7 @@ using namespace ::com::sun::star::lang; extern "C" { -SAL_DLLPUBLIC_EXPORT void* SAL_CALL sm_component_getFactory( const sal_Char* pImplementationName, +SAL_DLLPUBLIC_EXPORT void* sm_component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, void* /*pRegistryKey*/ ) { diff --git a/starmath/source/register.hxx b/starmath/source/register.hxx index 9cdd82a06bb6..cf6bac038eb7 100644 --- a/starmath/source/register.hxx +++ b/starmath/source/register.hxx @@ -24,34 +24,34 @@ #include <sfx2/sfxmodelfactory.hxx> //Math document -css::uno::Sequence< OUString > SAL_CALL +css::uno::Sequence< OUString > SmDocument_getSupportedServiceNames() throw(); -OUString SAL_CALL +OUString SmDocument_getImplementationName() throw(); /// @throws css::uno::Exception -css::uno::Reference< css::uno::XInterface >SAL_CALL +css::uno::Reference< css::uno::XInterface > SmDocument_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr, SfxModelFlags _nCreationFlags); //MathML import -css::uno::Sequence< OUString > SAL_CALL +css::uno::Sequence< OUString > SmXMLImport_getSupportedServiceNames() throw(); -OUString SAL_CALL +OUString SmXMLImport_getImplementationName() throw(); /// @throws css::uno::Exception -css::uno::Reference< css::uno::XInterface > SAL_CALL +css::uno::Reference< css::uno::XInterface > SmXMLImport_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr); -css::uno::Sequence< OUString > SAL_CALL +css::uno::Sequence< OUString > SmXMLImportMeta_getSupportedServiceNames() throw(); -OUString SAL_CALL +OUString SmXMLImportMeta_getImplementationName() throw(); /// @throws css::uno::Exception -css::uno::Reference< css::uno::XInterface > SAL_CALL +css::uno::Reference< css::uno::XInterface > SmXMLImportMeta_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr); -css::uno::Sequence< OUString > SAL_CALL +css::uno::Sequence< OUString > SmXMLImportSettings_getSupportedServiceNames() throw(); -OUString SAL_CALL SmXMLImportSettings_getImplementationName() throw(); +OUString SmXMLImportSettings_getImplementationName() throw(); /// @throws css::uno::Exception -css::uno::Reference< css::uno::XInterface > SAL_CALL +css::uno::Reference< css::uno::XInterface > SmXMLImportSettings_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr); #endif diff --git a/starmath/source/unodoc.cxx b/starmath/source/unodoc.cxx index 23de3a86e3ca..6355b5860f2f 100644 --- a/starmath/source/unodoc.cxx +++ b/starmath/source/unodoc.cxx @@ -27,17 +27,17 @@ using namespace ::com::sun::star; -OUString SAL_CALL SmDocument_getImplementationName() throw() +OUString SmDocument_getImplementationName() throw() { return OUString( "com.sun.star.comp.Math.FormulaDocument" ); } -uno::Sequence< OUString > SAL_CALL SmDocument_getSupportedServiceNames() throw() +uno::Sequence< OUString > SmDocument_getSupportedServiceNames() throw() { return uno::Sequence<OUString>{ "com.sun.star.formula.FormulaProperties" }; } -uno::Reference< uno::XInterface > SAL_CALL SmDocument_createInstance( +uno::Reference< uno::XInterface > SmDocument_createInstance( const uno::Reference< lang::XMultiServiceFactory > & /*rSMgr*/, SfxModelFlags _nCreationFlags ) { SolarMutexGuard aGuard; diff --git a/starmath/source/unofilter.cxx b/starmath/source/unofilter.cxx index 597d8f41718e..4a1d329731d3 100644 --- a/starmath/source/unofilter.cxx +++ b/starmath/source/unofilter.cxx @@ -115,7 +115,7 @@ uno::Sequence<OUString> MathTypeFilter::getSupportedServiceNames() return aRet; } -extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface* SAL_CALL com_sun_star_comp_Math_MathTypeFilter_get_implementation(uno::XComponentContext* /*pCtx*/, uno::Sequence<uno::Any> const& /*rSeq*/) +extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface* com_sun_star_comp_Math_MathTypeFilter_get_implementation(uno::XComponentContext* /*pCtx*/, uno::Sequence<uno::Any> const& /*rSeq*/) { return cppu::acquire(new MathTypeFilter); } diff --git a/stoc/source/corereflection/crefl.cxx b/stoc/source/corereflection/crefl.cxx index 1621ecb6627e..d7d59c769dcc 100644 --- a/stoc/source/corereflection/crefl.cxx +++ b/stoc/source/corereflection/crefl.cxx @@ -395,7 +395,7 @@ struct Singleton: } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_stoc_CoreReflection_get_implementation( css::uno::XComponentContext * context, css::uno::Sequence<css::uno::Any> const & arguments) diff --git a/stoc/source/defaultregistry/defaultregistry.cxx b/stoc/source/defaultregistry/defaultregistry.cxx index 5f24b18e34f6..90153bb123e8 100644 --- a/stoc/source/defaultregistry/defaultregistry.cxx +++ b/stoc/source/defaultregistry/defaultregistry.cxx @@ -1272,7 +1272,7 @@ void SAL_CALL NestedRegistryImpl::mergeKey( const OUString& aKeyName, const OUSt } // namespace -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_stoc_NestedRegistry_get_implementation( SAL_UNUSED_PARAMETER css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) diff --git a/stoc/source/implementationregistration/implreg.cxx b/stoc/source/implementationregistration/implreg.cxx index 3a86e6c864d9..a4a7f0beeca6 100644 --- a/stoc/source/implementationregistration/implreg.cxx +++ b/stoc/source/implementationregistration/implreg.cxx @@ -1717,7 +1717,7 @@ Reference< XSimpleRegistry > ImplementationRegistration::createTemporarySimpleRe } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_stoc_ImplementationRegistration_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) diff --git a/stoc/source/inspect/introspection.cxx b/stoc/source/inspect/introspection.cxx index 870a74a9bd55..67d2226a286b 100644 --- a/stoc/source/inspect/introspection.cxx +++ b/stoc/source/inspect/introspection.cxx @@ -2466,7 +2466,7 @@ struct Singleton: } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_stoc_Introspection_get_implementation( css::uno::XComponentContext * context, css::uno::Sequence<css::uno::Any> const & arguments) diff --git a/stoc/source/invocation/invocation.cxx b/stoc/source/invocation/invocation.cxx index 355da85b9bed..fa75e1dbf94b 100644 --- a/stoc/source/invocation/invocation.cxx +++ b/stoc/source/invocation/invocation.cxx @@ -1114,7 +1114,7 @@ Reference<XInterface> InvocationService::createInstanceWithArguments( } /// @throws RuntimeException -Reference<XInterface> SAL_CALL InvocationService_CreateInstance( const Reference<XComponentContext> & xCtx ) +Reference<XInterface> InvocationService_CreateInstance( const Reference<XComponentContext> & xCtx ) { Reference<XInterface> xService( *new InvocationService( xCtx ) ); return xService; @@ -1133,7 +1133,7 @@ static const struct ImplementationEntry g_entries[] = { nullptr, nullptr, nullptr, nullptr, nullptr, 0 } }; -extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL invocation_component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * invocation_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , g_entries ); diff --git a/stoc/source/invocation_adapterfactory/iafactory.cxx b/stoc/source/invocation_adapterfactory/iafactory.cxx index a4eba831991a..fea4816ac99e 100644 --- a/stoc/source/invocation_adapterfactory/iafactory.cxx +++ b/stoc/source/invocation_adapterfactory/iafactory.cxx @@ -551,17 +551,17 @@ void AdapterImpl::invoke( extern "C" { -static void SAL_CALL adapter_acquire( uno_Interface * pUnoI ) +static void adapter_acquire( uno_Interface * pUnoI ) { static_cast< InterfaceAdapterImpl * >( pUnoI )->m_pAdapter->acquire(); } -static void SAL_CALL adapter_release( uno_Interface * pUnoI ) +static void adapter_release( uno_Interface * pUnoI ) { static_cast< InterfaceAdapterImpl * >( pUnoI )->m_pAdapter->release(); } -static void SAL_CALL adapter_dispatch( +static void adapter_dispatch( uno_Interface * pUnoI, const typelib_TypeDescription * pMemberType, void * pReturn, void * pArgs[], uno_Any ** ppException ) { @@ -882,7 +882,7 @@ Sequence< OUString > FactoryImpl::getSupportedServiceNames() } /// @throws Exception -static Reference< XInterface > SAL_CALL FactoryImpl_create( +static Reference< XInterface > FactoryImpl_create( const Reference< XComponentContext > & xContext ) { return static_cast<cppu::OWeakObject *>(new FactoryImpl( xContext )); @@ -903,7 +903,7 @@ static const struct ::cppu::ImplementationEntry g_entries[] = { nullptr, nullptr, nullptr, nullptr, nullptr, 0 } }; -extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL invocadapt_component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * invocadapt_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { return ::cppu::component_getFactoryHelper( diff --git a/stoc/source/javaloader/javaloader.cxx b/stoc/source/javaloader/javaloader.cxx index 02bb22d2b7d9..0636e97c2236 100644 --- a/stoc/source/javaloader/javaloader.cxx +++ b/stoc/source/javaloader/javaloader.cxx @@ -334,7 +334,7 @@ static Mutex & getInitMutex() } /// @throws Exception -css::uno::Reference<XInterface> SAL_CALL JavaComponentLoader_CreateInstance(const css::uno::Reference<XComponentContext> & xCtx) +css::uno::Reference<XInterface> JavaComponentLoader_CreateInstance(const css::uno::Reference<XComponentContext> & xCtx) { css::uno::Reference<XInterface> xRet; @@ -380,7 +380,7 @@ static const struct ImplementationEntry g_entries[] = extern "C" { -SAL_DLLPUBLIC_EXPORT void * SAL_CALL javaloader_component_getFactory( +SAL_DLLPUBLIC_EXPORT void * javaloader_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , g_entries ); diff --git a/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx index 11e089740a47..b03834ea46bc 100644 --- a/stoc/source/javavm/javavm.cxx +++ b/stoc/source/javavm/javavm.cxx @@ -204,7 +204,7 @@ css::uno::Sequence< OUString > serviceGetSupportedServiceNames() return css::uno::Sequence< OUString > { "com.sun.star.java.JavaVirtualMachine" }; } -css::uno::Reference< css::uno::XInterface > SAL_CALL serviceCreateInstance( +css::uno::Reference< css::uno::XInterface > serviceCreateInstance( css::uno::Reference< css::uno::XComponentContext > const & rContext) { // Only one single instance of this service is ever constructed, and is @@ -587,7 +587,7 @@ private: } -extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL javavm_component_getFactory(sal_Char const * pImplName, +extern "C" SAL_DLLPUBLIC_EXPORT void * javavm_component_getFactory(sal_Char const * pImplName, void * pServiceManager, void * pRegistryKey) { diff --git a/stoc/source/loader/dllcomponentloader.cxx b/stoc/source/loader/dllcomponentloader.cxx index 2553dc171c54..db48d2d2ad28 100644 --- a/stoc/source/loader/dllcomponentloader.cxx +++ b/stoc/source/loader/dllcomponentloader.cxx @@ -149,7 +149,7 @@ sal_Bool SAL_CALL DllComponentLoader::writeRegistryInfo( } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_stoc_DLLComponentLoader_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) diff --git a/stoc/source/namingservice/namingservice.cxx b/stoc/source/namingservice/namingservice.cxx index 5fd2761d041a..daf5e2570141 100644 --- a/stoc/source/namingservice/namingservice.cxx +++ b/stoc/source/namingservice/namingservice.cxx @@ -82,7 +82,7 @@ public: }; -static Reference<XInterface> SAL_CALL NamingService_Impl_create( +static Reference<XInterface> NamingService_Impl_create( SAL_UNUSED_PARAMETER const Reference<XComponentContext> & ) { return *new NamingService_Impl(); @@ -147,7 +147,7 @@ static const struct ImplementationEntry g_entries[] = { nullptr, nullptr, nullptr, nullptr, nullptr, 0 } }; -extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL namingservice_component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * namingservice_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , g_entries ); diff --git a/stoc/source/proxy_factory/proxyfac.cxx b/stoc/source/proxy_factory/proxyfac.cxx index ae2c94f3c426..99915cde3e3a 100644 --- a/stoc/source/proxy_factory/proxyfac.cxx +++ b/stoc/source/proxy_factory/proxyfac.cxx @@ -191,7 +191,7 @@ extern "C" { -static void SAL_CALL binuno_proxy_free( +static void binuno_proxy_free( uno_ExtEnvironment * pEnv, void * pProxy ) { binuno_Proxy * proxy = static_cast< binuno_Proxy * >( @@ -201,7 +201,7 @@ static void SAL_CALL binuno_proxy_free( } -static void SAL_CALL binuno_proxy_acquire( uno_Interface * pUnoI ) +static void binuno_proxy_acquire( uno_Interface * pUnoI ) { binuno_Proxy * that = static_cast< binuno_Proxy * >( pUnoI ); if (osl_atomic_increment( &that->m_nRefCount ) == 1) @@ -220,7 +220,7 @@ static void SAL_CALL binuno_proxy_acquire( uno_Interface * pUnoI ) } -static void SAL_CALL binuno_proxy_release( uno_Interface * pUnoI ) +static void binuno_proxy_release( uno_Interface * pUnoI ) { binuno_Proxy * that = static_cast< binuno_Proxy * >( pUnoI ); if (osl_atomic_decrement( &that->m_nRefCount ) == 0) @@ -233,7 +233,7 @@ static void SAL_CALL binuno_proxy_release( uno_Interface * pUnoI ) } -static void SAL_CALL binuno_proxy_dispatch( +static void binuno_proxy_dispatch( uno_Interface * pUnoI, const typelib_TypeDescription * pMemberType, void * pReturn, void * pArgs [], uno_Any ** ppException ) { @@ -428,7 +428,7 @@ Sequence< OUString > FactoryImpl::getSupportedServiceNames() } /// @throws Exception -Reference< XInterface > SAL_CALL proxyfac_create( +Reference< XInterface > proxyfac_create( SAL_UNUSED_PARAMETER Reference< XComponentContext > const & ) { Reference< XInterface > xRet; @@ -459,7 +459,7 @@ static const ::cppu::ImplementationEntry g_entries [] = } -extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL proxyfac_component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * proxyfac_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { return ::cppu::component_getFactoryHelper( diff --git a/stoc/source/security/access_controller.cxx b/stoc/source/security/access_controller.cxx index 06fdc0e4cfbf..0ae4c8302c9a 100644 --- a/stoc/source/security/access_controller.cxx +++ b/stoc/source/security/access_controller.cxx @@ -855,7 +855,7 @@ Sequence< OUString > AccessController::getSupportedServiceNames() } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_security_comp_stoc_AccessController_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) diff --git a/stoc/source/security/file_policy.cxx b/stoc/source/security/file_policy.cxx index 6036f4b46f51..305d89585ea5 100644 --- a/stoc/source/security/file_policy.cxx +++ b/stoc/source/security/file_policy.cxx @@ -490,7 +490,7 @@ Sequence< OUString > FilePolicy::getSupportedServiceNames() } // namespace -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_security_comp_stoc_FilePolicy_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) diff --git a/stoc/source/servicemanager/servicemanager.cxx b/stoc/source/servicemanager/servicemanager.cxx index a44d788d3ecb..7774bf02f5b5 100644 --- a/stoc/source/servicemanager/servicemanager.cxx +++ b/stoc/source/servicemanager/servicemanager.cxx @@ -1508,7 +1508,7 @@ Any ORegistryServiceManager::getPropertyValue(const OUString& PropertyName) } // namespace -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_stoc_OServiceManager_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) @@ -1516,7 +1516,7 @@ com_sun_star_comp_stoc_OServiceManager_get_implementation( return cppu::acquire(new OServiceManager(context)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_stoc_ORegistryServiceManager_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) @@ -1524,7 +1524,7 @@ com_sun_star_comp_stoc_ORegistryServiceManager_get_implementation( return cppu::acquire(new ORegistryServiceManager(context)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_stoc_OServiceManagerWrapper_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) diff --git a/stoc/source/simpleregistry/simpleregistry.cxx b/stoc/source/simpleregistry/simpleregistry.cxx index acf1c86216bd..ac520ccc58d3 100644 --- a/stoc/source/simpleregistry/simpleregistry.cxx +++ b/stoc/source/simpleregistry/simpleregistry.cxx @@ -928,7 +928,7 @@ void SimpleRegistry::mergeKey( } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_stoc_SimpleRegistry_get_implementation( SAL_UNUSED_PARAMETER css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) diff --git a/stoc/source/typeconv/convert.cxx b/stoc/source/typeconv/convert.cxx index 011340f4e88e..c5ceaaa7a13c 100644 --- a/stoc/source/typeconv/convert.cxx +++ b/stoc/source/typeconv/convert.cxx @@ -876,7 +876,7 @@ Any TypeConverter_Impl::convertToSimpleType( const Any& rVal, TypeClass aDestina } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_comp_stoc_TypeConverter_get_implementation(css::uno::XComponentContext*, css::uno::Sequence<css::uno::Any> const &) { diff --git a/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx b/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx index f618b4a7ae1c..333a28aad663 100644 --- a/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx +++ b/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx @@ -177,7 +177,7 @@ OUString Translator::translateToExternal( } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_comp_uri_ExternalUriReferenceTranslator_get_implementation(css::uno::XComponentContext* , css::uno::Sequence<css::uno::Any> const &) { diff --git a/stoc/source/uriproc/UriReferenceFactory.cxx b/stoc/source/uriproc/UriReferenceFactory.cxx index 71efcf275945..dc96323c1bb4 100644 --- a/stoc/source/uriproc/UriReferenceFactory.cxx +++ b/stoc/source/uriproc/UriReferenceFactory.cxx @@ -605,7 +605,7 @@ css::uno::Reference< css::uri::XUriReference > Factory::makeRelative( } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_comp_uri_UriReferenceFactory_get_implementation(css::uno::XComponentContext* rxContext, css::uno::Sequence<css::uno::Any> const &) { diff --git a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx index d246f07c9221..e632dd98566c 100644 --- a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx +++ b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx @@ -190,7 +190,7 @@ css::uno::Reference< css::uri::XUriReference > Parser::parse( } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_comp_uri_UriSchemeParser_vndDOTsunDOTstarDOTexpand_get_implementation(css::uno::XComponentContext*, css::uno::Sequence<css::uno::Any> const &) { diff --git a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx index f7f13c6eb046..7ad8ac04a8f9 100644 --- a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx +++ b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx @@ -405,7 +405,7 @@ Parser::parse( } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_comp_uri_UriSchemeParser_vndDOTsunDOTstarDOTscript_get_implementation(css::uno::XComponentContext*, css::uno::Sequence<css::uno::Any> const &) { diff --git a/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx b/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx index d95ccf4a6906..64580feaefba 100644 --- a/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx +++ b/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx @@ -110,7 +110,7 @@ Factory::createVndSunStarPkgUrlReference( } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_comp_uri_VndSunStarPkgUrlReferenceFactory_get_implementation(css::uno::XComponentContext* rxContext, css::uno::Sequence<css::uno::Any> const &) { diff --git a/store/source/storbios.cxx b/store/source/storbios.cxx index 5d42354b6a62..38673f7b8165 100644 --- a/store/source/storbios.cxx +++ b/store/source/storbios.cxx @@ -460,7 +460,7 @@ protected: * OStorePageBIOS::AceCache implementation. * *======================================================================*/ -extern "C" typedef int (SAL_CALL * ace_constructor_type)(void*,void*); +extern "C" typedef int (* ace_constructor_type)(void*,void*); OStorePageBIOS::AceCache & OStorePageBIOS::AceCache::get() diff --git a/store/source/store.cxx b/store/source/store.cxx index 558d8ff0eae0..a7c7a7ae1099 100644 --- a/store/source/store.cxx +++ b/store/source/store.cxx @@ -64,7 +64,7 @@ using namespace store; /* * store_acquireHandle. */ -storeError SAL_CALL store_acquireHandle ( +storeError store_acquireHandle ( storeHandle Handle ) SAL_THROW_EXTERN_C() { @@ -79,7 +79,7 @@ storeError SAL_CALL store_acquireHandle ( /* * store_releaseHandle. */ -storeError SAL_CALL store_releaseHandle ( +storeError store_releaseHandle ( storeHandle Handle ) SAL_THROW_EXTERN_C() { @@ -99,7 +99,7 @@ storeError SAL_CALL store_releaseHandle ( /* * store_createMemoryFile. */ -storeError SAL_CALL store_createMemoryFile ( +storeError store_createMemoryFile ( sal_uInt16 nPageSize, storeFileHandle *phFile ) SAL_THROW_EXTERN_C() @@ -133,7 +133,7 @@ storeError SAL_CALL store_createMemoryFile ( /* * store_openFile. */ -storeError SAL_CALL store_openFile ( +storeError store_openFile ( rtl_uString *pFilename, storeAccessMode eAccessMode, sal_uInt16 nPageSize, @@ -171,7 +171,7 @@ storeError SAL_CALL store_openFile ( /* * store_closeFile. */ -storeError SAL_CALL store_closeFile ( +storeError store_closeFile ( storeFileHandle Handle ) SAL_THROW_EXTERN_C() { @@ -188,7 +188,7 @@ storeError SAL_CALL store_closeFile ( /* * store_flushFile. */ -storeError SAL_CALL store_flushFile ( +storeError store_flushFile ( storeFileHandle Handle ) SAL_THROW_EXTERN_C() { @@ -208,7 +208,7 @@ storeError SAL_CALL store_flushFile ( /* * store_openDirectory. */ -storeError SAL_CALL store_openDirectory ( +storeError store_openDirectory ( storeFileHandle hFile, rtl_uString const *pPath, rtl_uString const *pName, @@ -248,7 +248,7 @@ storeError SAL_CALL store_openDirectory ( /* * store_findFirst. */ -storeError SAL_CALL store_findFirst ( +storeError store_findFirst ( storeDirectoryHandle Handle, storeFindData *pFindData ) SAL_THROW_EXTERN_C() @@ -272,7 +272,7 @@ storeError SAL_CALL store_findFirst ( /* * store_findNext. */ -storeError SAL_CALL store_findNext ( +storeError store_findNext ( storeDirectoryHandle Handle, storeFindData *pFindData ) SAL_THROW_EXTERN_C() @@ -302,7 +302,7 @@ storeError SAL_CALL store_findNext ( /* * store_openStream */ -storeError SAL_CALL store_openStream ( +storeError store_openStream ( storeFileHandle hFile, rtl_uString const *pPath, rtl_uString const *pName, @@ -342,7 +342,7 @@ storeError SAL_CALL store_openStream ( /* * store_readStream. */ -storeError SAL_CALL store_readStream ( +storeError store_readStream ( storeStreamHandle Handle, sal_uInt32 nOffset, void *pBuffer, @@ -364,7 +364,7 @@ storeError SAL_CALL store_readStream ( /* * store_writeStream. */ -storeError SAL_CALL store_writeStream ( +storeError store_writeStream ( storeStreamHandle Handle, sal_uInt32 nOffset, const void *pBuffer, @@ -386,7 +386,7 @@ storeError SAL_CALL store_writeStream ( /* * store_remove. */ -storeError SAL_CALL store_remove ( +storeError store_remove ( storeFileHandle Handle, rtl_uString const *pPath, rtl_uString const *pName diff --git a/svgio/source/svguno/svguno.cxx b/svgio/source/svguno/svguno.cxx index 3176aaf0b302..05baa2cb6e35 100644 --- a/svgio/source/svguno/svguno.cxx +++ b/svgio/source/svguno/svguno.cxx @@ -36,7 +36,7 @@ static cppu::ImplementationEntry const services[] = { } -extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL svgio_component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * svgio_component_getFactory( char const * pImplName, void * pServiceManager, void * pRegistryKey) { return cppu::component_getFactoryHelper( diff --git a/svgio/source/svguno/xsvgparser.cxx b/svgio/source/svguno/xsvgparser.cxx index 0e666fc6d597..2b8e71a8df17 100644 --- a/svgio/source/svguno/xsvgparser.cxx +++ b/svgio/source/svguno/xsvgparser.cxx @@ -79,7 +79,7 @@ namespace svgio return OUString( "svgio::svgreader::XSvgParser" ); } - uno::Reference< uno::XInterface > SAL_CALL XSvgParser_createInstance(const uno::Reference< uno::XComponentContext >& context) + uno::Reference< uno::XInterface > XSvgParser_createInstance(const uno::Reference< uno::XComponentContext >& context) { return static_cast< ::cppu::OWeakObject* >(new XSvgParser(context)); } diff --git a/svgio/source/svguno/xsvgparser.hxx b/svgio/source/svguno/xsvgparser.hxx index 3c96049f4ba2..a02467589d1c 100644 --- a/svgio/source/svguno/xsvgparser.hxx +++ b/svgio/source/svguno/xsvgparser.hxx @@ -35,12 +35,12 @@ namespace com { namespace sun { namespace star { namespace svgio { namespace svgreader { -css::uno::Reference< css::uno::XInterface > SAL_CALL +css::uno::Reference< css::uno::XInterface > XSvgParser_createInstance( css::uno::Reference< css::uno::XComponentContext > const &); -OUString SAL_CALL XSvgParser_getImplementationName(); +OUString XSvgParser_getImplementationName(); -css::uno::Sequence< OUString > SAL_CALL +css::uno::Sequence< OUString > XSvgParser_getSupportedServiceNames(); } } diff --git a/svl/source/fsstor/fsfactory.cxx b/svl/source/fsstor/fsfactory.cxx index acdf68e98a34..1efb63ecf8bb 100644 --- a/svl/source/fsstor/fsfactory.cxx +++ b/svl/source/fsstor/fsfactory.cxx @@ -173,7 +173,7 @@ uno::Sequence< OUString > SAL_CALL FSStorageFactory::getSupportedServiceNames() extern "C" { -SAL_DLLPUBLIC_EXPORT void * SAL_CALL fsstorage_component_getFactory ( +SAL_DLLPUBLIC_EXPORT void * fsstorage_component_getFactory ( const sal_Char * pImplementationName, void * pServiceManager, SAL_UNUSED_PARAMETER void * /* pRegistryKey */) { diff --git a/svl/source/numbers/numfmuno.cxx b/svl/source/numbers/numfmuno.cxx index 417fdf3e48c1..3c50a2e16b71 100644 --- a/svl/source/numbers/numfmuno.cxx +++ b/svl/source/numbers/numfmuno.cxx @@ -919,7 +919,7 @@ uno::Sequence<OUString> SAL_CALL SvNumberFormatSettingsObj::getSupportedServiceN } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_uno_util_numbers_SvNumberFormatterServiceObject_get_implementation(css::uno::XComponentContext*, css::uno::Sequence<css::uno::Any> const &) { diff --git a/svl/source/numbers/supservs.cxx b/svl/source/numbers/supservs.cxx index 3b5a2e061ab4..c0724ce0cc57 100644 --- a/svl/source/numbers/supservs.cxx +++ b/svl/source/numbers/supservs.cxx @@ -163,7 +163,7 @@ void SvNumberFormatsSupplierServiceObject::implEnsureFormatter() } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_uno_util_numbers_SvNumberFormatsSupplierServiceObject_get_implementation(css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const &) { diff --git a/svl/source/passwordcontainer/passwordcontainer.cxx b/svl/source/passwordcontainer/passwordcontainer.cxx index 49d7b14534d6..00e1f0fa13b6 100644 --- a/svl/source/passwordcontainer/passwordcontainer.cxx +++ b/svl/source/passwordcontainer/passwordcontainer.cxx @@ -1389,7 +1389,7 @@ MasterPasswordRequest_Impl::MasterPasswordRequest_Impl( PasswordRequestMode Mode extern "C" { -SAL_DLLPUBLIC_EXPORT void * SAL_CALL passwordcontainer_component_getFactory ( +SAL_DLLPUBLIC_EXPORT void * passwordcontainer_component_getFactory ( const sal_Char * pImplementationName, SAL_UNUSED_PARAMETER void * pServiceManager, SAL_UNUSED_PARAMETER void * /* pRegistryKey */) diff --git a/svl/source/uno/pathservice.cxx b/svl/source/uno/pathservice.cxx index d445cac66c8b..8e49057f1e9c 100644 --- a/svl/source/uno/pathservice.cxx +++ b/svl/source/uno/pathservice.cxx @@ -75,7 +75,7 @@ public: }; -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_comp_svl_PathService_get_implementation(css::uno::XComponentContext*, css::uno::Sequence<css::uno::Any> const &) { diff --git a/svtools/source/filter/SvFilterOptionsDialog.cxx b/svtools/source/filter/SvFilterOptionsDialog.cxx index a699ea6acc9a..163de06fb880 100644 --- a/svtools/source/filter/SvFilterOptionsDialog.cxx +++ b/svtools/source/filter/SvFilterOptionsDialog.cxx @@ -279,7 +279,7 @@ void SvFilterOptionsDialog::setSourceDocument( const uno::Reference< lang::XComp } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_svtools_SvFilterOptionsDialog_get_implementation( css::uno::XComponentContext * context, css::uno::Sequence<css::uno::Any> const &) diff --git a/svtools/source/graphic/graphicunofactory.cxx b/svtools/source/graphic/graphicunofactory.cxx index 391d743a05e4..18553092edf5 100644 --- a/svtools/source/graphic/graphicunofactory.cxx +++ b/svtools/source/graphic/graphicunofactory.cxx @@ -107,7 +107,7 @@ OUString SAL_CALL GObjectImpl::getUniqueID() } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_graphic_GraphicObject_get_implementation( SAL_UNUSED_PARAMETER css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &arguments) diff --git a/svtools/source/graphic/provider.cxx b/svtools/source/graphic/provider.cxx index 2e60b79b7ca2..accc367a0cf1 100644 --- a/svtools/source/graphic/provider.cxx +++ b/svtools/source/graphic/provider.cxx @@ -835,7 +835,7 @@ void SAL_CALL GraphicProvider::storeGraphic( const uno::Reference< ::graphic::XG } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_graphic_GraphicProvider_get_implementation( css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) diff --git a/svtools/source/graphic/renderer.cxx b/svtools/source/graphic/renderer.cxx index 047f91061388..0c67524789b1 100644 --- a/svtools/source/graphic/renderer.cxx +++ b/svtools/source/graphic/renderer.cxx @@ -296,7 +296,7 @@ void SAL_CALL GraphicRendererVCL::render( const uno::Reference< graphic::XGraphi } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_graphic_GraphicRendererVCL_get_implementation( css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) diff --git a/svtools/source/hatchwindow/documentcloser.cxx b/svtools/source/hatchwindow/documentcloser.cxx index cbe95f7bcdc6..f7b71d090c41 100644 --- a/svtools/source/hatchwindow/documentcloser.cxx +++ b/svtools/source/hatchwindow/documentcloser.cxx @@ -238,7 +238,7 @@ uno::Sequence< OUString > SAL_CALL ODocumentCloser::getSupportedServiceNames() } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_embed_DocumentCloser_get_implementation( SAL_UNUSED_PARAMETER css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &arguments) diff --git a/svtools/source/hatchwindow/hatchwindowfactory.cxx b/svtools/source/hatchwindow/hatchwindowfactory.cxx index 9fc7a149afdd..d602b681d123 100644 --- a/svtools/source/hatchwindow/hatchwindowfactory.cxx +++ b/svtools/source/hatchwindow/hatchwindowfactory.cxx @@ -82,7 +82,7 @@ uno::Sequence< OUString > SAL_CALL OHatchWindowFactory::getSupportedServiceNames } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_embed_HatchWindowFactory_get_implementation( css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) diff --git a/svtools/source/misc/svtaccessiblefactory.cxx b/svtools/source/misc/svtaccessiblefactory.cxx index 2441e29fc246..a20177785d66 100644 --- a/svtools/source/misc/svtaccessiblefactory.cxx +++ b/svtools/source/misc/svtaccessiblefactory.cxx @@ -202,7 +202,7 @@ namespace svt #if HAVE_FEATURE_DESKTOP #ifndef DISABLE_DYNLOADING - extern "C" { static void SAL_CALL thisModule() {} } + extern "C" { static void thisModule() {} } #else extern "C" void* getSvtAccessibilityComponentFactory(); #endif diff --git a/svtools/source/svhtml/htmlkywd.cxx b/svtools/source/svhtml/htmlkywd.cxx index de34418d37ce..8a633c49404c 100644 --- a/svtools/source/svhtml/htmlkywd.cxx +++ b/svtools/source/svhtml/htmlkywd.cxx @@ -162,7 +162,7 @@ static HTML_TokenEntry aHTMLTokenTab[] = { extern "C" { -static int SAL_CALL HTMLKeyCompare( const void *pFirst, const void *pSecond) +static int HTMLKeyCompare( const void *pFirst, const void *pSecond) { HTML_TokenEntry const * pFirstEntry = static_cast<HTML_TokenEntry const *>(pFirst); HTML_TokenEntry const * pSecondEntry = static_cast<HTML_TokenEntry const *>(pSecond); @@ -499,7 +499,7 @@ static HTML_CharEntry aHTMLCharNameTab[] = { extern "C" { -static int SAL_CALL HTMLCharNameCompare( const void *pFirst, const void *pSecond) +static int HTMLCharNameCompare( const void *pFirst, const void *pSecond) { HTML_CharEntry const * pFirstEntry = static_cast<HTML_CharEntry const *>(pFirst); HTML_CharEntry const * pSecondEntry = static_cast<HTML_CharEntry const *>(pSecond); @@ -908,7 +908,7 @@ static HTML_ColorEntry aHTMLColorNameTab[] = { extern "C" { -static int SAL_CALL HTMLColorNameCompare( const void *pFirst, const void *pSecond) +static int HTMLColorNameCompare( const void *pFirst, const void *pSecond) { HTML_ColorEntry const * pFirstEntry = static_cast<HTML_ColorEntry const *>(pFirst); HTML_ColorEntry const * pSecondEntry = static_cast<HTML_ColorEntry const *>(pSecond); diff --git a/svtools/source/svrtf/rtfkeywd.cxx b/svtools/source/svrtf/rtfkeywd.cxx index 8ce750686236..47e3e68e15d3 100644 --- a/svtools/source/svrtf/rtfkeywd.cxx +++ b/svtools/source/svrtf/rtfkeywd.cxx @@ -1175,7 +1175,7 @@ static RTF_TokenEntry aRTFTokenTab[] = { extern "C" { -static int SAL_CALL RTFKeyCompare( const void *pFirst, const void *pSecond) +static int RTFKeyCompare( const void *pFirst, const void *pSecond) { int nRet = 0; if( -1 == static_cast<RTF_TokenEntry const *>(pFirst)->nToken ) diff --git a/svtools/source/uno/addrtempuno.cxx b/svtools/source/uno/addrtempuno.cxx index 37c6594564e4..88754128f81e 100644 --- a/svtools/source/uno/addrtempuno.cxx +++ b/svtools/source/uno/addrtempuno.cxx @@ -210,7 +210,7 @@ namespace { } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_svtools_OAddressBookSourceDialogUno_get_implementation( css::uno::XComponentContext * context, css::uno::Sequence<css::uno::Any> const &) diff --git a/svtools/source/uno/fpicker.cxx b/svtools/source/uno/fpicker.cxx index cab3e3a95db1..8db886d5cd1f 100644 --- a/svtools/source/uno/fpicker.cxx +++ b/svtools/source/uno/fpicker.cxx @@ -99,7 +99,7 @@ Reference< css::uno::XInterface > FilePicker_CreateInstance ( return xResult; } -OUString SAL_CALL FilePicker_getImplementationName() +OUString FilePicker_getImplementationName() { return OUString("com.sun.star.comp.svt.FilePicker"); } @@ -168,7 +168,7 @@ Reference< css::uno::XInterface > FolderPicker_CreateInstance ( return xResult; } -OUString SAL_CALL FolderPicker_getImplementationName() +OUString FolderPicker_getImplementationName() { return OUString("com.sun.star.comp.svt.FolderPicker"); } diff --git a/svtools/source/uno/fpicker.hxx b/svtools/source/uno/fpicker.hxx index 516c56ec667d..8e4056eb85ca 100644 --- a/svtools/source/uno/fpicker.hxx +++ b/svtools/source/uno/fpicker.hxx @@ -32,15 +32,15 @@ namespace com { namespace sun { namespace star { namespace uno { class XInterface; } } } } -css::uno::Reference<css::uno::XInterface> SAL_CALL FilePicker_CreateInstance( +css::uno::Reference<css::uno::XInterface> FilePicker_CreateInstance( css::uno::Reference< css::uno::XComponentContext > const & context); css::uno::Sequence<OUString> FilePicker_getSupportedServiceNames(); -OUString SAL_CALL FilePicker_getImplementationName(); +OUString FilePicker_getImplementationName(); -css::uno::Reference<css::uno::XInterface> SAL_CALL FolderPicker_CreateInstance( +css::uno::Reference<css::uno::XInterface> FolderPicker_CreateInstance( css::uno::Reference< css::uno::XComponentContext > const & context); css::uno::Sequence<OUString> FolderPicker_getSupportedServiceNames(); -OUString SAL_CALL FolderPicker_getImplementationName(); +OUString FolderPicker_getImplementationName(); #endif diff --git a/svtools/source/uno/miscservices.cxx b/svtools/source/uno/miscservices.cxx index 5bc360795a61..89368f922543 100644 --- a/svtools/source/uno/miscservices.cxx +++ b/svtools/source/uno/miscservices.cxx @@ -56,7 +56,7 @@ namespace extern "C" { -SAL_DLLPUBLIC_EXPORT void * SAL_CALL svt_component_getFactory( +SAL_DLLPUBLIC_EXPORT void * svt_component_getFactory( const sal_Char * pImplementationName, void * _pServiceManager, void * pRegistryKey) { void * pResult = nullptr; diff --git a/svtools/source/uno/wizard/unowizard.cxx b/svtools/source/uno/wizard/unowizard.cxx index 447765bc0fdf..c44c8de02a8f 100644 --- a/svtools/source/uno/wizard/unowizard.cxx +++ b/svtools/source/uno/wizard/unowizard.cxx @@ -482,7 +482,7 @@ namespace { } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_svtools_uno_Wizard_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) diff --git a/svx/source/core/coreservices.cxx b/svx/source/core/coreservices.cxx index f91442c6282c..032278e6e291 100644 --- a/svx/source/core/coreservices.cxx +++ b/svx/source/core/coreservices.cxx @@ -32,7 +32,7 @@ using namespace com::sun::star::registry; extern "C" { -SAL_DLLPUBLIC_EXPORT void * SAL_CALL svxcore_component_getFactory ( +SAL_DLLPUBLIC_EXPORT void * svxcore_component_getFactory ( const sal_Char * pImplName, void * pServiceManager, void * ) { void * pRet = nullptr; diff --git a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx index 4fd5857b315d..30e7be880d3e 100644 --- a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx @@ -458,7 +458,7 @@ Sequence< Reference< drawing::XCustomShapeHandle > > SAL_CALL EnhancedCustomShap } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_drawing_EnhancedCustomShapeEngine_get_implementation( css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) diff --git a/svx/source/dialog/SafeModeUI.cxx b/svx/source/dialog/SafeModeUI.cxx index 60a64fdbc2a1..c27fc80fe3c8 100644 --- a/svx/source/dialog/SafeModeUI.cxx +++ b/svx/source/dialog/SafeModeUI.cxx @@ -69,7 +69,7 @@ css::uno::Any SAL_CALL SafeModeUI::dispatchWithReturnValue(const css::util::URL& } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_svx_SafeModeUI_get_implementation( css::uno::XComponentContext * /*context*/, css::uno::Sequence<css::uno::Any> const &) diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx index b88e4cd9afe2..ddd58019718d 100644 --- a/svx/source/fmcomp/fmgridif.cxx +++ b/svx/source/fmcomp/fmgridif.cxx @@ -327,7 +327,7 @@ void SAL_CALL FmXGridControlMultiplexer::columnChanged( const EventObject& _even //= FmXGridControl -Reference< XInterface > SAL_CALL FmXGridControl_NewInstance_Impl(const Reference< XMultiServiceFactory>& _rxFactory) +Reference< XInterface > FmXGridControl_NewInstance_Impl(const Reference< XMultiServiceFactory>& _rxFactory) { return *(new FmXGridControl( comphelper::getComponentContext(_rxFactory) )); } diff --git a/svx/source/fmcomp/gridcols.cxx b/svx/source/fmcomp/gridcols.cxx index be80d793e4f4..1dc6aa92eb1b 100644 --- a/svx/source/fmcomp/gridcols.cxx +++ b/svx/source/fmcomp/gridcols.cxx @@ -47,7 +47,7 @@ const css::uno::Sequence<OUString>& getColumnTypes() // comparison of PropertyInfo -extern "C" int SAL_CALL NameCompare(const void* pFirst, const void* pSecond) +extern "C" int NameCompare(const void* pFirst, const void* pSecond) { return static_cast<OUString const *>(pFirst)->compareTo(*static_cast<OUString const *>(pSecond)); } diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx index 15be71774403..3a7524ec8f33 100644 --- a/svx/source/form/formcontroller.cxx +++ b/svx/source/form/formcontroller.cxx @@ -98,7 +98,7 @@ using namespace ::connectivity; using namespace ::dbtools; -css::uno::Reference< css::uno::XInterface > SAL_CALL +css::uno::Reference< css::uno::XInterface > FormController_NewInstance_Impl( const css::uno::Reference< css::lang::XMultiServiceFactory > & _rxORB ) { return *( new ::svxform::FormController( comphelper::getComponentContext(_rxORB) ) ); diff --git a/svx/source/form/legacyformcontroller.cxx b/svx/source/form/legacyformcontroller.cxx index 0f35b70d4f35..e234ef955de6 100644 --- a/svx/source/form/legacyformcontroller.cxx +++ b/svx/source/form/legacyformcontroller.cxx @@ -193,7 +193,7 @@ namespace svxform } -css::uno::Reference< css::uno::XInterface > SAL_CALL +css::uno::Reference< css::uno::XInterface > LegacyFormController_NewInstance_Impl( const css::uno::Reference< css::lang::XMultiServiceFactory > & _rxORB ) { return ::svxform::LegacyFormController::Create( _rxORB ); diff --git a/svx/source/form/xfm_addcondition.cxx b/svx/source/form/xfm_addcondition.cxx index 78382e66f87d..1ab50fa3007f 100644 --- a/svx/source/form/xfm_addcondition.cxx +++ b/svx/source/form/xfm_addcondition.cxx @@ -45,19 +45,19 @@ namespace svxform //= OAddConditionDialog - Reference< XInterface > SAL_CALL OAddConditionDialog_Create( const Reference< XMultiServiceFactory > & _rxORB ) + Reference< XInterface > OAddConditionDialog_Create( const Reference< XMultiServiceFactory > & _rxORB ) { return OAddConditionDialog::Create( _rxORB ); } - Sequence< OUString > SAL_CALL OAddConditionDialog_GetSupportedServiceNames() + Sequence< OUString > OAddConditionDialog_GetSupportedServiceNames() { return { "com.sun.star.xforms.ui.dialogs.AddCondition" }; } - OUString SAL_CALL OAddConditionDialog_GetImplementationName() + OUString OAddConditionDialog_GetImplementationName() { return OUString("org.openoffice.comp.svx.OAddConditionDialog"); } diff --git a/svx/source/inc/coreservices.hxx b/svx/source/inc/coreservices.hxx index 4f74500738a2..f53ea85c2e81 100644 --- a/svx/source/inc/coreservices.hxx +++ b/svx/source/inc/coreservices.hxx @@ -35,41 +35,41 @@ namespace com { namespace sun { namespace star { namespace svx { -OUString SAL_CALL ExtrusionDepthController_getImplementationName(); +OUString ExtrusionDepthController_getImplementationName(); /// @throws css::uno::RuntimeException -css::uno::Reference< css::uno::XInterface > SAL_CALL ExtrusionDepthController_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory > &); +css::uno::Reference< css::uno::XInterface > ExtrusionDepthController_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory > &); /// @throws css::uno::RuntimeException -css::uno::Sequence< OUString > SAL_CALL ExtrusionDepthController_getSupportedServiceNames(); +css::uno::Sequence< OUString > ExtrusionDepthController_getSupportedServiceNames(); -OUString SAL_CALL ExtrusionDirectionControl_getImplementationName(); +OUString ExtrusionDirectionControl_getImplementationName(); /// @throws css::uno::RuntimeException -css::uno::Reference< css::uno::XInterface > SAL_CALL ExtrusionDirectionControl_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory > &); +css::uno::Reference< css::uno::XInterface > ExtrusionDirectionControl_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory > &); /// @throws css::uno::RuntimeException -css::uno::Sequence< OUString > SAL_CALL ExtrusionDirectionControl_getSupportedServiceNames(); +css::uno::Sequence< OUString > ExtrusionDirectionControl_getSupportedServiceNames(); -OUString SAL_CALL ExtrusionLightingControl_getImplementationName(); +OUString ExtrusionLightingControl_getImplementationName(); /// @throws css::uno::RuntimeException -css::uno::Reference< css::uno::XInterface > SAL_CALL ExtrusionLightingControl_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory > &); +css::uno::Reference< css::uno::XInterface > ExtrusionLightingControl_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory > &); /// @throws css::uno::RuntimeException -css::uno::Sequence< OUString > SAL_CALL ExtrusionLightingControl_getSupportedServiceNames(); +css::uno::Sequence< OUString > ExtrusionLightingControl_getSupportedServiceNames(); -OUString SAL_CALL ExtrusionSurfaceControl_getImplementationName(); +OUString ExtrusionSurfaceControl_getImplementationName(); /// @throws css::uno::RuntimeException -css::uno::Reference< css::uno::XInterface > SAL_CALL ExtrusionSurfaceControl_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory > &); +css::uno::Reference< css::uno::XInterface > ExtrusionSurfaceControl_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory > &); /// @throws css::uno::RuntimeException -css::uno::Sequence< OUString > SAL_CALL ExtrusionSurfaceControl_getSupportedServiceNames(); +css::uno::Sequence< OUString > ExtrusionSurfaceControl_getSupportedServiceNames(); -OUString SAL_CALL FontworkAlignmentControl_getImplementationName(); +OUString FontworkAlignmentControl_getImplementationName(); /// @throws css::uno::RuntimeException -css::uno::Reference< css::uno::XInterface > SAL_CALL FontworkAlignmentControl_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory > &); +css::uno::Reference< css::uno::XInterface > FontworkAlignmentControl_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory > &); /// @throws css::uno::RuntimeException -css::uno::Sequence< OUString > SAL_CALL FontworkAlignmentControl_getSupportedServiceNames(); +css::uno::Sequence< OUString > FontworkAlignmentControl_getSupportedServiceNames(); -OUString SAL_CALL FontworkCharacterSpacingControl_getImplementationName(); +OUString FontworkCharacterSpacingControl_getImplementationName(); /// @throws css::uno::RuntimeException -css::uno::Reference< css::uno::XInterface > SAL_CALL FontworkCharacterSpacingControl_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory > &); +css::uno::Reference< css::uno::XInterface > FontworkCharacterSpacingControl_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory > &); /// @throws css::uno::RuntimeException -css::uno::Sequence< OUString > SAL_CALL FontworkCharacterSpacingControl_getSupportedServiceNames(); +css::uno::Sequence< OUString > FontworkCharacterSpacingControl_getSupportedServiceNames(); } #endif diff --git a/svx/source/inc/fmservs.hxx b/svx/source/inc/fmservs.hxx index 4e1239c65a32..28443a6a8519 100644 --- a/svx/source/inc/fmservs.hxx +++ b/svx/source/inc/fmservs.hxx @@ -82,28 +82,28 @@ namespace svxform { SVX_DLLPUBLIC void ImplSmartRegisterUnoServices(); - css::uno::Reference<css::uno::XInterface> SAL_CALL + css::uno::Reference<css::uno::XInterface> OAddConditionDialog_Create( css::uno::Reference<css::lang::XMultiServiceFactory> const &); - OUString SAL_CALL OAddConditionDialog_GetImplementationName(); + OUString OAddConditionDialog_GetImplementationName(); - css::uno::Sequence<OUString> SAL_CALL + css::uno::Sequence<OUString> OAddConditionDialog_GetSupportedServiceNames(); } /// @throws css::uno::Exception -css::uno::Reference<css::uno::XInterface> SAL_CALL +css::uno::Reference<css::uno::XInterface> FmXGridControl_NewInstance_Impl( css::uno::Reference<css::lang::XMultiServiceFactory> const &); /// @throws css::uno::Exception -css::uno::Reference<css::uno::XInterface> SAL_CALL +css::uno::Reference<css::uno::XInterface> FormController_NewInstance_Impl( css::uno::Reference<css::lang::XMultiServiceFactory> const &); /// @throws css::uno::Exception -css::uno::Reference<css::uno::XInterface> SAL_CALL +css::uno::Reference<css::uno::XInterface> LegacyFormController_NewInstance_Impl( css::uno::Reference<css::lang::XMultiServiceFactory> const &); diff --git a/svx/source/mnuctrls/smarttagmenu.cxx b/svx/source/mnuctrls/smarttagmenu.cxx index 401cd0545664..e4a9d171ce59 100644 --- a/svx/source/mnuctrls/smarttagmenu.cxx +++ b/svx/source/mnuctrls/smarttagmenu.cxx @@ -225,7 +225,7 @@ css::uno::Sequence< OUString > SmartTagMenuController::getSupportedServiceNames( return { "com.sun.star.frame.PopupMenuController" }; } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_svx_SmartTagMenuController_get_implementation( css::uno::XComponentContext* xContext, css::uno::Sequence< css::uno::Any > const & ) diff --git a/svx/source/sdr/primitive2d/primitivefactory2d.cxx b/svx/source/sdr/primitive2d/primitivefactory2d.cxx index caa7c7754410..8520b0ae0f16 100644 --- a/svx/source/sdr/primitive2d/primitivefactory2d.cxx +++ b/svx/source/sdr/primitive2d/primitivefactory2d.cxx @@ -104,7 +104,7 @@ css::uno::Sequence< css::uno::Reference< css::graphic::XPrimitive2D > > SAL_CALL } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_graphic_PrimitiveFactory2D_get_implementation( css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) diff --git a/svx/source/sidebar/PanelFactory.cxx b/svx/source/sidebar/PanelFactory.cxx index d834a7bd4b7b..f180d4b3d927 100644 --- a/svx/source/sidebar/PanelFactory.cxx +++ b/svx/source/sidebar/PanelFactory.cxx @@ -189,7 +189,7 @@ Reference<ui::XUIElement> SAL_CALL PanelFactory::createUIElement ( } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * org_apache_openoffice_comp_svx_sidebar_PanelFactory_get_implementation( css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx index 930f98419589..ef9634ad0800 100644 --- a/svx/source/svdraw/svdhdl.cxx +++ b/svx/source/svdraw/svdhdl.cxx @@ -1877,7 +1877,7 @@ struct ImplHdlAndIndex // Helper method for sorting handles taking care of OrdNums, keeping order in // single objects and re-sorting polygon handles intuitively -extern "C" int SAL_CALL ImplSortHdlFunc( const void* pVoid1, const void* pVoid2 ) +extern "C" int ImplSortHdlFunc( const void* pVoid1, const void* pVoid2 ) { const ImplHdlAndIndex* p1 = static_cast<ImplHdlAndIndex const *>(pVoid1); const ImplHdlAndIndex* p2 = static_cast<ImplHdlAndIndex const *>(pVoid2); diff --git a/svx/source/tbxctrls/bulletsnumbering.cxx b/svx/source/tbxctrls/bulletsnumbering.cxx index 8180d18977e3..19452663a579 100644 --- a/svx/source/tbxctrls/bulletsnumbering.cxx +++ b/svx/source/tbxctrls/bulletsnumbering.cxx @@ -226,7 +226,7 @@ css::uno::Sequence< OUString > SAL_CALL NumberingToolBoxControl::getSupportedSer return { "com.sun.star.frame.ToolbarController" }; } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_svx_NumberingToolBoxControl_get_implementation( css::uno::XComponentContext *rxContext, css::uno::Sequence<css::uno::Any> const & ) diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx index 1bd7380c39a7..b1e9eaec9b39 100644 --- a/svx/source/tbxctrls/extrusioncontrols.cxx +++ b/svx/source/tbxctrls/extrusioncontrols.cxx @@ -320,20 +320,20 @@ void SAL_CALL ExtrusionDirectionControl::initialize( const css::uno::Sequence< c // XServiceInfo -OUString SAL_CALL ExtrusionDirectionControl_getImplementationName() +OUString ExtrusionDirectionControl_getImplementationName() { return OUString( "com.sun.star.comp.svx.ExtrusionDirectionController" ); } -Sequence< OUString > SAL_CALL ExtrusionDirectionControl_getSupportedServiceNames() +Sequence< OUString > ExtrusionDirectionControl_getSupportedServiceNames() { Sequence<OUString> aSNS { "com.sun.star.frame.ToolbarController" }; return aSNS; } -Reference< XInterface > SAL_CALL SAL_CALL ExtrusionDirectionControl_createInstance( +Reference< XInterface > ExtrusionDirectionControl_createInstance( const Reference< XMultiServiceFactory >& rSMgr ) { @@ -573,20 +573,20 @@ void SAL_CALL ExtrusionDepthController::initialize( const css::uno::Sequence< cs // XServiceInfo -OUString SAL_CALL ExtrusionDepthController_getImplementationName() +OUString ExtrusionDepthController_getImplementationName() { return OUString( "com.sun.star.comp.svx.ExtrusionDepthController" ); } -Sequence< OUString > SAL_CALL ExtrusionDepthController_getSupportedServiceNames() +Sequence< OUString > ExtrusionDepthController_getSupportedServiceNames() { Sequence<OUString> aSNS { "com.sun.star.frame.ToolbarController" }; return aSNS; } -Reference< XInterface > SAL_CALL SAL_CALL ExtrusionDepthController_createInstance( const Reference< XMultiServiceFactory >& rSMgr ) +Reference< XInterface > ExtrusionDepthController_createInstance( const Reference< XMultiServiceFactory >& rSMgr ) { return *new ExtrusionDepthController( comphelper::getComponentContext(rSMgr) ); } @@ -833,20 +833,20 @@ void SAL_CALL ExtrusionLightingControl::initialize( const css::uno::Sequence< cs // XServiceInfo -OUString SAL_CALL ExtrusionLightingControl_getImplementationName() +OUString ExtrusionLightingControl_getImplementationName() { return OUString( "com.sun.star.comp.svx.ExtrusionLightingController" ); } -Sequence< OUString > SAL_CALL ExtrusionLightingControl_getSupportedServiceNames() +Sequence< OUString > ExtrusionLightingControl_getSupportedServiceNames() { Sequence<OUString> aSNS { "com.sun.star.frame.ToolbarController" }; return aSNS; } -Reference< XInterface > SAL_CALL SAL_CALL ExtrusionLightingControl_createInstance( +Reference< XInterface > ExtrusionLightingControl_createInstance( const Reference< XMultiServiceFactory >& rSMgr ) { @@ -968,20 +968,20 @@ void SAL_CALL ExtrusionSurfaceControl::initialize( const css::uno::Sequence< css // XServiceInfo -OUString SAL_CALL ExtrusionSurfaceControl_getImplementationName() +OUString ExtrusionSurfaceControl_getImplementationName() { return OUString( "com.sun.star.comp.svx.ExtrusionSurfaceController" ); } -Sequence< OUString > SAL_CALL ExtrusionSurfaceControl_getSupportedServiceNames() +Sequence< OUString > ExtrusionSurfaceControl_getSupportedServiceNames() { Sequence<OUString> aSNS { "com.sun.star.frame.ToolbarController" }; return aSNS; } -Reference< XInterface > SAL_CALL SAL_CALL ExtrusionSurfaceControl_createInstance( +Reference< XInterface > ExtrusionSurfaceControl_createInstance( const Reference< XMultiServiceFactory >& rSMgr ) { diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx index 45bca9404639..ba77ccd5beed 100644 --- a/svx/source/tbxctrls/fontworkgallery.cxx +++ b/svx/source/tbxctrls/fontworkgallery.cxx @@ -377,20 +377,20 @@ void SAL_CALL FontworkAlignmentControl::initialize( const css::uno::Sequence< cs // XServiceInfo -OUString SAL_CALL FontworkAlignmentControl_getImplementationName() +OUString FontworkAlignmentControl_getImplementationName() { return OUString( "com.sun.star.comp.svx.FontworkAlignmentController" ); } -Sequence< OUString > SAL_CALL FontworkAlignmentControl_getSupportedServiceNames() +Sequence< OUString > FontworkAlignmentControl_getSupportedServiceNames() { Sequence<OUString> aSNS { "com.sun.star.frame.ToolbarController" }; return aSNS; } -Reference< XInterface > SAL_CALL SAL_CALL FontworkAlignmentControl_createInstance( const Reference< XMultiServiceFactory >& rSMgr ) +Reference< XInterface > FontworkAlignmentControl_createInstance( const Reference< XMultiServiceFactory >& rSMgr ) { return *new FontworkAlignmentControl( comphelper::getComponentContext(rSMgr) ); } @@ -601,20 +601,20 @@ void SAL_CALL FontworkCharacterSpacingControl::initialize( const css::uno::Seque // XServiceInfo -OUString SAL_CALL FontworkCharacterSpacingControl_getImplementationName() +OUString FontworkCharacterSpacingControl_getImplementationName() { return OUString( "com.sun.star.comp.svx.FontworkCharacterSpacingController" ); } -Sequence< OUString > SAL_CALL FontworkCharacterSpacingControl_getSupportedServiceNames() +Sequence< OUString > FontworkCharacterSpacingControl_getSupportedServiceNames() { Sequence<OUString> aSNS { "com.sun.star.frame.ToolbarController" }; return aSNS; } -Reference< XInterface > SAL_CALL SAL_CALL FontworkCharacterSpacingControl_createInstance( const Reference< XMultiServiceFactory >& rSMgr ) +Reference< XInterface > FontworkCharacterSpacingControl_createInstance( const Reference< XMultiServiceFactory >& rSMgr ) { return *new FontworkCharacterSpacingControl( comphelper::getComponentContext(rSMgr) ); } diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx index b9e7b5e222dc..54d30c89687c 100644 --- a/svx/source/tbxctrls/linectrl.cxx +++ b/svx/source/tbxctrls/linectrl.cxx @@ -506,7 +506,7 @@ css::uno::Sequence<OUString> SvxLineEndToolBoxControl::getSupportedServiceNames( return { "com.sun.star.frame.ToolbarController" }; } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_svx_LineEndToolBoxControl_get_implementation( css::uno::XComponentContext* rContext, css::uno::Sequence<css::uno::Any> const & ) diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index cb4432f61d86..7d674171a114 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -2749,7 +2749,7 @@ css::uno::Sequence< OUString > SvxFontNameToolBoxControl::getSupportedServiceNam return { "com.sun.star.frame.ToolbarController" }; } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_svx_FontNameToolBoxControl_get_implementation( css::uno::XComponentContext*, css::uno::Sequence<css::uno::Any> const & ) @@ -2998,7 +2998,7 @@ css::uno::Sequence<OUString> SvxColorToolBoxControl::getSupportedServiceNames() return { "com.sun.star.frame.ToolbarController" }; } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_svx_ColorToolBoxControl_get_implementation( css::uno::XComponentContext* rContext, css::uno::Sequence<css::uno::Any> const & ) @@ -3057,7 +3057,7 @@ css::uno::Sequence< OUString > SvxFrameToolBoxControl::getSupportedServiceNames( return { "com.sun.star.frame.ToolbarController" }; } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_svx_FrameToolBoxControl_get_implementation( css::uno::XComponentContext* rContext, css::uno::Sequence<css::uno::Any> const & ) @@ -3162,7 +3162,7 @@ css::uno::Sequence<OUString> SvxCurrencyToolBoxControl::getSupportedServiceNames return { "com.sun.star.frame.ToolbarController" }; } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_svx_CurrencyToolBoxControl_get_implementation( css::uno::XComponentContext* rContext, css::uno::Sequence<css::uno::Any> const & ) diff --git a/svx/source/tbxctrls/tbunocontroller.cxx b/svx/source/tbxctrls/tbunocontroller.cxx index cca2876053f9..1ba5165cb8e9 100644 --- a/svx/source/tbxctrls/tbunocontroller.cxx +++ b/svx/source/tbxctrls/tbunocontroller.cxx @@ -403,7 +403,7 @@ void FontHeightToolBoxControl::dispatchCommand( } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_svx_FontHeightToolBoxController_get_implementation( css::uno::XComponentContext *rxContext, css::uno::Sequence<css::uno::Any> const &) diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx b/svx/source/tbxctrls/tbunosearchcontrollers.cxx index e2c38217e393..5f68bbd228ff 100644 --- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx +++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx @@ -1463,7 +1463,7 @@ void SAL_CALL FindbarDispatcher::removeStatusListener( const css::uno::Reference } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_svx_FindTextToolboxController_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) @@ -1471,7 +1471,7 @@ com_sun_star_svx_FindTextToolboxController_get_implementation( return cppu::acquire(new FindTextToolbarController(context)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_svx_ExitFindbarToolboxController_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) @@ -1479,7 +1479,7 @@ com_sun_star_svx_ExitFindbarToolboxController_get_implementation( return cppu::acquire(new ExitSearchToolboxController(context)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_svx_UpSearchToolboxController_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) @@ -1487,7 +1487,7 @@ com_sun_star_svx_UpSearchToolboxController_get_implementation( return cppu::acquire(new UpDownSearchToolboxController(context, UpDownSearchToolboxController::UP)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_svx_DownSearchToolboxController_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) @@ -1495,7 +1495,7 @@ com_sun_star_svx_DownSearchToolboxController_get_implementation( return cppu::acquire(new UpDownSearchToolboxController(context, UpDownSearchToolboxController::DOWN)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_svx_MatchCaseToolboxController_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) @@ -1503,7 +1503,7 @@ com_sun_star_svx_MatchCaseToolboxController_get_implementation( return cppu::acquire(new MatchCaseToolboxController(context)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_svx_SearchFormattedToolboxController_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) @@ -1511,7 +1511,7 @@ com_sun_star_svx_SearchFormattedToolboxController_get_implementation( return cppu::acquire(new SearchFormattedToolboxController(context)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_svx_FindAllToolboxController_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) @@ -1519,7 +1519,7 @@ com_sun_star_svx_FindAllToolboxController_get_implementation( return cppu::acquire(new FindAllToolboxController(context)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_svx_SearchLabelToolboxController_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) @@ -1527,7 +1527,7 @@ com_sun_star_svx_SearchLabelToolboxController_get_implementation( return cppu::acquire(new SearchLabelToolboxController(context)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_svx_Impl_FindbarDispatcher_get_implementation( SAL_UNUSED_PARAMETER css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) diff --git a/svx/source/unodialogs/textconversiondlgs/services.cxx b/svx/source/unodialogs/textconversiondlgs/services.cxx index de6d3f6df754..edaf9076b6d4 100644 --- a/svx/source/unodialogs/textconversiondlgs/services.cxx +++ b/svx/source/unodialogs/textconversiondlgs/services.cxx @@ -37,7 +37,7 @@ static const struct ::cppu::ImplementationEntry g_entries_unodialogs_chinesetran extern "C" { -SAL_DLLPUBLIC_EXPORT void * SAL_CALL textconversiondlgs_component_getFactory( +SAL_DLLPUBLIC_EXPORT void * textconversiondlgs_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { return ::cppu::component_getFactoryHelper( diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx index df98ffaf8dab..981e378a381b 100644 --- a/svx/source/unodraw/UnoGraphicExporter.cxx +++ b/svx/source/unodraw/UnoGraphicExporter.cxx @@ -1256,7 +1256,7 @@ Graphic SvxGetGraphicForShape( SdrObject& rShape ) return aGraphic; } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_Draw_GraphicExporter_get_implementation( css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) diff --git a/svx/source/unodraw/UnoNamespaceMap.cxx b/svx/source/unodraw/UnoNamespaceMap.cxx index 9e3f264bc32b..aa905c7ea754 100644 --- a/svx/source/unodraw/UnoNamespaceMap.cxx +++ b/svx/source/unodraw/UnoNamespaceMap.cxx @@ -68,19 +68,19 @@ namespace svx virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; }; - Reference< XInterface > SAL_CALL NamespaceMap_createInstance( sal_uInt16* pWhichIds, SfxItemPool* pPool ) + Reference< XInterface > NamespaceMap_createInstance( sal_uInt16* pWhichIds, SfxItemPool* pPool ) { return static_cast<XWeak*>(new NamespaceMap( pWhichIds, pPool )); } - Sequence< OUString > SAL_CALL NamespaceMap_getSupportedServiceNames() + Sequence< OUString > NamespaceMap_getSupportedServiceNames() throw() { Sequence<OUString> aSupportedServiceNames { "com.sun.star.xml.NamespaceMap" }; return aSupportedServiceNames; } - OUString SAL_CALL NamespaceMap_getImplementationName() + OUString NamespaceMap_getImplementationName() throw() { return OUString( "com.sun.star.comp.Svx.NamespaceMap" ); diff --git a/svx/source/unodraw/XPropertyTable.cxx b/svx/source/unodraw/XPropertyTable.cxx index 98231be1007e..c3361936613c 100644 --- a/svx/source/unodraw/XPropertyTable.cxx +++ b/svx/source/unodraw/XPropertyTable.cxx @@ -247,7 +247,7 @@ public: virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; }; -uno::Reference< uno::XInterface > SAL_CALL SvxUnoXColorTable_createInstance( XPropertyList* pList ) throw() +uno::Reference< uno::XInterface > SvxUnoXColorTable_createInstance( XPropertyList* pList ) throw() { return static_cast<OWeakObject*>(new SvxUnoXColorTable( pList )); } @@ -305,7 +305,7 @@ public: virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; }; -uno::Reference< uno::XInterface > SAL_CALL SvxUnoXLineEndTable_createInstance( XPropertyList* pTable ) throw() +uno::Reference< uno::XInterface > SvxUnoXLineEndTable_createInstance( XPropertyList* pTable ) throw() { return static_cast<OWeakObject*>(new SvxUnoXLineEndTable( pTable )); } @@ -372,7 +372,7 @@ public: virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; }; -uno::Reference< uno::XInterface > SAL_CALL SvxUnoXDashTable_createInstance( XPropertyList* pTable ) throw() +uno::Reference< uno::XInterface > SvxUnoXDashTable_createInstance( XPropertyList* pTable ) throw() { return static_cast<OWeakObject*>(new SvxUnoXDashTable( pTable )); } @@ -449,7 +449,7 @@ public: virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; }; -uno::Reference< uno::XInterface > SAL_CALL SvxUnoXHatchTable_createInstance( XPropertyList* pTable ) throw() +uno::Reference< uno::XInterface > SvxUnoXHatchTable_createInstance( XPropertyList* pTable ) throw() { return static_cast<OWeakObject*>(new SvxUnoXHatchTable( pTable )); } @@ -521,7 +521,7 @@ public: virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; }; -uno::Reference< uno::XInterface > SAL_CALL SvxUnoXGradientTable_createInstance( XPropertyList* pTable ) throw() +uno::Reference< uno::XInterface > SvxUnoXGradientTable_createInstance( XPropertyList* pTable ) throw() { return static_cast<OWeakObject*>(new SvxUnoXGradientTable( pTable )); } @@ -605,7 +605,7 @@ public: virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; }; -uno::Reference< uno::XInterface > SAL_CALL SvxUnoXBitmapTable_createInstance( XPropertyList* pTable ) throw() +uno::Reference< uno::XInterface > SvxUnoXBitmapTable_createInstance( XPropertyList* pTable ) throw() { return static_cast<OWeakObject*>(new SvxUnoXBitmapTable( pTable )); } diff --git a/svx/source/unodraw/gluepts.cxx b/svx/source/unodraw/gluepts.cxx index a0769b73ccfe..9a2a7ab66d39 100644 --- a/svx/source/unodraw/gluepts.cxx +++ b/svx/source/unodraw/gluepts.cxx @@ -503,7 +503,7 @@ sal_Bool SAL_CALL SvxUnoGluePointAccess::hasElements() /** * Create a SvxUnoGluePointAccess */ -uno::Reference< uno::XInterface > SAL_CALL SvxUnoGluePointAccess_createInstance( SdrObject* pObject ) +uno::Reference< uno::XInterface > SvxUnoGluePointAccess_createInstance( SdrObject* pObject ) { return *new SvxUnoGluePointAccess(pObject); } diff --git a/svx/source/unodraw/gluepts.hxx b/svx/source/unodraw/gluepts.hxx index 2fb26c82163a..45397037aa39 100644 --- a/svx/source/unodraw/gluepts.hxx +++ b/svx/source/unodraw/gluepts.hxx @@ -30,7 +30,7 @@ namespace com { namespace sun { namespace star { namespace uno { } } } } class SdrObject; -css::uno::Reference<css::uno::XInterface> SAL_CALL +css::uno::Reference<css::uno::XInterface> SvxUnoGluePointAccess_createInstance(SdrObject * pObject); #endif diff --git a/svx/source/unodraw/recoveryui.cxx b/svx/source/unodraw/recoveryui.cxx index 2a352ddb473a..afbf6456c3d8 100644 --- a/svx/source/unodraw/recoveryui.cxx +++ b/svx/source/unodraw/recoveryui.cxx @@ -282,7 +282,7 @@ void RecoveryUI::impl_showAllRecoveredDocs() } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_svx_RecoveryUI_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) diff --git a/svx/source/unodraw/unobtabl.cxx b/svx/source/unodraw/unobtabl.cxx index 047f0b842841..c2f0949b5c41 100644 --- a/svx/source/unodraw/unobtabl.cxx +++ b/svx/source/unodraw/unobtabl.cxx @@ -97,7 +97,7 @@ uno::Type SAL_CALL SvxUnoBitmapTable::getElementType( ) /** * Create a bitmaptable */ -uno::Reference< uno::XInterface > SAL_CALL SvxUnoBitmapTable_createInstance( SdrModel* pModel ) +uno::Reference< uno::XInterface > SvxUnoBitmapTable_createInstance( SdrModel* pModel ) { return *new SvxUnoBitmapTable(pModel); } diff --git a/svx/source/unodraw/unoctabl.cxx b/svx/source/unodraw/unoctabl.cxx index d97d081430ea..17e0817c2621 100644 --- a/svx/source/unodraw/unoctabl.cxx +++ b/svx/source/unodraw/unoctabl.cxx @@ -171,7 +171,7 @@ sal_Bool SAL_CALL SvxUnoColorTable::hasElements() } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_drawing_SvxUnoColorTable_get_implementation( css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) diff --git a/svx/source/unodraw/unodtabl.cxx b/svx/source/unodraw/unodtabl.cxx index 77f0a6e8e67f..0fa393fc2ee6 100644 --- a/svx/source/unodraw/unodtabl.cxx +++ b/svx/source/unodraw/unodtabl.cxx @@ -80,7 +80,7 @@ uno::Type SAL_CALL SvxUnoDashTable::getElementType( ) /** * Create a gradienttable */ -uno::Reference< uno::XInterface > SAL_CALL SvxUnoDashTable_createInstance( SdrModel* pModel ) +uno::Reference< uno::XInterface > SvxUnoDashTable_createInstance( SdrModel* pModel ) { return *new SvxUnoDashTable(pModel); } diff --git a/svx/source/unodraw/unogtabl.cxx b/svx/source/unodraw/unogtabl.cxx index bfea79bcbd5d..8021b2d16f88 100644 --- a/svx/source/unodraw/unogtabl.cxx +++ b/svx/source/unodraw/unogtabl.cxx @@ -79,7 +79,7 @@ uno::Type SAL_CALL SvxUnoGradientTable::getElementType( ) /** * Create a gradienttable */ -uno::Reference< uno::XInterface > SAL_CALL SvxUnoGradientTable_createInstance( SdrModel* pModel ) +uno::Reference< uno::XInterface > SvxUnoGradientTable_createInstance( SdrModel* pModel ) { return *new SvxUnoGradientTable(pModel); } diff --git a/svx/source/unodraw/unohtabl.cxx b/svx/source/unodraw/unohtabl.cxx index e596d2233bd7..ec056461db0f 100644 --- a/svx/source/unodraw/unohtabl.cxx +++ b/svx/source/unodraw/unohtabl.cxx @@ -77,7 +77,7 @@ uno::Type SAL_CALL SvxUnoHatchTable::getElementType( ) /** * Create a hatchtable */ -uno::Reference< uno::XInterface > SAL_CALL SvxUnoHatchTable_createInstance( SdrModel* pModel ) +uno::Reference< uno::XInterface > SvxUnoHatchTable_createInstance( SdrModel* pModel ) { return *new SvxUnoHatchTable(pModel); } diff --git a/svx/source/unodraw/unomtabl.cxx b/svx/source/unodraw/unomtabl.cxx index 57725e32318d..de686a031822 100644 --- a/svx/source/unodraw/unomtabl.cxx +++ b/svx/source/unodraw/unomtabl.cxx @@ -412,7 +412,7 @@ sal_Bool SAL_CALL SvxUnoMarkerTable::hasElements( ) /** * Create a hatchtable */ -uno::Reference< uno::XInterface > SAL_CALL SvxUnoMarkerTable_createInstance( SdrModel* pModel ) +uno::Reference< uno::XInterface > SvxUnoMarkerTable_createInstance( SdrModel* pModel ) { return *new SvxUnoMarkerTable(pModel); } diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx index fd48bef8aef8..da67f601a553 100644 --- a/svx/source/unodraw/unoshap2.cxx +++ b/svx/source/unodraw/unoshap2.cxx @@ -937,7 +937,7 @@ SvxShapePolyPolygon::~SvxShapePolyPolygon() throw() { } -basegfx::B2DPolyPolygon SAL_CALL ImplSvxPointSequenceSequenceToB2DPolyPolygon( const drawing::PointSequenceSequence* pOuterSequence) throw() +basegfx::B2DPolyPolygon ImplSvxPointSequenceSequenceToB2DPolyPolygon( const drawing::PointSequenceSequence* pOuterSequence) throw() { basegfx::B2DPolyPolygon aRetval; @@ -1033,7 +1033,7 @@ bool SvxShapePolyPolygon::setPropertyValueImpl( const OUString& rName, const Sfx throw lang::IllegalArgumentException(); } -void SAL_CALL B2DPolyPolygonToSvxPointSequenceSequence( const basegfx::B2DPolyPolygon& rPolyPoly, drawing::PointSequenceSequence& rRetval ) +void B2DPolyPolygonToSvxPointSequenceSequence( const basegfx::B2DPolyPolygon& rPolyPoly, drawing::PointSequenceSequence& rRetval ) { if( (sal_uInt32)rRetval.getLength() != rPolyPoly.count() ) rRetval.realloc( rPolyPoly.count() ); diff --git a/svx/source/unodraw/unoshcol.cxx b/svx/source/unodraw/unoshcol.cxx index 607f155ed8ee..a24533062e34 100644 --- a/svx/source/unodraw/unoshcol.cxx +++ b/svx/source/unodraw/unoshcol.cxx @@ -253,7 +253,7 @@ uno::Sequence< OUString > SAL_CALL SvxShapeCollection::getSupportedServiceNames( } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_drawing_SvxShapeCollection_get_implementation( css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) diff --git a/svx/source/unodraw/unottabl.cxx b/svx/source/unodraw/unottabl.cxx index 149487f44f79..3cc9843e2599 100644 --- a/svx/source/unodraw/unottabl.cxx +++ b/svx/source/unodraw/unottabl.cxx @@ -79,7 +79,7 @@ uno::Type SAL_CALL SvxUnoTransGradientTable::getElementType( ) /** * Create a hatchtable */ -uno::Reference< uno::XInterface > SAL_CALL SvxUnoTransGradientTable_createInstance( SdrModel* pModel ) +uno::Reference< uno::XInterface > SvxUnoTransGradientTable_createInstance( SdrModel* pModel ) { return *new SvxUnoTransGradientTable(pModel); } diff --git a/svx/source/unogallery/unogalthemeprovider.cxx b/svx/source/unogallery/unogalthemeprovider.cxx index 229229b56f0c..2ad4a47445b8 100644 --- a/svx/source/unogallery/unogalthemeprovider.cxx +++ b/svx/source/unogallery/unogalthemeprovider.cxx @@ -243,7 +243,7 @@ void SAL_CALL GalleryThemeProvider::removeByName( const OUString& rName ) } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_gallery_GalleryThemeProvider_get_implementation( css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx index ff7e4043d519..4c0272084a40 100644 --- a/svx/source/xml/xmlgrhlp.cxx +++ b/svx/source/xml/xmlgrhlp.cxx @@ -1037,7 +1037,7 @@ Sequence< OUString > SAL_CALL SvXMLGraphicImportExportHelper::getSupportedServic uses eCreateMode == SvXMLGraphicHelperMode::Read, bDirect == sal_True in SvXMLGraphicHelper */ -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_Svx_GraphicImportHelper_get_implementation( css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) @@ -1057,7 +1057,7 @@ com_sun_star_comp_Svx_GraphicImportHelper_get_implementation( uses eCreateMode == SvXMLGraphicHelperMode::Write, bDirect == sal_True in SvXMLGraphicHelper */ -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_Svx_GraphicExportHelper_get_implementation( css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) diff --git a/sw/inc/shellio.hxx b/sw/inc/shellio.hxx index abe6d48d209f..eb764518061a 100644 --- a/sw/inc/shellio.hxx +++ b/sw/inc/shellio.hxx @@ -177,9 +177,9 @@ protected: #define SW_STREAM_READER 1 #define SW_STORAGE_READER 2 -extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportDOC(SvStream &rStream, const OUString &rFltName); -extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportRTF(SvStream &rStream); -extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportHTML(SvStream &rStream); +extern "C" SAL_DLLPUBLIC_EXPORT bool TestImportDOC(SvStream &rStream, const OUString &rFltName); +extern "C" SAL_DLLPUBLIC_EXPORT bool TestImportRTF(SvStream &rStream); +extern "C" SAL_DLLPUBLIC_EXPORT bool TestImportHTML(SvStream &rStream); SAL_DLLPUBLIC_EXPORT void FlushFontCache(); class SW_DLLPUBLIC Reader diff --git a/sw/source/core/bastyp/calc.cxx b/sw/source/core/bastyp/calc.cxx index 2e43e93b7947..cb903b36ba7f 100644 --- a/sw/source/core/bastyp/calc.cxx +++ b/sw/source/core/bastyp/calc.cxx @@ -145,7 +145,7 @@ const sal_Int32 coContFlags = & ~i18n::KParseTokens::IGNORE_LEADING_WS; extern "C" { -static int SAL_CALL OperatorCompare( const void *pFirst, const void *pSecond) +static int OperatorCompare( const void *pFirst, const void *pSecond) { int nRet = 0; if( CALC_NAME == static_cast<const CalcOp*>(pFirst)->eOp ) diff --git a/sw/source/core/docnode/finalthreadmanager.cxx b/sw/source/core/docnode/finalthreadmanager.cxx index 94f52fa8024d..4d90b7fa158b 100644 --- a/sw/source/core/docnode/finalthreadmanager.cxx +++ b/sw/source/core/docnode/finalthreadmanager.cxx @@ -437,7 +437,7 @@ void SAL_CALL FinalThreadManager::disposing( const css::lang::EventObject& ) // nothing to do, because instance doesn't hold any references of observed objects } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_util_comp_FinalThreadManager_get_implementation(css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const &) { diff --git a/sw/source/core/inc/unofreg.hxx b/sw/source/core/inc/unofreg.hxx index 698a6bc0fa0d..cbfd140d25e7 100644 --- a/sw/source/core/inc/unofreg.hxx +++ b/sw/source/core/inc/unofreg.hxx @@ -31,16 +31,16 @@ namespace com { namespace sun { namespace star { namespace lang { } } } } // module -css::uno::Sequence< OUString > SAL_CALL SwUnoModule_getSupportedServiceNames() throw(); -OUString SAL_CALL SwUnoModule_getImplementationName() throw(); +css::uno::Sequence< OUString > SwUnoModule_getSupportedServiceNames() throw(); +OUString SwUnoModule_getImplementationName() throw(); /// @throws css::uno::Exception -css::uno::Reference< css::uno::XInterface > SAL_CALL SwUnoModule_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > &rSMgr ); +css::uno::Reference< css::uno::XInterface > SwUnoModule_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > &rSMgr ); // writer documents -css::uno::Sequence< OUString > SAL_CALL SwTextDocument_getSupportedServiceNames() throw(); -OUString SAL_CALL SwTextDocument_getImplementationName() throw(); +css::uno::Sequence< OUString > SwTextDocument_getSupportedServiceNames() throw(); +OUString SwTextDocument_getImplementationName() throw(); /// @throws css::uno::Exception -css::uno::Reference< css::uno::XInterface > SAL_CALL SwTextDocument_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > &rSMgr, SfxModelFlags _nCreationFlags ); +css::uno::Reference< css::uno::XInterface > SwTextDocument_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > &rSMgr, SfxModelFlags _nCreationFlags ); #endif diff --git a/sw/source/core/layout/dumpfilter.cxx b/sw/source/core/layout/dumpfilter.cxx index 56c0b06f6ff4..37fcded5e262 100644 --- a/sw/source/core/layout/dumpfilter.cxx +++ b/sw/source/core/layout/dumpfilter.cxx @@ -156,7 +156,7 @@ namespace sw } // Namespace sw -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_comp_Writer_LayoutDump_get_implementation(css::uno::XComponentContext*, css::uno::Sequence<css::uno::Any> const &) { diff --git a/sw/source/filter/basflt/fltini.cxx b/sw/source/filter/basflt/fltini.cxx index 002317811a3d..e99b643480d4 100644 --- a/sw/source/filter/basflt/fltini.cxx +++ b/sw/source/filter/basflt/fltini.cxx @@ -725,8 +725,8 @@ Reader* GetDOCXReader() #endif } -typedef sal_uInt32 ( SAL_CALL *SaveOrDel )( SfxObjectShell&, SotStorage&, sal_Bool, const OUString& ); -typedef sal_uInt32 ( SAL_CALL *GetSaveWarning )( SfxObjectShell& ); +typedef sal_uInt32 ( *SaveOrDel )( SfxObjectShell&, SotStorage&, sal_Bool, const OUString& ); +typedef sal_uInt32 ( *GetSaveWarning )( SfxObjectShell& ); ErrCode SaveOrDelMSVBAStorage( SfxObjectShell& rDoc, SotStorage& rStor, bool bSaveInto, const OUString& rStorageName ) { diff --git a/sw/source/filter/docx/swdocxreader.cxx b/sw/source/filter/docx/swdocxreader.cxx index 4386de8fdc3e..6d0596073868 100644 --- a/sw/source/filter/docx/swdocxreader.cxx +++ b/sw/source/filter/docx/swdocxreader.cxx @@ -43,7 +43,7 @@ using namespace css; -extern "C" SAL_DLLPUBLIC_EXPORT Reader* SAL_CALL ImportDOCX() +extern "C" SAL_DLLPUBLIC_EXPORT Reader* ImportDOCX() { return new SwDOCXReader; } diff --git a/sw/source/filter/html/svxcss1.cxx b/sw/source/filter/html/svxcss1.cxx index 12e2cd62aea5..559e4e7cb197 100644 --- a/sw/source/filter/html/svxcss1.cxx +++ b/sw/source/filter/html/svxcss1.cxx @@ -3151,7 +3151,7 @@ static CSS1PropEntry aCSS1PropFnTab[] = extern "C" { -static int SAL_CALL CSS1PropEntryCompare( const void *pFirst, const void *pSecond) +static int CSS1PropEntryCompare( const void *pFirst, const void *pSecond) { int nRet; if( static_cast<const CSS1PropEntry*>(pFirst)->pFunc ) diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx index d5eb72ed2450..bd4b8edb7878 100644 --- a/sw/source/filter/html/swhtml.cxx +++ b/sw/source/filter/html/swhtml.cxx @@ -5512,7 +5512,7 @@ namespace }; } -bool SAL_CALL TestImportHTML(SvStream &rStream) +bool TestImportHTML(SvStream &rStream) { FontCacheGuard aFontCacheGuard; std::unique_ptr<Reader> xReader(new HTMLReader); diff --git a/sw/source/filter/rtf/swparrtf.cxx b/sw/source/filter/rtf/swparrtf.cxx index e56ec072faf0..be23eeaeb0a2 100644 --- a/sw/source/filter/rtf/swparrtf.cxx +++ b/sw/source/filter/rtf/swparrtf.cxx @@ -159,9 +159,9 @@ ErrCode SwRTFReader::Read(SwDoc& rDoc, const OUString& /*rBaseURL*/, SwPaM& rPam return ret; } -extern "C" SAL_DLLPUBLIC_EXPORT Reader* SAL_CALL ImportRTF() { return new SwRTFReader; } +extern "C" SAL_DLLPUBLIC_EXPORT Reader* ImportRTF() { return new SwRTFReader; } -extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportRTF(SvStream& rStream) +extern "C" SAL_DLLPUBLIC_EXPORT bool TestImportRTF(SvStream& rStream) { SwGlobals::ensure(); diff --git a/sw/source/filter/ww8/docxexportfilter.cxx b/sw/source/filter/ww8/docxexportfilter.cxx index e0c2522e29e3..4069289670e0 100644 --- a/sw/source/filter/ww8/docxexportfilter.cxx +++ b/sw/source/filter/ww8/docxexportfilter.cxx @@ -108,13 +108,13 @@ OUString DocxExportFilter::getImplementationName() return DocxExport_getImplementationName(); } -uno::Sequence< OUString > SAL_CALL DocxExport_getSupportedServiceNames() throw() +uno::Sequence< OUString > DocxExport_getSupportedServiceNames() throw() { return uno::Sequence< OUString > { "com.sun.star.document.ExportFilter" }; } /// @throws uno::Exception -uno::Reference< uno::XInterface > SAL_CALL DocxExport_createInstance(const uno::Reference< uno::XComponentContext > & xCtx ) +uno::Reference< uno::XInterface > DocxExport_createInstance(const uno::Reference< uno::XComponentContext > & xCtx ) { return static_cast<cppu::OWeakObject*>(new DocxExportFilter( xCtx )); } @@ -137,7 +137,7 @@ extern "C" { nullptr, nullptr, nullptr, nullptr, nullptr, 0 } }; -SAL_DLLPUBLIC_EXPORT void* SAL_CALL msword_component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* pRegistryKey ) +SAL_DLLPUBLIC_EXPORT void* msword_component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* pRegistryKey ) { return ::cppu::component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey, entries ); } diff --git a/sw/source/filter/ww8/rtfexport.cxx b/sw/source/filter/ww8/rtfexport.cxx index 3a7454098294..f31ae9bba61b 100644 --- a/sw/source/filter/ww8/rtfexport.cxx +++ b/sw/source/filter/ww8/rtfexport.cxx @@ -1437,8 +1437,8 @@ ErrCode SwRTFWriter::WriteStream() return ERRCODE_NONE; } -extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL ExportRTF(const OUString& rFltName, - const OUString& rBaseURL, WriterRef& xRet) +extern "C" SAL_DLLPUBLIC_EXPORT void ExportRTF(const OUString& rFltName, const OUString& rBaseURL, + WriterRef& xRet) { xRet = new SwRTFWriter(rFltName, rBaseURL); } diff --git a/sw/source/filter/ww8/rtfexportfilter.cxx b/sw/source/filter/ww8/rtfexportfilter.cxx index 61abb4a8a2f5..65d143595252 100644 --- a/sw/source/filter/ww8/rtfexportfilter.cxx +++ b/sw/source/filter/ww8/rtfexportfilter.cxx @@ -99,13 +99,13 @@ void RtfExportFilter::setSourceDocument(const uno::Reference<lang::XComponent>& OUString RtfExport_getImplementationName() { return OUString(IMPL_NAME_RTFEXPORT); } -uno::Sequence<OUString> SAL_CALL RtfExport_getSupportedServiceNames() noexcept +uno::Sequence<OUString> RtfExport_getSupportedServiceNames() noexcept { return uno::Sequence<OUString>{ "com.sun.star.document.ExportFilter" }; } uno::Reference<uno::XInterface> - SAL_CALL RtfExport_createInstance(const uno::Reference<uno::XComponentContext>& xCtx) +RtfExport_createInstance(const uno::Reference<uno::XComponentContext>& xCtx) { return static_cast<cppu::OWeakObject*>(new RtfExportFilter(xCtx)); } diff --git a/sw/source/filter/ww8/rtfexportfilter.hxx b/sw/source/filter/ww8/rtfexportfilter.hxx index 472c3c1d5a86..e8cd635585c6 100644 --- a/sw/source/filter/ww8/rtfexportfilter.hxx +++ b/sw/source/filter/ww8/rtfexportfilter.hxx @@ -57,10 +57,10 @@ public: }; OUString RtfExport_getImplementationName(); -css::uno::Sequence<OUString> SAL_CALL RtfExport_getSupportedServiceNames() noexcept; +css::uno::Sequence<OUString> RtfExport_getSupportedServiceNames() noexcept; /// @throws css::uno::Exception css::uno::Reference<css::uno::XInterface> - SAL_CALL RtfExport_createInstance(const css::uno::Reference<css::uno::XComponentContext>& xCtx); +RtfExport_createInstance(const css::uno::Reference<css::uno::XComponentContext>& xCtx); #define IMPL_NAME_RTFEXPORT "com.sun.star.comp.Writer.RtfExport" diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx index c67d69cceb12..3f6c736f2bd1 100644 --- a/sw/source/filter/ww8/wrtww8.cxx +++ b/sw/source/filter/ww8/wrtww8.cxx @@ -3680,18 +3680,18 @@ SwWW8Writer::~SwWW8Writer() { } -extern "C" SAL_DLLPUBLIC_EXPORT sal_uInt32 SAL_CALL SaveOrDelMSVBAStorage_ww8( SfxObjectShell& rDoc, SotStorage& rStor, sal_Bool bSaveInto, const OUString& rStorageName ) +extern "C" SAL_DLLPUBLIC_EXPORT sal_uInt32 SaveOrDelMSVBAStorage_ww8( SfxObjectShell& rDoc, SotStorage& rStor, sal_Bool bSaveInto, const OUString& rStorageName ) { SvxImportMSVBasic aTmp( rDoc, rStor ); return sal_uInt32(aTmp.SaveOrDelMSVBAStorage( bSaveInto, rStorageName )); } -extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL ExportDOC( const OUString& rFltName, const OUString& rBaseURL, WriterRef& xRet ) +extern "C" SAL_DLLPUBLIC_EXPORT void ExportDOC( const OUString& rFltName, const OUString& rBaseURL, WriterRef& xRet ) { xRet = new SwWW8Writer( rFltName, rBaseURL ); } -extern "C" SAL_DLLPUBLIC_EXPORT sal_uInt32 SAL_CALL GetSaveWarningOfMSVBAStorage_ww8( SfxObjectShell &rDocS ) +extern "C" SAL_DLLPUBLIC_EXPORT sal_uInt32 GetSaveWarningOfMSVBAStorage_ww8( SfxObjectShell &rDocS ) { return sal_uInt32(SvxImportMSVBasic::GetSaveWarningOfMSVBAStorage( rDocS )); } diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index a60a0971f687..c6d829c4c915 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -6203,7 +6203,7 @@ ErrCode SwWW8ImplReader::LoadDoc(WW8Glossary *pGloss) return nErrRet; } -extern "C" SAL_DLLPUBLIC_EXPORT Reader* SAL_CALL ImportDOC() +extern "C" SAL_DLLPUBLIC_EXPORT Reader* ImportDOC() { return new WW8Reader; } @@ -6220,7 +6220,7 @@ namespace }; } -bool SAL_CALL TestImportDOC(SvStream &rStream, const OUString &rFltName) +bool TestImportDOC(SvStream &rStream, const OUString &rFltName) { FontCacheGuard aFontCacheGuard; std::unique_ptr<Reader> xReader(ImportDOC()); @@ -6264,17 +6264,17 @@ bool SAL_CALL TestImportDOC(SvStream &rStream, const OUString &rFltName) return bRet; } -extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportWW8(SvStream &rStream) +extern "C" SAL_DLLPUBLIC_EXPORT bool TestImportWW8(SvStream &rStream) { return TestImportDOC(rStream, "CWW8"); } -extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportWW6(SvStream &rStream) +extern "C" SAL_DLLPUBLIC_EXPORT bool TestImportWW6(SvStream &rStream) { return TestImportDOC(rStream, "CWW6"); } -extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportWW2(SvStream &rStream) +extern "C" SAL_DLLPUBLIC_EXPORT bool TestImportWW2(SvStream &rStream) { return TestImportDOC(rStream, "WW6"); } diff --git a/sw/source/filter/xml/xmlexp.cxx b/sw/source/filter/xml/xmlexp.cxx index 037fe68c3959..dd1f4269c9a6 100644 --- a/sw/source/filter/xml/xmlexp.cxx +++ b/sw/source/filter/xml/xmlexp.cxx @@ -531,7 +531,7 @@ const SwDoc* SwXMLExport::getDoc() const return const_cast< SwXMLExport* >( this )->getDoc(); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_comp_Writer_XMLExporter_get_implementation(css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const &) { @@ -539,7 +539,7 @@ com_sun_star_comp_Writer_XMLExporter_get_implementation(css::uno::XComponentCont SvXMLExportFlags::ALL)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_comp_Writer_XMLStylesExporter_get_implementation(css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const &) { @@ -548,7 +548,7 @@ com_sun_star_comp_Writer_XMLStylesExporter_get_implementation(css::uno::XCompone SvXMLExportFlags::FONTDECLS)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_comp_Writer_XMLContentExporter_get_implementation(css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const &) { @@ -557,7 +557,7 @@ com_sun_star_comp_Writer_XMLContentExporter_get_implementation(css::uno::XCompon SvXMLExportFlags::FONTDECLS)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_comp_Writer_XMLMetaExporter_get_implementation(css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const &) { @@ -565,7 +565,7 @@ com_sun_star_comp_Writer_XMLMetaExporter_get_implementation(css::uno::XComponent SvXMLExportFlags::META)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_comp_Writer_XMLSettingsExporter_get_implementation(css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const &) { @@ -573,7 +573,7 @@ com_sun_star_comp_Writer_XMLSettingsExporter_get_implementation(css::uno::XCompo SvXMLExportFlags::SETTINGS)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_comp_Writer_XMLOasisExporter_get_implementation(css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const &) { @@ -581,7 +581,7 @@ com_sun_star_comp_Writer_XMLOasisExporter_get_implementation(css::uno::XComponen SvXMLExportFlags::ALL | SvXMLExportFlags::OASIS)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_comp_Writer_XMLOasisStylesExporter_get_implementation(css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const &) { @@ -590,7 +590,7 @@ com_sun_star_comp_Writer_XMLOasisStylesExporter_get_implementation(css::uno::XCo SvXMLExportFlags::FONTDECLS | SvXMLExportFlags::OASIS)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_comp_Writer_XMLOasisContentExporter_get_implementation(css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const &) { @@ -599,7 +599,7 @@ com_sun_star_comp_Writer_XMLOasisContentExporter_get_implementation(css::uno::XC SvXMLExportFlags::FONTDECLS | SvXMLExportFlags::OASIS)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_comp_Writer_XMLOasisMetaExporter_get_implementation(css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const &) { @@ -607,7 +607,7 @@ com_sun_star_comp_Writer_XMLOasisMetaExporter_get_implementation(css::uno::XComp SvXMLExportFlags::META | SvXMLExportFlags::OASIS)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_comp_Writer_XMLOasisSettingsExporter_get_implementation(css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const &) { diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx index e2118d87ca34..7b63719bfe8d 100644 --- a/sw/source/filter/xml/xmlimp.cxx +++ b/sw/source/filter/xml/xmlimp.cxx @@ -1507,7 +1507,7 @@ const SwDoc* SwXMLImport::getDoc() const return const_cast< SwXMLImport* >( this )->getDoc(); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_comp_Writer_XMLOasisImporter_get_implementation(css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const &) { @@ -1516,7 +1516,7 @@ com_sun_star_comp_Writer_XMLOasisImporter_get_implementation(css::uno::XComponen } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_comp_Writer_XMLOasisStylesImporter_get_implementation(css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const &) { @@ -1526,7 +1526,7 @@ com_sun_star_comp_Writer_XMLOasisStylesImporter_get_implementation(css::uno::XCo } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_comp_Writer_XMLOasisContentImporter_get_implementation(css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const &) { @@ -1535,7 +1535,7 @@ com_sun_star_comp_Writer_XMLOasisContentImporter_get_implementation(css::uno::XC SvXMLImportFlags::FONTDECLS)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_comp_Writer_XMLOasisMetaImporter_get_implementation(css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const &) { @@ -1544,7 +1544,7 @@ com_sun_star_comp_Writer_XMLOasisMetaImporter_get_implementation(css::uno::XComp } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_comp_Writer_XMLOasisSettingsImporter_get_implementation(css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const &) { @@ -1552,7 +1552,7 @@ com_sun_star_comp_Writer_XMLOasisSettingsImporter_get_implementation(css::uno::X SvXMLImportFlags::SETTINGS)); } -extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportFODT(SvStream &rStream) +extern "C" SAL_DLLPUBLIC_EXPORT bool TestImportFODT(SvStream &rStream) { SwGlobals::ensure(); @@ -1601,7 +1601,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportFODT(SvStream &rStream) return ret; } -extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportDOCX(SvStream &rStream) +extern "C" SAL_DLLPUBLIC_EXPORT bool TestImportDOCX(SvStream &rStream) { SwGlobals::ensure(); diff --git a/sw/source/ui/uno/swdetect.cxx b/sw/source/ui/uno/swdetect.cxx index 44d5c205eb6a..a87824640c4f 100644 --- a/sw/source/ui/uno/swdetect.cxx +++ b/sw/source/ui/uno/swdetect.cxx @@ -132,7 +132,7 @@ Sequence< OUString > SAL_CALL SwFilterDetect::getSupportedServiceNames() return seqServiceNames ; } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_comp_writer_FormatDetector_get_implementation(css::uno::XComponentContext*, css::uno::Sequence<css::uno::Any> const &) { diff --git a/sw/source/ui/vba/service.cxx b/sw/source/ui/vba/service.cxx index 3864993f0ed5..2b2adc652695 100644 --- a/sw/source/ui/vba/service.cxx +++ b/sw/source/ui/vba/service.cxx @@ -25,7 +25,7 @@ namespace sdecl = comphelper::service_decl; -extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL vbaswobj_component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * vbaswobj_component_getFactory( const sal_Char * pImplName, void *, void *) { void* pRet = sdecl::component_getFactoryHelper(pImplName, diff --git a/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx b/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx index e1ad415c34db..2452cea5b51e 100644 --- a/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx +++ b/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx @@ -290,7 +290,7 @@ void MMExcludeEntryController::statusChanged(const frame::FeatureStateEvent& rEv } -extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface * lo_writer_MMCurrentEntryController_get_implementation( uno::XComponentContext *context, uno::Sequence<uno::Any> const &) @@ -298,7 +298,7 @@ lo_writer_MMCurrentEntryController_get_implementation( return cppu::acquire(new MMCurrentEntryController(context)); } -extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface * lo_writer_MMExcludeEntryController_get_implementation( uno::XComponentContext *context, uno::Sequence<uno::Any> const &) diff --git a/sw/source/uibase/dialog/swabstdlg.cxx b/sw/source/uibase/dialog/swabstdlg.cxx index 6343d27cf54e..b4a9277b1921 100644 --- a/sw/source/uibase/dialog/swabstdlg.cxx +++ b/sw/source/uibase/dialog/swabstdlg.cxx @@ -23,11 +23,11 @@ #include <osl/module.hxx> -typedef SwAbstractDialogFactory* (SAL_CALL *SwFuncPtrCreateDialogFactory)(); +typedef SwAbstractDialogFactory* (*SwFuncPtrCreateDialogFactory)(); #ifndef DISABLE_DYNLOADING -extern "C" { static void SAL_CALL thisModule() {} } +extern "C" { static void thisModule() {} } #else diff --git a/sw/source/uibase/ribbar/workctrl.cxx b/sw/source/uibase/ribbar/workctrl.cxx index fe285abb58bc..d88e959813ec 100644 --- a/sw/source/uibase/ribbar/workctrl.cxx +++ b/sw/source/uibase/ribbar/workctrl.cxx @@ -946,7 +946,7 @@ void NavElementToolBoxControl::dispatchCommand( } } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * lo_writer_NavElementToolBoxController_get_implementation( css::uno::XComponentContext *rxContext, css::uno::Sequence<css::uno::Any> const &) @@ -1078,7 +1078,7 @@ void SAL_CALL PrevNextScrollToolboxController::statusChanged( const css::frame:: } } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * lo_writer_PreviousScrollToolboxController_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) @@ -1086,7 +1086,7 @@ lo_writer_PreviousScrollToolboxController_get_implementation( return cppu::acquire( new PrevNextScrollToolboxController( context, PrevNextScrollToolboxController::PREVIOUS ) ); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * lo_writer_NextScrollToolboxController_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) diff --git a/sw/source/uibase/sidebar/SwPanelFactory.cxx b/sw/source/uibase/sidebar/SwPanelFactory.cxx index d7b2962e26f0..9fe8ccc143c9 100644 --- a/sw/source/uibase/sidebar/SwPanelFactory.cxx +++ b/sw/source/uibase/sidebar/SwPanelFactory.cxx @@ -188,7 +188,7 @@ Reference<ui::XUIElement> SAL_CALL SwPanelFactory::createUIElement ( } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * org_apache_openoffice_comp_sw_sidebar_SwPanelFactory_get_implementation( css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) diff --git a/sw/source/uibase/uno/SwXFilterOptions.cxx b/sw/source/uibase/uno/SwXFilterOptions.cxx index f5c8af9796df..1426c688d587 100644 --- a/sw/source/uibase/uno/SwXFilterOptions.cxx +++ b/sw/source/uibase/uno/SwXFilterOptions.cxx @@ -138,7 +138,7 @@ uno::Sequence< OUString > SwXFilterOptions::getSupportedServiceNames() return uno::Sequence< OUString> (&sService, 1); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_comp_Writer_FilterOptionsDialog_get_implementation(css::uno::XComponentContext*, css::uno::Sequence<css::uno::Any> const &) { diff --git a/sw/source/uibase/uno/unoatxt.cxx b/sw/source/uibase/uno/unoatxt.cxx index 28c2c7f85454..5b37293c7805 100644 --- a/sw/source/uibase/uno/unoatxt.cxx +++ b/sw/source/uibase/uno/unoatxt.cxx @@ -1047,7 +1047,7 @@ void SwAutoTextEventDescriptor::getByName( } } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SwXAutoTextContainer_get_implementation(css::uno::XComponentContext*, css::uno::Sequence<css::uno::Any> const &) { diff --git a/sw/source/uibase/uno/unodoc.cxx b/sw/source/uibase/uno/unodoc.cxx index 2a63caf061c4..08c032796e90 100644 --- a/sw/source/uibase/uno/unodoc.cxx +++ b/sw/source/uibase/uno/unodoc.cxx @@ -30,7 +30,7 @@ using namespace ::com::sun::star; // com.sun.star.comp.Writer.TextDocument -uno::Sequence< OUString > SAL_CALL SwTextDocument_getSupportedServiceNames() throw() +uno::Sequence< OUString > SwTextDocument_getSupportedServiceNames() throw() { // return only top level services here! All others must be // resolved by rtti! @@ -38,12 +38,12 @@ uno::Sequence< OUString > SAL_CALL SwTextDocument_getSupportedServiceNames() thr return aRet; } -OUString SAL_CALL SwTextDocument_getImplementationName() throw() +OUString SwTextDocument_getImplementationName() throw() { return OUString( "com.sun.star.comp.Writer.TextDocument" ); } -uno::Reference< uno::XInterface > SAL_CALL SwTextDocument_createInstance( +uno::Reference< uno::XInterface > SwTextDocument_createInstance( const uno::Reference< lang::XMultiServiceFactory >&, SfxModelFlags _nCreationFlags ) { SolarMutexGuard aGuard; @@ -52,7 +52,7 @@ uno::Reference< uno::XInterface > SAL_CALL SwTextDocument_createInstance( return uno::Reference< uno::XInterface >( pShell->GetModel() ); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_comp_Writer_WebDocument_get_implementation(css::uno::XComponentContext*, css::uno::Sequence<css::uno::Any> const &) { @@ -65,7 +65,7 @@ com_sun_star_comp_Writer_WebDocument_get_implementation(css::uno::XComponentCont } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_comp_Writer_GlobalDocument_get_implementation(css::uno::XComponentContext*, css::uno::Sequence<css::uno::Any> const &) { diff --git a/sw/source/uibase/uno/unofreg.cxx b/sw/source/uibase/uno/unofreg.cxx index dce6625edf92..3d2b0b91683f 100644 --- a/sw/source/uibase/uno/unofreg.cxx +++ b/sw/source/uibase/uno/unofreg.cxx @@ -40,7 +40,7 @@ using namespace ::com::sun::star::lang; extern "C" { -SAL_DLLPUBLIC_EXPORT void * SAL_CALL sw_component_getFactory( +SAL_DLLPUBLIC_EXPORT void * sw_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * ) @@ -82,7 +82,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL sw_component_getFactory( } // extern "C" -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SwXMailMerge_get_implementation(css::uno::XComponentContext*, css::uno::Sequence<css::uno::Any> const &) { diff --git a/sw/source/uibase/uno/unomod.cxx b/sw/source/uibase/uno/unomod.cxx index 3cd3772ea3fa..c614793a2173 100644 --- a/sw/source/uibase/uno/unomod.cxx +++ b/sw/source/uibase/uno/unomod.cxx @@ -957,7 +957,7 @@ Sequence< OUString > SwXViewSettings::getSupportedServiceNames() return aRet; } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SwXModule_get_implementation(css::uno::XComponentContext*, css::uno::Sequence<css::uno::Any> const &) { diff --git a/sw/source/uibase/uno/unomodule.cxx b/sw/source/uibase/uno/unomodule.cxx index cf074ec15d02..dce4a610fcaf 100644 --- a/sw/source/uibase/uno/unomodule.cxx +++ b/sw/source/uibase/uno/unomodule.cxx @@ -32,18 +32,18 @@ using namespace css; -OUString SAL_CALL SwUnoModule_getImplementationName() throw() +OUString SwUnoModule_getImplementationName() throw() { return OUString( "com.sun.star.comp.Writer.WriterModule" ); } -uno::Sequence< OUString > SAL_CALL SwUnoModule_getSupportedServiceNames() throw() +uno::Sequence< OUString > SwUnoModule_getSupportedServiceNames() throw() { uno::Sequence<OUString> aSeq { "com.sun.star.text.ModuleDispatcher" }; return aSeq; } -uno::Reference< uno::XInterface > SAL_CALL SwUnoModule_createInstance( +uno::Reference< uno::XInterface > SwUnoModule_createInstance( const uno::Reference< lang::XMultiServiceFactory > & ) { SolarMutexGuard aGuard; diff --git a/test/source/vclbootstrapprotector.cxx b/test/source/vclbootstrapprotector.cxx index cf6341737919..f0c7581237be 100644 --- a/test/source/vclbootstrapprotector.cxx +++ b/test/source/vclbootstrapprotector.cxx @@ -50,7 +50,7 @@ private: } -extern "C" SAL_DLLPUBLIC_EXPORT CppUnit::Protector * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT CppUnit::Protector * vclbootstrapprotector() { return new Protector; } diff --git a/testtools/source/bridgetest/bridgetest.cxx b/testtools/source/bridgetest/bridgetest.cxx index 3209d774addd..a4244190f5ca 100644 --- a/testtools/source/bridgetest/bridgetest.cxx +++ b/testtools/source/bridgetest/bridgetest.cxx @@ -1198,7 +1198,7 @@ Sequence< OUString > TestBridgeImpl::getSupportedServiceNames() } -static Reference< XInterface > SAL_CALL TestBridgeImpl_create( +static Reference< XInterface > TestBridgeImpl_create( const Reference< XComponentContext > & xContext ) { return Reference< XInterface >( @@ -1210,7 +1210,7 @@ static Reference< XInterface > SAL_CALL TestBridgeImpl_create( extern "C" { -SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( +SAL_DLLPUBLIC_EXPORT void * component_getFactory( const sal_Char * pImplName, void * pServiceManager, SAL_UNUSED_PARAMETER void * ) { diff --git a/testtools/source/bridgetest/constructors.cxx b/testtools/source/bridgetest/constructors.cxx index 790161bbc453..d1e9c6d5a0da 100644 --- a/testtools/source/bridgetest/constructors.cxx +++ b/testtools/source/bridgetest/constructors.cxx @@ -405,36 +405,36 @@ OUString Impl2::fn12( const OUString& arg ) return "12" + arg; } -css::uno::Reference< css::uno::XInterface > SAL_CALL create( +css::uno::Reference< css::uno::XInterface > create( SAL_UNUSED_PARAMETER css::uno::Reference< css::uno::XComponentContext > const &) { return static_cast< ::cppu::OWeakObject * >(new Impl); } -OUString SAL_CALL getImplementationName() { +OUString getImplementationName() { return OUString( "comp.test.testtools.bridgetest.Constructors"); } -css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() { +css::uno::Sequence< OUString > getSupportedServiceNames() { css::uno::Sequence< OUString > s { "test.testtools.bridgetest.Constructors" }; return s; } -css::uno::Reference< css::uno::XInterface > SAL_CALL create2( +css::uno::Reference< css::uno::XInterface > create2( SAL_UNUSED_PARAMETER css::uno::Reference< css::uno::XComponentContext > const &) { return static_cast< ::cppu::OWeakObject * >(new Impl2); } -OUString SAL_CALL getImplementationName2() { +OUString getImplementationName2() { return OUString( "comp.test.testtools.bridgetest.Constructors2"); } -css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames2() { +css::uno::Sequence< OUString > getSupportedServiceNames2() { css::uno::Sequence< OUString > s { "test.testtools.bridgetest.Constructors2" }; return s; } @@ -447,7 +447,7 @@ css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames2() { { nullptr, nullptr, nullptr, nullptr, nullptr, 0 } }; } -extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * component_getFactory( char const * implName, void * serviceManager, void * registryKey) { return ::cppu::component_getFactoryHelper( diff --git a/testtools/source/bridgetest/cppobj.cxx b/testtools/source/bridgetest/cppobj.cxx index b4b648c3d350..6280a13f8158 100644 --- a/testtools/source/bridgetest/cppobj.cxx +++ b/testtools/source/bridgetest/cppobj.cxx @@ -1117,7 +1117,7 @@ Sequence< OUString > Test_Impl::getSupportedServiceNames() } -static Reference< XInterface > SAL_CALL Test_Impl_create( +static Reference< XInterface > Test_Impl_create( SAL_UNUSED_PARAMETER const Reference< XMultiServiceFactory > & ) { return Reference< XInterface >( static_cast<XBridgeTest *>(new Test_Impl()) ); @@ -1127,7 +1127,7 @@ static Reference< XInterface > SAL_CALL Test_Impl_create( extern "C" { -SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( +SAL_DLLPUBLIC_EXPORT void * component_getFactory( const sal_Char * pImplName, SAL_UNUSED_PARAMETER void * pServiceManager, SAL_UNUSED_PARAMETER void * ) { diff --git a/toolkit/source/awt/asynccallback.cxx b/toolkit/source/awt/asynccallback.cxx index f83b390c2eb7..e9cc75f5f462 100644 --- a/toolkit/source/awt/asynccallback.cxx +++ b/toolkit/source/awt/asynccallback.cxx @@ -113,7 +113,7 @@ IMPL_STATIC_LINK( AsyncCallback, Notify_Impl, void*, p, void ) } // closing anonymous implementation namespace -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_awt_comp_AsyncCallback_get_implementation( css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) diff --git a/toolkit/source/awt/vclxmenu.cxx b/toolkit/source/awt/vclxmenu.cxx index 66510b1feba1..93e78e301e2c 100644 --- a/toolkit/source/awt/vclxmenu.cxx +++ b/toolkit/source/awt/vclxmenu.cxx @@ -849,7 +849,7 @@ VCLXMenuBar::VCLXMenuBar( MenuBar* pMenuBar ) : VCLXMenu( static_cast<Menu *>(pM { } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_VCLXMenuBar_get_implementation( css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) @@ -867,7 +867,7 @@ VCLXPopupMenu::VCLXPopupMenu( PopupMenu* pPopMenu ) : VCLXMenu( static_cast<Menu ImplAddListener(); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_VCLXPopupMenu_get_implementation( css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) diff --git a/toolkit/source/awt/vclxpointer.cxx b/toolkit/source/awt/vclxpointer.cxx index a2427984761b..018c335afc18 100644 --- a/toolkit/source/awt/vclxpointer.cxx +++ b/toolkit/source/awt/vclxpointer.cxx @@ -63,7 +63,7 @@ css::uno::Sequence<OUString> VCLXPointer::getSupportedServiceNames() "com.sun.star.awt.Pointer", "stardiv.vcl.Pointer"}; } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_VCLXPointer_get_implementation( css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) diff --git a/toolkit/source/awt/vclxprinter.cxx b/toolkit/source/awt/vclxprinter.cxx index 6fe73f2ab59c..3c61ad7b5fbd 100644 --- a/toolkit/source/awt/vclxprinter.cxx +++ b/toolkit/source/awt/vclxprinter.cxx @@ -397,7 +397,7 @@ css::uno::Sequence<OUString> VCLXPrinterServer::getSupportedServiceNames() "com.sun.star.awt.PrinterServer", "stardiv.vcl.PrinterServer"}; } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_VCLXPrinterServer_get_implementation( css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx index e2df8b70f695..744306d01ec9 100644 --- a/toolkit/source/awt/vclxtoolkit.cxx +++ b/toolkit/source/awt/vclxtoolkit.cxx @@ -135,7 +135,7 @@ namespace { -extern "C" typedef vcl::Window* (SAL_CALL *FN_SvtCreateWindow)( +extern "C" typedef vcl::Window* (*FN_SvtCreateWindow)( VCLXWindow** ppNewComp, const css::awt::WindowDescriptor* pDescriptor, vcl::Window* pParent, @@ -508,7 +508,7 @@ static ComponentInfo aComponentInfos [] = extern "C" { -static int SAL_CALL ComponentInfoCompare( const void* pFirst, const void* pSecond) +static int ComponentInfoCompare( const void* pFirst, const void* pSecond) { return strcmp( static_cast<ComponentInfo const *>(pFirst)->pName, static_cast<ComponentInfo const *>(pSecond)->pName ); @@ -621,7 +621,7 @@ osl::Condition & getInitCondition() extern "C" { -static void SAL_CALL ToolkitWorkerFunction( void* pArgs ) +static void ToolkitWorkerFunction( void* pArgs ) { osl_setThreadName("VCLXToolkit VCL main thread"); @@ -1206,7 +1206,7 @@ vcl::Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp, #ifndef DISABLE_DYNLOADING -extern "C" { static void SAL_CALL thisModule() {} } +extern "C" { static void thisModule() {} } #else @@ -1997,7 +1997,7 @@ void SAL_CALL VCLXToolkit::mouseMove( const css::awt::MouseEvent & aMouseEvent ) } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_VCLXToolkit_get_implementation( css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) diff --git a/toolkit/source/controls/animatedimages.cxx b/toolkit/source/controls/animatedimages.cxx index 56a5a0b94123..9357b20e5fe8 100644 --- a/toolkit/source/controls/animatedimages.cxx +++ b/toolkit/source/controls/animatedimages.cxx @@ -492,7 +492,7 @@ namespace toolkit { } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * org_openoffice_comp_toolkit_AnimatedImagesControl_get_implementation( css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) @@ -500,7 +500,7 @@ org_openoffice_comp_toolkit_AnimatedImagesControl_get_implementation( return cppu::acquire(new AnimatedImagesControl()); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * org_openoffice_comp_toolkit_AnimatedImagesControlModel_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) diff --git a/toolkit/source/controls/dialogcontrol.cxx b/toolkit/source/controls/dialogcontrol.cxx index 8ca31adf47d3..04b70d6d686b 100644 --- a/toolkit/source/controls/dialogcontrol.cxx +++ b/toolkit/source/controls/dialogcontrol.cxx @@ -1208,7 +1208,7 @@ uno::Reference< beans::XPropertySetInfo > UnoFrameModel::getPropertySetInfo( ) return xInfo; } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoControlDialogModel_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) @@ -1216,7 +1216,7 @@ stardiv_Toolkit_UnoControlDialogModel_get_implementation( return cppu::acquire(new OGeometryControlModel<UnoControlDialogModel>(context)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoDialogControl_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) @@ -1224,7 +1224,7 @@ stardiv_Toolkit_UnoDialogControl_get_implementation( return cppu::acquire(new UnoDialogControl(context)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoMultiPageControl_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) @@ -1232,7 +1232,7 @@ stardiv_Toolkit_UnoMultiPageControl_get_implementation( return cppu::acquire(new UnoMultiPageControl(context)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoMultiPageModel_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) @@ -1240,7 +1240,7 @@ stardiv_Toolkit_UnoMultiPageModel_get_implementation( return cppu::acquire(new UnoMultiPageModel(context)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoPageControl_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) @@ -1248,7 +1248,7 @@ stardiv_Toolkit_UnoPageControl_get_implementation( return cppu::acquire(new UnoPageControl(context)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoPageModel_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) @@ -1256,7 +1256,7 @@ stardiv_Toolkit_UnoPageModel_get_implementation( return cppu::acquire(new UnoPageModel(context)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoFrameControl_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) @@ -1264,7 +1264,7 @@ stardiv_Toolkit_UnoFrameControl_get_implementation( return cppu::acquire(new UnoFrameControl(context)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoFrameModel_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) diff --git a/toolkit/source/controls/formattedcontrol.cxx b/toolkit/source/controls/formattedcontrol.cxx index 194aaf33749f..b25f2c2a582c 100644 --- a/toolkit/source/controls/formattedcontrol.cxx +++ b/toolkit/source/controls/formattedcontrol.cxx @@ -481,7 +481,7 @@ namespace toolkit } // namespace toolkit -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoControlFormattedFieldModel_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) @@ -489,7 +489,7 @@ stardiv_Toolkit_UnoControlFormattedFieldModel_get_implementation( return cppu::acquire(new toolkit::UnoControlFormattedFieldModel(context)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoFormattedFieldControl_get_implementation( css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) diff --git a/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx b/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx index ef153feaeec4..7ece076514cb 100644 --- a/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx +++ b/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx @@ -392,7 +392,7 @@ private: } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_DefaultGridColumnModel_get_implementation( css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) diff --git a/toolkit/source/controls/grid/defaultgriddatamodel.cxx b/toolkit/source/controls/grid/defaultgriddatamodel.cxx index 10bebd5c87eb..4a25f01237e0 100644 --- a/toolkit/source/controls/grid/defaultgriddatamodel.cxx +++ b/toolkit/source/controls/grid/defaultgriddatamodel.cxx @@ -501,7 +501,7 @@ private: } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_DefaultGridDataModel_get_implementation( css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) diff --git a/toolkit/source/controls/grid/gridcolumn.cxx b/toolkit/source/controls/grid/gridcolumn.cxx index d0561edbd533..9ad9a8bdbe60 100644 --- a/toolkit/source/controls/grid/gridcolumn.cxx +++ b/toolkit/source/controls/grid/gridcolumn.cxx @@ -310,7 +310,7 @@ namespace toolkit } } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * org_openoffice_comp_toolkit_GridColumn_get_implementation( css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) diff --git a/toolkit/source/controls/grid/gridcontrol.cxx b/toolkit/source/controls/grid/gridcontrol.cxx index cc77817b2f4e..acbbf5ed4ab6 100644 --- a/toolkit/source/controls/grid/gridcontrol.cxx +++ b/toolkit/source/controls/grid/gridcontrol.cxx @@ -448,7 +448,7 @@ void SAL_CALL UnoGridControl::removeSelectionListener(const css::uno::Reference< } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_GridControl_get_implementation( css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) @@ -456,7 +456,7 @@ stardiv_Toolkit_GridControl_get_implementation( return cppu::acquire(new toolkit::UnoGridControl()); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_GridControlModel_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) diff --git a/toolkit/source/controls/grid/sortablegriddatamodel.cxx b/toolkit/source/controls/grid/sortablegriddatamodel.cxx index ad1cc2611a51..e9cafb05b6d8 100644 --- a/toolkit/source/controls/grid/sortablegriddatamodel.cxx +++ b/toolkit/source/controls/grid/sortablegriddatamodel.cxx @@ -938,7 +938,7 @@ public: } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * org_openoffice_comp_toolkit_SortableGridDataModel_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) diff --git a/toolkit/source/controls/roadmapcontrol.cxx b/toolkit/source/controls/roadmapcontrol.cxx index ad39e9c24748..8d0a3ce774ee 100644 --- a/toolkit/source/controls/roadmapcontrol.cxx +++ b/toolkit/source/controls/roadmapcontrol.cxx @@ -500,7 +500,7 @@ css::uno::Sequence<OUString> UnoRoadmapControl::getSupportedServiceNames() } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoControlRoadmapModel_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) @@ -508,7 +508,7 @@ stardiv_Toolkit_UnoControlRoadmapModel_get_implementation( return cppu::acquire(new toolkit::UnoControlRoadmapModel(context)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoRoadmapControl_get_implementation( css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) diff --git a/toolkit/source/controls/spinningprogress.cxx b/toolkit/source/controls/spinningprogress.cxx index fbb44bcbc7ba..3cf094f9f5dd 100644 --- a/toolkit/source/controls/spinningprogress.cxx +++ b/toolkit/source/controls/spinningprogress.cxx @@ -126,7 +126,7 @@ protected: } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * org_openoffice_comp_toolkit_SpinningProgressControlModel_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) diff --git a/toolkit/source/controls/stdtabcontroller.cxx b/toolkit/source/controls/stdtabcontroller.cxx index 967113a46602..bf8a8192a58a 100644 --- a/toolkit/source/controls/stdtabcontroller.cxx +++ b/toolkit/source/controls/stdtabcontroller.cxx @@ -403,7 +403,7 @@ Reference< XControl > StdTabController::FindControl( Sequence< Reference< XCont return Reference< XControl > (); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_StdTabController_get_implementation( css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) diff --git a/toolkit/source/controls/stdtabcontrollermodel.cxx b/toolkit/source/controls/stdtabcontrollermodel.cxx index b382cf9ae158..2a7dc44a6d8f 100644 --- a/toolkit/source/controls/stdtabcontrollermodel.cxx +++ b/toolkit/source/controls/stdtabcontrollermodel.cxx @@ -431,7 +431,7 @@ css::uno::Sequence<OUString> StdTabControllerModel::getSupportedServiceNames() "stardiv.vcl.controlmodel.TabController"}; } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_StdTabControllerModel_get_implementation( css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) diff --git a/toolkit/source/controls/tabpagecontainer.cxx b/toolkit/source/controls/tabpagecontainer.cxx index 19ae57413a44..5102f883b5a8 100644 --- a/toolkit/source/controls/tabpagecontainer.cxx +++ b/toolkit/source/controls/tabpagecontainer.cxx @@ -332,7 +332,7 @@ void SAL_CALL UnoControlTabPageContainer::addControl( const OUString& Name, cons xContainerListener->elementInserted( aEvent ); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoControlTabPageContainerModel_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) @@ -340,7 +340,7 @@ stardiv_Toolkit_UnoControlTabPageContainerModel_get_implementation( return cppu::acquire(new UnoControlTabPageContainerModel(context)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoControlTabPageContainer_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) diff --git a/toolkit/source/controls/tabpagemodel.cxx b/toolkit/source/controls/tabpagemodel.cxx index 90f22675da0f..73a10f3c5461 100644 --- a/toolkit/source/controls/tabpagemodel.cxx +++ b/toolkit/source/controls/tabpagemodel.cxx @@ -299,7 +299,7 @@ void SAL_CALL UnoControlTabPage::windowShown( const css::lang::EventObject& ) {} void SAL_CALL UnoControlTabPage::windowHidden( const css::lang::EventObject& ) {} -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoControlTabPageModel_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) @@ -307,7 +307,7 @@ stardiv_Toolkit_UnoControlTabPageModel_get_implementation( return cppu::acquire(new UnoControlTabPageModel(context)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoControlTabPage_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) diff --git a/toolkit/source/controls/tkscrollbar.cxx b/toolkit/source/controls/tkscrollbar.cxx index 35210ddd776a..a91a5933066a 100644 --- a/toolkit/source/controls/tkscrollbar.cxx +++ b/toolkit/source/controls/tkscrollbar.cxx @@ -302,7 +302,7 @@ namespace toolkit } // namespace toolkit -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoControlScrollBarModel_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) @@ -310,7 +310,7 @@ stardiv_Toolkit_UnoControlScrollBarModel_get_implementation( return cppu::acquire(new toolkit::UnoControlScrollBarModel(context)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoScrollBarControl_get_implementation( css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) diff --git a/toolkit/source/controls/tkspinbutton.cxx b/toolkit/source/controls/tkspinbutton.cxx index d913d40159df..b1fc40aa6826 100644 --- a/toolkit/source/controls/tkspinbutton.cxx +++ b/toolkit/source/controls/tkspinbutton.cxx @@ -415,7 +415,7 @@ public: } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoSpinButtonModel_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) @@ -423,7 +423,7 @@ stardiv_Toolkit_UnoSpinButtonModel_get_implementation( return cppu::acquire(new UnoSpinButtonModel(context)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoSpinButtonControl_get_implementation( css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) diff --git a/toolkit/source/controls/tree/treecontrol.cxx b/toolkit/source/controls/tree/treecontrol.cxx index 33a6c739d189..4292b6c42932 100644 --- a/toolkit/source/controls/tree/treecontrol.cxx +++ b/toolkit/source/controls/tree/treecontrol.cxx @@ -506,7 +506,7 @@ void SAL_CALL TreeEditListenerMultiplexer::nodeEdited( const Reference< XTreeNod } } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_TreeControlModel_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) @@ -514,7 +514,7 @@ stardiv_Toolkit_TreeControlModel_get_implementation( return cppu::acquire(new toolkit::UnoTreeModel(context)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_TreeControl_get_implementation( css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) diff --git a/toolkit/source/controls/tree/treedatamodel.cxx b/toolkit/source/controls/tree/treedatamodel.cxx index 6910e92a1d75..fd43049ca663 100644 --- a/toolkit/source/controls/tree/treedatamodel.cxx +++ b/toolkit/source/controls/tree/treedatamodel.cxx @@ -522,7 +522,7 @@ Sequence< OUString > SAL_CALL MutableTreeNode::getSupportedServiceNames( ) } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_MutableTreeDataModel_get_implementation( css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) diff --git a/toolkit/source/controls/unocontrolcontainer.cxx b/toolkit/source/controls/unocontrolcontainer.cxx index e4f5b5353fa4..0a992812f7d8 100644 --- a/toolkit/source/controls/unocontrolcontainer.cxx +++ b/toolkit/source/controls/unocontrolcontainer.cxx @@ -831,7 +831,7 @@ void UnoControlContainer::PrepareWindowDescriptor( css::awt::WindowDescriptor& r } } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoControlContainer_get_implementation( css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) diff --git a/toolkit/source/controls/unocontrolcontainermodel.cxx b/toolkit/source/controls/unocontrolcontainermodel.cxx index 4db57220cc4d..5c7b11c76043 100644 --- a/toolkit/source/controls/unocontrolcontainermodel.cxx +++ b/toolkit/source/controls/unocontrolcontainermodel.cxx @@ -90,7 +90,7 @@ css::uno::Reference< css::beans::XPropertySetInfo > UnoControlContainerModel::ge return *pHelper; } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoControlContainerModel_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) diff --git a/toolkit/source/controls/unocontrols.cxx b/toolkit/source/controls/unocontrols.cxx index a53188af6775..f74f468b7562 100644 --- a/toolkit/source/controls/unocontrols.cxx +++ b/toolkit/source/controls/unocontrols.cxx @@ -174,7 +174,7 @@ css::uno::Sequence<OUString> UnoControlEditModel::getSupportedServiceNames() return s; } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoControlEditModel_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) @@ -493,7 +493,7 @@ uno::Sequence< OUString > UnoEditControl::getSupportedServiceNames() return aNames; } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoEditControl_get_implementation( css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) @@ -574,7 +574,7 @@ UnoControlFileControlModel::getSupportedServiceNames() return s; } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoControlFileControlModel_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) @@ -609,7 +609,7 @@ css::uno::Sequence<OUString> UnoFileControl::getSupportedServiceNames() return s; } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoFileControl_get_implementation( css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) @@ -759,7 +759,7 @@ css::uno::Sequence<OUString> UnoControlButtonModel::getSupportedServiceNames() return s; } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoControlButtonModel_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) @@ -917,7 +917,7 @@ css::uno::Sequence<OUString> UnoButtonControl::getSupportedServiceNames() return s; } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoButtonControl_get_implementation( css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) @@ -1024,7 +1024,7 @@ void SAL_CALL UnoControlImageControlModel::setFastPropertyValue_NoBroadcast( sal } } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoControlImageControlModel_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) @@ -1093,7 +1093,7 @@ css::uno::Sequence<OUString> UnoImageControlControl::getSupportedServiceNames() return s; } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoImageControlControl_get_implementation( css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) @@ -1162,7 +1162,7 @@ UnoControlRadioButtonModel::getSupportedServiceNames() return s; } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoControlRadioButtonModel_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) @@ -1340,7 +1340,7 @@ css::uno::Sequence<OUString> UnoRadioButtonControl::getSupportedServiceNames() return s; } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoRadioButtonControl_get_implementation( css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) @@ -1408,7 +1408,7 @@ css::uno::Sequence<OUString> UnoControlCheckBoxModel::getSupportedServiceNames() return s; } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoControlCheckBoxModel_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) @@ -1559,7 +1559,7 @@ css::uno::Sequence<OUString> UnoCheckBoxControl::getSupportedServiceNames() return s; } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoCheckBoxControl_get_implementation( css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) @@ -1617,7 +1617,7 @@ uno::Reference< beans::XPropertySetInfo > UnoControlFixedHyperlinkModel::getProp return xInfo; } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoControlFixedHyperlinkModel_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) @@ -1750,7 +1750,7 @@ void UnoFixedHyperlinkControl::removeActionListener(const uno::Reference< awt::X maActionListeners.removeInterface( l ); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoFixedHyperlinkControl_get_implementation( css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) @@ -1819,7 +1819,7 @@ UnoControlFixedTextModel::getSupportedServiceNames() return s; } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoControlFixedTextModel_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) @@ -1918,7 +1918,7 @@ css::uno::Sequence<OUString> UnoFixedTextControl::getSupportedServiceNames() return s; } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoFixedTextControl_get_implementation( css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) @@ -1990,7 +1990,7 @@ css::uno::Sequence<OUString> UnoControlGroupBoxModel::getSupportedServiceNames() return s; } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoControlGroupBoxModel_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) @@ -2032,7 +2032,7 @@ css::uno::Sequence<OUString> UnoGroupBoxControl::getSupportedServiceNames() return s; } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoGroupBoxControl_get_implementation( css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) @@ -2592,7 +2592,7 @@ void UnoControlListBoxModel::impl_notifyItemListEvent_nolck( const sal_Int32 i_n m_aItemListListeners.notifyEach( NotificationMethod, aEvent ); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoControlListBoxModel_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) @@ -3020,7 +3020,7 @@ void SAL_CALL UnoListBoxControl::itemListChanged( const lang::EventObject& i_rEv xPeerListener->itemListChanged( i_rEvent ); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoListBoxControl_get_implementation( css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) @@ -3114,7 +3114,7 @@ uno::Any UnoControlComboBoxModel::ImplGetDefaultValue( sal_uInt16 nPropId ) cons return UnoControlModel::ImplGetDefaultValue( nPropId ); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoControlComboBoxModel_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) @@ -3435,7 +3435,7 @@ sal_Int16 UnoComboBoxControl::getDropDownLineCount() return ImplGetPropertyValue_INT16( BASEPROPERTY_LINECOUNT ); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoComboBoxControl_get_implementation( css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) @@ -3592,7 +3592,7 @@ UnoControlDateFieldModel::getSupportedServiceNames() return s; } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoControlDateFieldModel_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) @@ -3802,7 +3802,7 @@ css::uno::Sequence<OUString> UnoDateFieldControl::getSupportedServiceNames() return s; } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoDateFieldControl_get_implementation( css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) @@ -3867,7 +3867,7 @@ UnoControlTimeFieldModel::getSupportedServiceNames() return s; } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoControlTimeFieldModel_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) @@ -4036,7 +4036,7 @@ css::uno::Sequence<OUString> UnoTimeFieldControl::getSupportedServiceNames() return s; } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoTimeFieldControl_get_implementation( css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) @@ -4101,7 +4101,7 @@ UnoControlNumericFieldModel::getSupportedServiceNames() return s; } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoControlNumericFieldModel_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) @@ -4261,7 +4261,7 @@ sal_Int16 UnoNumericFieldControl::getDecimalDigits() return ImplGetPropertyValue_INT16( BASEPROPERTY_DECIMALACCURACY ); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoNumericFieldControl_get_implementation( css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) @@ -4330,7 +4330,7 @@ UnoControlCurrencyFieldModel::getSupportedServiceNames() return s; } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoControlCurrencyFieldModel_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) @@ -4490,7 +4490,7 @@ sal_Int16 UnoCurrencyFieldControl::getDecimalDigits() return ImplGetPropertyValue_INT16( BASEPROPERTY_DECIMALACCURACY ); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoCurrencyFieldControl_get_implementation( css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) @@ -4554,7 +4554,7 @@ UnoControlPatternFieldModel::getSupportedServiceNames() return s; } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoControlPatternFieldModel_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) @@ -4660,7 +4660,7 @@ css::uno::Sequence<OUString> UnoPatternFieldControl::getSupportedServiceNames() return s; } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoPatternFieldControl_get_implementation( css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) @@ -4737,7 +4737,7 @@ UnoControlProgressBarModel::getSupportedServiceNames() return s; } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoControlProgressBarModel_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) @@ -4829,7 +4829,7 @@ css::uno::Sequence<OUString> UnoProgressBarControl::getSupportedServiceNames() return s; } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoProgressBarControl_get_implementation( css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) @@ -4902,7 +4902,7 @@ UnoControlFixedLineModel::getSupportedServiceNames() return s; } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoControlFixedLineModel_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) @@ -4944,7 +4944,7 @@ css::uno::Sequence<OUString> UnoFixedLineControl::getSupportedServiceNames() return s; } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * stardiv_Toolkit_UnoFixedLineControl_get_implementation( css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) diff --git a/toolkit/source/helper/accessibilityclient.cxx b/toolkit/source/helper/accessibilityclient.cxx index fd253b74b8e1..59044160eac0 100644 --- a/toolkit/source/helper/accessibilityclient.cxx +++ b/toolkit/source/helper/accessibilityclient.cxx @@ -144,7 +144,7 @@ namespace toolkit #if HAVE_FEATURE_DESKTOP #ifndef DISABLE_DYNLOADING - extern "C" { static void SAL_CALL thisModule() {} } + extern "C" { static void thisModule() {} } #else extern "C" void *getStandardAccessibleFactory(); #endif diff --git a/ucb/source/cacher/cachedcontentresultset.cxx b/ucb/source/cacher/cachedcontentresultset.cxx index 1497ed15071d..73f0c5a8b256 100644 --- a/ucb/source/cacher/cachedcontentresultset.cxx +++ b/ucb/source/cacher/cachedcontentresultset.cxx @@ -2108,7 +2108,7 @@ XTYPEPROVIDER_IMPL_3( CachedContentResultSetFactory, XSERVICEINFO_COMMOM_IMPL( CachedContentResultSetFactory, OUString( "com.sun.star.comp.ucb.CachedContentResultSetFactory" ) ) /// @throws css::uno::Exception -static css::uno::Reference< css::uno::XInterface > SAL_CALL +static css::uno::Reference< css::uno::XInterface > CachedContentResultSetFactory_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory> & rSMgr ) { css::lang::XServiceInfo* pX = diff --git a/ucb/source/cacher/cachedcontentresultsetstub.cxx b/ucb/source/cacher/cachedcontentresultsetstub.cxx index cc0f41fbe598..2dfa3d816936 100644 --- a/ucb/source/cacher/cachedcontentresultsetstub.cxx +++ b/ucb/source/cacher/cachedcontentresultsetstub.cxx @@ -532,7 +532,7 @@ XTYPEPROVIDER_IMPL_3( CachedContentResultSetStubFactory, XSERVICEINFO_COMMOM_IMPL( CachedContentResultSetStubFactory, OUString( "com.sun.star.comp.ucb.CachedContentResultSetStubFactory" ) ) /// @throws css::uno::Exception -static css::uno::Reference< css::uno::XInterface > SAL_CALL +static css::uno::Reference< css::uno::XInterface > CachedContentResultSetStubFactory_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory> & rSMgr ) { css::lang::XServiceInfo* pX = diff --git a/ucb/source/cacher/cacheddynamicresultset.cxx b/ucb/source/cacher/cacheddynamicresultset.cxx index 3ebc0a4e46a2..ec2f15f7b7a7 100644 --- a/ucb/source/cacher/cacheddynamicresultset.cxx +++ b/ucb/source/cacher/cacheddynamicresultset.cxx @@ -195,7 +195,7 @@ XTYPEPROVIDER_IMPL_3( CachedDynamicResultSetFactory, XSERVICEINFO_COMMOM_IMPL( CachedDynamicResultSetFactory, OUString( "com.sun.star.comp.ucb.CachedDynamicResultSetFactory" ) ) /// @throws css::uno::Exception -static css::uno::Reference< css::uno::XInterface > SAL_CALL +static css::uno::Reference< css::uno::XInterface > CachedDynamicResultSetFactory_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory> & rSMgr ) { css::lang::XServiceInfo* pX = diff --git a/ucb/source/cacher/cacheddynamicresultsetstub.cxx b/ucb/source/cacher/cacheddynamicresultsetstub.cxx index 4b8cdaeeb54b..a73c28235883 100644 --- a/ucb/source/cacher/cacheddynamicresultsetstub.cxx +++ b/ucb/source/cacher/cacheddynamicresultsetstub.cxx @@ -187,7 +187,7 @@ XTYPEPROVIDER_IMPL_3( CachedDynamicResultSetStubFactory, XSERVICEINFO_COMMOM_IMPL( CachedDynamicResultSetStubFactory, OUString( "com.sun.star.comp.ucb.CachedDynamicResultSetStubFactory" ) ) /// @throws css::uno::Exception -static css::uno::Reference< css::uno::XInterface > SAL_CALL +static css::uno::Reference< css::uno::XInterface > CachedDynamicResultSetStubFactory_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory> & rSMgr ) { css::lang::XServiceInfo* pX = diff --git a/ucb/source/cacher/cacheserv.cxx b/ucb/source/cacher/cacheserv.cxx index f0c2cd913902..5321d0c2ab6f 100644 --- a/ucb/source/cacher/cacheserv.cxx +++ b/ucb/source/cacher/cacheserv.cxx @@ -30,7 +30,7 @@ using namespace com::sun::star::lang; using namespace com::sun::star::registry; -extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL cached1_component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * cached1_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * ) { void * pRet = nullptr; diff --git a/ucb/source/core/FileAccess.cxx b/ucb/source/core/FileAccess.cxx index f73c15578644..3093a71e43fa 100644 --- a/ucb/source/core/FileAccess.cxx +++ b/ucb/source/core/FileAccess.cxx @@ -722,7 +722,7 @@ void OFileAccess::setHidden( const OUString& FileURL, sal_Bool bHidden ) }; // namespace end -Reference< XInterface > SAL_CALL FileAccess_CreateInstance( const Reference< XMultiServiceFactory > & xSMgr ) +Reference< XInterface > FileAccess_CreateInstance( const Reference< XMultiServiceFactory > & xSMgr ) { return Reference < XInterface >( static_cast<cppu::OWeakObject *>(new OFileAccess( comphelper::getComponentContext(xSMgr) )) ); } diff --git a/ucb/source/core/FileAccess.hxx b/ucb/source/core/FileAccess.hxx index 39e062773e11..734380fe4f92 100644 --- a/ucb/source/core/FileAccess.hxx +++ b/ucb/source/core/FileAccess.hxx @@ -34,7 +34,7 @@ namespace uno { class XInterface; } #define IMPLEMENTATION_NAME "com.sun.star.comp.ucb.SimpleFileAccess" -css::uno::Reference<css::uno::XInterface> SAL_CALL FileAccess_CreateInstance( +css::uno::Reference<css::uno::XInterface> FileAccess_CreateInstance( css::uno::Reference<css::lang::XMultiServiceFactory> const & xSMgr); css::uno::Sequence<OUString> FileAccess_getSupportedServiceNames(); diff --git a/ucb/source/core/cmdenv.cxx b/ucb/source/core/cmdenv.cxx index f5a8f73e9640..03f84b893189 100644 --- a/ucb/source/core/cmdenv.cxx +++ b/ucb/source/core/cmdenv.cxx @@ -125,7 +125,7 @@ UcbCommandEnvironment::getProgressHandler() // Service factory implementation. /// @throws uno::Exception -static uno::Reference< uno::XInterface > SAL_CALL +static uno::Reference< uno::XInterface > UcbCommandEnvironment_CreateInstance( const uno::Reference< lang::XMultiServiceFactory> & /*rSMgr*/ ) { diff --git a/ucb/source/core/provprox.cxx b/ucb/source/core/provprox.cxx index 73a81c5f51c4..5441e17086ab 100644 --- a/ucb/source/core/provprox.cxx +++ b/ucb/source/core/provprox.cxx @@ -49,7 +49,7 @@ UcbContentProviderProxyFactory::~UcbContentProviderProxyFactory() XSERVICEINFO_COMMOM_IMPL( UcbContentProviderProxyFactory, OUString( "com.sun.star.comp.ucb.UcbContentProviderProxyFactory" ) ) /// @throws css::uno::Exception -static css::uno::Reference< css::uno::XInterface > SAL_CALL +static css::uno::Reference< css::uno::XInterface > UcbContentProviderProxyFactory_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory> & rSMgr ) { css::lang::XServiceInfo* pX = diff --git a/ucb/source/core/ucb.cxx b/ucb/source/core/ucb.cxx index 63eb33a35fa4..4e199f14c3df 100644 --- a/ucb/source/core/ucb.cxx +++ b/ucb/source/core/ucb.cxx @@ -333,7 +333,7 @@ void SAL_CALL UniversalContentBroker::removeEventListener( XSERVICEINFO_COMMOM_IMPL( UniversalContentBroker, OUString( "com.sun.star.comp.ucb.UniversalContentBroker" ) ) /// @throws css::uno::Exception -static css::uno::Reference< css::uno::XInterface > SAL_CALL +static css::uno::Reference< css::uno::XInterface > UniversalContentBroker_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory> & rSMgr ) { css::lang::XServiceInfo* pX = diff --git a/ucb/source/core/ucbprops.cxx b/ucb/source/core/ucbprops.cxx index 6c2b1949fd6c..b8482c429c21 100644 --- a/ucb/source/core/ucbprops.cxx +++ b/ucb/source/core/ucbprops.cxx @@ -197,7 +197,7 @@ UcbPropertiesManager::~UcbPropertiesManager() XSERVICEINFO_COMMOM_IMPL( UcbPropertiesManager, OUString( "com.sun.star.comp.ucb.UcbPropertiesManager" ) ) /// @throws css::uno::Exception -static css::uno::Reference< css::uno::XInterface > SAL_CALL +static css::uno::Reference< css::uno::XInterface > UcbPropertiesManager_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory> & /*rSMgr*/ ) { css::lang::XServiceInfo* pX = diff --git a/ucb/source/core/ucbserv.cxx b/ucb/source/core/ucbserv.cxx index cb5a806325ce..c65f0f29c958 100644 --- a/ucb/source/core/ucbserv.cxx +++ b/ucb/source/core/ucbserv.cxx @@ -30,7 +30,7 @@ using namespace com::sun::star::uno; using namespace com::sun::star::lang; -extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL ucb_component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * ucb_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * ) { void * pRet = nullptr; diff --git a/ucb/source/core/ucbstore.cxx b/ucb/source/core/ucbstore.cxx index 6c2cbeaad3c8..5e3fdfa90d53 100644 --- a/ucb/source/core/ucbstore.cxx +++ b/ucb/source/core/ucbstore.cxx @@ -156,7 +156,7 @@ UcbStore::~UcbStore() XSERVICEINFO_COMMOM_IMPL( UcbStore, OUString( "com.sun.star.comp.ucb.UcbStore" ) ) /// @throws css::uno::Exception -static css::uno::Reference< css::uno::XInterface > SAL_CALL +static css::uno::Reference< css::uno::XInterface > UcbStore_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory> & rSMgr ) { css::lang::XServiceInfo* pX = diff --git a/ucb/source/sorter/sortdynres.cxx b/ucb/source/sorter/sortdynres.cxx index 028f8a56992b..dfd99daa0f15 100644 --- a/ucb/source/sorter/sortdynres.cxx +++ b/ucb/source/sorter/sortdynres.cxx @@ -439,7 +439,7 @@ css::uno::Sequence< OUString > SAL_CALL SortedDynamicResultSetFactory::getSuppor } /// @throws css::uno::Exception -static css::uno::Reference< css::uno::XInterface > SAL_CALL +static css::uno::Reference< css::uno::XInterface > SortedDynamicResultSetFactory_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory> & rSMgr ) { diff --git a/ucb/source/sorter/sortmain.cxx b/ucb/source/sorter/sortmain.cxx index 0223122697e5..c0d9f0508240 100644 --- a/ucb/source/sorter/sortmain.cxx +++ b/ucb/source/sorter/sortmain.cxx @@ -25,7 +25,7 @@ using namespace com::sun::star::uno; using namespace com::sun::star::lang; -extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL srtrs1_component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * srtrs1_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * ) { void * pRet = nullptr; diff --git a/ucb/source/ucp/cmis/cmis_provider.cxx b/ucb/source/ucp/cmis/cmis_provider.cxx index e043d167e028..10abce763b23 100644 --- a/ucb/source/ucp/cmis/cmis_provider.cxx +++ b/ucb/source/ucp/cmis/cmis_provider.cxx @@ -119,7 +119,7 @@ XTYPEPROVIDER_IMPL_3( ContentProvider, XSERVICEINFO_COMMOM_IMPL( ContentProvider, OUString("com.sun.star.comp.CmisContentProvider") ) /// @throws css::uno::Exception -static css::uno::Reference< css::uno::XInterface > SAL_CALL +static css::uno::Reference< css::uno::XInterface > ContentProvider_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory> & rSMgr ) { css::lang::XServiceInfo* pX = @@ -138,7 +138,7 @@ ONE_INSTANCE_SERVICE_FACTORY_IMPL( ContentProvider ); } -extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL ucpcmis1_component_getFactory( const sal_Char *pImplName, +extern "C" SAL_DLLPUBLIC_EXPORT void * ucpcmis1_component_getFactory( const sal_Char *pImplName, void *pServiceManager, void * ) { void * pRet = nullptr; diff --git a/ucb/source/ucp/expand/ucpexpand.cxx b/ucb/source/ucp/expand/ucpexpand.cxx index 9e08a9277f0b..0dcd493cbc23 100644 --- a/ucb/source/ucp/expand/ucpexpand.cxx +++ b/ucb/source/ucp/expand/ucpexpand.cxx @@ -103,7 +103,7 @@ void ExpandContentProviderImpl::disposing() } -uno::Reference< uno::XInterface > SAL_CALL create( +uno::Reference< uno::XInterface > create( uno::Reference< uno::XComponentContext > const & xComponentContext ) { return static_cast< ::cppu::OWeakObject * >( @@ -111,13 +111,13 @@ uno::Reference< uno::XInterface > SAL_CALL create( } -OUString SAL_CALL implName() +OUString implName() { return OUString("com.sun.star.comp.ucb.ExpandContentProvider"); } -uno::Sequence< OUString > SAL_CALL supportedServices() +uno::Sequence< OUString > supportedServices() { return uno::Sequence< OUString > { OUString("com.sun.star.ucb.ExpandContentProvider"), @@ -222,7 +222,7 @@ static const ::cppu::ImplementationEntry s_entries [] = extern "C" { -SAL_DLLPUBLIC_EXPORT void * SAL_CALL ucpexpand1_component_getFactory( +SAL_DLLPUBLIC_EXPORT void * ucpexpand1_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) diff --git a/ucb/source/ucp/ext/ucpext_services.cxx b/ucb/source/ucp/ext/ucpext_services.cxx index 82171f065d48..6f52d6d542b9 100644 --- a/ucb/source/ucp/ext/ucpext_services.cxx +++ b/ucb/source/ucp/ext/ucpext_services.cxx @@ -48,7 +48,7 @@ namespace ucb { namespace ucp { namespace ext extern "C" { - SAL_DLLPUBLIC_EXPORT void * SAL_CALL ucpext_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) + SAL_DLLPUBLIC_EXPORT void * ucpext_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { return ::cppu::component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , ::ucb::ucp::ext::s_aServiceEntries ); } diff --git a/ucb/source/ucp/file/prov.cxx b/ucb/source/ucp/file/prov.cxx index 2cfcc149e336..1c41642e30ce 100644 --- a/ucb/source/ucp/file/prov.cxx +++ b/ucb/source/ucp/file/prov.cxx @@ -48,7 +48,7 @@ using namespace com::sun::star::container; #endif -extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL ucpfile_component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * ucpfile_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * ) { void * pRet = nullptr; diff --git a/ucb/source/ucp/ftp/ftpcontentprovider.cxx b/ucb/source/ucp/ftp/ftpcontentprovider.cxx index 9eac0b3acdce..359259ac94ad 100644 --- a/ucb/source/ucp/ftp/ftpcontentprovider.cxx +++ b/ucb/source/ucp/ftp/ftpcontentprovider.cxx @@ -115,7 +115,7 @@ css::uno::Sequence< OUString > SAL_CALL FTPContentProvider::getSupportedServiceN } /// @throws css::uno::Exception -static css::uno::Reference< css::uno::XInterface > SAL_CALL +static css::uno::Reference< css::uno::XInterface > FTPContentProvider_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory> & rSMgr ) { diff --git a/ucb/source/ucp/ftp/ftpservices.cxx b/ucb/source/ucp/ftp/ftpservices.cxx index 511f3375de52..653134d5fec3 100644 --- a/ucb/source/ucp/ftp/ftpservices.cxx +++ b/ucb/source/ucp/ftp/ftpservices.cxx @@ -26,7 +26,7 @@ using namespace com::sun::star; using namespace ftp; -extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL ucpftp1_component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * ucpftp1_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) { void * pRet = nullptr; diff --git a/ucb/source/ucp/gio/gio_provider.cxx b/ucb/source/ucp/gio/gio_provider.cxx index 63183e254588..5410a258b549 100644 --- a/ucb/source/ucp/gio/gio_provider.cxx +++ b/ucb/source/ucp/gio/gio_provider.cxx @@ -96,7 +96,7 @@ XTYPEPROVIDER_IMPL_3( ContentProvider, XSERVICEINFO_COMMOM_IMPL( ContentProvider, OUString( "com.sun.star.comp.GIOContentProvider" ) ) /// @throws css::uno::Exception -static css::uno::Reference< css::uno::XInterface > SAL_CALL +static css::uno::Reference< css::uno::XInterface > ContentProvider_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory> & rSMgr ) { css::lang::XServiceInfo* pX = @@ -115,7 +115,7 @@ ONE_INSTANCE_SERVICE_FACTORY_IMPL( ContentProvider ); } -extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL ucpgio1_component_getFactory( const sal_Char *pImplName, +extern "C" SAL_DLLPUBLIC_EXPORT void * ucpgio1_component_getFactory( const sal_Char *pImplName, void *pServiceManager, void * ) { void * pRet = nullptr; diff --git a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx index 886b7dd35e05..642df28c2d4c 100644 --- a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx +++ b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx @@ -226,7 +226,7 @@ XTYPEPROVIDER_IMPL_4( HierarchyDataSource, XSERVICEINFO_COMMOM_IMPL( HierarchyDataSource, OUString( "com.sun.star.comp.ucb.HierarchyDataSource" ) ) /// @throws css::uno::Exception -static css::uno::Reference< css::uno::XInterface > SAL_CALL +static css::uno::Reference< css::uno::XInterface > HierarchyDataSource_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory> & rSMgr ) { css::lang::XServiceInfo* pX = diff --git a/ucb/source/ucp/hierarchy/hierarchyprovider.cxx b/ucb/source/ucp/hierarchy/hierarchyprovider.cxx index 4945afb35c47..ecaa9d7d4971 100644 --- a/ucb/source/ucp/hierarchy/hierarchyprovider.cxx +++ b/ucb/source/ucp/hierarchy/hierarchyprovider.cxx @@ -98,7 +98,7 @@ XTYPEPROVIDER_IMPL_4( HierarchyContentProvider, XSERVICEINFO_COMMOM_IMPL( HierarchyContentProvider, OUString( "com.sun.star.comp.ucb.HierarchyContentProvider" ) ) /// @throws css::uno::Exception -static css::uno::Reference< css::uno::XInterface > SAL_CALL +static css::uno::Reference< css::uno::XInterface > HierarchyContentProvider_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory> & rSMgr ) { css::lang::XServiceInfo* pX = diff --git a/ucb/source/ucp/hierarchy/hierarchyservices.cxx b/ucb/source/ucp/hierarchy/hierarchyservices.cxx index 76eecc876f1f..b4c2ab09b5d4 100644 --- a/ucb/source/ucp/hierarchy/hierarchyservices.cxx +++ b/ucb/source/ucp/hierarchy/hierarchyservices.cxx @@ -26,7 +26,7 @@ using namespace com::sun::star; using namespace hierarchy_ucp; -extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL ucphier1_component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * ucphier1_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) { void * pRet = nullptr; diff --git a/ucb/source/ucp/image/ucpimage.cxx b/ucb/source/ucp/image/ucpimage.cxx index 2354e6783d26..78bac968b722 100644 --- a/ucb/source/ucp/image/ucpimage.cxx +++ b/ucb/source/ucp/image/ucpimage.cxx @@ -155,7 +155,7 @@ private: } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_ucb_ImageContentProvider_get_implementation( css::uno::XComponentContext * context, css::uno::Sequence<css::uno::Any> const &) diff --git a/ucb/source/ucp/package/pkgprovider.cxx b/ucb/source/ucp/package/pkgprovider.cxx index 28f3df48b2f5..912e1fdb7d8b 100644 --- a/ucb/source/ucp/package/pkgprovider.cxx +++ b/ucb/source/ucp/package/pkgprovider.cxx @@ -142,7 +142,7 @@ XTYPEPROVIDER_IMPL_3( ContentProvider, XSERVICEINFO_COMMOM_IMPL( ContentProvider, OUString( "com.sun.star.comp.ucb.PackageContentProvider" ) ) /// @throws css::uno::Exception -static css::uno::Reference< css::uno::XInterface > SAL_CALL +static css::uno::Reference< css::uno::XInterface > ContentProvider_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory> & rSMgr ) { css::lang::XServiceInfo* pX = diff --git a/ucb/source/ucp/package/pkgservices.cxx b/ucb/source/ucp/package/pkgservices.cxx index cf750b61d8b4..874814b8e2c0 100644 --- a/ucb/source/ucp/package/pkgservices.cxx +++ b/ucb/source/ucp/package/pkgservices.cxx @@ -25,7 +25,7 @@ using namespace com::sun::star; -extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL ucppkg1_component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * ucppkg1_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) { void * pRet = nullptr; diff --git a/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx b/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx index 8dceacb8cc96..1bf916d3c35e 100644 --- a/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx +++ b/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx @@ -121,7 +121,7 @@ DocumentContentFactory::createDocumentContent( // Service factory implementation. /// @throws uno::Exception -static uno::Reference< uno::XInterface > SAL_CALL +static uno::Reference< uno::XInterface > DocumentContentFactory_CreateInstance( const uno::Reference< lang::XMultiServiceFactory> & rSMgr ) { diff --git a/ucb/source/ucp/tdoc/tdoc_provider.cxx b/ucb/source/ucp/tdoc/tdoc_provider.cxx index fa311a7fb895..58f2652a4dc0 100644 --- a/ucb/source/ucp/tdoc/tdoc_provider.cxx +++ b/ucb/source/ucp/tdoc/tdoc_provider.cxx @@ -105,7 +105,7 @@ XTYPEPROVIDER_IMPL_4( ContentProvider, XSERVICEINFO_COMMOM_IMPL( ContentProvider, OUString( "com.sun.star.comp.ucb.TransientDocumentsContentProvider" ) ) /// @throws css::uno::Exception -static css::uno::Reference< css::uno::XInterface > SAL_CALL +static css::uno::Reference< css::uno::XInterface > ContentProvider_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory> & rSMgr ) { css::lang::XServiceInfo* pX = diff --git a/ucb/source/ucp/tdoc/tdoc_services.cxx b/ucb/source/ucp/tdoc/tdoc_services.cxx index 22817e84a428..fcef4671f9b7 100644 --- a/ucb/source/ucp/tdoc/tdoc_services.cxx +++ b/ucb/source/ucp/tdoc/tdoc_services.cxx @@ -29,7 +29,7 @@ using namespace com::sun::star; using namespace tdoc_ucp; -extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL ucptdoc1_component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * ucptdoc1_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) { void * pRet = nullptr; diff --git a/ucb/source/ucp/webdav-neon/webdavprovider.cxx b/ucb/source/ucp/webdav-neon/webdavprovider.cxx index b4699392574f..142351f9db0d 100644 --- a/ucb/source/ucp/webdav-neon/webdavprovider.cxx +++ b/ucb/source/ucp/webdav-neon/webdavprovider.cxx @@ -96,7 +96,7 @@ XTYPEPROVIDER_IMPL_3( ContentProvider, XSERVICEINFO_COMMOM_IMPL( ContentProvider, OUString( "com.sun.star.comp.WebDAVContentProvider" ) ) /// @throws css::uno::Exception -static css::uno::Reference< css::uno::XInterface > SAL_CALL +static css::uno::Reference< css::uno::XInterface > ContentProvider_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory> & rSMgr ) { css::lang::XServiceInfo* pX = diff --git a/ucb/source/ucp/webdav-neon/webdavservices.cxx b/ucb/source/ucp/webdav-neon/webdavservices.cxx index 3645824e4c68..3ee252834caf 100644 --- a/ucb/source/ucp/webdav-neon/webdavservices.cxx +++ b/ucb/source/ucp/webdav-neon/webdavservices.cxx @@ -34,7 +34,7 @@ using namespace com::sun::star; -extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL ucpdav1_component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * ucpdav1_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) { void * pRet = nullptr; diff --git a/unotest/source/cpp/unobootstrapprotector/unobootstrapprotector.cxx b/unotest/source/cpp/unobootstrapprotector/unobootstrapprotector.cxx index eaa965a0350f..9aee5f52bf63 100644 --- a/unotest/source/cpp/unobootstrapprotector/unobootstrapprotector.cxx +++ b/unotest/source/cpp/unobootstrapprotector/unobootstrapprotector.cxx @@ -96,7 +96,7 @@ Prot::~Prot() } -extern "C" SAL_DLLPUBLIC_EXPORT CppUnit::Protector * SAL_CALL unobootstrapprotector() +extern "C" SAL_DLLPUBLIC_EXPORT CppUnit::Protector * unobootstrapprotector() { return new Prot; } diff --git a/unotest/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx b/unotest/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx index efb308e24967..2230f8465671 100644 --- a/unotest/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx +++ b/unotest/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx @@ -75,7 +75,7 @@ bool Prot::protect( } -extern "C" SAL_DLLPUBLIC_EXPORT CppUnit::Protector * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT CppUnit::Protector * unoexceptionprotector() { return new Prot; } diff --git a/unotools/source/misc/unotoolsservices.cxx b/unotools/source/misc/unotoolsservices.cxx index 09ab8d97debd..10cc549f2b01 100644 --- a/unotools/source/misc/unotoolsservices.cxx +++ b/unotools/source/misc/unotoolsservices.cxx @@ -15,7 +15,7 @@ namespace sdecl = ::comphelper::service_decl; -extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL utl_component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void* utl_component_getFactory( sal_Char const* pImplName, void*, void*) { return sdecl::component_getFactoryHelper( pImplName, diff --git a/unoxml/source/rdf/CBlankNode.cxx b/unoxml/source/rdf/CBlankNode.cxx index 500057c73824..f5cd28801d0c 100644 --- a/unoxml/source/rdf/CBlankNode.cxx +++ b/unoxml/source/rdf/CBlankNode.cxx @@ -112,17 +112,17 @@ OUString SAL_CALL CBlankNode::getStringValue() // component helper namespace namespace comp_CBlankNode { -OUString SAL_CALL _getImplementationName() { +OUString _getImplementationName() { return OUString( "CBlankNode"); } -css::uno::Sequence< OUString > SAL_CALL _getSupportedServiceNames() +css::uno::Sequence< OUString > _getSupportedServiceNames() { css::uno::Sequence< OUString > s { "com.sun.star.rdf.BlankNode" }; return s; } -css::uno::Reference< css::uno::XInterface > SAL_CALL _create( +css::uno::Reference< css::uno::XInterface > _create( const css::uno::Reference< css::uno::XComponentContext > & ) { return static_cast< ::cppu::OWeakObject * >(new CBlankNode); diff --git a/unoxml/source/rdf/CLiteral.cxx b/unoxml/source/rdf/CLiteral.cxx index 4aa81fcf5f51..214989495741 100644 --- a/unoxml/source/rdf/CLiteral.cxx +++ b/unoxml/source/rdf/CLiteral.cxx @@ -170,16 +170,16 @@ css::uno::Reference< css::rdf::XURI > SAL_CALL CLiteral::getDatatype() // component helper namespace namespace comp_CLiteral { -OUString SAL_CALL _getImplementationName() { +OUString _getImplementationName() { return OUString( "CLiteral"); } -css::uno::Sequence< OUString > SAL_CALL _getSupportedServiceNames() +css::uno::Sequence< OUString > _getSupportedServiceNames() { return { "com.sun.star.rdf.Literal" }; } -css::uno::Reference< css::uno::XInterface > SAL_CALL _create( +css::uno::Reference< css::uno::XInterface > _create( const css::uno::Reference< css::uno::XComponentContext > & ) { return static_cast< ::cppu::OWeakObject * >(new CLiteral); diff --git a/unoxml/source/rdf/CNodes.hxx b/unoxml/source/rdf/CNodes.hxx index 70653c6fa4f4..3ee915697c75 100644 --- a/unoxml/source/rdf/CNodes.hxx +++ b/unoxml/source/rdf/CNodes.hxx @@ -28,9 +28,9 @@ namespace comp_CBlankNode { // component and service helper functions: -OUString SAL_CALL _getImplementationName(); -css::uno::Sequence< OUString > SAL_CALL _getSupportedServiceNames(); -css::uno::Reference< css::uno::XInterface > SAL_CALL _create( css::uno::Reference< css::uno::XComponentContext > const & context ); +OUString _getImplementationName(); +css::uno::Sequence< OUString > _getSupportedServiceNames(); +css::uno::Reference< css::uno::XInterface > _create( css::uno::Reference< css::uno::XComponentContext > const & context ); } // closing component helper namespace @@ -39,9 +39,9 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL _create( css::uno::Referenc namespace comp_CURI { // component and service helper functions: -OUString SAL_CALL _getImplementationName(); -css::uno::Sequence< OUString > SAL_CALL _getSupportedServiceNames(); -css::uno::Reference< css::uno::XInterface > SAL_CALL _create( css::uno::Reference< css::uno::XComponentContext > const & context ); +OUString _getImplementationName(); +css::uno::Sequence< OUString > _getSupportedServiceNames(); +css::uno::Reference< css::uno::XInterface > _create( css::uno::Reference< css::uno::XComponentContext > const & context ); } // closing component helper namespace @@ -50,9 +50,9 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL _create( css::uno::Referenc namespace comp_CLiteral { // component and service helper functions: -OUString SAL_CALL _getImplementationName(); -css::uno::Sequence< OUString > SAL_CALL _getSupportedServiceNames(); -css::uno::Reference< css::uno::XInterface > SAL_CALL _create( css::uno::Reference< css::uno::XComponentContext > const & context ); +OUString _getImplementationName(); +css::uno::Sequence< OUString > _getSupportedServiceNames(); +css::uno::Reference< css::uno::XInterface > _create( css::uno::Reference< css::uno::XComponentContext > const & context ); } // closing component helper namespace diff --git a/unoxml/source/rdf/CURI.cxx b/unoxml/source/rdf/CURI.cxx index c00f528b45c6..971303beb92f 100644 --- a/unoxml/source/rdf/CURI.cxx +++ b/unoxml/source/rdf/CURI.cxx @@ -793,18 +793,18 @@ OUString SAL_CALL CURI::getLocalName() // component helper namespace namespace comp_CURI { -OUString SAL_CALL _getImplementationName() { +OUString _getImplementationName() { return OUString( "CURI"); } -css::uno::Sequence< OUString > SAL_CALL _getSupportedServiceNames() +css::uno::Sequence< OUString > _getSupportedServiceNames() { css::uno::Sequence< OUString > s { "com.sun.star.rdf.URI" }; return s; } -css::uno::Reference< css::uno::XInterface > SAL_CALL _create( +css::uno::Reference< css::uno::XInterface > _create( const css::uno::Reference< css::uno::XComponentContext > & ) { return static_cast< ::cppu::OWeakObject * >(new CURI); diff --git a/unoxml/source/rdf/librdf_repository.cxx b/unoxml/source/rdf/librdf_repository.cxx index d2325543e6d3..bbb2c1295280 100644 --- a/unoxml/source/rdf/librdf_repository.cxx +++ b/unoxml/source/rdf/librdf_repository.cxx @@ -2310,17 +2310,17 @@ librdf_TypeConverter::convertToStatement(librdf_statement* i_pStmt, // component helper namespace namespace comp_librdf_Repository { -OUString SAL_CALL _getImplementationName() { +OUString _getImplementationName() { return OUString("librdf_Repository"); } -uno::Sequence< OUString > SAL_CALL _getSupportedServiceNames() +uno::Sequence< OUString > _getSupportedServiceNames() { uno::Sequence< OUString > s { "com.sun.star.rdf.Repository" }; return s; } -uno::Reference< uno::XInterface > SAL_CALL _create( +uno::Reference< uno::XInterface > _create( const uno::Reference< uno::XComponentContext > & context) { return static_cast< ::cppu::OWeakObject * >(new librdf_Repository(context)); diff --git a/unoxml/source/rdf/librdf_repository.hxx b/unoxml/source/rdf/librdf_repository.hxx index c26e43a39664..2f67490d495b 100644 --- a/unoxml/source/rdf/librdf_repository.hxx +++ b/unoxml/source/rdf/librdf_repository.hxx @@ -28,9 +28,9 @@ namespace comp_librdf_Repository { // component and service helper functions: -OUString SAL_CALL _getImplementationName(); -css::uno::Sequence< OUString > SAL_CALL _getSupportedServiceNames(); -css::uno::Reference< css::uno::XInterface > SAL_CALL _create( css::uno::Reference< css::uno::XComponentContext > const & context ); +OUString _getImplementationName(); +css::uno::Sequence< OUString > _getSupportedServiceNames(); +css::uno::Reference< css::uno::XInterface > _create( css::uno::Reference< css::uno::XComponentContext > const & context ); } // closing component helper namespace diff --git a/unoxml/source/rdf/librdf_services.cxx b/unoxml/source/rdf/librdf_services.cxx index c26054a03fc8..cd6292bb26ce 100644 --- a/unoxml/source/rdf/librdf_services.cxx +++ b/unoxml/source/rdf/librdf_services.cxx @@ -50,7 +50,7 @@ static ::cppu::ImplementationEntry const entries[] = { { nullptr, nullptr, nullptr, nullptr, nullptr, 0 } }; -SAL_DLLPUBLIC_EXPORT void * SAL_CALL unordf_component_getFactory( +SAL_DLLPUBLIC_EXPORT void * unordf_component_getFactory( const char * implName, void * serviceManager, void * registryKey) { return ::cppu::component_getFactoryHelper( diff --git a/unoxml/source/service/services.cxx b/unoxml/source/service/services.cxx index 190827e7d18f..cf029fb3d01b 100644 --- a/unoxml/source/service/services.cxx +++ b/unoxml/source/service/services.cxx @@ -41,7 +41,7 @@ using namespace css::registry; extern "C" { -SAL_DLLPUBLIC_EXPORT void* SAL_CALL unoxml_component_getFactory(const sal_Char *pImplementationName, void *pServiceManager, void * /*pRegistryKey*/) +SAL_DLLPUBLIC_EXPORT void* unoxml_component_getFactory(const sal_Char *pImplementationName, void *pServiceManager, void * /*pRegistryKey*/) { void* pReturn = nullptr ; if ( pImplementationName && pServiceManager ) diff --git a/uui/source/interactionhandler.cxx b/uui/source/interactionhandler.cxx index c399c8c14482..417a2e09fbbb 100644 --- a/uui/source/interactionhandler.cxx +++ b/uui/source/interactionhandler.cxx @@ -158,7 +158,7 @@ sal_Bool SAL_CALL UUIInteractionHandler::handleInteractionRequest( } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_uui_UUIInteractionHandler_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) diff --git a/uui/source/passwordcontainer.cxx b/uui/source/passwordcontainer.cxx index 420f098e1d7c..92a54f53fae7 100644 --- a/uui/source/passwordcontainer.cxx +++ b/uui/source/passwordcontainer.cxx @@ -402,7 +402,7 @@ PasswordContainerInteractionHandler::handleInteractionRequest( // Service factory implementation. /// @throws uno::Exception -static uno::Reference< uno::XInterface > SAL_CALL +static uno::Reference< uno::XInterface > PasswordContainerInteractionHandler_CreateInstance( const uno::Reference< lang::XMultiServiceFactory> & rSMgr ) { diff --git a/uui/source/requeststringresolver.cxx b/uui/source/requeststringresolver.cxx index 1289a9e9c6fc..7fddd59a1270 100644 --- a/uui/source/requeststringresolver.cxx +++ b/uui/source/requeststringresolver.cxx @@ -69,7 +69,7 @@ UUIInteractionRequestStringResolver::getStringFromInformationalRequest( } } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_uui_UUIInteractionRequestStringResolver_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) diff --git a/uui/source/services.cxx b/uui/source/services.cxx index 052658aac19c..6430da3dcf87 100644 --- a/uui/source/services.cxx +++ b/uui/source/services.cxx @@ -31,7 +31,7 @@ using namespace com::sun::star::lang; using namespace com::sun::star::registry; -extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL uui_component_getFactory(sal_Char const * pImplName, +extern "C" SAL_DLLPUBLIC_EXPORT void * uui_component_getFactory(sal_Char const * pImplName, void * pServiceManager, void *) { diff --git a/vbahelper/source/msforms/service.cxx b/vbahelper/source/msforms/service.cxx index 2981de965e74..50de0010a0d3 100644 --- a/vbahelper/source/msforms/service.cxx +++ b/vbahelper/source/msforms/service.cxx @@ -30,7 +30,7 @@ namespace sdecl = comphelper::service_decl; extern "C" { - SAL_DLLPUBLIC_EXPORT void * SAL_CALL msforms_component_getFactory( + SAL_DLLPUBLIC_EXPORT void * msforms_component_getFactory( const sal_Char * pImplName, void *, void *) { SAL_INFO("vbahelper", "In component_getFactory for " << pImplName ); diff --git a/vcl/inc/factory.hxx b/vcl/inc/factory.hxx index d33bb2c371ed..55203844d1bb 100644 --- a/vcl/inc/factory.hxx +++ b/vcl/inc/factory.hxx @@ -35,41 +35,41 @@ namespace com { namespace sun { namespace star { namespace uno { class XInterface; } } } } -css::uno::Sequence<OUString> SAL_CALL vcl_session_getSupportedServiceNames(); +css::uno::Sequence<OUString> vcl_session_getSupportedServiceNames(); -OUString SAL_CALL vcl_session_getImplementationName(); +OUString vcl_session_getImplementationName(); -css::uno::Reference<css::uno::XInterface> SAL_CALL vcl_session_createInstance( +css::uno::Reference<css::uno::XInterface> vcl_session_createInstance( css::uno::Reference<css::lang::XMultiServiceFactory > const &); namespace vcl { -css::uno::Sequence<OUString> SAL_CALL +css::uno::Sequence<OUString> FontIdentificator_getSupportedServiceNames(); -OUString SAL_CALL FontIdentificator_getImplementationName(); +OUString FontIdentificator_getImplementationName(); -css::uno::Reference<css::uno::XInterface> SAL_CALL +css::uno::Reference<css::uno::XInterface> FontIdentificator_createInstance( css::uno::Reference<css::lang::XMultiServiceFactory > const &); -OUString SAL_CALL Clipboard_getImplementationName(); +OUString Clipboard_getImplementationName(); -css::uno::Reference<css::lang::XSingleServiceFactory> SAL_CALL +css::uno::Reference<css::lang::XSingleServiceFactory> Clipboard_createFactory(); -css::uno::Sequence<OUString> SAL_CALL DragSource_getSupportedServiceNames(); +css::uno::Sequence<OUString> DragSource_getSupportedServiceNames(); -OUString SAL_CALL DragSource_getImplementationName(); +OUString DragSource_getImplementationName(); -css::uno::Reference<css::uno::XInterface> SAL_CALL DragSource_createInstance( +css::uno::Reference<css::uno::XInterface> DragSource_createInstance( css::uno::Reference<css::lang::XMultiServiceFactory > const &); -css::uno::Sequence<OUString> SAL_CALL DropTarget_getSupportedServiceNames(); +css::uno::Sequence<OUString> DropTarget_getSupportedServiceNames(); -OUString SAL_CALL DropTarget_getImplementationName(); +OUString DropTarget_getImplementationName(); -css::uno::Reference<css::uno::XInterface> SAL_CALL DropTarget_createInstance( +css::uno::Reference<css::uno::XInterface> DropTarget_createInstance( css::uno::Reference<css::lang::XMultiServiceFactory > const &); } diff --git a/vcl/source/app/session.cxx b/vcl/source/app/session.cxx index 0969f33eadab..35ec2f8cdb83 100644 --- a/vcl/source/app/session.cxx +++ b/vcl/source/app/session.cxx @@ -383,14 +383,14 @@ void VCLSession::disposing() { // service implementation -OUString SAL_CALL vcl_session_getImplementationName() +OUString vcl_session_getImplementationName() { SAL_INFO("vcl.se", "vcl_session_getImplementationName"); return OUString( "com.sun.star.frame.VCLSessionManagerClient" ); } -Sequence< OUString > SAL_CALL vcl_session_getSupportedServiceNames() +Sequence< OUString > vcl_session_getSupportedServiceNames() { SAL_INFO("vcl.se", "vcl_session_getSupportedServiceNames"); @@ -398,7 +398,7 @@ Sequence< OUString > SAL_CALL vcl_session_getSupportedServiceNames() return aRet; } -css::uno::Reference< XInterface > SAL_CALL vcl_session_createInstance( SAL_UNUSED_PARAMETER const css::uno::Reference< XMultiServiceFactory > & ) +css::uno::Reference< XInterface > vcl_session_createInstance( SAL_UNUSED_PARAMETER const css::uno::Reference< XMultiServiceFactory > & ) { SAL_INFO("vcl.se", "vcl_session_createInstance"); diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx index f9e82ccd2acb..087710450d2d 100644 --- a/vcl/source/app/svapp.cxx +++ b/vcl/source/app/svapp.cxx @@ -151,7 +151,7 @@ namespace } extern "C" { - typedef UnoWrapperBase* (SAL_CALL *FN_TkCreateUnoWrapper)(); + typedef UnoWrapperBase* (*FN_TkCreateUnoWrapper)(); } struct ImplPostEventData @@ -1422,7 +1422,7 @@ extern "C" { UnoWrapperBase* CreateUnoWrapper(); } #else -extern "C" { static void SAL_CALL thisModule() {} } +extern "C" { static void thisModule() {} } #endif diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx index e4b1468eecec..528e797c1abc 100644 --- a/vcl/source/app/svmain.cxx +++ b/vcl/source/app/svmain.cxx @@ -111,7 +111,7 @@ static bool g_bIsLeanException; static bool isInitVCL(); -oslSignalAction SAL_CALL VCLExceptionSignal_impl( void* /*pData*/, oslSignalInfo* pInfo) +oslSignalAction VCLExceptionSignal_impl( void* /*pData*/, oslSignalInfo* pInfo) { static volatile bool bIn = false; @@ -655,7 +655,7 @@ static unsigned __stdcall threadmain( void *pArgs ) static oslThread hThreadID = nullptr; extern "C" { -static void SAL_CALL MainWorkerFunction( void* pArgs ) +static void MainWorkerFunction( void* pArgs ) { static_cast<WorkerThreadData*>(pArgs)->pWorker( static_cast<WorkerThreadData*>(pArgs)->pThreadData ); delete static_cast<WorkerThreadData*>(pArgs); diff --git a/vcl/source/bitmap/checksum.cxx b/vcl/source/bitmap/checksum.cxx index 3c9a8a6f1656..d33d884033f9 100644 --- a/vcl/source/bitmap/checksum.cxx +++ b/vcl/source/bitmap/checksum.cxx @@ -126,7 +126,7 @@ static const sal_uInt64 vcl_crc64Table[256] = { /* * vcl_crc64. */ -sal_uInt64 SAL_CALL vcl_crc64 ( +sal_uInt64 vcl_crc64 ( sal_uInt64 Crc, const void *Data, sal_uInt32 DatLen) SAL_THROW_EXTERN_C() { diff --git a/vcl/source/components/dtranscomp.cxx b/vcl/source/components/dtranscomp.cxx index 46ca921d3def..dd1bf719ffa6 100644 --- a/vcl/source/components/dtranscomp.cxx +++ b/vcl/source/components/dtranscomp.cxx @@ -215,7 +215,7 @@ Reference< XInterface > ClipboardFactory::createInstanceWithArguments( const Seq return xResult; } -OUString SAL_CALL Clipboard_getImplementationName() +OUString Clipboard_getImplementationName() { return OUString( #if defined MACOSX @@ -230,7 +230,7 @@ OUString SAL_CALL Clipboard_getImplementationName() ); } -Reference< XSingleServiceFactory > SAL_CALL Clipboard_createFactory() +Reference< XSingleServiceFactory > Clipboard_createFactory() { return Reference< XSingleServiceFactory >( new ClipboardFactory() ); } @@ -303,7 +303,7 @@ void GenericDragSource::initialize( const Sequence< Any >& ) { } -Sequence< OUString > SAL_CALL DragSource_getSupportedServiceNames() +Sequence< OUString > DragSource_getSupportedServiceNames() { #if defined MACOSX return { "com.sun.star.datatransfer.dnd.OleDragSource" }; @@ -314,7 +314,7 @@ Sequence< OUString > SAL_CALL DragSource_getSupportedServiceNames() #endif } -OUString SAL_CALL DragSource_getImplementationName() +OUString DragSource_getImplementationName() { #if defined MACOSX return OUString("com.sun.star.comp.datatransfer.dnd.OleDragSource_V1"); @@ -325,7 +325,7 @@ OUString SAL_CALL DragSource_getImplementationName() #endif } -Reference< XInterface > SAL_CALL DragSource_createInstance( const Reference< XMultiServiceFactory >& ) +Reference< XInterface > DragSource_createInstance( const Reference< XMultiServiceFactory >& ) { SolarMutexGuard aGuard; Reference< XInterface > xResult = ImplGetSVData()->mpDefInst->CreateDragSource(); @@ -404,7 +404,7 @@ void GenericDropTarget::setDefaultActions( sal_Int8) { } -Sequence< OUString > SAL_CALL DropTarget_getSupportedServiceNames() +Sequence< OUString > DropTarget_getSupportedServiceNames() { #if defined MACOSX return Sequence< OUString > { "com.sun.star.datatransfer.dnd.OleDropTarget" }; @@ -415,7 +415,7 @@ Sequence< OUString > SAL_CALL DropTarget_getSupportedServiceNames() #endif } -OUString SAL_CALL DropTarget_getImplementationName() +OUString DropTarget_getImplementationName() { return OUString( #if defined MACOSX @@ -428,7 +428,7 @@ OUString SAL_CALL DropTarget_getImplementationName() ); } -Reference< XInterface > SAL_CALL DropTarget_createInstance( const Reference< XMultiServiceFactory >& ) +Reference< XInterface > DropTarget_createInstance( const Reference< XMultiServiceFactory >& ) { SolarMutexGuard aGuard; Reference< XInterface > xResult = ImplGetSVData()->mpDefInst->CreateDropTarget(); diff --git a/vcl/source/components/factory.cxx b/vcl/source/components/factory.cxx index 27f701f721f9..51b256d0cc1a 100644 --- a/vcl/source/components/factory.cxx +++ b/vcl/source/components/factory.cxx @@ -31,7 +31,7 @@ using namespace com::sun::star::lang; extern "C" { - VCL_DLLPUBLIC void* SAL_CALL vcl_component_getFactory( + VCL_DLLPUBLIC void* vcl_component_getFactory( const sal_Char* pImplementationName, void* pXUnoSMgr, void* /*pXUnoKey*/ diff --git a/vcl/source/components/fontident.cxx b/vcl/source/components/fontident.cxx index ac3168160657..58226634a477 100644 --- a/vcl/source/components/fontident.cxx +++ b/vcl/source/components/fontident.cxx @@ -157,7 +157,7 @@ OUString FontIdentificator_getImplementationName() return OUString( "vcl::FontIdentificator" ); } -Reference< XInterface > SAL_CALL FontIdentificator_createInstance( const Reference< XMultiServiceFactory >& ) +Reference< XInterface > FontIdentificator_createInstance( const Reference< XMultiServiceFactory >& ) { return static_cast< ::cppu::OWeakObject * >( new FontIdentificator ); } diff --git a/vcl/source/gdi/bitmap3.cxx b/vcl/source/gdi/bitmap3.cxx index 7873c3dde40f..668bf5f23f29 100644 --- a/vcl/source/gdi/bitmap3.cxx +++ b/vcl/source/gdi/bitmap3.cxx @@ -1596,7 +1596,7 @@ struct PopularColorCount sal_uInt32 mnCount; }; -extern "C" int SAL_CALL ImplPopularCmpFnc( const void* p1, const void* p2 ) +extern "C" int ImplPopularCmpFnc( const void* p1, const void* p2 ) { int nRet; diff --git a/vcl/source/gdi/bitmap4.cxx b/vcl/source/gdi/bitmap4.cxx index d5e995770993..554485de13dd 100644 --- a/vcl/source/gdi/bitmap4.cxx +++ b/vcl/source/gdi/bitmap4.cxx @@ -967,7 +967,7 @@ struct PopArtEntry sal_uInt32 mnCount; }; -extern "C" int SAL_CALL ImplPopArtCmpFnc( const void* p1, const void* p2 ) +extern "C" int ImplPopArtCmpFnc( const void* p1, const void* p2 ) { int nRet; diff --git a/vcl/source/gdi/impvect.cxx b/vcl/source/gdi/impvect.cxx index e8fe30b7e5b0..d172aeae2418 100644 --- a/vcl/source/gdi/impvect.cxx +++ b/vcl/source/gdi/impvect.cxx @@ -99,7 +99,7 @@ struct ImplColorSet bool mbSet; }; -extern "C" int SAL_CALL ImplColorSetCmpFnc( const void* p1, const void* p2 ) +extern "C" int ImplColorSetCmpFnc( const void* p1, const void* p2 ) { ImplColorSet const * pSet1 = static_cast<ImplColorSet const *>(p1); ImplColorSet const * pSet2 = static_cast<ImplColorSet const *>(p2); diff --git a/vcl/source/outdev/hatch.cxx b/vcl/source/outdev/hatch.cxx index e84ec3a2874b..46edae35f790 100644 --- a/vcl/source/outdev/hatch.cxx +++ b/vcl/source/outdev/hatch.cxx @@ -35,7 +35,7 @@ #define HATCH_MAXPOINTS 1024 -extern "C" int SAL_CALL HatchCmpFnc( const void* p1, const void* p2 ) +extern "C" int HatchCmpFnc( const void* p1, const void* p2 ) { const long nX1 = static_cast<Point const *>(p1)->X(); const long nX2 = static_cast<Point const *>(p2)->X(); diff --git a/vcl/source/uitest/uno/uitest_uno.cxx b/vcl/source/uitest/uno/uitest_uno.cxx index 9486ff752b97..a625e670667e 100644 --- a/vcl/source/uitest/uno/uitest_uno.cxx +++ b/vcl/source/uitest/uno/uitest_uno.cxx @@ -102,7 +102,7 @@ css::uno::Sequence<OUString> UITestUnoObj::getSupportedServiceNames() return aServiceNames; } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* UITest_get_implementation(css::uno::XComponentContext*, css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new UITestUnoObj()); diff --git a/vcl/source/window/abstdlg.cxx b/vcl/source/window/abstdlg.cxx index 807e75ead2d0..aa2c971b5bbd 100644 --- a/vcl/source/window/abstdlg.cxx +++ b/vcl/source/window/abstdlg.cxx @@ -24,10 +24,10 @@ #include <vcl/abstdlg.hxx> #include <vcl/bitmap.hxx> -typedef VclAbstractDialogFactory* (SAL_CALL *FuncPtrCreateDialogFactory)(); +typedef VclAbstractDialogFactory* (*FuncPtrCreateDialogFactory)(); #ifndef DISABLE_DYNLOADING -extern "C" { static void SAL_CALL thisModule() {} } +extern "C" { static void thisModule() {} } #else extern "C" VclAbstractDialogFactory* CreateDialogFactory(); #endif diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx index da1e806d3a4d..624e15f76ab4 100644 --- a/vcl/source/window/builder.cxx +++ b/vcl/source/window/builder.cxx @@ -1127,7 +1127,7 @@ void VclBuilder::cleanupWidgetOwnScrolling(vcl::Window *pScrollParent, vcl::Wind } #ifndef DISABLE_DYNLOADING -extern "C" { static void SAL_CALL thisModule() {} } +extern "C" { static void thisModule() {} } #endif VclPtr<vcl::Window> VclBuilder::makeObject(vcl::Window *pParent, const OString &name, const OString &id, diff --git a/vcl/unx/generic/app/salinst.cxx b/vcl/unx/generic/app/salinst.cxx index 7771a898edc9..c2d6197c38c8 100644 --- a/vcl/unx/generic/app/salinst.cxx +++ b/vcl/unx/generic/app/salinst.cxx @@ -207,7 +207,7 @@ void X11SalInstance::AfterAppInit() pSalDisplay->SetupInput(); } -extern "C" { static void SAL_CALL thisModule() {} } +extern "C" { static void thisModule() {} } void X11SalInstance::AddToRecentDocumentList(const OUString& rFileUrl, const OUString& rMimeType, const OUString& rDocumentService) { diff --git a/vcl/unx/generic/app/sm.cxx b/vcl/unx/generic/app/sm.cxx index afe20eaba31f..b38126ad14ae 100644 --- a/vcl/unx/generic/app/sm.cxx +++ b/vcl/unx/generic/app/sm.cxx @@ -112,7 +112,7 @@ extern "C" void ICEWatchProc( IceConn ice_conn, IcePointer client_data, Bool opening, IcePointer * watch_data); -extern "C" void SAL_CALL ICEConnectionWorker(void * data); +extern "C" void ICEConnectionWorker(void * data); class ICEConnectionObserver { diff --git a/vcl/unx/generic/dtrans/X11_clipboard.hxx b/vcl/unx/generic/dtrans/X11_clipboard.hxx index a54a87f4ccd4..2f4e55b74773 100644 --- a/vcl/unx/generic/dtrans/X11_clipboard.hxx +++ b/vcl/unx/generic/dtrans/X11_clipboard.hxx @@ -105,7 +105,7 @@ namespace x11 { virtual css::uno::Reference< css::uno::XInterface > getReference() throw() override; }; - css::uno::Sequence< OUString > SAL_CALL X11Clipboard_getSupportedServiceNames(); + css::uno::Sequence< OUString > X11Clipboard_getSupportedServiceNames(); css::uno::Reference< css::uno::XInterface > SAL_CALL X11Clipboard_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & xMultiServiceFactory); diff --git a/vcl/unx/generic/dtrans/X11_selection.hxx b/vcl/unx/generic/dtrans/X11_selection.hxx index 40b81f414902..de6e631ab9cc 100644 --- a/vcl/unx/generic/dtrans/X11_selection.hxx +++ b/vcl/unx/generic/dtrans/X11_selection.hxx @@ -485,11 +485,11 @@ namespace x11 { virtual void SAL_CALL notifyTermination( const css::lang::EventObject& aEvent ) override; }; - css::uno::Sequence< OUString > SAL_CALL Xdnd_getSupportedServiceNames(); + css::uno::Sequence< OUString > Xdnd_getSupportedServiceNames(); css::uno::Reference< css::uno::XInterface > SAL_CALL Xdnd_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & xMultiServiceFactory); - css::uno::Sequence< OUString > SAL_CALL Xdnd_dropTarget_getSupportedServiceNames(); + css::uno::Sequence< OUString > Xdnd_dropTarget_getSupportedServiceNames(); css::uno::Reference< css::uno::XInterface > SAL_CALL Xdnd_dropTarget_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & xMultiServiceFactory); diff --git a/vcl/unx/generic/dtrans/X11_service.cxx b/vcl/unx/generic/dtrans/X11_service.cxx index 52c4a6573fcf..5c1f451f8d49 100644 --- a/vcl/unx/generic/dtrans/X11_service.cxx +++ b/vcl/unx/generic/dtrans/X11_service.cxx @@ -35,19 +35,19 @@ using namespace com::sun::star::datatransfer::clipboard; using namespace com::sun::star::awt; using namespace x11; -Sequence< OUString > SAL_CALL x11::X11Clipboard_getSupportedServiceNames() +Sequence< OUString > x11::X11Clipboard_getSupportedServiceNames() { Sequence< OUString > aRet { "com.sun.star.datatransfer.clipboard.SystemClipboard" }; return aRet; } -Sequence< OUString > SAL_CALL x11::Xdnd_getSupportedServiceNames() +Sequence< OUString > x11::Xdnd_getSupportedServiceNames() { Sequence< OUString > aRet { "com.sun.star.datatransfer.dnd.X11DragSource" }; return aRet; } -Sequence< OUString > SAL_CALL x11::Xdnd_dropTarget_getSupportedServiceNames() +Sequence< OUString > x11::Xdnd_dropTarget_getSupportedServiceNames() { Sequence< OUString > aRet { "com.sun.star.datatransfer.dnd.X11DropTarget" }; return aRet; diff --git a/vcl/workben/fftester.cxx b/vcl/workben/fftester.cxx index 3dd2fdb014f6..8957a89480cb 100644 --- a/vcl/workben/fftester.cxx +++ b/vcl/workben/fftester.cxx @@ -54,7 +54,7 @@ using namespace ::com::sun::star::lang; using namespace cppu; #ifndef DISABLE_DYNLOADING -extern "C" { static void SAL_CALL thisModule() {} } +extern "C" { static void thisModule() {} } #endif typedef bool (*FFilterCall)(SvStream &rStream); diff --git a/writerfilter/source/filter/RtfFilter.cxx b/writerfilter/source/filter/RtfFilter.cxx index 711d0e5d3116..b9299d0d3f7d 100644 --- a/writerfilter/source/filter/RtfFilter.cxx +++ b/writerfilter/source/filter/RtfFilter.cxx @@ -204,7 +204,7 @@ uno::Sequence<OUString> RtfFilter::getSupportedServiceNames() return aRet; } -extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface* SAL_CALL com_sun_star_comp_Writer_RtfFilter_get_implementation(uno::XComponentContext* pComponent, uno::Sequence<uno::Any> const& /*rSequence*/) +extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface* com_sun_star_comp_Writer_RtfFilter_get_implementation(uno::XComponentContext* pComponent, uno::Sequence<uno::Any> const& /*rSequence*/) { return cppu::acquire(new RtfFilter(pComponent)); } diff --git a/writerfilter/source/filter/WriterFilter.cxx b/writerfilter/source/filter/WriterFilter.cxx index 01d0f66a652f..8bbc7b7224dd 100644 --- a/writerfilter/source/filter/WriterFilter.cxx +++ b/writerfilter/source/filter/WriterFilter.cxx @@ -365,7 +365,7 @@ void WriterFilter::putPropertiesToDocumentGrabBag(const comphelper::SequenceAsHa } } -extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface* SAL_CALL com_sun_star_comp_Writer_WriterFilter_get_implementation(uno::XComponentContext* component, uno::Sequence<uno::Any> const& /*rSequence*/) +extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface* com_sun_star_comp_Writer_WriterFilter_get_implementation(uno::XComponentContext* component, uno::Sequence<uno::Any> const& /*rSequence*/) { return cppu::acquire(new WriterFilter(component)); } diff --git a/writerperfect/source/calc/MSWorksCalcImportFilter.cxx b/writerperfect/source/calc/MSWorksCalcImportFilter.cxx index 700cc2c20ea2..2cef6152f4a8 100644 --- a/writerperfect/source/calc/MSWorksCalcImportFilter.cxx +++ b/writerperfect/source/calc/MSWorksCalcImportFilter.cxx @@ -418,7 +418,7 @@ Sequence< OUString > SAL_CALL MSWorksCalcImportFilter::getSupportedServiceNames( } extern "C" -SAL_DLLPUBLIC_EXPORT css::uno::XInterface *SAL_CALL +SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_Calc_MSWorksCalcImportFilter_get_implementation( css::uno::XComponentContext *const context, const css::uno::Sequence<css::uno::Any> &) diff --git a/writerperfect/source/calc/MWAWCalcImportFilter.cxx b/writerperfect/source/calc/MWAWCalcImportFilter.cxx index 904b58351bf7..64b61e9dad3c 100644 --- a/writerperfect/source/calc/MWAWCalcImportFilter.cxx +++ b/writerperfect/source/calc/MWAWCalcImportFilter.cxx @@ -118,7 +118,7 @@ Sequence< OUString > SAL_CALL MWAWCalcImportFilter::getSupportedServiceNames() } extern "C" -SAL_DLLPUBLIC_EXPORT css::uno::XInterface *SAL_CALL +SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_Calc_MWAWCalcImportFilter_get_implementation( css::uno::XComponentContext *const context, const css::uno::Sequence<css::uno::Any> &) diff --git a/writerperfect/source/calc/NumbersImportFilter.cxx b/writerperfect/source/calc/NumbersImportFilter.cxx index f23397e94c56..9d0774f8a5c8 100644 --- a/writerperfect/source/calc/NumbersImportFilter.cxx +++ b/writerperfect/source/calc/NumbersImportFilter.cxx @@ -65,7 +65,7 @@ Sequence< OUString > SAL_CALL NumbersImportFilter::getSupportedServiceNames() } extern "C" -SAL_DLLPUBLIC_EXPORT css::uno::XInterface *SAL_CALL +SAL_DLLPUBLIC_EXPORT css::uno::XInterface * org_libreoffice_comp_Calc_NumbersImportFilter_get_implementation( css::uno::XComponentContext *const context, const css::uno::Sequence<css::uno::Any> &) diff --git a/writerperfect/source/calc/StarOfficeCalcImportFilter.cxx b/writerperfect/source/calc/StarOfficeCalcImportFilter.cxx index d6b529a6c66f..38a7dd062163 100644 --- a/writerperfect/source/calc/StarOfficeCalcImportFilter.cxx +++ b/writerperfect/source/calc/StarOfficeCalcImportFilter.cxx @@ -82,7 +82,7 @@ Sequence< OUString > SAL_CALL StarOfficeCalcImportFilter::getSupportedServiceNam } extern "C" -SAL_DLLPUBLIC_EXPORT css::uno::XInterface *SAL_CALL +SAL_DLLPUBLIC_EXPORT css::uno::XInterface * org_libreoffice_comp_Calc_StarOfficeCalcImportFilter_get_implementation( css::uno::XComponentContext *const context, const css::uno::Sequence<css::uno::Any> &) diff --git a/writerperfect/source/draw/CDRImportFilter.cxx b/writerperfect/source/draw/CDRImportFilter.cxx index c2d9c39494d7..362c56fa522b 100644 --- a/writerperfect/source/draw/CDRImportFilter.cxx +++ b/writerperfect/source/draw/CDRImportFilter.cxx @@ -61,7 +61,7 @@ Sequence< OUString > SAL_CALL CDRImportFilter::getSupportedServiceNames() } extern "C" -SAL_DLLPUBLIC_EXPORT css::uno::XInterface *SAL_CALL +SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_Draw_CDRImportFilter_get_implementation( css::uno::XComponentContext *const context, const css::uno::Sequence<css::uno::Any> &) diff --git a/writerperfect/source/draw/CMXImportFilter.cxx b/writerperfect/source/draw/CMXImportFilter.cxx index 28c24e0e2b8a..3e7541863259 100644 --- a/writerperfect/source/draw/CMXImportFilter.cxx +++ b/writerperfect/source/draw/CMXImportFilter.cxx @@ -61,7 +61,7 @@ Sequence< OUString > SAL_CALL CMXImportFilter::getSupportedServiceNames() } extern "C" -SAL_DLLPUBLIC_EXPORT css::uno::XInterface *SAL_CALL +SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_Draw_CMXImportFilter_get_implementation( css::uno::XComponentContext *const context, const css::uno::Sequence<css::uno::Any> &) diff --git a/writerperfect/source/draw/FreehandImportFilter.cxx b/writerperfect/source/draw/FreehandImportFilter.cxx index 7d640c3fd83c..e22844b5cbd4 100644 --- a/writerperfect/source/draw/FreehandImportFilter.cxx +++ b/writerperfect/source/draw/FreehandImportFilter.cxx @@ -57,7 +57,7 @@ Sequence< OUString > SAL_CALL FreehandImportFilter::getSupportedServiceNames() } extern "C" -SAL_DLLPUBLIC_EXPORT css::uno::XInterface *SAL_CALL +SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_Draw_FreehandImportFilter_get_implementation( css::uno::XComponentContext *const context, const css::uno::Sequence<css::uno::Any> &) diff --git a/writerperfect/source/draw/MSPUBImportFilter.cxx b/writerperfect/source/draw/MSPUBImportFilter.cxx index 61cf0b557888..36c20f267c63 100644 --- a/writerperfect/source/draw/MSPUBImportFilter.cxx +++ b/writerperfect/source/draw/MSPUBImportFilter.cxx @@ -57,7 +57,7 @@ Sequence< OUString > SAL_CALL MSPUBImportFilter::getSupportedServiceNames() } extern "C" -SAL_DLLPUBLIC_EXPORT css::uno::XInterface *SAL_CALL +SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_Draw_MSPUBImportFilter_get_implementation( css::uno::XComponentContext *const context, const css::uno::Sequence<css::uno::Any> &) diff --git a/writerperfect/source/draw/MWAWDrawImportFilter.cxx b/writerperfect/source/draw/MWAWDrawImportFilter.cxx index e8a7a3d3f9e0..483eb5a89225 100644 --- a/writerperfect/source/draw/MWAWDrawImportFilter.cxx +++ b/writerperfect/source/draw/MWAWDrawImportFilter.cxx @@ -110,7 +110,7 @@ Sequence< OUString > SAL_CALL MWAWDrawImportFilter::getSupportedServiceNames() } extern "C" -SAL_DLLPUBLIC_EXPORT css::uno::XInterface *SAL_CALL +SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_Draw_MWAWDrawImportFilter_get_implementation( css::uno::XComponentContext *const context, const css::uno::Sequence<css::uno::Any> &) diff --git a/writerperfect/source/draw/PageMakerImportFilter.cxx b/writerperfect/source/draw/PageMakerImportFilter.cxx index 7f0c62857cf7..450c59c19df5 100644 --- a/writerperfect/source/draw/PageMakerImportFilter.cxx +++ b/writerperfect/source/draw/PageMakerImportFilter.cxx @@ -59,7 +59,7 @@ Sequence< OUString > SAL_CALL PageMakerImportFilter::getSupportedServiceNames() } extern "C" -SAL_DLLPUBLIC_EXPORT css::uno::XInterface *SAL_CALL +SAL_DLLPUBLIC_EXPORT css::uno::XInterface * org_libreoffice_comp_Draw_PageMakerImportFilter_get_implementation( css::uno::XComponentContext *const context, const css::uno::Sequence<css::uno::Any> &) diff --git a/writerperfect/source/draw/QXPImportFilter.cxx b/writerperfect/source/draw/QXPImportFilter.cxx index 9556cbec6a3f..3779bc5c38bc 100644 --- a/writerperfect/source/draw/QXPImportFilter.cxx +++ b/writerperfect/source/draw/QXPImportFilter.cxx @@ -55,7 +55,7 @@ Sequence< OUString > SAL_CALL QXPImportFilter::getSupportedServiceNames() } extern "C" -SAL_DLLPUBLIC_EXPORT css::uno::XInterface *SAL_CALL +SAL_DLLPUBLIC_EXPORT css::uno::XInterface * org_libreoffice_comp_Draw_QXPImportFilter_get_implementation( css::uno::XComponentContext *const context, const css::uno::Sequence<css::uno::Any> &) diff --git a/writerperfect/source/draw/StarOfficeDrawImportFilter.cxx b/writerperfect/source/draw/StarOfficeDrawImportFilter.cxx index 7197d496a7b9..b5cfb1537619 100644 --- a/writerperfect/source/draw/StarOfficeDrawImportFilter.cxx +++ b/writerperfect/source/draw/StarOfficeDrawImportFilter.cxx @@ -84,7 +84,7 @@ Sequence< OUString > SAL_CALL StarOfficeDrawImportFilter::getSupportedServiceNam } extern "C" -SAL_DLLPUBLIC_EXPORT css::uno::XInterface *SAL_CALL +SAL_DLLPUBLIC_EXPORT css::uno::XInterface * org_libreoffice_comp_Draw_StarOfficeDrawImportFilter_get_implementation( css::uno::XComponentContext *const context, const css::uno::Sequence<css::uno::Any> &) diff --git a/writerperfect/source/draw/VisioImportFilter.cxx b/writerperfect/source/draw/VisioImportFilter.cxx index 896fdacc4fb3..4745d0add6c0 100644 --- a/writerperfect/source/draw/VisioImportFilter.cxx +++ b/writerperfect/source/draw/VisioImportFilter.cxx @@ -57,7 +57,7 @@ Sequence< OUString > SAL_CALL VisioImportFilter::getSupportedServiceNames() } extern "C" -SAL_DLLPUBLIC_EXPORT css::uno::XInterface *SAL_CALL +SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_Draw_VisioImportFilter_get_implementation( css::uno::XComponentContext *const context, const css::uno::Sequence<css::uno::Any> &) diff --git a/writerperfect/source/draw/WPGImportFilter.cxx b/writerperfect/source/draw/WPGImportFilter.cxx index dadbd084e117..31dce33774e7 100644 --- a/writerperfect/source/draw/WPGImportFilter.cxx +++ b/writerperfect/source/draw/WPGImportFilter.cxx @@ -64,7 +64,7 @@ Sequence< OUString > SAL_CALL WPGImportFilter::getSupportedServiceNames() } extern "C" -SAL_DLLPUBLIC_EXPORT css::uno::XInterface *SAL_CALL +SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_Draw_WPGImportFilter_get_implementation( css::uno::XComponentContext *const context, const css::uno::Sequence<css::uno::Any> &) diff --git a/writerperfect/source/draw/ZMFImportFilter.cxx b/writerperfect/source/draw/ZMFImportFilter.cxx index c5bfe12a9214..ce63773ef4c2 100644 --- a/writerperfect/source/draw/ZMFImportFilter.cxx +++ b/writerperfect/source/draw/ZMFImportFilter.cxx @@ -55,7 +55,7 @@ Sequence< OUString > SAL_CALL ZMFImportFilter::getSupportedServiceNames() } extern "C" -SAL_DLLPUBLIC_EXPORT css::uno::XInterface *SAL_CALL +SAL_DLLPUBLIC_EXPORT css::uno::XInterface * org_libreoffice_comp_Draw_ZMFImportFilter_get_implementation( css::uno::XComponentContext *const context, const css::uno::Sequence<css::uno::Any> &) diff --git a/writerperfect/source/impress/KeynoteImportFilter.cxx b/writerperfect/source/impress/KeynoteImportFilter.cxx index 03c53211c742..2f7760cae86c 100644 --- a/writerperfect/source/impress/KeynoteImportFilter.cxx +++ b/writerperfect/source/impress/KeynoteImportFilter.cxx @@ -252,7 +252,7 @@ Sequence< OUString > SAL_CALL KeynoteImportFilter::getSupportedServiceNames() } extern "C" -SAL_DLLPUBLIC_EXPORT css::uno::XInterface *SAL_CALL +SAL_DLLPUBLIC_EXPORT css::uno::XInterface * org_libreoffice_comp_Impress_KeynoteImportFilter_get_implementation( css::uno::XComponentContext *const context, const css::uno::Sequence<css::uno::Any> &) diff --git a/writerperfect/source/impress/MWAWPresentationImportFilter.cxx b/writerperfect/source/impress/MWAWPresentationImportFilter.cxx index a1b2d7f06145..5fe085548364 100644 --- a/writerperfect/source/impress/MWAWPresentationImportFilter.cxx +++ b/writerperfect/source/impress/MWAWPresentationImportFilter.cxx @@ -96,7 +96,7 @@ Sequence< OUString > SAL_CALL MWAWPresentationImportFilter::getSupportedServiceN } extern "C" -SAL_DLLPUBLIC_EXPORT css::uno::XInterface *SAL_CALL +SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_Impress_MWAWPresentationImportFilter_get_implementation( css::uno::XComponentContext *const context, const css::uno::Sequence<css::uno::Any> &) diff --git a/writerperfect/source/impress/StarOfficePresentationImportFilter.cxx b/writerperfect/source/impress/StarOfficePresentationImportFilter.cxx index 00fdd5b22933..02ab78b899fa 100644 --- a/writerperfect/source/impress/StarOfficePresentationImportFilter.cxx +++ b/writerperfect/source/impress/StarOfficePresentationImportFilter.cxx @@ -84,7 +84,7 @@ Sequence< OUString > SAL_CALL StarOfficePresentationImportFilter::getSupportedSe } extern "C" -SAL_DLLPUBLIC_EXPORT css::uno::XInterface *SAL_CALL +SAL_DLLPUBLIC_EXPORT css::uno::XInterface * org_libreoffice_comp_Presentation_StarOfficePresentationImportFilter_get_implementation( css::uno::XComponentContext *const context, const css::uno::Sequence<css::uno::Any> &) diff --git a/writerperfect/source/writer/AbiWordImportFilter.cxx b/writerperfect/source/writer/AbiWordImportFilter.cxx index e2b702272337..4bc4414793f1 100644 --- a/writerperfect/source/writer/AbiWordImportFilter.cxx +++ b/writerperfect/source/writer/AbiWordImportFilter.cxx @@ -57,7 +57,7 @@ Sequence< OUString > SAL_CALL AbiWordImportFilter::getSupportedServiceNames() } extern "C" -SAL_DLLPUBLIC_EXPORT css::uno::XInterface *SAL_CALL +SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_Writer_AbiWordImportFilter_get_implementation( css::uno::XComponentContext *const context, const css::uno::Sequence<css::uno::Any> &) diff --git a/writerperfect/source/writer/EBookImportFilter.cxx b/writerperfect/source/writer/EBookImportFilter.cxx index ecddf56302a5..a911ea2cc8d7 100644 --- a/writerperfect/source/writer/EBookImportFilter.cxx +++ b/writerperfect/source/writer/EBookImportFilter.cxx @@ -109,7 +109,7 @@ Sequence< OUString > SAL_CALL EBookImportFilter::getSupportedServiceNames() } extern "C" -SAL_DLLPUBLIC_EXPORT css::uno::XInterface *SAL_CALL +SAL_DLLPUBLIC_EXPORT css::uno::XInterface * org_libreoffice_comp_Writer_EBookImportFilter_get_implementation( css::uno::XComponentContext *const context, const css::uno::Sequence<css::uno::Any> &) diff --git a/writerperfect/source/writer/EPUBExportFilter.cxx b/writerperfect/source/writer/EPUBExportFilter.cxx index 2d06e2c2e34f..d1f2c73621f4 100644 --- a/writerperfect/source/writer/EPUBExportFilter.cxx +++ b/writerperfect/source/writer/EPUBExportFilter.cxx @@ -197,7 +197,7 @@ uno::Sequence<OUString> EPUBExportFilter::getSupportedServiceNames() return aRet; } -extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface *SAL_CALL com_sun_star_comp_Writer_EPUBExportFilter_get_implementation(uno::XComponentContext *pContext, uno::Sequence<uno::Any> const &) +extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface * com_sun_star_comp_Writer_EPUBExportFilter_get_implementation(uno::XComponentContext *pContext, uno::Sequence<uno::Any> const &) { return cppu::acquire(new EPUBExportFilter(pContext)); } diff --git a/writerperfect/source/writer/EPUBExportUIComponent.cxx b/writerperfect/source/writer/EPUBExportUIComponent.cxx index b6fe80ff3604..e7f7f7f005a8 100644 --- a/writerperfect/source/writer/EPUBExportUIComponent.cxx +++ b/writerperfect/source/writer/EPUBExportUIComponent.cxx @@ -83,7 +83,7 @@ sal_Int16 EPUBExportUIComponent::execute() return ui::dialogs::ExecutableDialogResults::CANCEL; } -extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface *SAL_CALL com_sun_star_comp_Writer_EPUBExportUIComponent_get_implementation(uno::XComponentContext *pCtx, uno::Sequence<uno::Any> const &) +extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface * com_sun_star_comp_Writer_EPUBExportUIComponent_get_implementation(uno::XComponentContext *pCtx, uno::Sequence<uno::Any> const &) { return cppu::acquire(new EPUBExportUIComponent(pCtx)); } diff --git a/writerperfect/source/writer/MSWorksImportFilter.cxx b/writerperfect/source/writer/MSWorksImportFilter.cxx index 092a8fb77efa..9af6027b3e75 100644 --- a/writerperfect/source/writer/MSWorksImportFilter.cxx +++ b/writerperfect/source/writer/MSWorksImportFilter.cxx @@ -137,7 +137,7 @@ Sequence< OUString > SAL_CALL MSWorksImportFilter::getSupportedServiceNames() } extern "C" -SAL_DLLPUBLIC_EXPORT css::uno::XInterface *SAL_CALL +SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_Writer_MSWorksImportFilter_get_implementation( css::uno::XComponentContext *const context, const css::uno::Sequence<css::uno::Any> &) diff --git a/writerperfect/source/writer/MWAWImportFilter.cxx b/writerperfect/source/writer/MWAWImportFilter.cxx index 0d8d9f29b0f5..b8bf3b51223e 100644 --- a/writerperfect/source/writer/MWAWImportFilter.cxx +++ b/writerperfect/source/writer/MWAWImportFilter.cxx @@ -110,7 +110,7 @@ Sequence< OUString > SAL_CALL MWAWImportFilter::getSupportedServiceNames() } extern "C" -SAL_DLLPUBLIC_EXPORT css::uno::XInterface *SAL_CALL +SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_Writer_MWAWImportFilter_get_implementation( css::uno::XComponentContext *const context, const css::uno::Sequence<css::uno::Any> &) diff --git a/writerperfect/source/writer/PagesImportFilter.cxx b/writerperfect/source/writer/PagesImportFilter.cxx index 9352a9b3b92c..abcb3eb08764 100644 --- a/writerperfect/source/writer/PagesImportFilter.cxx +++ b/writerperfect/source/writer/PagesImportFilter.cxx @@ -61,7 +61,7 @@ Sequence< OUString > SAL_CALL PagesImportFilter::getSupportedServiceNames() } extern "C" -SAL_DLLPUBLIC_EXPORT css::uno::XInterface *SAL_CALL +SAL_DLLPUBLIC_EXPORT css::uno::XInterface * org_libreoffice_comp_Writer_PagesImportFilter_get_implementation( css::uno::XComponentContext *const context, const css::uno::Sequence<css::uno::Any> &) diff --git a/writerperfect/source/writer/StarOfficeWriterImportFilter.cxx b/writerperfect/source/writer/StarOfficeWriterImportFilter.cxx index f04343e205bb..5d083131b6f6 100644 --- a/writerperfect/source/writer/StarOfficeWriterImportFilter.cxx +++ b/writerperfect/source/writer/StarOfficeWriterImportFilter.cxx @@ -105,7 +105,7 @@ Sequence< OUString > SAL_CALL StarOfficeWriterImportFilter::getSupportedServiceN } extern "C" -SAL_DLLPUBLIC_EXPORT css::uno::XInterface *SAL_CALL +SAL_DLLPUBLIC_EXPORT css::uno::XInterface * org_libreoffice_comp_Writer_StarOfficeWriterImportFilter_get_implementation( css::uno::XComponentContext *const context, const css::uno::Sequence<css::uno::Any> &) diff --git a/writerperfect/source/writer/WordPerfectImportFilter.cxx b/writerperfect/source/writer/WordPerfectImportFilter.cxx index cf75d61c67ec..6a32a7d37c36 100644 --- a/writerperfect/source/writer/WordPerfectImportFilter.cxx +++ b/writerperfect/source/writer/WordPerfectImportFilter.cxx @@ -231,7 +231,7 @@ Sequence< OUString > SAL_CALL WordPerfectImportFilter::getSupportedServiceNames( extern "C" -SAL_DLLPUBLIC_EXPORT css::uno::XInterface *SAL_CALL +SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_Writer_WordPerfectImportFilter_get_implementation( css::uno::XComponentContext *const context, const css::uno::Sequence<css::uno::Any> &) diff --git a/xmlhelp/source/cxxhelp/provider/provider.cxx b/xmlhelp/source/cxxhelp/provider/provider.cxx index 6dd16f955a99..78912d06b0c5 100644 --- a/xmlhelp/source/cxxhelp/provider/provider.cxx +++ b/xmlhelp/source/cxxhelp/provider/provider.cxx @@ -127,7 +127,7 @@ ContentProvider::getSupportedServiceNames() } /// @throws uno::Exception -static uno::Reference< uno::XInterface > SAL_CALL +static uno::Reference< uno::XInterface > ContentProvider_CreateInstance( const uno::Reference< lang::XMultiServiceFactory> & rSMgr ) { diff --git a/xmlhelp/source/cxxhelp/provider/services.cxx b/xmlhelp/source/cxxhelp/provider/services.cxx index f84f7c1b11d0..52e0616f65c0 100644 --- a/xmlhelp/source/cxxhelp/provider/services.cxx +++ b/xmlhelp/source/cxxhelp/provider/services.cxx @@ -26,7 +26,7 @@ using namespace com::sun::star; -extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL ucpchelp_component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * ucpchelp_component_getFactory( const sal_Char * pImplName, void * pServiceManager, SAL_UNUSED_PARAMETER void * /*pRegistryKey*/ ) diff --git a/xmloff/inc/facreg.hxx b/xmloff/inc/facreg.hxx index d19ad010913f..aac65f11862e 100644 --- a/xmloff/inc/facreg.hxx +++ b/xmloff/inc/facreg.hxx @@ -34,281 +34,281 @@ namespace com { namespace sun { namespace star { } } } // impress oasis import -OUString SAL_CALL XMLImpressImportOasis_getImplementationName() throw(); -css::uno::Sequence<OUString> SAL_CALL XMLImpressImportOasis_getSupportedServiceNames() throw(); +OUString XMLImpressImportOasis_getImplementationName() throw(); +css::uno::Sequence<OUString> XMLImpressImportOasis_getSupportedServiceNames() throw(); /// @throws css::uno::Exception -css::uno::Reference<css::uno::XInterface> SAL_CALL XMLImpressImportOasis_createInstance( +css::uno::Reference<css::uno::XInterface> XMLImpressImportOasis_createInstance( css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr); -OUString SAL_CALL XMLImpressStylesImportOasis_getImplementationName() throw(); -css::uno::Sequence<OUString> SAL_CALL XMLImpressStylesImportOasis_getSupportedServiceNames() throw(); +OUString XMLImpressStylesImportOasis_getImplementationName() throw(); +css::uno::Sequence<OUString> XMLImpressStylesImportOasis_getSupportedServiceNames() throw(); /// @throws css::uno::Exception -css::uno::Reference<css::uno::XInterface> SAL_CALL XMLImpressStylesImportOasis_createInstance( +css::uno::Reference<css::uno::XInterface> XMLImpressStylesImportOasis_createInstance( css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr); -OUString SAL_CALL XMLImpressContentImportOasis_getImplementationName() throw(); -css::uno::Sequence<OUString> SAL_CALL XMLImpressContentImportOasis_getSupportedServiceNames() throw(); +OUString XMLImpressContentImportOasis_getImplementationName() throw(); +css::uno::Sequence<OUString> XMLImpressContentImportOasis_getSupportedServiceNames() throw(); /// @throws css::uno::Exception -css::uno::Reference<css::uno::XInterface> SAL_CALL XMLImpressContentImportOasis_createInstance( +css::uno::Reference<css::uno::XInterface> XMLImpressContentImportOasis_createInstance( css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr); -OUString SAL_CALL XMLImpressMetaImportOasis_getImplementationName() throw(); -css::uno::Sequence<OUString> SAL_CALL XMLImpressMetaImportOasis_getSupportedServiceNames() throw(); +OUString XMLImpressMetaImportOasis_getImplementationName() throw(); +css::uno::Sequence<OUString> XMLImpressMetaImportOasis_getSupportedServiceNames() throw(); /// @throws css::uno::Exception -css::uno::Reference<css::uno::XInterface> SAL_CALL XMLImpressMetaImportOasis_createInstance( +css::uno::Reference<css::uno::XInterface> XMLImpressMetaImportOasis_createInstance( css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr); -OUString SAL_CALL XMLImpressSettingsImportOasis_getImplementationName() throw(); -css::uno::Sequence<OUString> SAL_CALL XMLImpressSettingsImportOasis_getSupportedServiceNames() throw(); +OUString XMLImpressSettingsImportOasis_getImplementationName() throw(); +css::uno::Sequence<OUString> XMLImpressSettingsImportOasis_getSupportedServiceNames() throw(); /// @throws css::uno::Exception -css::uno::Reference<css::uno::XInterface> SAL_CALL XMLImpressSettingsImportOasis_createInstance( +css::uno::Reference<css::uno::XInterface> XMLImpressSettingsImportOasis_createInstance( css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr); // impress oasis export -OUString SAL_CALL XMLImpressExportOasis_getImplementationName() throw(); -css::uno::Sequence<OUString> SAL_CALL XMLImpressExportOasis_getSupportedServiceNames() throw(); +OUString XMLImpressExportOasis_getImplementationName() throw(); +css::uno::Sequence<OUString> XMLImpressExportOasis_getSupportedServiceNames() throw(); /// @throws css::uno::Exception -css::uno::Reference<css::uno::XInterface> SAL_CALL XMLImpressExportOasis_createInstance( +css::uno::Reference<css::uno::XInterface> XMLImpressExportOasis_createInstance( css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr); -OUString SAL_CALL XMLImpressStylesExportOasis_getImplementationName() throw(); -css::uno::Sequence<OUString> SAL_CALL XMLImpressStylesExportOasis_getSupportedServiceNames() throw(); +OUString XMLImpressStylesExportOasis_getImplementationName() throw(); +css::uno::Sequence<OUString> XMLImpressStylesExportOasis_getSupportedServiceNames() throw(); /// @throws css::uno::Exception -css::uno::Reference<css::uno::XInterface> SAL_CALL XMLImpressStylesExportOasis_createInstance( +css::uno::Reference<css::uno::XInterface> XMLImpressStylesExportOasis_createInstance( css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr); -OUString SAL_CALL XMLImpressContentExportOasis_getImplementationName() throw(); -css::uno::Sequence<OUString> SAL_CALL XMLImpressContentExportOasis_getSupportedServiceNames() throw(); +OUString XMLImpressContentExportOasis_getImplementationName() throw(); +css::uno::Sequence<OUString> XMLImpressContentExportOasis_getSupportedServiceNames() throw(); /// @throws css::uno::Exception -css::uno::Reference<css::uno::XInterface> SAL_CALL XMLImpressContentExportOasis_createInstance( +css::uno::Reference<css::uno::XInterface> XMLImpressContentExportOasis_createInstance( css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr); -OUString SAL_CALL XMLImpressMetaExportOasis_getImplementationName() throw(); -css::uno::Sequence<OUString> SAL_CALL XMLImpressMetaExportOasis_getSupportedServiceNames() throw(); +OUString XMLImpressMetaExportOasis_getImplementationName() throw(); +css::uno::Sequence<OUString> XMLImpressMetaExportOasis_getSupportedServiceNames() throw(); /// @throws css::uno::Exception -css::uno::Reference<css::uno::XInterface> SAL_CALL XMLImpressMetaExportOasis_createInstance( +css::uno::Reference<css::uno::XInterface> XMLImpressMetaExportOasis_createInstance( css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr); -OUString SAL_CALL XMLImpressSettingsExportOasis_getImplementationName() throw(); -css::uno::Sequence<OUString> SAL_CALL XMLImpressSettingsExportOasis_getSupportedServiceNames() throw(); +OUString XMLImpressSettingsExportOasis_getImplementationName() throw(); +css::uno::Sequence<OUString> XMLImpressSettingsExportOasis_getSupportedServiceNames() throw(); /// @throws css::uno::Exception -css::uno::Reference<css::uno::XInterface> SAL_CALL XMLImpressSettingsExportOasis_createInstance( +css::uno::Reference<css::uno::XInterface> XMLImpressSettingsExportOasis_createInstance( css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr); // impress OOo import // impress OOo export -OUString SAL_CALL XMLImpressExportOOO_getImplementationName() throw(); -css::uno::Sequence<OUString> SAL_CALL XMLImpressExportOOO_getSupportedServiceNames() throw(); +OUString XMLImpressExportOOO_getImplementationName() throw(); +css::uno::Sequence<OUString> XMLImpressExportOOO_getSupportedServiceNames() throw(); /// @throws css::uno::Exception -css::uno::Reference<css::uno::XInterface> SAL_CALL XMLImpressExportOOO_createInstance( +css::uno::Reference<css::uno::XInterface> XMLImpressExportOOO_createInstance( css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr); -OUString SAL_CALL XMLImpressStylesExportOOO_getImplementationName() throw(); -css::uno::Sequence<OUString> SAL_CALL XMLImpressStylesExportOOO_getSupportedServiceNames() throw(); +OUString XMLImpressStylesExportOOO_getImplementationName() throw(); +css::uno::Sequence<OUString> XMLImpressStylesExportOOO_getSupportedServiceNames() throw(); /// @throws css::uno::Exception -css::uno::Reference<css::uno::XInterface> SAL_CALL XMLImpressStylesExportOOO_createInstance( +css::uno::Reference<css::uno::XInterface> XMLImpressStylesExportOOO_createInstance( css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr); -OUString SAL_CALL XMLImpressContentExportOOO_getImplementationName() throw(); -css::uno::Sequence<OUString> SAL_CALL XMLImpressContentExportOOO_getSupportedServiceNames() throw(); +OUString XMLImpressContentExportOOO_getImplementationName() throw(); +css::uno::Sequence<OUString> XMLImpressContentExportOOO_getSupportedServiceNames() throw(); /// @throws css::uno::Exception -css::uno::Reference<css::uno::XInterface> SAL_CALL XMLImpressContentExportOOO_createInstance( +css::uno::Reference<css::uno::XInterface> XMLImpressContentExportOOO_createInstance( css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr); -OUString SAL_CALL XMLImpressMetaExportOOO_getImplementationName() throw(); -css::uno::Sequence<OUString> SAL_CALL XMLImpressMetaExportOOO_getSupportedServiceNames() throw(); +OUString XMLImpressMetaExportOOO_getImplementationName() throw(); +css::uno::Sequence<OUString> XMLImpressMetaExportOOO_getSupportedServiceNames() throw(); /// @throws css::uno::Exception -css::uno::Reference<css::uno::XInterface> SAL_CALL XMLImpressMetaExportOOO_createInstance( +css::uno::Reference<css::uno::XInterface> XMLImpressMetaExportOOO_createInstance( css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr); -OUString SAL_CALL XMLImpressSettingsExportOOO_getImplementationName() throw(); -css::uno::Sequence<OUString> SAL_CALL XMLImpressSettingsExportOOO_getSupportedServiceNames() throw(); +OUString XMLImpressSettingsExportOOO_getImplementationName() throw(); +css::uno::Sequence<OUString> XMLImpressSettingsExportOOO_getSupportedServiceNames() throw(); /// @throws css::uno::Exception -css::uno::Reference<css::uno::XInterface> SAL_CALL XMLImpressSettingsExportOOO_createInstance( +css::uno::Reference<css::uno::XInterface> XMLImpressSettingsExportOOO_createInstance( css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr); // draw oasis import -OUString SAL_CALL XMLDrawImportOasis_getImplementationName() throw(); -css::uno::Sequence<OUString> SAL_CALL XMLDrawImportOasis_getSupportedServiceNames() throw(); +OUString XMLDrawImportOasis_getImplementationName() throw(); +css::uno::Sequence<OUString> XMLDrawImportOasis_getSupportedServiceNames() throw(); /// @throws css::uno::Exception -css::uno::Reference<css::uno::XInterface> SAL_CALL XMLDrawImportOasis_createInstance( +css::uno::Reference<css::uno::XInterface> XMLDrawImportOasis_createInstance( css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr); -OUString SAL_CALL XMLDrawStylesImportOasis_getImplementationName() throw(); -css::uno::Sequence<OUString> SAL_CALL XMLDrawStylesImportOasis_getSupportedServiceNames() throw(); +OUString XMLDrawStylesImportOasis_getImplementationName() throw(); +css::uno::Sequence<OUString> XMLDrawStylesImportOasis_getSupportedServiceNames() throw(); /// @throws css::uno::Exception -css::uno::Reference<css::uno::XInterface> SAL_CALL XMLDrawStylesImportOasis_createInstance( +css::uno::Reference<css::uno::XInterface> XMLDrawStylesImportOasis_createInstance( css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr); -OUString SAL_CALL XMLDrawContentImportOasis_getImplementationName() throw(); -css::uno::Sequence<OUString> SAL_CALL XMLDrawContentImportOasis_getSupportedServiceNames() throw(); +OUString XMLDrawContentImportOasis_getImplementationName() throw(); +css::uno::Sequence<OUString> XMLDrawContentImportOasis_getSupportedServiceNames() throw(); /// @throws css::uno::Exception -css::uno::Reference<css::uno::XInterface> SAL_CALL XMLDrawContentImportOasis_createInstance( +css::uno::Reference<css::uno::XInterface> XMLDrawContentImportOasis_createInstance( css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr); -OUString SAL_CALL XMLDrawMetaImportOasis_getImplementationName() throw(); -css::uno::Sequence<OUString> SAL_CALL XMLDrawMetaImportOasis_getSupportedServiceNames() throw(); +OUString XMLDrawMetaImportOasis_getImplementationName() throw(); +css::uno::Sequence<OUString> XMLDrawMetaImportOasis_getSupportedServiceNames() throw(); /// @throws css::uno::Exception -css::uno::Reference<css::uno::XInterface> SAL_CALL XMLDrawMetaImportOasis_createInstance( +css::uno::Reference<css::uno::XInterface> XMLDrawMetaImportOasis_createInstance( css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr); -OUString SAL_CALL XMLDrawSettingsImportOasis_getImplementationName() throw(); -css::uno::Sequence<OUString> SAL_CALL XMLDrawSettingsImportOasis_getSupportedServiceNames() throw(); +OUString XMLDrawSettingsImportOasis_getImplementationName() throw(); +css::uno::Sequence<OUString> XMLDrawSettingsImportOasis_getSupportedServiceNames() throw(); /// @throws css::uno::Exception -css::uno::Reference<css::uno::XInterface> SAL_CALL XMLDrawSettingsImportOasis_createInstance( +css::uno::Reference<css::uno::XInterface> XMLDrawSettingsImportOasis_createInstance( css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr); // draw oasis export -OUString SAL_CALL XMLDrawExportOasis_getImplementationName() throw(); -css::uno::Sequence<OUString> SAL_CALL XMLDrawExportOasis_getSupportedServiceNames() throw(); +OUString XMLDrawExportOasis_getImplementationName() throw(); +css::uno::Sequence<OUString> XMLDrawExportOasis_getSupportedServiceNames() throw(); /// @throws css::uno::Exception -css::uno::Reference<css::uno::XInterface> SAL_CALL XMLDrawExportOasis_createInstance( +css::uno::Reference<css::uno::XInterface> XMLDrawExportOasis_createInstance( css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr); -OUString SAL_CALL XMLDrawStylesExportOasis_getImplementationName() throw(); -css::uno::Sequence<OUString> SAL_CALL XMLDrawStylesExportOasis_getSupportedServiceNames() throw(); +OUString XMLDrawStylesExportOasis_getImplementationName() throw(); +css::uno::Sequence<OUString> XMLDrawStylesExportOasis_getSupportedServiceNames() throw(); /// @throws css::uno::Exception -css::uno::Reference<css::uno::XInterface> SAL_CALL XMLDrawStylesExportOasis_createInstance( +css::uno::Reference<css::uno::XInterface> XMLDrawStylesExportOasis_createInstance( css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr); -OUString SAL_CALL XMLDrawContentExportOasis_getImplementationName() throw(); -css::uno::Sequence<OUString> SAL_CALL XMLDrawContentExportOasis_getSupportedServiceNames() throw(); +OUString XMLDrawContentExportOasis_getImplementationName() throw(); +css::uno::Sequence<OUString> XMLDrawContentExportOasis_getSupportedServiceNames() throw(); /// @throws css::uno::Exception -css::uno::Reference<css::uno::XInterface> SAL_CALL XMLDrawContentExportOasis_createInstance( +css::uno::Reference<css::uno::XInterface> XMLDrawContentExportOasis_createInstance( css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr); -OUString SAL_CALL XMLDrawMetaExportOasis_getImplementationName() throw(); -css::uno::Sequence<OUString> SAL_CALL XMLDrawMetaExportOasis_getSupportedServiceNames() throw(); +OUString XMLDrawMetaExportOasis_getImplementationName() throw(); +css::uno::Sequence<OUString> XMLDrawMetaExportOasis_getSupportedServiceNames() throw(); /// @throws css::uno::Exception -css::uno::Reference<css::uno::XInterface> SAL_CALL XMLDrawMetaExportOasis_createInstance( +css::uno::Reference<css::uno::XInterface> XMLDrawMetaExportOasis_createInstance( css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr); -OUString SAL_CALL XMLDrawSettingsExportOasis_getImplementationName() throw(); -css::uno::Sequence<OUString> SAL_CALL XMLDrawSettingsExportOasis_getSupportedServiceNames() throw(); +OUString XMLDrawSettingsExportOasis_getImplementationName() throw(); +css::uno::Sequence<OUString> XMLDrawSettingsExportOasis_getSupportedServiceNames() throw(); /// @throws css::uno::Exception -css::uno::Reference<css::uno::XInterface> SAL_CALL XMLDrawSettingsExportOasis_createInstance( +css::uno::Reference<css::uno::XInterface> XMLDrawSettingsExportOasis_createInstance( css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr); // draw OOo import // draw OOo export -OUString SAL_CALL XMLDrawExportOOO_getImplementationName() throw(); -css::uno::Sequence<OUString> SAL_CALL XMLDrawExportOOO_getSupportedServiceNames() throw(); +OUString XMLDrawExportOOO_getImplementationName() throw(); +css::uno::Sequence<OUString> XMLDrawExportOOO_getSupportedServiceNames() throw(); /// @throws css::uno::Exception -css::uno::Reference<css::uno::XInterface> SAL_CALL XMLDrawExportOOO_createInstance( +css::uno::Reference<css::uno::XInterface> XMLDrawExportOOO_createInstance( css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr); -OUString SAL_CALL XMLDrawStylesExportOOO_getImplementationName() throw(); -css::uno::Sequence<OUString> SAL_CALL XMLDrawStylesExportOOO_getSupportedServiceNames() throw(); +OUString XMLDrawStylesExportOOO_getImplementationName() throw(); +css::uno::Sequence<OUString> XMLDrawStylesExportOOO_getSupportedServiceNames() throw(); /// @throws css::uno::Exception -css::uno::Reference<css::uno::XInterface> SAL_CALL XMLDrawStylesExportOOO_createInstance( +css::uno::Reference<css::uno::XInterface> XMLDrawStylesExportOOO_createInstance( css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr); -OUString SAL_CALL XMLDrawContentExportOOO_getImplementationName() throw(); -css::uno::Sequence<OUString> SAL_CALL XMLDrawContentExportOOO_getSupportedServiceNames() throw(); +OUString XMLDrawContentExportOOO_getImplementationName() throw(); +css::uno::Sequence<OUString> XMLDrawContentExportOOO_getSupportedServiceNames() throw(); /// @throws css::uno::Exception -css::uno::Reference<css::uno::XInterface> SAL_CALL XMLDrawContentExportOOO_createInstance( +css::uno::Reference<css::uno::XInterface> XMLDrawContentExportOOO_createInstance( css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr); -OUString SAL_CALL XMLDrawMetaExportOOO_getImplementationName() throw(); -css::uno::Sequence<OUString> SAL_CALL XMLDrawMetaExportOOO_getSupportedServiceNames() throw(); +OUString XMLDrawMetaExportOOO_getImplementationName() throw(); +css::uno::Sequence<OUString> XMLDrawMetaExportOOO_getSupportedServiceNames() throw(); /// @throws css::uno::Exception -css::uno::Reference<css::uno::XInterface> SAL_CALL XMLDrawMetaExportOOO_createInstance( +css::uno::Reference<css::uno::XInterface> XMLDrawMetaExportOOO_createInstance( css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr); -OUString SAL_CALL XMLDrawSettingsExportOOO_getImplementationName() throw(); -css::uno::Sequence<OUString> SAL_CALL XMLDrawSettingsExportOOO_getSupportedServiceNames() throw(); +OUString XMLDrawSettingsExportOOO_getImplementationName() throw(); +css::uno::Sequence<OUString> XMLDrawSettingsExportOOO_getSupportedServiceNames() throw(); /// @throws css::uno::Exception -css::uno::Reference<css::uno::XInterface> SAL_CALL XMLDrawSettingsExportOOO_createInstance( +css::uno::Reference<css::uno::XInterface> XMLDrawSettingsExportOOO_createInstance( css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr); // impress animation import -OUString SAL_CALL AnimationsImport_getImplementationName() throw(); -css::uno::Sequence<OUString> SAL_CALL AnimationsImport_getSupportedServiceNames() throw(); +OUString AnimationsImport_getImplementationName() throw(); +css::uno::Sequence<OUString> AnimationsImport_getSupportedServiceNames() throw(); /// @throws css::uno::Exception -css::uno::Reference<css::uno::XInterface> SAL_CALL AnimationsImport_createInstance( +css::uno::Reference<css::uno::XInterface> AnimationsImport_createInstance( css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr); // drawing layer export -OUString SAL_CALL XMLDrawingLayerExport_getImplementationName() throw(); -css::uno::Sequence<OUString> SAL_CALL XMLDrawingLayerExport_getSupportedServiceNames() throw(); +OUString XMLDrawingLayerExport_getImplementationName() throw(); +css::uno::Sequence<OUString> XMLDrawingLayerExport_getSupportedServiceNames() throw(); /// @throws css::uno::Exception -css::uno::Reference<css::uno::XInterface> SAL_CALL XMLDrawingLayerExport_createInstance( +css::uno::Reference<css::uno::XInterface> XMLDrawingLayerExport_createInstance( css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr); // impress xml clipboard export -OUString SAL_CALL XMLImpressClipboardExport_getImplementationName() throw(); -css::uno::Sequence<OUString> SAL_CALL XMLImpressClipboardExport_getSupportedServiceNames() throw(); +OUString XMLImpressClipboardExport_getImplementationName() throw(); +css::uno::Sequence<OUString> XMLImpressClipboardExport_getSupportedServiceNames() throw(); /// @throws css::uno::Exception -css::uno::Reference<css::uno::XInterface> SAL_CALL XMLImpressClipboardExport_createInstance( +css::uno::Reference<css::uno::XInterface> XMLImpressClipboardExport_createInstance( css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr); // chart oasis import -OUString SAL_CALL SchXMLImport_getImplementationName() throw(); -css::uno::Sequence<OUString> SAL_CALL SchXMLImport_getSupportedServiceNames() throw(); +OUString SchXMLImport_getImplementationName() throw(); +css::uno::Sequence<OUString> SchXMLImport_getSupportedServiceNames() throw(); /// @throws css::uno::Exception -css::uno::Reference<css::uno::XInterface> SAL_CALL SchXMLImport_createInstance( +css::uno::Reference<css::uno::XInterface> SchXMLImport_createInstance( css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr); -OUString SAL_CALL SchXMLImport_Meta_getImplementationName() throw(); -css::uno::Sequence<OUString> SAL_CALL SchXMLImport_Meta_getSupportedServiceNames() throw(); +OUString SchXMLImport_Meta_getImplementationName() throw(); +css::uno::Sequence<OUString> SchXMLImport_Meta_getSupportedServiceNames() throw(); /// @throws css::uno::Exception -css::uno::Reference<css::uno::XInterface> SAL_CALL SchXMLImport_Meta_createInstance( +css::uno::Reference<css::uno::XInterface> SchXMLImport_Meta_createInstance( css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr); -OUString SAL_CALL SchXMLImport_Styles_getImplementationName() throw(); -css::uno::Sequence<OUString> SAL_CALL SchXMLImport_Styles_getSupportedServiceNames() throw(); +OUString SchXMLImport_Styles_getImplementationName() throw(); +css::uno::Sequence<OUString> SchXMLImport_Styles_getSupportedServiceNames() throw(); /// @throws css::uno::Exception -css::uno::Reference<css::uno::XInterface> SAL_CALL SchXMLImport_Styles_createInstance( +css::uno::Reference<css::uno::XInterface> SchXMLImport_Styles_createInstance( css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr); -OUString SAL_CALL SchXMLImport_Content_getImplementationName() throw(); -css::uno::Sequence<OUString> SAL_CALL SchXMLImport_Content_getSupportedServiceNames() throw(); +OUString SchXMLImport_Content_getImplementationName() throw(); +css::uno::Sequence<OUString> SchXMLImport_Content_getSupportedServiceNames() throw(); /// @throws css::uno::Exception -css::uno::Reference<css::uno::XInterface> SAL_CALL SchXMLImport_Content_createInstance( +css::uno::Reference<css::uno::XInterface> SchXMLImport_Content_createInstance( css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr); // chart oasis export -OUString SAL_CALL SchXMLExport_Oasis_getImplementationName() throw(); -css::uno::Sequence<OUString> SAL_CALL SchXMLExport_Oasis_getSupportedServiceNames() throw(); +OUString SchXMLExport_Oasis_getImplementationName() throw(); +css::uno::Sequence<OUString> SchXMLExport_Oasis_getSupportedServiceNames() throw(); /// @throws css::uno::Exception -css::uno::Reference<css::uno::XInterface> SAL_CALL SchXMLExport_Oasis_createInstance( +css::uno::Reference<css::uno::XInterface> SchXMLExport_Oasis_createInstance( css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr); -OUString SAL_CALL SchXMLExport_Oasis_Meta_getImplementationName() throw(); -css::uno::Sequence<OUString> SAL_CALL SchXMLExport_Oasis_Meta_getSupportedServiceNames() throw(); +OUString SchXMLExport_Oasis_Meta_getImplementationName() throw(); +css::uno::Sequence<OUString> SchXMLExport_Oasis_Meta_getSupportedServiceNames() throw(); /// @throws css::uno::Exception -css::uno::Reference<css::uno::XInterface> SAL_CALL SchXMLExport_Oasis_Meta_createInstance( +css::uno::Reference<css::uno::XInterface> SchXMLExport_Oasis_Meta_createInstance( css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr); -OUString SAL_CALL SchXMLExport_Oasis_Styles_getImplementationName() throw(); -css::uno::Sequence<OUString> SAL_CALL SchXMLExport_Oasis_Styles_getSupportedServiceNames() throw(); +OUString SchXMLExport_Oasis_Styles_getImplementationName() throw(); +css::uno::Sequence<OUString> SchXMLExport_Oasis_Styles_getSupportedServiceNames() throw(); /// @throws css::uno::Exception -css::uno::Reference<css::uno::XInterface> SAL_CALL SchXMLExport_Oasis_Styles_createInstance( +css::uno::Reference<css::uno::XInterface> SchXMLExport_Oasis_Styles_createInstance( css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr); -OUString SAL_CALL SchXMLExport_Oasis_Content_getImplementationName() throw(); -css::uno::Sequence<OUString> SAL_CALL SchXMLExport_Oasis_Content_getSupportedServiceNames() throw(); +OUString SchXMLExport_Oasis_Content_getImplementationName() throw(); +css::uno::Sequence<OUString> SchXMLExport_Oasis_Content_getSupportedServiceNames() throw(); /// @throws css::uno::Exception -css::uno::Reference<css::uno::XInterface> SAL_CALL SchXMLExport_Oasis_Content_createInstance( +css::uno::Reference<css::uno::XInterface> SchXMLExport_Oasis_Content_createInstance( css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr); // chart OOo import // chart OOo export -OUString SAL_CALL SchXMLExport_getImplementationName() throw(); -css::uno::Sequence<OUString> SAL_CALL SchXMLExport_getSupportedServiceNames() throw(); +OUString SchXMLExport_getImplementationName() throw(); +css::uno::Sequence<OUString> SchXMLExport_getSupportedServiceNames() throw(); /// @throws css::uno::Exception -css::uno::Reference<css::uno::XInterface> SAL_CALL SchXMLExport_createInstance( +css::uno::Reference<css::uno::XInterface> SchXMLExport_createInstance( css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr); -OUString SAL_CALL SchXMLExport_Styles_getImplementationName() throw(); -css::uno::Sequence<OUString> SAL_CALL SchXMLExport_Styles_getSupportedServiceNames() throw(); +OUString SchXMLExport_Styles_getImplementationName() throw(); +css::uno::Sequence<OUString> SchXMLExport_Styles_getSupportedServiceNames() throw(); /// @throws css::uno::Exception -css::uno::Reference<css::uno::XInterface> SAL_CALL SchXMLExport_Styles_createInstance( +css::uno::Reference<css::uno::XInterface> SchXMLExport_Styles_createInstance( css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr); -OUString SAL_CALL SchXMLExport_Content_getImplementationName() throw(); -css::uno::Sequence<OUString> SAL_CALL SchXMLExport_Content_getSupportedServiceNames() throw(); +OUString SchXMLExport_Content_getImplementationName() throw(); +css::uno::Sequence<OUString> SchXMLExport_Content_getSupportedServiceNames() throw(); /// @throws css::uno::Exception -css::uno::Reference<css::uno::XInterface> SAL_CALL SchXMLExport_Content_createInstance( +css::uno::Reference<css::uno::XInterface> SchXMLExport_Content_createInstance( css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr); // meta export OOo -OUString SAL_CALL XMLMetaExportOOO_getImplementationName() throw(); -css::uno::Sequence<OUString> SAL_CALL XMLMetaExportOOO_getSupportedServiceNames() throw(); +OUString XMLMetaExportOOO_getImplementationName() throw(); +css::uno::Sequence<OUString> XMLMetaExportOOO_getSupportedServiceNames() throw(); /// @throws css::uno::Exception -css::uno::Reference<css::uno::XInterface> SAL_CALL XMLMetaExportOOO_createInstance( +css::uno::Reference<css::uno::XInterface> XMLMetaExportOOO_createInstance( css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr); // writer autotext event export -OUString SAL_CALL XMLAutoTextEventExport_getImplementationName() throw(); -css::uno::Sequence<OUString> SAL_CALL XMLAutoTextEventExport_getSupportedServiceNames() throw(); +OUString XMLAutoTextEventExport_getImplementationName() throw(); +css::uno::Sequence<OUString> XMLAutoTextEventExport_getSupportedServiceNames() throw(); /// @throws css::uno::Exception -css::uno::Reference<css::uno::XInterface> SAL_CALL XMLAutoTextEventExport_createInstance( +css::uno::Reference<css::uno::XInterface> XMLAutoTextEventExport_createInstance( css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr); // writer autotext event import -OUString SAL_CALL XMLAutoTextEventImport_getImplementationName() throw(); -css::uno::Sequence<OUString> SAL_CALL XMLAutoTextEventImport_getSupportedServiceNames() throw(); +OUString XMLAutoTextEventImport_getImplementationName() throw(); +css::uno::Sequence<OUString> XMLAutoTextEventImport_getSupportedServiceNames() throw(); /// @throws css::uno::Exception -css::uno::Reference<css::uno::XInterface> SAL_CALL XMLAutoTextEventImport_createInstance( +css::uno::Reference<css::uno::XInterface> XMLAutoTextEventImport_createInstance( css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr); // writer autotext event export OOo -OUString SAL_CALL XMLAutoTextEventExportOOO_getImplementationName() throw(); -css::uno::Sequence<OUString> SAL_CALL XMLAutoTextEventExportOOO_getSupportedServiceNames() throw(); +OUString XMLAutoTextEventExportOOO_getImplementationName() throw(); +css::uno::Sequence<OUString> XMLAutoTextEventExportOOO_getSupportedServiceNames() throw(); /// @throws css::uno::Exception -css::uno::Reference<css::uno::XInterface> SAL_CALL XMLAutoTextEventExportOOO_createInstance( +css::uno::Reference<css::uno::XInterface> XMLAutoTextEventExportOOO_createInstance( css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr); #endif diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx index 0b9c79f38e32..b28ec1b60ff0 100644 --- a/xmloff/source/chart/SchXMLExport.cxx +++ b/xmloff/source/chart/SchXMLExport.cxx @@ -3673,34 +3673,34 @@ void SchXMLExportHelper_Impl::InitRangeSegmentationProperties( const Reference< // first version: everything goes in one storage -Sequence< OUString > SAL_CALL SchXMLExport_getSupportedServiceNames() throw() +Sequence< OUString > SchXMLExport_getSupportedServiceNames() throw() { return Sequence< OUString > { "com.sun.star.comp.Chart.XMLExporter" }; } -OUString SAL_CALL SchXMLExport_getImplementationName() throw() +OUString SchXMLExport_getImplementationName() throw() { return OUString( "SchXMLExport.Compact" ); } -Reference< uno::XInterface > SAL_CALL SchXMLExport_createInstance(const Reference< lang::XMultiServiceFactory > & rSMgr) +Reference< uno::XInterface > SchXMLExport_createInstance(const Reference< lang::XMultiServiceFactory > & rSMgr) { // #103997# removed some flags from EXPORT_ALL return static_cast<cppu::OWeakObject*>(new SchXMLExport( comphelper::getComponentContext(rSMgr), SchXMLExport_getImplementationName(), SvXMLExportFlags::ALL ^ ( SvXMLExportFlags::SETTINGS | SvXMLExportFlags::MASTERSTYLES | SvXMLExportFlags::SCRIPTS ))); } // Oasis format -Sequence< OUString > SAL_CALL SchXMLExport_Oasis_getSupportedServiceNames() throw() +Sequence< OUString > SchXMLExport_Oasis_getSupportedServiceNames() throw() { return Sequence< OUString > { "com.sun.star.comp.Chart.XMLOasisExporter" }; } -OUString SAL_CALL SchXMLExport_Oasis_getImplementationName() throw() +OUString SchXMLExport_Oasis_getImplementationName() throw() { return OUString( "SchXMLExport.Oasis.Compact" ); } -Reference< uno::XInterface > SAL_CALL SchXMLExport_Oasis_createInstance(const Reference< lang::XMultiServiceFactory > & rSMgr) +Reference< uno::XInterface > SchXMLExport_Oasis_createInstance(const Reference< lang::XMultiServiceFactory > & rSMgr) { // #103997# removed some flags from EXPORT_ALL return static_cast<cppu::OWeakObject*>(new SchXMLExport( comphelper::getComponentContext(rSMgr), @@ -3710,80 +3710,80 @@ Reference< uno::XInterface > SAL_CALL SchXMLExport_Oasis_createInstance(const Re // multiple storage version: one for content / styles / meta -Sequence< OUString > SAL_CALL SchXMLExport_Styles_getSupportedServiceNames() throw() +Sequence< OUString > SchXMLExport_Styles_getSupportedServiceNames() throw() { return Sequence< OUString > { "com.sun.star.comp.Chart.XMLStylesExporter" }; } -OUString SAL_CALL SchXMLExport_Styles_getImplementationName() throw() +OUString SchXMLExport_Styles_getImplementationName() throw() { return OUString( "SchXMLExport.Styles" ); } -Reference< uno::XInterface > SAL_CALL SchXMLExport_Styles_createInstance(const Reference< lang::XMultiServiceFactory >& rSMgr) +Reference< uno::XInterface > SchXMLExport_Styles_createInstance(const Reference< lang::XMultiServiceFactory >& rSMgr) { return static_cast<cppu::OWeakObject*>(new SchXMLExport( comphelper::getComponentContext(rSMgr), SchXMLExport_Styles_getImplementationName(), SvXMLExportFlags::STYLES )); } // Oasis format -Sequence< OUString > SAL_CALL SchXMLExport_Oasis_Styles_getSupportedServiceNames() throw() +Sequence< OUString > SchXMLExport_Oasis_Styles_getSupportedServiceNames() throw() { return Sequence< OUString > { "com.sun.star.comp.Chart.XMLOasisStylesExporter" }; } -OUString SAL_CALL SchXMLExport_Oasis_Styles_getImplementationName() throw() +OUString SchXMLExport_Oasis_Styles_getImplementationName() throw() { return OUString( "SchXMLExport.Oasis.Styles" ); } -Reference< uno::XInterface > SAL_CALL SchXMLExport_Oasis_Styles_createInstance(const Reference< lang::XMultiServiceFactory > & rSMgr) +Reference< uno::XInterface > SchXMLExport_Oasis_Styles_createInstance(const Reference< lang::XMultiServiceFactory > & rSMgr) { return static_cast<cppu::OWeakObject*>(new SchXMLExport( comphelper::getComponentContext(rSMgr), SchXMLExport_Oasis_Styles_getImplementationName(), SvXMLExportFlags::STYLES | SvXMLExportFlags::OASIS )); } -Sequence< OUString > SAL_CALL SchXMLExport_Content_getSupportedServiceNames() throw() +Sequence< OUString > SchXMLExport_Content_getSupportedServiceNames() throw() { return Sequence< OUString > { "com.sun.star.comp.Chart.XMLContentExporter" }; } -OUString SAL_CALL SchXMLExport_Content_getImplementationName() throw() +OUString SchXMLExport_Content_getImplementationName() throw() { return OUString( "SchXMLExport.Content" ); } -Reference< uno::XInterface > SAL_CALL SchXMLExport_Content_createInstance(const Reference< lang::XMultiServiceFactory > & rSMgr) +Reference< uno::XInterface > SchXMLExport_Content_createInstance(const Reference< lang::XMultiServiceFactory > & rSMgr) { return static_cast<cppu::OWeakObject*>(new SchXMLExport( comphelper::getComponentContext(rSMgr), SchXMLExport_Content_getImplementationName(), SvXMLExportFlags::AUTOSTYLES | SvXMLExportFlags::CONTENT | SvXMLExportFlags::FONTDECLS )); } // Oasis format -Sequence< OUString > SAL_CALL SchXMLExport_Oasis_Content_getSupportedServiceNames() throw() +Sequence< OUString > SchXMLExport_Oasis_Content_getSupportedServiceNames() throw() { return Sequence< OUString > { "com.sun.star.comp.Chart.XMLOasisContentExporter" }; } -OUString SAL_CALL SchXMLExport_Oasis_Content_getImplementationName() throw() +OUString SchXMLExport_Oasis_Content_getImplementationName() throw() { return OUString( "SchXMLExport.Oasis.Content" ); } -Reference< uno::XInterface > SAL_CALL SchXMLExport_Oasis_Content_createInstance(const Reference< lang::XMultiServiceFactory > & rSMgr) +Reference< uno::XInterface > SchXMLExport_Oasis_Content_createInstance(const Reference< lang::XMultiServiceFactory > & rSMgr) { return static_cast<cppu::OWeakObject*>(new SchXMLExport( comphelper::getComponentContext(rSMgr), SchXMLExport_Oasis_Content_getImplementationName(), SvXMLExportFlags::AUTOSTYLES | SvXMLExportFlags::CONTENT | SvXMLExportFlags::FONTDECLS | SvXMLExportFlags::OASIS )); } // Oasis format -Sequence< OUString > SAL_CALL SchXMLExport_Oasis_Meta_getSupportedServiceNames() throw() +Sequence< OUString > SchXMLExport_Oasis_Meta_getSupportedServiceNames() throw() { return Sequence< OUString > { "com.sun.star.comp.Chart.XMLOasisMetaExporter" }; } -OUString SAL_CALL SchXMLExport_Oasis_Meta_getImplementationName() throw() +OUString SchXMLExport_Oasis_Meta_getImplementationName() throw() { return OUString( "SchXMLExport.Oasis.Meta" ); } -Reference< uno::XInterface > SAL_CALL SchXMLExport_Oasis_Meta_createInstance(const Reference< lang::XMultiServiceFactory > & rSMgr) +Reference< uno::XInterface > SchXMLExport_Oasis_Meta_createInstance(const Reference< lang::XMultiServiceFactory > & rSMgr) { return static_cast<cppu::OWeakObject*>(new SchXMLExport( comphelper::getComponentContext(rSMgr), SchXMLExport_Oasis_Meta_getImplementationName(), SvXMLExportFlags::META | SvXMLExportFlags::OASIS )); } diff --git a/xmloff/source/chart/SchXMLImport.cxx b/xmloff/source/chart/SchXMLImport.cxx index b7dc42566ec3..b5f604b52d23 100644 --- a/xmloff/source/chart/SchXMLImport.cxx +++ b/xmloff/source/chart/SchXMLImport.cxx @@ -607,64 +607,64 @@ void SAL_CALL SchXMLImport::setTargetDocument(const uno::Reference<lang::XCompon // first version: everything comes from one storage -Sequence< OUString > SAL_CALL SchXMLImport_getSupportedServiceNames() throw() +Sequence< OUString > SchXMLImport_getSupportedServiceNames() throw() { return Sequence< OUString > { "com.sun.star.comp.Chart.XMLOasisImporter" }; } -OUString SAL_CALL SchXMLImport_getImplementationName() throw() +OUString SchXMLImport_getImplementationName() throw() { return OUString( "SchXMLImport" ); } -Reference< uno::XInterface > SAL_CALL SchXMLImport_createInstance(const Reference< lang::XMultiServiceFactory > & rSMgr) +Reference< uno::XInterface > SchXMLImport_createInstance(const Reference< lang::XMultiServiceFactory > & rSMgr) { return static_cast<cppu::OWeakObject*>(new SchXMLImport( comphelper::getComponentContext(rSMgr), SchXMLImport_getImplementationName(), SvXMLImportFlags::ALL)); } // multiple storage version: one for content / styles / meta -Sequence< OUString > SAL_CALL SchXMLImport_Styles_getSupportedServiceNames() throw() +Sequence< OUString > SchXMLImport_Styles_getSupportedServiceNames() throw() { return Sequence< OUString > { "com.sun.star.comp.Chart.XMLOasisStylesImporter" }; } -OUString SAL_CALL SchXMLImport_Styles_getImplementationName() throw() +OUString SchXMLImport_Styles_getImplementationName() throw() { return OUString( "SchXMLImport.Styles" ); } -Reference< uno::XInterface > SAL_CALL SchXMLImport_Styles_createInstance(const Reference< lang::XMultiServiceFactory > & rSMgr) +Reference< uno::XInterface > SchXMLImport_Styles_createInstance(const Reference< lang::XMultiServiceFactory > & rSMgr) { return static_cast<cppu::OWeakObject*>(new SchXMLImport( comphelper::getComponentContext(rSMgr), SchXMLImport_Styles_getImplementationName(), SvXMLImportFlags::STYLES )); } -Sequence< OUString > SAL_CALL SchXMLImport_Content_getSupportedServiceNames() throw() +Sequence< OUString > SchXMLImport_Content_getSupportedServiceNames() throw() { return Sequence< OUString > { "com.sun.star.comp.Chart.XMLOasisContentImporter" }; } -OUString SAL_CALL SchXMLImport_Content_getImplementationName() throw() +OUString SchXMLImport_Content_getImplementationName() throw() { return OUString( "SchXMLImport.Content" ); } -Reference< uno::XInterface > SAL_CALL SchXMLImport_Content_createInstance(const Reference< lang::XMultiServiceFactory > & rSMgr) +Reference< uno::XInterface > SchXMLImport_Content_createInstance(const Reference< lang::XMultiServiceFactory > & rSMgr) { return static_cast<cppu::OWeakObject*>(new SchXMLImport( comphelper::getComponentContext(rSMgr), SchXMLImport_Content_getImplementationName(), SvXMLImportFlags::CONTENT | SvXMLImportFlags::AUTOSTYLES | SvXMLImportFlags::FONTDECLS )); } -Sequence< OUString > SAL_CALL SchXMLImport_Meta_getSupportedServiceNames() throw() +Sequence< OUString > SchXMLImport_Meta_getSupportedServiceNames() throw() { return Sequence< OUString > { "com.sun.star.comp.Chart.XMLOasisMetaImporter" }; } -OUString SAL_CALL SchXMLImport_Meta_getImplementationName() throw() +OUString SchXMLImport_Meta_getImplementationName() throw() { return OUString( "SchXMLImport.Meta" ); } -Reference< uno::XInterface > SAL_CALL SchXMLImport_Meta_createInstance(const Reference< lang::XMultiServiceFactory > & rSMgr) +Reference< uno::XInterface > SchXMLImport_Meta_createInstance(const Reference< lang::XMultiServiceFactory > & rSMgr) { return static_cast<cppu::OWeakObject*>(new SchXMLImport( comphelper::getComponentContext(rSMgr), SchXMLImport_Meta_getImplementationName(), SvXMLImportFlags::META )); } diff --git a/xmloff/source/core/facreg.cxx b/xmloff/source/core/facreg.cxx index f38a2e2eb860..a1a5e909fa9d 100644 --- a/xmloff/source/core/facreg.cxx +++ b/xmloff/source/core/facreg.cxx @@ -44,7 +44,7 @@ extern "C" classname##_getSupportedServiceNames() );\ } -XMLOFF_DLLPUBLIC void * SAL_CALL xo_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) +XMLOFF_DLLPUBLIC void * xo_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) { void * pRet = nullptr; if( pServiceManager ) diff --git a/xmloff/source/draw/animationimport.cxx b/xmloff/source/draw/animationimport.cxx index 75553fa8a1cd..af8875e7056c 100644 --- a/xmloff/source/draw/animationimport.cxx +++ b/xmloff/source/draw/animationimport.cxx @@ -89,12 +89,12 @@ using ::com::sun::star::container::XEnumeration; using ::com::sun::star::lang::XMultiServiceFactory; using ::com::sun::star::lang::XInitialization; -Sequence< OUString > SAL_CALL AnimationsImport_getSupportedServiceNames() throw() +Sequence< OUString > AnimationsImport_getSupportedServiceNames() throw() { return Sequence< OUString > { "com.sun.star.comp.Xmloff.AnimationsImport" }; } -OUString SAL_CALL AnimationsImport_getImplementationName() throw() +OUString AnimationsImport_getImplementationName() throw() { return OUString( "xmloff::AnimationsImport" ); } @@ -1409,7 +1409,7 @@ void AnimationNodeContext::postProcessRootNode( const Reference< XAnimationNode } // namespace xmloff -Reference< XInterface > SAL_CALL AnimationsImport_createInstance(const Reference< XMultiServiceFactory > & rSMgr) +Reference< XInterface > AnimationsImport_createInstance(const Reference< XMultiServiceFactory > & rSMgr) { return static_cast<cppu::OWeakObject*>(new xmloff::AnimationsImport( comphelper::getComponentContext(rSMgr) )); } diff --git a/xmloff/source/meta/MetaExportComponent.cxx b/xmloff/source/meta/MetaExportComponent.cxx index db1ed653958f..ee5f5229bf48 100644 --- a/xmloff/source/meta/MetaExportComponent.cxx +++ b/xmloff/source/meta/MetaExportComponent.cxx @@ -176,13 +176,13 @@ void XMLMetaExportComponent::ExportAutoStyles_() {} void XMLMetaExportComponent::ExportMasterStyles_() {} void XMLMetaExportComponent::ExportContent_() {} -uno::Sequence< OUString > SAL_CALL XMLMetaExportOOO_getSupportedServiceNames() +uno::Sequence< OUString > XMLMetaExportOOO_getSupportedServiceNames() throw() { return uno::Sequence< OUString > { "com.sun.star.document.XMLMetaExporter" }; } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * XMLMetaExportComponent_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) @@ -190,12 +190,12 @@ XMLMetaExportComponent_get_implementation( return cppu::acquire(new XMLMetaExportComponent(context, "XMLMetaExportComponent", SvXMLExportFlags::META|SvXMLExportFlags::OASIS)); } -OUString SAL_CALL XMLMetaExportOOO_getImplementationName() throw() +OUString XMLMetaExportOOO_getImplementationName() throw() { return OUString( "XMLMetaExportOOo" ); } -uno::Reference< uno::XInterface > SAL_CALL XMLMetaExportOOO_createInstance( +uno::Reference< uno::XInterface > XMLMetaExportOOO_createInstance( const uno::Reference< lang::XMultiServiceFactory > & rSMgr) { return static_cast<cppu::OWeakObject*>(new XMLMetaExportComponent( comphelper::getComponentContext(rSMgr), XMLMetaExportOOO_getImplementationName(), SvXMLExportFlags::META)); diff --git a/xmloff/source/meta/MetaImportComponent.cxx b/xmloff/source/meta/MetaImportComponent.cxx index 2159916ad9cc..45756e5343b2 100644 --- a/xmloff/source/meta/MetaImportComponent.cxx +++ b/xmloff/source/meta/MetaImportComponent.cxx @@ -54,7 +54,7 @@ protected: // global functions to support the component -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * XMLMetaImportComponent_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) diff --git a/xmloff/source/meta/xmlversion.cxx b/xmloff/source/meta/xmlversion.cxx index 48104f58ff34..6aa6b7979e0a 100644 --- a/xmloff/source/meta/xmlversion.cxx +++ b/xmloff/source/meta/xmlversion.cxx @@ -443,7 +443,7 @@ XMLVersionListPersistence::getSupportedServiceNames() "com.sun.star.document.DocumentRevisionListPersistence"}; } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * XMLVersionListPersistence_get_implementation( css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) diff --git a/xmloff/source/text/XMLAutoTextEventExport.cxx b/xmloff/source/text/XMLAutoTextEventExport.cxx index 3066d047a30f..0853e44d78b4 100644 --- a/xmloff/source/text/XMLAutoTextEventExport.cxx +++ b/xmloff/source/text/XMLAutoTextEventExport.cxx @@ -202,19 +202,19 @@ void XMLAutoTextEventExport::ExportContent_() {} // methods to support the component registration -Sequence< OUString > SAL_CALL XMLAutoTextEventExport_getSupportedServiceNames() +Sequence< OUString > XMLAutoTextEventExport_getSupportedServiceNames() throw() { Sequence<OUString> aSeq { XMLAutoTextEventExport_getImplementationName() }; return aSeq; } -OUString SAL_CALL XMLAutoTextEventExport_getImplementationName() throw() +OUString XMLAutoTextEventExport_getImplementationName() throw() { return OUString( "com.sun.star.comp.Writer.XMLOasisAutotextEventsExporter" ); } -Reference< XInterface > SAL_CALL XMLAutoTextEventExport_createInstance( +Reference< XInterface > XMLAutoTextEventExport_createInstance( const Reference< XMultiServiceFactory > & rSMgr) { return static_cast<cppu::OWeakObject*>(new XMLAutoTextEventExport( comphelper::getComponentContext(rSMgr), XMLAutoTextEventExport_getImplementationName(), SvXMLExportFlags::ALL|SvXMLExportFlags::OASIS)); @@ -222,19 +222,19 @@ Reference< XInterface > SAL_CALL XMLAutoTextEventExport_createInstance( // methods to support the component registration -Sequence< OUString > SAL_CALL XMLAutoTextEventExportOOO_getSupportedServiceNames() +Sequence< OUString > XMLAutoTextEventExportOOO_getSupportedServiceNames() throw() { Sequence<OUString> aSeq { XMLAutoTextEventExportOOO_getImplementationName() }; return aSeq; } -OUString SAL_CALL XMLAutoTextEventExportOOO_getImplementationName() throw() +OUString XMLAutoTextEventExportOOO_getImplementationName() throw() { return OUString( "com.sun.star.comp.Writer.XMLAutotextEventsExporter" ); } -Reference< XInterface > SAL_CALL XMLAutoTextEventExportOOO_createInstance( +Reference< XInterface > XMLAutoTextEventExportOOO_createInstance( const Reference< XMultiServiceFactory > & rSMgr) { return static_cast<cppu::OWeakObject*>(new XMLAutoTextEventExport( comphelper::getComponentContext(rSMgr), XMLAutoTextEventExportOOO_getImplementationName(), SvXMLExportFlags::ALL)); diff --git a/xmloff/source/text/XMLAutoTextEventImport.cxx b/xmloff/source/text/XMLAutoTextEventImport.cxx index 285a8ca1d13b..2a21108b81b0 100644 --- a/xmloff/source/text/XMLAutoTextEventImport.cxx +++ b/xmloff/source/text/XMLAutoTextEventImport.cxx @@ -103,7 +103,7 @@ SvXMLImportContext* XMLAutoTextEventImport::CreateDocumentContext( } -Sequence< OUString > SAL_CALL +Sequence< OUString > XMLAutoTextEventImport_getSupportedServiceNames() throw() { @@ -111,12 +111,12 @@ Sequence< OUString > SAL_CALL return aSeq; } -OUString SAL_CALL XMLAutoTextEventImport_getImplementationName() throw() +OUString XMLAutoTextEventImport_getImplementationName() throw() { return OUString( "com.sun.star.comp.Writer.XMLOasisAutotextEventsImporter" ); } -Reference< XInterface > SAL_CALL XMLAutoTextEventImport_createInstance( +Reference< XInterface > XMLAutoTextEventImport_createInstance( const Reference< XMultiServiceFactory > & rSMgr) { return static_cast<cppu::OWeakObject*>(new XMLAutoTextEventImport( comphelper::getComponentContext(rSMgr) )); diff --git a/xmloff/source/transform/OOo2Oasis.cxx b/xmloff/source/transform/OOo2Oasis.cxx index 741cc56c9f43..6756fb50199d 100644 --- a/xmloff/source/transform/OOo2Oasis.cxx +++ b/xmloff/source/transform/OOo2Oasis.cxx @@ -1985,19 +1985,19 @@ Sequence< css::uno::Type > SAL_CALL // Service registration -OUString SAL_CALL OOo2OasisTransformer_getImplementationName() throw() +OUString OOo2OasisTransformer_getImplementationName() throw() { return OUString( "com.sun.star.comp.OOo2OasisTransformer" ); } -Sequence< OUString > SAL_CALL OOo2OasisTransformer_getSupportedServiceNames() throw() +Sequence< OUString > OOo2OasisTransformer_getSupportedServiceNames() throw() { const OUString aServiceName( OOo2OasisTransformer_getImplementationName() ); const Sequence< OUString > aSeq( &aServiceName, 1 ); return aSeq; } -Reference< XInterface > SAL_CALL OOo2OasisTransformer_createInstance( +Reference< XInterface > OOo2OasisTransformer_createInstance( const Reference< XMultiServiceFactory > & ) { return static_cast<cppu::OWeakObject*>(new OOo2OasisTransformer()); diff --git a/xmloff/source/transform/Oasis2OOo.cxx b/xmloff/source/transform/Oasis2OOo.cxx index 3c1d47121d8d..5a981090c6ff 100644 --- a/xmloff/source/transform/Oasis2OOo.cxx +++ b/xmloff/source/transform/Oasis2OOo.cxx @@ -1956,12 +1956,12 @@ Sequence< OUString > SAL_CALL Oasis2OOoTransformer::getSupportedServiceNames( ) // Service registration -OUString SAL_CALL Oasis2OOoTransformer_getImplementationName() throw() +OUString Oasis2OOoTransformer_getImplementationName() throw() { return OUString( "com.sun.star.comp.Oasis2OOoTransformer" ); } -Sequence< OUString > SAL_CALL Oasis2OOoTransformer_getSupportedServiceNames() +Sequence< OUString > Oasis2OOoTransformer_getSupportedServiceNames() throw() { const OUString aServiceName( Oasis2OOoTransformer_getImplementationName() ); @@ -1969,7 +1969,7 @@ Sequence< OUString > SAL_CALL Oasis2OOoTransformer_getSupportedServiceNames() return aSeq; } -Reference< XInterface > SAL_CALL Oasis2OOoTransformer_createInstance( +Reference< XInterface > Oasis2OOoTransformer_createInstance( const Reference< XMultiServiceFactory > &) { SAL_INFO("xmloff.transform", "Creating Oasis2OOoTransformer"); diff --git a/xmloff/source/transform/XMLFilterRegistration.cxx b/xmloff/source/transform/XMLFilterRegistration.cxx index 8e1fe66d1080..2c35501227b2 100644 --- a/xmloff/source/transform/XMLFilterRegistration.cxx +++ b/xmloff/source/transform/XMLFilterRegistration.cxx @@ -31,9 +31,9 @@ using namespace ::com::sun::star; namespace { - typedef OUString (SAL_CALL * GetImplementationName)(); - typedef uno::Sequence< OUString > (SAL_CALL * GetSupportedServiceNames)(); - typedef uno::Reference< ::uno::XInterface > (SAL_CALL * CreateInstance)( + typedef OUString (* GetImplementationName)(); + typedef uno::Sequence< OUString > (* GetSupportedServiceNames)(); + typedef uno::Reference< ::uno::XInterface > (* CreateInstance)( const uno::Reference< lang::XMultiServiceFactory >& ); struct ServiceDescriptor @@ -86,7 +86,7 @@ namespace extern "C" { -SAL_DLLPUBLIC_EXPORT void* SAL_CALL xof_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) +SAL_DLLPUBLIC_EXPORT void* xof_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) { void * pRet = nullptr; if( pServiceManager ) diff --git a/xmloff/source/transform/XMLFilterRegistration.hxx b/xmloff/source/transform/XMLFilterRegistration.hxx index 67747352c621..767bcfae4a7b 100644 --- a/xmloff/source/transform/XMLFilterRegistration.hxx +++ b/xmloff/source/transform/XMLFilterRegistration.hxx @@ -22,16 +22,16 @@ #include <sal/config.h> -OUString SAL_CALL OOo2OasisTransformer_getImplementationName() throw(); -css::uno::Sequence< OUString > SAL_CALL OOo2OasisTransformer_getSupportedServiceNames() throw(); +OUString OOo2OasisTransformer_getImplementationName() throw(); +css::uno::Sequence< OUString > OOo2OasisTransformer_getSupportedServiceNames() throw(); /// @throws css::uno::Exception -css::uno::Reference< css::uno::XInterface > SAL_CALL OOo2OasisTransformer_createInstance( +css::uno::Reference< css::uno::XInterface > OOo2OasisTransformer_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr ); -OUString SAL_CALL Oasis2OOoTransformer_getImplementationName() throw(); -css::uno::Sequence< OUString > SAL_CALL Oasis2OOoTransformer_getSupportedServiceNames() throw(); +OUString Oasis2OOoTransformer_getImplementationName() throw(); +css::uno::Sequence< OUString > Oasis2OOoTransformer_getSupportedServiceNames() throw(); /// @throws css::uno::Exception -css::uno::Reference< css::uno::XInterface > SAL_CALL Oasis2OOoTransformer_createInstance( +css::uno::Reference< css::uno::XInterface > Oasis2OOoTransformer_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr ); OUString SAL_CALL XMLAutoTextEventImportOOO_getImplementationName() throw(); diff --git a/xmlscript/source/inc/unoservices.hxx b/xmlscript/source/inc/unoservices.hxx index de330a74ad3e..32582d248c22 100644 --- a/xmlscript/source/inc/unoservices.hxx +++ b/xmlscript/source/inc/unoservices.hxx @@ -34,12 +34,12 @@ namespace com { namespace sun { namespace star { namespace uno { namespace xmlscript { -css::uno::Sequence<OUString> SAL_CALL +css::uno::Sequence<OUString> getSupportedServiceNames_DocumentHandlerImpl(); -OUString SAL_CALL getImplementationName_DocumentHandlerImpl(); +OUString getImplementationName_DocumentHandlerImpl(); -css::uno::Reference<css::uno::XInterface> SAL_CALL create_DocumentHandlerImpl( +css::uno::Reference<css::uno::XInterface> create_DocumentHandlerImpl( css::uno::Reference<css::uno::XComponentContext> const & xContext); } diff --git a/xmlscript/source/inc/xml_import.hxx b/xmlscript/source/inc/xml_import.hxx index 23f40fefba88..2ac4fb7d543d 100644 --- a/xmlscript/source/inc/xml_import.hxx +++ b/xmlscript/source/inc/xml_import.hxx @@ -46,7 +46,7 @@ namespace xmlscript document handler for parser */ css::uno::Reference< css::xml::sax::XDocumentHandler > -SAL_CALL createDocumentHandler( +createDocumentHandler( css::uno::Reference< css::xml::input::XRoot > const & xRoot ); diff --git a/xmlscript/source/misc/unoservices.cxx b/xmlscript/source/misc/unoservices.cxx index 00ca4d074b93..e6fce092b762 100644 --- a/xmlscript/source/misc/unoservices.cxx +++ b/xmlscript/source/misc/unoservices.cxx @@ -38,7 +38,7 @@ namespace xmlscript extern "C" { - SAL_DLLPUBLIC_EXPORT void * SAL_CALL xmlscript_component_getFactory( + SAL_DLLPUBLIC_EXPORT void * xmlscript_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { return ::cppu::component_getFactoryHelper( diff --git a/xmlscript/source/xml_helper/xml_byteseq.cxx b/xmlscript/source/xml_helper/xml_byteseq.cxx index 7948e1cf0d87..5291dfbd5187 100644 --- a/xmlscript/source/xml_helper/xml_byteseq.cxx +++ b/xmlscript/source/xml_helper/xml_byteseq.cxx @@ -122,12 +122,12 @@ void BSeqOutputStream::closeOutput() { } -Reference< io::XInputStream > SAL_CALL createInputStream( std::vector<sal_Int8> const & rInData ) +Reference< io::XInputStream > createInputStream( std::vector<sal_Int8> const & rInData ) { return new BSeqInputStream( rInData ); } -Reference< io::XInputStream > SAL_CALL createInputStream( const sal_Int8* pData, int len ) +Reference< io::XInputStream > createInputStream( const sal_Int8* pData, int len ) { std::vector<sal_Int8> rInData(len); if (len != 0) { @@ -136,7 +136,7 @@ Reference< io::XInputStream > SAL_CALL createInputStream( const sal_Int8* pData, return new BSeqInputStream( rInData ); } -Reference< io::XOutputStream > SAL_CALL createOutputStream( std::vector<sal_Int8> * pOutData ) +Reference< io::XOutputStream > createOutputStream( std::vector<sal_Int8> * pOutData ) { return new BSeqOutputStream( pOutData ); } diff --git a/xmlscript/source/xml_helper/xml_impctx.cxx b/xmlscript/source/xml_helper/xml_impctx.cxx index dbb32918d48c..48b3153228c6 100644 --- a/xmlscript/source/xml_helper/xml_impctx.cxx +++ b/xmlscript/source/xml_helper/xml_impctx.cxx @@ -702,7 +702,7 @@ OUString ExtendedAttributes::getValueByUidName( return OUString(); } -Reference< xml::sax::XDocumentHandler > SAL_CALL createDocumentHandler( +Reference< xml::sax::XDocumentHandler > createDocumentHandler( Reference< xml::input::XRoot > const & xRoot ) { SAL_WARN_IF( !xRoot.is(), "xmlscript.xmlhelper", "xRoot is NULL" ); @@ -714,7 +714,7 @@ Reference< xml::sax::XDocumentHandler > SAL_CALL createDocumentHandler( return Reference< xml::sax::XDocumentHandler >(); } -Reference< XInterface > SAL_CALL create_DocumentHandlerImpl( +Reference< XInterface > create_DocumentHandlerImpl( SAL_UNUSED_PARAMETER Reference< XComponentContext > const & ) { return static_cast< ::cppu::OWeakObject * >( diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_addfunc.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_addfunc.cxx index 68f63a8d3a25..24e5a4c3eb2f 100644 --- a/xmlscript/source/xmldlg_imexp/xmldlg_addfunc.cxx +++ b/xmlscript/source/xmldlg_imexp/xmldlg_addfunc.cxx @@ -53,7 +53,7 @@ uno::Reference< io::XInputStream > InputStreamProvider::createInputStream() return ::xmlscript::createInputStream( _bytes ); } -uno::Reference< io::XInputStreamProvider > SAL_CALL exportDialogModel( +uno::Reference< io::XInputStreamProvider > exportDialogModel( uno::Reference< container::XNameContainer > const & xDialogModel, uno::Reference< uno::XComponentContext > const & xContext, uno::Reference< XModel > const & xDocument ) @@ -69,7 +69,7 @@ uno::Reference< io::XInputStreamProvider > SAL_CALL exportDialogModel( return new InputStreamProvider( aBytes ); } -void SAL_CALL importDialogModel( +void importDialogModel( uno::Reference< io::XInputStream > const & xInput, uno::Reference< container::XNameContainer > const & xDialogModel, uno::Reference< uno::XComponentContext > const & xContext, diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx index 9dab7b525b9b..5d802a380d93 100644 --- a/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx +++ b/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx @@ -1352,7 +1352,7 @@ void StyleBag::dump( Reference< xml::sax::XExtendedDocumentHandler > const & xOu } } -void SAL_CALL exportDialogModel( +void exportDialogModel( Reference< xml::sax::XExtendedDocumentHandler > const & xOut, Reference< container::XNameContainer > const & xDialogModel, Reference< frame::XModel > const & xDocument ) diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx index bd937e7d3b3b..f0d6777d9534 100644 --- a/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx +++ b/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx @@ -1759,7 +1759,7 @@ Reference< xml::input::XElement > DialogImport::getStyle( return nullptr; } -Reference< xml::sax::XDocumentHandler > SAL_CALL importDialogModel( +Reference< xml::sax::XDocumentHandler > importDialogModel( Reference< container::XNameContainer > const & xDialogModel, Reference< XComponentContext > const & xContext, Reference< XModel > const & xDocument ) diff --git a/xmlscript/source/xmlflat_imexp/xmlbas_export.cxx b/xmlscript/source/xmlflat_imexp/xmlbas_export.cxx index b280f28ce8da..872f47a7e2df 100644 --- a/xmlscript/source/xmlflat_imexp/xmlbas_export.cxx +++ b/xmlscript/source/xmlflat_imexp/xmlbas_export.cxx @@ -382,7 +382,7 @@ sal_Bool XMLBasicExporterBase::filter( const Sequence< beans::PropertyValue >& / } // namespace xmlscript -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_xmlscript_XMLBasicExporter( css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) @@ -390,7 +390,7 @@ com_sun_star_comp_xmlscript_XMLBasicExporter( return cppu::acquire(new xmlscript::XMLBasicExporter()); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_xmlscript_XMLOasisBasicExporter( css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) diff --git a/xmlscript/source/xmlflat_imexp/xmlbas_import.cxx b/xmlscript/source/xmlflat_imexp/xmlbas_import.cxx index 61d0dabec521..9a143c6567e1 100644 --- a/xmlscript/source/xmlflat_imexp/xmlbas_import.cxx +++ b/xmlscript/source/xmlflat_imexp/xmlbas_import.cxx @@ -628,7 +628,7 @@ void BasicImport::setDocumentLocator( const Reference< xml::sax::XLocator >& /*x } // namespace xmlscript -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_xmlscript_XMLBasicImporter( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) @@ -636,7 +636,7 @@ com_sun_star_comp_xmlscript_XMLBasicImporter( return cppu::acquire(new xmlscript::XMLBasicImporter(context)); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_xmlscript_XMLOasisBasicImporter( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) diff --git a/xmlscript/source/xmllib_imexp/xmllib_export.cxx b/xmlscript/source/xmllib_imexp/xmllib_export.cxx index bb92579f4f5f..e2c73119a7d7 100644 --- a/xmlscript/source/xmllib_imexp/xmllib_export.cxx +++ b/xmlscript/source/xmllib_imexp/xmllib_export.cxx @@ -31,7 +31,7 @@ const char aTrueStr[] = "true"; const char aFalseStr[] = "false"; void -SAL_CALL exportLibraryContainer( +exportLibraryContainer( Reference< xml::sax::XWriter > const & xOut, const LibDescriptorArray* pLibArray ) { @@ -89,7 +89,7 @@ SAL_CALL exportLibraryContainer( } void -SAL_CALL exportLibrary( +exportLibrary( css::uno::Reference< css::xml::sax::XWriter > const & xOut, const LibDescriptor& rLib ) { diff --git a/xmlscript/source/xmllib_imexp/xmllib_import.cxx b/xmlscript/source/xmllib_imexp/xmllib_import.cxx index 5b216324273a..ea2de8523f48 100644 --- a/xmlscript/source/xmllib_imexp/xmllib_import.cxx +++ b/xmlscript/source/xmllib_imexp/xmllib_import.cxx @@ -230,14 +230,14 @@ void LibraryElement::endElement() } Reference< css::xml::sax::XDocumentHandler > -SAL_CALL importLibraryContainer( LibDescriptorArray* pLibArray ) +importLibraryContainer( LibDescriptorArray* pLibArray ) { return ::xmlscript::createDocumentHandler( static_cast< xml::input::XRoot * >( new LibraryImport( pLibArray ) ) ); } css::uno::Reference< css::xml::sax::XDocumentHandler > -SAL_CALL importLibrary( LibDescriptor& rLib ) +importLibrary( LibDescriptor& rLib ) { return ::xmlscript::createDocumentHandler( static_cast< xml::input::XRoot * >( new LibraryImport( &rLib ) ) ); diff --git a/xmlscript/source/xmlmod_imexp/xmlmod_export.cxx b/xmlscript/source/xmlmod_imexp/xmlmod_export.cxx index 38d6239055b5..a15ea963897a 100644 --- a/xmlscript/source/xmlmod_imexp/xmlmod_export.cxx +++ b/xmlscript/source/xmlmod_imexp/xmlmod_export.cxx @@ -27,7 +27,7 @@ namespace xmlscript { void -SAL_CALL exportScriptModule( +exportScriptModule( Reference< xml::sax::XWriter > const & xOut, const ModuleDescriptor& rMod ) { diff --git a/xmlscript/source/xmlmod_imexp/xmlmod_import.cxx b/xmlscript/source/xmlmod_imexp/xmlmod_import.cxx index b2a0ac4aa7e7..e34e6fc058a7 100644 --- a/xmlscript/source/xmlmod_imexp/xmlmod_import.cxx +++ b/xmlscript/source/xmlmod_imexp/xmlmod_import.cxx @@ -143,7 +143,7 @@ ModuleImport::~ModuleImport() } Reference< xml::sax::XDocumentHandler > -SAL_CALL importScriptModule( ModuleDescriptor& rMod ) +importScriptModule( ModuleDescriptor& rMod ) { return ::xmlscript::createDocumentHandler( static_cast< xml::input::XRoot * >( new ModuleImport( rMod ) ) ); diff --git a/xmlsecurity/inc/framework/saxeventkeeperimpl.hxx b/xmlsecurity/inc/framework/saxeventkeeperimpl.hxx index 89331ab0b427..9b6a8d472754 100644 --- a/xmlsecurity/inc/framework/saxeventkeeperimpl.hxx +++ b/xmlsecurity/inc/framework/saxeventkeeperimpl.hxx @@ -286,7 +286,7 @@ public: OUString SAXEventKeeperImpl_getImplementationName(); /// @throws css::uno::RuntimeException -css::uno::Sequence< OUString > SAL_CALL SAXEventKeeperImpl_getSupportedServiceNames( ); +css::uno::Sequence< OUString > SAXEventKeeperImpl_getSupportedServiceNames( ); #endif diff --git a/xmlsecurity/inc/framework/signaturecreatorimpl.hxx b/xmlsecurity/inc/framework/signaturecreatorimpl.hxx index 5e6d85169452..65e9c6a8ee1f 100644 --- a/xmlsecurity/inc/framework/signaturecreatorimpl.hxx +++ b/xmlsecurity/inc/framework/signaturecreatorimpl.hxx @@ -92,7 +92,7 @@ public: OUString SignatureCreatorImpl_getImplementationName(); /// @throws css::uno::RuntimeException -css::uno::Sequence< OUString > SAL_CALL SignatureCreatorImpl_getSupportedServiceNames( ); +css::uno::Sequence< OUString > SignatureCreatorImpl_getSupportedServiceNames( ); #endif diff --git a/xmlsecurity/inc/framework/signatureverifierimpl.hxx b/xmlsecurity/inc/framework/signatureverifierimpl.hxx index 3dbef1b9a501..a1bc82213fb8 100644 --- a/xmlsecurity/inc/framework/signatureverifierimpl.hxx +++ b/xmlsecurity/inc/framework/signatureverifierimpl.hxx @@ -85,7 +85,7 @@ public: OUString SignatureVerifierImpl_getImplementationName(); /// @throws css::uno::RuntimeException -css::uno::Sequence< OUString > SAL_CALL SignatureVerifierImpl_getSupportedServiceNames( ); +css::uno::Sequence< OUString > SignatureVerifierImpl_getSupportedServiceNames( ); #endif diff --git a/xmlsecurity/inc/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx b/xmlsecurity/inc/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx index e3d109f1993a..3140ce93587b 100644 --- a/xmlsecurity/inc/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx +++ b/xmlsecurity/inc/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx @@ -215,12 +215,12 @@ public: OUString XMLDocumentWrapper_XmlSecImpl_getImplementationName(); /// @throws css::uno::RuntimeException -css::uno::Sequence< OUString > SAL_CALL +css::uno::Sequence< OUString > XMLDocumentWrapper_XmlSecImpl_getSupportedServiceNames( ); /// @throws css::uno::Exception css::uno::Reference< css::uno::XInterface > -SAL_CALL XMLDocumentWrapper_XmlSecImpl_createInstance( +XMLDocumentWrapper_XmlSecImpl_createInstance( const css::uno::Reference< css::uno::XComponentContext > &); #endif diff --git a/xmlsecurity/inc/xmlsec/xmlelementwrapper_xmlsecimpl.hxx b/xmlsecurity/inc/xmlsec/xmlelementwrapper_xmlsecimpl.hxx index 04bc35c5bbb0..f9ab86b7cd92 100644 --- a/xmlsecurity/inc/xmlsec/xmlelementwrapper_xmlsecimpl.hxx +++ b/xmlsecurity/inc/xmlsec/xmlelementwrapper_xmlsecimpl.hxx @@ -86,11 +86,11 @@ public: OUString XMLElementWrapper_XmlSecImpl_getImplementationName(); /// @throws css::uno::RuntimeException -css::uno::Sequence< OUString > SAL_CALL XMLElementWrapper_XmlSecImpl_getSupportedServiceNames( ); +css::uno::Sequence< OUString > XMLElementWrapper_XmlSecImpl_getSupportedServiceNames( ); /// @throws css::uno::Exception css::uno::Reference< css::uno::XInterface > -SAL_CALL XMLElementWrapper_XmlSecImpl_createInstance( +XMLElementWrapper_XmlSecImpl_createInstance( const css::uno::Reference< css::uno::XComponentContext > &); #endif diff --git a/xmlsecurity/source/component/documentdigitalsignatures.hxx b/xmlsecurity/source/component/documentdigitalsignatures.hxx index 9ef24ab36e5e..4bb8de8ebf6d 100644 --- a/xmlsecurity/source/component/documentdigitalsignatures.hxx +++ b/xmlsecurity/source/component/documentdigitalsignatures.hxx @@ -111,7 +111,7 @@ public: }; /// @throws css::uno::Exception -css::uno::Reference< css::uno::XInterface > SAL_CALL DocumentDigitalSignatures_CreateInstance( +css::uno::Reference< css::uno::XInterface > DocumentDigitalSignatures_CreateInstance( const css::uno::Reference< css::uno::XComponentContext >& rCtx); #endif // INCLUDED_XMLSECURITY_SOURCE_COMPONENT_DOCUMENTDIGITALSIGNATURES_HXX diff --git a/xmlsecurity/source/component/registerservices.cxx b/xmlsecurity/source/component/registerservices.cxx index 24de5116abc9..1ee0290f22b2 100644 --- a/xmlsecurity/source/component/registerservices.cxx +++ b/xmlsecurity/source/component/registerservices.cxx @@ -30,7 +30,7 @@ using namespace ::com::sun::star::uno; extern "C" { -SAL_DLLPUBLIC_EXPORT void* SAL_CALL xmlsecurity_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) +SAL_DLLPUBLIC_EXPORT void* xmlsecurity_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) { void* pRet = nullptr; uno::Reference< XInterface > xFactory; diff --git a/xmlsecurity/source/framework/saxeventkeeperimpl.cxx b/xmlsecurity/source/framework/saxeventkeeperimpl.cxx index f082b452bad0..9ed84bb165fa 100644 --- a/xmlsecurity/source/framework/saxeventkeeperimpl.cxx +++ b/xmlsecurity/source/framework/saxeventkeeperimpl.cxx @@ -1169,7 +1169,7 @@ OUString SAXEventKeeperImpl_getImplementationName () return OUString ( IMPLEMENTATION_NAME ); } -cssu::Sequence< OUString > SAL_CALL SAXEventKeeperImpl_getSupportedServiceNames( ) +cssu::Sequence< OUString > SAXEventKeeperImpl_getSupportedServiceNames( ) { cssu::Sequence<OUString> aRet { "com.sun.star.xml.crypto.sax.SAXEventKeeper" }; return aRet; diff --git a/xmlsecurity/source/framework/signaturecreatorimpl.cxx b/xmlsecurity/source/framework/signaturecreatorimpl.cxx index 00e635667a16..953a8f6ea3bb 100644 --- a/xmlsecurity/source/framework/signaturecreatorimpl.cxx +++ b/xmlsecurity/source/framework/signaturecreatorimpl.cxx @@ -180,7 +180,7 @@ OUString SignatureCreatorImpl_getImplementationName () return OUString ( IMPLEMENTATION_NAME ); } -cssu::Sequence< OUString > SAL_CALL SignatureCreatorImpl_getSupportedServiceNames( ) +cssu::Sequence< OUString > SignatureCreatorImpl_getSupportedServiceNames( ) { cssu::Sequence<OUString> aRet { "com.sun.star.xml.crypto.sax.SignatureCreator" }; return aRet; diff --git a/xmlsecurity/source/framework/signatureverifierimpl.cxx b/xmlsecurity/source/framework/signatureverifierimpl.cxx index e861356a86f5..f6982ae88dc4 100644 --- a/xmlsecurity/source/framework/signatureverifierimpl.cxx +++ b/xmlsecurity/source/framework/signatureverifierimpl.cxx @@ -134,7 +134,7 @@ OUString SignatureVerifierImpl_getImplementationName () return OUString( IMPLEMENTATION_NAME ); } -cssu::Sequence< OUString > SAL_CALL SignatureVerifierImpl_getSupportedServiceNames( ) +cssu::Sequence< OUString > SignatureVerifierImpl_getSupportedServiceNames( ) { cssu::Sequence<OUString> aRet { "com.sun.star.xml.crypto.sax.SignatureVerifier" }; return aRet; diff --git a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx index 14722cb8b474..15b85566e201 100644 --- a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx +++ b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx @@ -469,13 +469,13 @@ OUString ONSSInitializer_getImplementationName () return OUString ( IMPLEMENTATION_NAME ); } -cssu::Sequence< OUString > SAL_CALL ONSSInitializer_getSupportedServiceNames( ) +cssu::Sequence< OUString > ONSSInitializer_getSupportedServiceNames( ) { cssu::Sequence<OUString> aRet { NSS_SERVICE_NAME }; return aRet; } -cssu::Reference< cssu::XInterface > SAL_CALL ONSSInitializer_createInstance( const cssu::Reference< cssl::XMultiServiceFactory > & rSMgr) +cssu::Reference< cssu::XInterface > ONSSInitializer_createInstance( const cssu::Reference< cssl::XMultiServiceFactory > & rSMgr) { return static_cast<cppu::OWeakObject*>(new ONSSInitializer( comphelper::getComponentContext(rSMgr) )); } diff --git a/xmlsecurity/source/xmlsec/nss/nssinitializer.hxx b/xmlsecurity/source/xmlsec/nss/nssinitializer.hxx index 9e07b6eda444..c018f5af4bb6 100644 --- a/xmlsecurity/source/xmlsec/nss/nssinitializer.hxx +++ b/xmlsecurity/source/xmlsec/nss/nssinitializer.hxx @@ -64,11 +64,11 @@ public: OUString ONSSInitializer_getImplementationName(); /// @throws css::uno::RuntimeException -css::uno::Sequence< OUString > SAL_CALL ONSSInitializer_getSupportedServiceNames(); +css::uno::Sequence< OUString > ONSSInitializer_getSupportedServiceNames(); /// @throws css::uno::Exception css::uno::Reference< css::uno::XInterface > -SAL_CALL ONSSInitializer_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr ); +ONSSInitializer_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr ); #endif diff --git a/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx index a45f34ee9714..19e92fc2113b 100644 --- a/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx +++ b/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx @@ -113,7 +113,7 @@ OUString SEInitializer_NssImpl_getImplementationName () return OUString ("com.sun.star.xml.security.bridge.xmlsec.SEInitializer_NssImpl" ); } -uno::Sequence< OUString > SAL_CALL SEInitializer_NssImpl_getSupportedServiceNames( ) +uno::Sequence< OUString > SEInitializer_NssImpl_getSupportedServiceNames( ) { uno::Sequence < OUString > aRet(2); OUString* pArray = aRet.getArray(); @@ -122,7 +122,7 @@ uno::Sequence< OUString > SAL_CALL SEInitializer_NssImpl_getSupportedServiceName return aRet; } -uno::Reference< uno::XInterface > SAL_CALL SEInitializer_NssImpl_createInstance( const uno::Reference< lang::XMultiServiceFactory > & rxMSF) +uno::Reference< uno::XInterface > SEInitializer_NssImpl_createInstance( const uno::Reference< lang::XMultiServiceFactory > & rxMSF) { return static_cast<cppu::OWeakObject*>(new SEInitializer_NssImpl(comphelper::getComponentContext(rxMSF))); } diff --git a/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.hxx index 29335e780bb4..03485e199408 100644 --- a/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.hxx +++ b/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.hxx @@ -58,11 +58,11 @@ public: OUString SEInitializer_NssImpl_getImplementationName(); /// @throws css::uno::RuntimeException -css::uno::Sequence< OUString > SAL_CALL SEInitializer_NssImpl_getSupportedServiceNames( ); +css::uno::Sequence< OUString > SEInitializer_NssImpl_getSupportedServiceNames( ); /// @throws css::uno::Exception css::uno::Reference< css::uno::XInterface > -SAL_CALL SEInitializer_NssImpl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & rxMSF); +SEInitializer_NssImpl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & rxMSF); #endif diff --git a/xmlsecurity/source/xmlsec/nss/xsec_nss.cxx b/xmlsecurity/source/xmlsec/nss/xsec_nss.cxx index 9e424a4e5d79..1776c8f86af7 100644 --- a/xmlsecurity/source/xmlsec/nss/xsec_nss.cxx +++ b/xmlsecurity/source/xmlsec/nss/xsec_nss.cxx @@ -38,7 +38,7 @@ using namespace ::com::sun::star::registry; extern "C" { -void* SAL_CALL nss_component_getFactory( const sal_Char* pImplName , void* pServiceManager , void* /*pRegistryKey*/ ) +void* nss_component_getFactory( const sal_Char* pImplName , void* pServiceManager , void* /*pRegistryKey*/ ) { void* pRet = nullptr; Reference< XSingleServiceFactory > xFactory ; diff --git a/xmlsecurity/source/xmlsec/serialnumberadapter.hxx b/xmlsecurity/source/xmlsec/serialnumberadapter.hxx index 2eb976afdced..e6ddc0dad1fa 100644 --- a/xmlsecurity/source/xmlsec/serialnumberadapter.hxx +++ b/xmlsecurity/source/xmlsec/serialnumberadapter.hxx @@ -33,7 +33,7 @@ namespace com { namespace sun { namespace star { namespace uno { namespace xml_security { namespace serial_number_adapter { -css::uno::Reference< css::uno::XInterface > SAL_CALL create( +css::uno::Reference< css::uno::XInterface > create( css::uno::Reference< css::uno::XComponentContext > const &); /// @throws css::uno::RuntimeException diff --git a/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx b/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx index 75da47627c18..42b749225f23 100644 --- a/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx +++ b/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx @@ -898,13 +898,13 @@ OUString XMLDocumentWrapper_XmlSecImpl_getImplementationName () return OUString ( IMPLEMENTATION_NAME ); } -cssu::Sequence< OUString > SAL_CALL XMLDocumentWrapper_XmlSecImpl_getSupportedServiceNames( ) +cssu::Sequence< OUString > XMLDocumentWrapper_XmlSecImpl_getSupportedServiceNames( ) { cssu::Sequence<OUString> aRet { "com.sun.star.xml.wrapper.XMLDocumentWrapper" }; return aRet; } -cssu::Reference< cssu::XInterface > SAL_CALL XMLDocumentWrapper_XmlSecImpl_createInstance( +cssu::Reference< cssu::XInterface > XMLDocumentWrapper_XmlSecImpl_createInstance( const cssu::Reference< cssu::XComponentContext > &) { return static_cast<cppu::OWeakObject*>(new XMLDocumentWrapper_XmlSecImpl( )); diff --git a/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx b/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx index b9e20e782120..76f9bd16d2c4 100644 --- a/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx +++ b/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx @@ -66,13 +66,13 @@ OUString XMLElementWrapper_XmlSecImpl_getImplementationName () return OUString ( IMPLEMENTATION_NAME ); } -cssu::Sequence< OUString > SAL_CALL XMLElementWrapper_XmlSecImpl_getSupportedServiceNames( ) +cssu::Sequence< OUString > XMLElementWrapper_XmlSecImpl_getSupportedServiceNames( ) { cssu::Sequence<OUString> aRet { "com.sun.star.xml.wrapper.XMLElementWrapper" }; return aRet; } -cssu::Reference< cssu::XInterface > SAL_CALL +cssu::Reference< cssu::XInterface > XMLElementWrapper_XmlSecImpl_createInstance( const cssu::Reference< cssu::XComponentContext > &) { diff --git a/xmlsecurity/source/xmlsec/xsec_xmlsec.cxx b/xmlsecurity/source/xmlsec/xsec_xmlsec.cxx index 296c1c847d49..edc0a3a6e97d 100644 --- a/xmlsecurity/source/xmlsec/xsec_xmlsec.cxx +++ b/xmlsecurity/source/xmlsec/xsec_xmlsec.cxx @@ -40,7 +40,7 @@ using namespace ::com::sun::star::lang; extern "C" { -SAL_DLLPUBLIC_EXPORT void* SAL_CALL xsec_xmlsec_component_getFactory( const sal_Char* pImplName , void* pServiceManager , void* pRegistryKey ) +SAL_DLLPUBLIC_EXPORT void* xsec_xmlsec_component_getFactory( const sal_Char* pImplName , void* pServiceManager , void* pRegistryKey ) { void* pRet = nullptr; Reference< XInterface > xFactory ; diff --git a/xmlsecurity/source/xmlsec/xsec_xmlsec.hxx b/xmlsecurity/source/xmlsec/xsec_xmlsec.hxx index 7db284869e56..5ecdf4e9de68 100644 --- a/xmlsecurity/source/xmlsec/xsec_xmlsec.hxx +++ b/xmlsecurity/source/xmlsec/xsec_xmlsec.hxx @@ -24,7 +24,7 @@ extern "C" { -void* SAL_CALL nss_component_getFactory( const sal_Char*, void*, void* ); +void* nss_component_getFactory( const sal_Char*, void*, void* ); #if defined( XMLSEC_CRYPTO_MSCRYPTO ) void* mscrypt_component_getFactory( const sal_Char*, void*, void* ); |