diff options
Diffstat (limited to 'connectivity')
| -rw-r--r-- | connectivity/source/cpool/ZPoolCollection.cxx | 6 | ||||
| -rw-r--r-- | connectivity/source/cpool/ZPoolCollection.hxx | 6 | ||||
| -rw-r--r-- | connectivity/source/manager/mdrivermanager.cxx | 8 | ||||
| -rw-r--r-- | connectivity/source/manager/mdrivermanager.hxx | 8 |
4 files changed, 14 insertions, 14 deletions
diff --git a/connectivity/source/cpool/ZPoolCollection.cxx b/connectivity/source/cpool/ZPoolCollection.cxx index 313ee07246ef..1d86449a0386 100644 --- a/connectivity/source/cpool/ZPoolCollection.cxx +++ b/connectivity/source/cpool/ZPoolCollection.cxx @@ -149,19 +149,19 @@ Sequence< OUString > SAL_CALL OPoolCollection::getSupportedServiceNames( ) } //---------------------------------------OPoolCollection---------------------------------- -Reference< XInterface > SAL_CALL OPoolCollection::CreateInstance(const Reference< XMultiServiceFactory >& _rxFactory) +Reference< XInterface > OPoolCollection::CreateInstance(const Reference< XMultiServiceFactory >& _rxFactory) { return static_cast<XDriverManager*>(new OPoolCollection(comphelper::getComponentContext(_rxFactory))); } -OUString SAL_CALL OPoolCollection::getImplementationName_Static( ) +OUString OPoolCollection::getImplementationName_Static( ) { return OUString("com.sun.star.sdbc.OConnectionPool"); } -Sequence< OUString > SAL_CALL OPoolCollection::getSupportedServiceNames_Static( ) +Sequence< OUString > OPoolCollection::getSupportedServiceNames_Static( ) { Sequence< OUString > aSupported { "com.sun.star.sdbc.ConnectionPool" }; return aSupported; diff --git a/connectivity/source/cpool/ZPoolCollection.hxx b/connectivity/source/cpool/ZPoolCollection.hxx index 7e218a944e22..3f4a99369a2e 100644 --- a/connectivity/source/cpool/ZPoolCollection.hxx +++ b/connectivity/source/cpool/ZPoolCollection.hxx @@ -124,11 +124,11 @@ namespace connectivity virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; // XServiceInfo - static methods - static css::uno::Reference< css::uno::XInterface > SAL_CALL CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >&); + static css::uno::Reference< css::uno::XInterface > CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >&); /// @throws css::uno::RuntimeException - static OUString SAL_CALL getImplementationName_Static( ); + static OUString getImplementationName_Static( ); /// @throws css::uno::RuntimeException - static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_Static( ); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static( ); // XEventListener virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override; diff --git a/connectivity/source/manager/mdrivermanager.cxx b/connectivity/source/manager/mdrivermanager.cxx index e2a3d0ddf360..696bf3bcf911 100644 --- a/connectivity/source/manager/mdrivermanager.cxx +++ b/connectivity/source/manager/mdrivermanager.cxx @@ -520,26 +520,26 @@ Sequence< OUString > SAL_CALL OSDBCDriverManager::getSupportedServiceNames( ) } -Reference< XInterface > SAL_CALL OSDBCDriverManager::Create( const Reference< XMultiServiceFactory >& _rxFactory ) +Reference< XInterface > OSDBCDriverManager::Create( const Reference< XMultiServiceFactory >& _rxFactory ) { return *( new OSDBCDriverManager( comphelper::getComponentContext(_rxFactory) ) ); } -OUString SAL_CALL OSDBCDriverManager::getImplementationName_static( ) +OUString OSDBCDriverManager::getImplementationName_static( ) { return OUString("com.sun.star.comp.sdbc.OSDBCDriverManager"); } -Sequence< OUString > SAL_CALL OSDBCDriverManager::getSupportedServiceNames_static( ) +Sequence< OUString > OSDBCDriverManager::getSupportedServiceNames_static( ) { Sequence< OUString > aSupported { getSingletonName_static() }; return aSupported; } -OUString SAL_CALL OSDBCDriverManager::getSingletonName_static( ) +OUString OSDBCDriverManager::getSingletonName_static( ) { return OUString( "com.sun.star.sdbc.DriverManager" ); } diff --git a/connectivity/source/manager/mdrivermanager.hxx b/connectivity/source/manager/mdrivermanager.hxx index 51316a8425d1..ece23dcc0210 100644 --- a/connectivity/source/manager/mdrivermanager.hxx +++ b/connectivity/source/manager/mdrivermanager.hxx @@ -105,12 +105,12 @@ namespace drivermanager // XServiceInfo - static methods /// @throws css::uno::RuntimeException - static OUString SAL_CALL getImplementationName_static( ); + static OUString getImplementationName_static( ); /// @throws css::uno::RuntimeException - static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static( ); + static css::uno::Sequence< OUString > getSupportedServiceNames_static( ); /// @throws css::uno::RuntimeException - static OUString SAL_CALL getSingletonName_static( ); - static css::uno::Reference< css::uno::XInterface > SAL_CALL Create( const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxContext ); + static OUString getSingletonName_static( ); + static css::uno::Reference< css::uno::XInterface > Create( const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxContext ); // XNamingService virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getRegisteredObject( const OUString& Name ) override; |