diff options
Diffstat (limited to 'connectivity')
39 files changed, 52 insertions, 52 deletions
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; |