diff options
Diffstat (limited to 'ucb')
33 files changed, 38 insertions, 38 deletions
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; |