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