8 files changed, 8 insertions, 8 deletions
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 =