diff options
177 files changed, 341 insertions, 358 deletions
diff --git a/comphelper/source/container/enumerablemap.cxx b/comphelper/source/container/enumerablemap.cxx index eb818d0f9c33..0d2e1483509b 100644 --- a/comphelper/source/container/enumerablemap.cxx +++ b/comphelper/source/container/enumerablemap.cxx @@ -185,9 +185,9 @@ namespace comphelper public: // XServiceInfo, static version (used for component registration) - static OUString SAL_CALL getImplementationName_static( ); - static Sequence< OUString > SAL_CALL getSupportedServiceNames_static( ); - static Reference< XInterface > SAL_CALL Create( const Reference< XComponentContext >& ); + static OUString getImplementationName_static( ); + static Sequence< OUString > getSupportedServiceNames_static( ); + static Reference< XInterface > Create( const Reference< XComponentContext >& ); private: void impl_initValues_throw( const Sequence< Pair< Any, Any > >& _initialValues ); @@ -659,20 +659,20 @@ namespace comphelper } - OUString SAL_CALL EnumerableMap::getImplementationName_static( ) + OUString EnumerableMap::getImplementationName_static( ) { return OUString( "org.openoffice.comp.comphelper.EnumerableMap" ); } - Sequence< OUString > SAL_CALL EnumerableMap::getSupportedServiceNames_static( ) + Sequence< OUString > EnumerableMap::getSupportedServiceNames_static( ) { Sequence< OUString > aServiceNames { "com.sun.star.container.EnumerableMap" }; return aServiceNames; } - Reference< XInterface > SAL_CALL EnumerableMap::Create( SAL_UNUSED_PARAMETER const Reference< XComponentContext >& ) + Reference< XInterface > EnumerableMap::Create( SAL_UNUSED_PARAMETER const Reference< XComponentContext >& ) { return *new EnumerableMap; } diff --git a/compilerplugins/clang/salcall.cxx b/compilerplugins/clang/salcall.cxx index f60eecf40e80..663c9c8f45b6 100644 --- a/compilerplugins/clang/salcall.cxx +++ b/compilerplugins/clang/salcall.cxx @@ -276,23 +276,6 @@ bool SalCall::VisitFunctionDecl(FunctionDecl const* decl) } } - // these often have their address taken - if (methodDecl && methodDecl->getIdentifier()) - { - auto name = methodDecl->getName(); - if (name == "getImplementationName_static" || name == "getSupportedServiceNames_static" - || name == "getSupportedServiceNames_Static" || name == "Create" || name == "create" - || name == "CreateInstance" || name == "getImplementationName_Static" - || name == "getSingletonName_static" || name == "getLdapUserProfileBeName" - || name == "getLdapUserProfileBeServiceNames" || name == "impl_staticCreateSelfInstance" - || name == "impl_createInstance" || name == "impl_staticGetImplementationName" - || name == "impl_staticGetSupportedServiceNames" - || name == "impl_getStaticSupportedServiceNames" - || name == "impl_getStaticImplementationName" || name == "getBackendName" - || name == "getBackendServiceNames") - return true; - } - bool bOK = rewrite(rewriteLoc); if (bOK && canonicalDecl != decl) { 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; diff --git a/dbaccess/source/core/inc/DatabaseDataProvider.hxx b/dbaccess/source/core/inc/DatabaseDataProvider.hxx index 70218008bb72..21616edaa3da 100644 --- a/dbaccess/source/core/inc/DatabaseDataProvider.hxx +++ b/dbaccess/source/core/inc/DatabaseDataProvider.hxx @@ -62,7 +62,7 @@ public: /// @throws css::uno::RuntimeException static OUString getImplementationName_Static(); static css::uno::Reference< css::uno::XInterface > - SAL_CALL Create(css::uno::Reference< css::uno::XComponentContext > const & context); + Create(css::uno::Reference< css::uno::XComponentContext > const & context); private: // css::uno::XInterface: diff --git a/dbaccess/source/core/inc/databasecontext.hxx b/dbaccess/source/core/inc/databasecontext.hxx index 3aac43f4ca9c..c69c35084e47 100644 --- a/dbaccess/source/core/inc/databasecontext.hxx +++ b/dbaccess/source/core/inc/databasecontext.hxx @@ -131,7 +131,7 @@ public: /// @throws css::uno::RuntimeException static OUString getImplementationName_static(); static css::uno::Reference< css::uno::XInterface > - SAL_CALL Create(const css::uno::Reference< css::uno::XComponentContext >&); + Create(const css::uno::Reference< css::uno::XComponentContext >&); // XElementAccess virtual css::uno::Type SAL_CALL getElementType( ) override; diff --git a/dbaccess/source/ext/macromigration/macromigrationwizard.cxx b/dbaccess/source/ext/macromigration/macromigrationwizard.cxx index 4cb72dce82df..fccd12968016 100644 --- a/dbaccess/source/ext/macromigration/macromigrationwizard.cxx +++ b/dbaccess/source/ext/macromigration/macromigrationwizard.cxx @@ -40,7 +40,7 @@ namespace dbmm } } - Reference< XInterface > SAL_CALL MacroMigrationDialogService::Create( const Reference< XComponentContext >& _rxContext ) + Reference< XInterface > MacroMigrationDialogService::Create( const Reference< XComponentContext >& _rxContext ) { return *(new MacroMigrationDialogService( _rxContext ) ); } @@ -55,12 +55,12 @@ namespace dbmm return css::uno::Sequence<sal_Int8>(); } - OUString SAL_CALL MacroMigrationDialogService::getImplementationName_static() + OUString MacroMigrationDialogService::getImplementationName_static() { return OUString( "com.sun.star.comp.dbaccess.macromigration.MacroMigrationDialogService" ); } - Sequence< OUString > SAL_CALL MacroMigrationDialogService::getSupportedServiceNames_static() + Sequence< OUString > MacroMigrationDialogService::getSupportedServiceNames_static() { Sequence< OUString > aServices { "com.sun.star.sdb.application.MacroMigrationWizard" }; return aServices; diff --git a/dbaccess/source/ext/macromigration/macromigrationwizard.hxx b/dbaccess/source/ext/macromigration/macromigrationwizard.hxx index 2da76f44f0e9..886239cde4de 100644 --- a/dbaccess/source/ext/macromigration/macromigrationwizard.hxx +++ b/dbaccess/source/ext/macromigration/macromigrationwizard.hxx @@ -77,11 +77,11 @@ namespace dbmm virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const override; // helper for factories - static Reference< XInterface > SAL_CALL Create( const Reference< XComponentContext >& _rxContext ); + static Reference< XInterface > Create( const Reference< XComponentContext >& _rxContext ); /// @throws RuntimeException - static OUString SAL_CALL getImplementationName_static(); + static OUString getImplementationName_static(); /// @throws RuntimeException - static Sequence< OUString > SAL_CALL getSupportedServiceNames_static(); + static Sequence< OUString > getSupportedServiceNames_static(); protected: virtual ~MacroMigrationDialogService() override; diff --git a/dbaccess/source/filter/xml/dbloader2.cxx b/dbaccess/source/filter/xml/dbloader2.cxx index d7c8f18af9f6..6de682c0ff6a 100644 --- a/dbaccess/source/filter/xml/dbloader2.cxx +++ b/dbaccess/source/filter/xml/dbloader2.cxx @@ -112,7 +112,7 @@ public: } static Sequence< OUString> getSupportedServiceNames_Static() throw( ); static css::uno::Reference< css::uno::XInterface > - SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&); + Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&); virtual OUString SAL_CALL detect( css::uno::Sequence< css::beans::PropertyValue >& Descriptor ) override; }; @@ -183,7 +183,7 @@ OUString SAL_CALL DBTypeDetection::detect( css::uno::Sequence< css::beans::Prope return OUString(); } -Reference< XInterface > SAL_CALL DBTypeDetection::Create( const Reference< XMultiServiceFactory > & rSMgr ) +Reference< XInterface > DBTypeDetection::Create( const Reference< XMultiServiceFactory > & rSMgr ) { return *(new DBTypeDetection( comphelper::getComponentContext(rSMgr) )); } @@ -247,7 +247,7 @@ public: } static Sequence< OUString > getSupportedServiceNames_Static() throw( ); static css::uno::Reference< css::uno::XInterface > - SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&); + Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&); // XLoader virtual void SAL_CALL load( const Reference< XFrame > & _rFrame, const OUString& _rURL, @@ -267,7 +267,7 @@ DBContentLoader::DBContentLoader(const Reference< XComponentContext >& _rxFactor } -Reference< XInterface > SAL_CALL DBContentLoader::Create( const Reference< XMultiServiceFactory > & rSMgr ) +Reference< XInterface > DBContentLoader::Create( const Reference< XMultiServiceFactory > & rSMgr ) { return *(new DBContentLoader( comphelper::getComponentContext(rSMgr) )); } diff --git a/dbaccess/source/filter/xml/xmlExport.cxx b/dbaccess/source/filter/xml/xmlExport.cxx index 1dbd082cd983..5c7bfb047e67 100644 --- a/dbaccess/source/filter/xml/xmlExport.cxx +++ b/dbaccess/source/filter/xml/xmlExport.cxx @@ -69,19 +69,19 @@ namespace dbaxml { public: /// @throws RuntimeException - static OUString SAL_CALL getImplementationName_Static( ); + static OUString getImplementationName_Static( ); /// @throws RuntimeException - static Sequence< OUString > SAL_CALL getSupportedServiceNames_Static( ); - static Reference< XInterface > SAL_CALL Create(const Reference< css::lang::XMultiServiceFactory >&); + static Sequence< OUString > getSupportedServiceNames_Static( ); + static Reference< XInterface > Create(const Reference< css::lang::XMultiServiceFactory >&); }; class ODBFullExportHelper { public: /// @throws RuntimeException - static OUString SAL_CALL getImplementationName_Static( ); + static OUString getImplementationName_Static( ); /// @throws RuntimeException - static Sequence< OUString > SAL_CALL getSupportedServiceNames_Static( ); - static Reference< XInterface > SAL_CALL Create(const Reference< css::lang::XMultiServiceFactory >&); + static Sequence< OUString > getSupportedServiceNames_Static( ); + static Reference< XInterface > Create(const Reference< css::lang::XMultiServiceFactory >&); }; } @@ -103,31 +103,31 @@ extern "C" void createRegistryInfo_OFullExport( ) namespace dbaxml { - Reference< XInterface > SAL_CALL ODBExportHelper::Create(const Reference< XMultiServiceFactory >& _rxORB) + Reference< XInterface > ODBExportHelper::Create(const Reference< XMultiServiceFactory >& _rxORB) { return static_cast< XServiceInfo* >(new ODBExport(comphelper::getComponentContext(_rxORB), getImplementationName_Static(), SvXMLExportFlags::SETTINGS | SvXMLExportFlags::PRETTY )); } - OUString SAL_CALL ODBExportHelper::getImplementationName_Static( ) + OUString ODBExportHelper::getImplementationName_Static( ) { return OUString("com.sun.star.comp.sdb.XMLSettingsExporter"); } - Sequence< OUString > SAL_CALL ODBExportHelper::getSupportedServiceNames_Static( ) + Sequence< OUString > ODBExportHelper::getSupportedServiceNames_Static( ) { Sequence< OUString > aSupported { "com.sun.star.document.ExportFilter" }; return aSupported; } - Reference< XInterface > SAL_CALL ODBFullExportHelper::Create(const Reference< XMultiServiceFactory >& _rxORB) + Reference< XInterface > ODBFullExportHelper::Create(const Reference< XMultiServiceFactory >& _rxORB) { return static_cast< XServiceInfo* >(new ODBExport(comphelper::getComponentContext(_rxORB), getImplementationName_Static(), SvXMLExportFlags::ALL)); } - OUString SAL_CALL ODBFullExportHelper::getImplementationName_Static( ) + OUString ODBFullExportHelper::getImplementationName_Static( ) { return OUString("com.sun.star.comp.sdb.XMLFullExporter"); } - Sequence< OUString > SAL_CALL ODBFullExportHelper::getSupportedServiceNames_Static( ) + Sequence< OUString > ODBFullExportHelper::getSupportedServiceNames_Static( ) { Sequence< OUString > aSupported { "com.sun.star.document.ExportFilter" }; return aSupported; @@ -260,7 +260,7 @@ css::uno::Sequence<OUString> ODBExport::getSupportedServiceNames_Static() } css::uno::Reference< css::uno::XInterface > - SAL_CALL ODBExport::Create(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxORB) + ODBExport::Create(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxORB) { return static_cast< XServiceInfo* >(new ODBExport( comphelper::getComponentContext(_rxORB), getImplementationName_Static())); } diff --git a/dbaccess/source/filter/xml/xmlExport.hxx b/dbaccess/source/filter/xml/xmlExport.hxx index 441974d8736c..1f357c201e14 100644 --- a/dbaccess/source/filter/xml/xmlExport.hxx +++ b/dbaccess/source/filter/xml/xmlExport.hxx @@ -172,13 +172,13 @@ public: ODBExport(const Reference< XComponentContext >& _rxContext, OUString const & implementationName, SvXMLExportFlags nExportFlag = SvXMLExportFlags::CONTENT | SvXMLExportFlags::AUTOSTYLES | SvXMLExportFlags::PRETTY | SvXMLExportFlags::FONTDECLS | SvXMLExportFlags::SCRIPTS ); /// @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 + static css::uno::Sequence<OUString> getSupportedServiceNames_Static(); - static css::uno::Reference<css::uno::XInterface> SAL_CALL Create( + static css::uno::Reference<css::uno::XInterface> Create( css::uno::Reference<css::lang::XMultiServiceFactory> const & _rxORB); rtl::Reference < XMLPropertySetMapper > const & GetColumnStylesPropertySetMapper() const; diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx b/dbaccess/source/filter/xml/xmlfilter.cxx index f3980dcdb810..8684012c47ac 100644 --- a/dbaccess/source/filter/xml/xmlfilter.cxx +++ b/dbaccess/source/filter/xml/xmlfilter.cxx @@ -239,7 +239,7 @@ css::uno::Sequence<OUString> ODBFilter::getSupportedServiceNames_Static() css::uno::Reference< css::uno::XInterface > - SAL_CALL ODBFilter::Create(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxORB) + ODBFilter::Create(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxORB) { return static_cast< XServiceInfo* >(new ODBFilter( comphelper::getComponentContext(_rxORB))); } diff --git a/dbaccess/source/filter/xml/xmlfilter.hxx b/dbaccess/source/filter/xml/xmlfilter.hxx index 9c8188ebb21b..896dbecc7bb0 100644 --- a/dbaccess/source/filter/xml/xmlfilter.hxx +++ b/dbaccess/source/filter/xml/xmlfilter.hxx @@ -112,13 +112,13 @@ public: virtual sal_Bool SAL_CALL filter( const Sequence< PropertyValue >& rDescriptor ) override; /// @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 + static css::uno::Sequence<OUString> getSupportedServiceNames_Static(); - static css::uno::Reference<css::uno::XInterface> SAL_CALL Create( + static css::uno::Reference<css::uno::XInterface> Create( css::uno::Reference<css::lang::XMultiServiceFactory> const & _rxORB); // helper class diff --git a/dbaccess/source/inc/apitools.hxx b/dbaccess/source/inc/apitools.hxx index aa31acc516d1..1a4c3a639c9c 100644 --- a/dbaccess/source/inc/apitools.hxx +++ b/dbaccess/source/inc/apitools.hxx @@ -71,7 +71,7 @@ public: { \ return getImplementationName_Static(); \ } \ - OUString SAL_CALL classname::getImplementationName_Static( ) \ + OUString classname::getImplementationName_Static( ) \ { \ return OUString(implasciiname); \ } \ @@ -93,7 +93,7 @@ public: { \ return getSupportedServiceNames_Static(); \ } \ - css::uno::Sequence< OUString > SAL_CALL classname::getSupportedServiceNames_Static( ) \ + css::uno::Sequence< OUString > classname::getSupportedServiceNames_Static( ) \ { \ css::uno::Sequence< OUString > aSupported { serviceasciiname }; \ return aSupported; \ @@ -104,7 +104,7 @@ public: { \ return getSupportedServiceNames_Static(); \ } \ - css::uno::Sequence< OUString > SAL_CALL classname::getSupportedServiceNames_Static( ) \ + css::uno::Sequence< OUString > classname::getSupportedServiceNames_Static( ) \ { \ css::uno::Sequence< OUString > aSupported(2); \ aSupported[0] = serviceasciiname1; \ @@ -135,7 +135,7 @@ public: IMPLEMENT_SERVICE_INFO_SUPPORTS(classname) \ IMPLEMENT_SERVICE_INFO_GETSUPPORTED2_STATIC(classname, serviceasciiname1,serviceasciiname2) \ css::uno::Reference< css::uno::XInterface > \ - SAL_CALL classname::Create(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxORB) \ + classname::Create(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxORB) \ { \ return static_cast< XServiceInfo* >(new classname(_rxORB)); \ } diff --git a/dbaccess/source/sdbtools/connection/connectiontools.cxx b/dbaccess/source/sdbtools/connection/connectiontools.cxx index 3b3cb04dc522..02b3f04522ee 100644 --- a/dbaccess/source/sdbtools/connection/connectiontools.cxx +++ b/dbaccess/source/sdbtools/connection/connectiontools.cxx @@ -106,18 +106,18 @@ namespace sdbtools return getSupportedServiceNames_static(); } - OUString SAL_CALL ConnectionTools::getImplementationName_static() + OUString ConnectionTools::getImplementationName_static() { return OUString( "com.sun.star.comp.dbaccess.ConnectionTools" ); } - Sequence< OUString > SAL_CALL ConnectionTools::getSupportedServiceNames_static() + Sequence< OUString > ConnectionTools::getSupportedServiceNames_static() { Sequence<OUString> aSupported { "com.sun.star.sdb.tools.ConnectionTools" }; return aSupported; } - Reference< XInterface > SAL_CALL ConnectionTools::Create(const Reference< XComponentContext >& _rxContext ) + Reference< XInterface > ConnectionTools::Create(const Reference< XComponentContext >& _rxContext ) { return *( new ConnectionTools( Reference<XComponentContext>( _rxContext ) ) ); } diff --git a/dbaccess/source/sdbtools/inc/connectiontools.hxx b/dbaccess/source/sdbtools/inc/connectiontools.hxx index b4b6b727a8cf..5e4837112b3f 100644 --- a/dbaccess/source/sdbtools/inc/connectiontools.hxx +++ b/dbaccess/source/sdbtools/inc/connectiontools.hxx @@ -63,9 +63,9 @@ namespace sdbtools virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // XServiceInfo - static versions - static OUString SAL_CALL getImplementationName_static(); - static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static(); - static css::uno::Reference< css::uno::XInterface > SAL_CALL + static OUString getImplementationName_static(); + static css::uno::Sequence< OUString > getSupportedServiceNames_static(); + static css::uno::Reference< css::uno::XInterface > Create(const css::uno::Reference< css::uno::XComponentContext >&); // XInitialization diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx index e181050ece55..099ec1bef8d1 100644 --- a/dbaccess/source/ui/app/AppController.cxx +++ b/dbaccess/source/ui/app/AppController.cxx @@ -177,7 +177,7 @@ Sequence< OUString> SAL_CALL OApplicationController::getSupportedServiceNames() return getSupportedServiceNames_Static(); } -Reference< XInterface > SAL_CALL OApplicationController::Create(const Reference<XMultiServiceFactory >& _rxFactory) +Reference< XInterface > OApplicationController::Create(const Reference<XMultiServiceFactory >& _rxFactory) { return *(new OApplicationController( comphelper::getComponentContext(_rxFactory))); } diff --git a/dbaccess/source/ui/app/AppController.hxx b/dbaccess/source/ui/app/AppController.hxx index 1daea6f5fd3f..9e40df4b2573 100644 --- a/dbaccess/source/ui/app/AppController.hxx +++ b/dbaccess/source/ui/app/AppController.hxx @@ -390,7 +390,7 @@ namespace dbaui /// @throws css::uno::RuntimeException static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); static css::uno::Reference< css::uno::XInterface > - SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&); + Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&); // css::frame::XController virtual void SAL_CALL attachFrame(const css::uno::Reference< css::frame::XFrame > & xFrame) override; diff --git a/dbaccess/source/ui/browser/dbloader.cxx b/dbaccess/source/ui/browser/dbloader.cxx index e4ce425cc3d0..fa8a4a1a8f97 100644 --- a/dbaccess/source/ui/browser/dbloader.cxx +++ b/dbaccess/source/ui/browser/dbloader.cxx @@ -85,7 +85,7 @@ public: } static Sequence< OUString> getSupportedServiceNames_Static() throw( ); static css::uno::Reference< css::uno::XInterface > - SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&); + Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&); // XLoader virtual void SAL_CALL load( const Reference< XFrame > & _rFrame, const OUString& _rURL, @@ -106,7 +106,7 @@ extern "C" void createRegistryInfo_DBContentLoader() static ::dbaui::OMultiInstanceAutoRegistration< DBContentLoader > aAutoRegistration; } -Reference< XInterface > SAL_CALL DBContentLoader::Create( const Reference< XMultiServiceFactory > & rSMgr ) +Reference< XInterface > DBContentLoader::Create( const Reference< XMultiServiceFactory > & rSMgr ) { return *(new DBContentLoader(comphelper::getComponentContext(rSMgr))); } diff --git a/dbaccess/source/ui/browser/exsrcbrw.cxx b/dbaccess/source/ui/browser/exsrcbrw.cxx index 2064f344e5cf..6c5b5d5dcc59 100644 --- a/dbaccess/source/ui/browser/exsrcbrw.cxx +++ b/dbaccess/source/ui/browser/exsrcbrw.cxx @@ -91,7 +91,7 @@ css::uno::Sequence<OUString> SbaExternalSourceBrowser::getSupportedServiceNames_ return aSupported; } -Reference< XInterface > SAL_CALL SbaExternalSourceBrowser::Create(const Reference<XMultiServiceFactory >& _rxFactory) +Reference< XInterface > SbaExternalSourceBrowser::Create(const Reference<XMultiServiceFactory >& _rxFactory) { return *(new SbaExternalSourceBrowser( comphelper::getComponentContext(_rxFactory))); } diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx index 2b534bc1cafa..2d5d39cab684 100644 --- a/dbaccess/source/ui/browser/sbagrid.cxx +++ b/dbaccess/source/ui/browser/sbagrid.cxx @@ -115,7 +115,7 @@ css::uno::Sequence<OUString> SAL_CALL SbaXGridControl::getSupportedServiceNames( return getSupportedServiceNames_Static(); } -Reference< XInterface > SAL_CALL SbaXGridControl::Create(const Reference<XMultiServiceFactory >& _rxFactory) +Reference< XInterface > SbaXGridControl::Create(const Reference<XMultiServiceFactory >& _rxFactory) { return *(new SbaXGridControl( comphelper::getComponentContext(_rxFactory) )); } diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx index a82590aeefe6..3f70fdb4e1b0 100644 --- a/dbaccess/source/ui/browser/unodatbr.cxx +++ b/dbaccess/source/ui/browser/unodatbr.cxx @@ -201,7 +201,7 @@ css::uno::Sequence<OUString> SbaTableQueryBrowser::getSupportedServiceNames_Stat return aSupported; } -Reference< XInterface > SAL_CALL SbaTableQueryBrowser::Create(const Reference<XMultiServiceFactory >& _rxFactory) +Reference< XInterface > SbaTableQueryBrowser::Create(const Reference<XMultiServiceFactory >& _rxFactory) { SolarMutexGuard aGuard; return *(new SbaTableQueryBrowser(comphelper::getComponentContext(_rxFactory))); diff --git a/dbaccess/source/ui/inc/RelationController.hxx b/dbaccess/source/ui/inc/RelationController.hxx index a779cb1757a7..35ab382c40fa 100644 --- a/dbaccess/source/ui/inc/RelationController.hxx +++ b/dbaccess/source/ui/inc/RelationController.hxx @@ -64,7 +64,7 @@ namespace dbaui /// @throws css::uno::RuntimeException static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); static css::uno::Reference< css::uno::XInterface > - SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&); + Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&); // OJoinController overridables virtual bool allowViews() const override; diff --git a/dbaccess/source/ui/inc/TableController.hxx b/dbaccess/source/ui/inc/TableController.hxx index add296253741..355d49f9e277 100644 --- a/dbaccess/source/ui/inc/TableController.hxx +++ b/dbaccess/source/ui/inc/TableController.hxx @@ -129,7 +129,7 @@ namespace dbaui /// @throws css::uno::RuntimeException static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); static css::uno::Reference< css::uno::XInterface > - SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&); + Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&); private: void startTableListening(); diff --git a/dbaccess/source/ui/inc/exsrcbrw.hxx b/dbaccess/source/ui/inc/exsrcbrw.hxx index 8c1442d1b7d2..12333d3ef434 100644 --- a/dbaccess/source/ui/inc/exsrcbrw.hxx +++ b/dbaccess/source/ui/inc/exsrcbrw.hxx @@ -48,7 +48,7 @@ namespace dbaui /// @throws css::uno::RuntimeException static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); static css::uno::Reference< css::uno::XInterface > - SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&); + Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&); // UNO DECLARE_UNO3_DEFAULTS(SbaExternalSourceBrowser, SbaXDataBrowserController) diff --git a/dbaccess/source/ui/inc/querycontroller.hxx b/dbaccess/source/ui/inc/querycontroller.hxx index ab24420b1d6f..6e99796fc474 100644 --- a/dbaccess/source/ui/inc/querycontroller.hxx +++ b/dbaccess/source/ui/inc/querycontroller.hxx @@ -180,7 +180,7 @@ namespace dbaui /// @throws css::uno::RuntimeException static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); static css::uno::Reference< css::uno::XInterface > - SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&); + Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&); // XController virtual css::uno::Any SAL_CALL getViewData() override; diff --git a/dbaccess/source/ui/inc/sbagrid.hxx b/dbaccess/source/ui/inc/sbagrid.hxx index 776933fd89aa..efaf68834f66 100644 --- a/dbaccess/source/ui/inc/sbagrid.hxx +++ b/dbaccess/source/ui/inc/sbagrid.hxx @@ -78,7 +78,7 @@ namespace dbaui /// @throws css::uno::RuntimeException static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); static css::uno::Reference< css::uno::XInterface > - SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&); + Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&); // css::frame::XDispatch virtual void SAL_CALL dispatch(const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& aArgs) override; diff --git a/dbaccess/source/ui/inc/unodatbr.hxx b/dbaccess/source/ui/inc/unodatbr.hxx index f41b0762d9e3..8f149a104722 100644 --- a/dbaccess/source/ui/inc/unodatbr.hxx +++ b/dbaccess/source/ui/inc/unodatbr.hxx @@ -142,7 +142,7 @@ namespace dbaui /// @throws css::uno::RuntimeException static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); static css::uno::Reference< css::uno::XInterface > - SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&); + Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&); DECLARE_UNO3_DEFAULTS(SbaTableQueryBrowser,SbaXDataBrowserController) // late construction diff --git a/dbaccess/source/ui/inc/unosqlmessage.hxx b/dbaccess/source/ui/inc/unosqlmessage.hxx index 650527dc9efc..6a38537ab82f 100644 --- a/dbaccess/source/ui/inc/unosqlmessage.hxx +++ b/dbaccess/source/ui/inc/unosqlmessage.hxx @@ -53,7 +53,7 @@ public: /// @throws css::uno::RuntimeException static OUString getImplementationName_Static(); static css::uno::Reference< css::uno::XInterface > - SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&); + Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&); // XPropertySet virtual css::uno::Reference<css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() override; diff --git a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx index d2bfb7348d50..7b572a7722f4 100644 --- a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx +++ b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx @@ -125,7 +125,7 @@ IMPLEMENT_SERVICE_INFO_SUPPORTS(LimitBoxController) IMPLEMENT_SERVICE_INFO_GETSUPPORTED1_STATIC(LimitBoxController, "com.sun.star.frame.ToolbarController") uno::Reference< uno::XInterface > - SAL_CALL LimitBoxController::Create(const uno::Reference< css::lang::XMultiServiceFactory >& _rxORB) + LimitBoxController::Create(const uno::Reference< css::lang::XMultiServiceFactory >& _rxORB) { return static_cast< XServiceInfo* >(new LimitBoxController( comphelper::getComponentContext(_rxORB) )); } diff --git a/dbaccess/source/ui/querydesign/limitboxcontroller.hxx b/dbaccess/source/ui/querydesign/limitboxcontroller.hxx index 3928509c1e6c..721b9cc56ef7 100644 --- a/dbaccess/source/ui/querydesign/limitboxcontroller.hxx +++ b/dbaccess/source/ui/querydesign/limitboxcontroller.hxx @@ -43,11 +43,11 @@ class LimitBoxController: public svt::ToolboxController, /// XServiceInfo DECLARE_SERVICE_INFO(); /// @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( ); static css::uno::Reference< css::uno::XInterface > - SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&); + Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&); /// XComponent virtual void SAL_CALL dispose() override; diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx index 4a4dc1f41436..aadc8f0fe7fa 100644 --- a/dbaccess/source/ui/querydesign/querycontroller.cxx +++ b/dbaccess/source/ui/querydesign/querycontroller.cxx @@ -124,7 +124,7 @@ namespace dbaui Sequence<OUString> aSupported { "com.sun.star.sdb.ViewDesign" }; return aSupported; } - static Reference< XInterface > SAL_CALL Create(const Reference< XMultiServiceFactory >& _rM) + static Reference< XInterface > Create(const Reference< XMultiServiceFactory >& _rM) { return *(new OViewController(comphelper::getComponentContext(_rM))); } @@ -299,7 +299,7 @@ Sequence< OUString> SAL_CALL OQueryController::getSupportedServiceNames() return getSupportedServiceNames_Static(); } -Reference< XInterface > SAL_CALL OQueryController::Create(const Reference<XMultiServiceFactory >& _rxFactory) +Reference< XInterface > OQueryController::Create(const Reference<XMultiServiceFactory >& _rxFactory) { return *(new OQueryController(comphelper::getComponentContext(_rxFactory))); } diff --git a/dbaccess/source/ui/relationdesign/RelationController.cxx b/dbaccess/source/ui/relationdesign/RelationController.cxx index 233ee361c776..3bb0804ae42b 100644 --- a/dbaccess/source/ui/relationdesign/RelationController.cxx +++ b/dbaccess/source/ui/relationdesign/RelationController.cxx @@ -114,7 +114,7 @@ Sequence< OUString> SAL_CALL ORelationController::getSupportedServiceNames() return getSupportedServiceNames_Static(); } -Reference< XInterface > SAL_CALL ORelationController::Create(const Reference<XMultiServiceFactory >& _rxFactory) +Reference< XInterface > ORelationController::Create(const Reference<XMultiServiceFactory >& _rxFactory) { return *(new ORelationController(comphelper::getComponentContext(_rxFactory))); } diff --git a/dbaccess/source/ui/tabledesign/TableController.cxx b/dbaccess/source/ui/tabledesign/TableController.cxx index 772bcb8bc27a..438497169b3f 100644 --- a/dbaccess/source/ui/tabledesign/TableController.cxx +++ b/dbaccess/source/ui/tabledesign/TableController.cxx @@ -128,7 +128,7 @@ Sequence< OUString> SAL_CALL OTableController::getSupportedServiceNames() return getSupportedServiceNames_Static(); } -Reference< XInterface > SAL_CALL OTableController::Create(const Reference<XMultiServiceFactory >& _rxFactory) +Reference< XInterface > OTableController::Create(const Reference<XMultiServiceFactory >& _rxFactory) { return *(new OTableController(comphelper::getComponentContext(_rxFactory))); } diff --git a/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx b/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx index f82b414af681..8a2bd3e88a84 100644 --- a/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx +++ b/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx @@ -55,7 +55,7 @@ namespace dbaui /// @throws css::uno::RuntimeException static OUString getImplementationName_Static(); static css::uno::Reference< css::uno::XInterface > - SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&); + Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&); // XPropertySet virtual css::uno::Reference< css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() override; @@ -77,7 +77,7 @@ namespace dbaui return css::uno::Sequence<sal_Int8>(); } - Reference< XInterface > SAL_CALL OAdvancedSettingsDialog::Create(const Reference< XMultiServiceFactory >& _rxFactory) + Reference< XInterface > OAdvancedSettingsDialog::Create(const Reference< XMultiServiceFactory >& _rxFactory) { return *(new OAdvancedSettingsDialog( comphelper::getComponentContext(_rxFactory) )); } diff --git a/dbaccess/source/ui/uno/ColumnControl.cxx b/dbaccess/source/ui/uno/ColumnControl.cxx index 720f0e40075c..859b100579f7 100644 --- a/dbaccess/source/ui/uno/ColumnControl.cxx +++ b/dbaccess/source/ui/uno/ColumnControl.cxx @@ -48,7 +48,7 @@ IMPLEMENT_SERVICE_INFO_IMPLNAME_STATIC(OColumnControl, SERVICE_CONTROLDEFAULT) IMPLEMENT_SERVICE_INFO_SUPPORTS(OColumnControl) IMPLEMENT_SERVICE_INFO_GETSUPPORTED2_STATIC(OColumnControl, "com.sun.star.awt.UnoControl","com.sun.star.sdb.ColumnDescriptorControl") -Reference< XInterface > SAL_CALL OColumnControl::Create(const Reference< XMultiServiceFactory >& _rxORB) +Reference< XInterface > OColumnControl::Create(const Reference< XMultiServiceFactory >& _rxORB) { return static_cast< XServiceInfo* >(new OColumnControl(comphelper::getComponentContext(_rxORB))); } diff --git a/dbaccess/source/ui/uno/ColumnControl.hxx b/dbaccess/source/ui/uno/ColumnControl.hxx index 39e7f89247fa..1c0f7ffbfdbb 100644 --- a/dbaccess/source/ui/uno/ColumnControl.hxx +++ b/dbaccess/source/ui/uno/ColumnControl.hxx @@ -41,11 +41,11 @@ namespace dbaui // XServiceInfo DECLARE_SERVICE_INFO(); /// @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( ); static css::uno::Reference< css::uno::XInterface > - SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&); + Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&); // css::awt::XControl virtual void SAL_CALL createPeer(const css::uno::Reference< css::awt::XToolkit >& _rToolkit, const css::uno::Reference< css::awt::XWindowPeer >& Parent) override; diff --git a/dbaccess/source/ui/uno/ColumnModel.hxx b/dbaccess/source/ui/uno/ColumnModel.hxx index 400805e091be..705f9166376d 100644 --- a/dbaccess/source/ui/uno/ColumnModel.hxx +++ b/dbaccess/source/ui/uno/ColumnModel.hxx @@ -75,11 +75,11 @@ public: // css::lang::XServiceInfo DECLARE_SERVICE_INFO(); /// @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( ); static css::uno::Reference< css::uno::XInterface > - SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&); + Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&); virtual css::uno::Sequence<css::uno::Type> SAL_CALL getTypes() override; virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId() override; diff --git a/dbaccess/source/ui/uno/DBTypeWizDlg.cxx b/dbaccess/source/ui/uno/DBTypeWizDlg.cxx index 355708d80624..fa119a03fd2c 100644 --- a/dbaccess/source/ui/uno/DBTypeWizDlg.cxx +++ b/dbaccess/source/ui/uno/DBTypeWizDlg.cxx @@ -47,7 +47,7 @@ Sequence<sal_Int8> SAL_CALL ODBTypeWizDialog::getImplementationId( ) return css::uno::Sequence<sal_Int8>(); } -Reference< XInterface > SAL_CALL ODBTypeWizDialog::Create(const Reference< XMultiServiceFactory >& _rxFactory) +Reference< XInterface > ODBTypeWizDialog::Create(const Reference< XMultiServiceFactory >& _rxFactory) { return *(new ODBTypeWizDialog( comphelper::getComponentContext(_rxFactory) )); } diff --git a/dbaccess/source/ui/uno/DBTypeWizDlg.hxx b/dbaccess/source/ui/uno/DBTypeWizDlg.hxx index d0fc12e261b1..a13e569b1f87 100644 --- a/dbaccess/source/ui/uno/DBTypeWizDlg.hxx +++ b/dbaccess/source/ui/uno/DBTypeWizDlg.hxx @@ -45,7 +45,7 @@ public: /// @throws css::uno::RuntimeException static OUString getImplementationName_Static(); static css::uno::Reference< css::uno::XInterface > - SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&); + Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&); // XPropertySet virtual css::uno::Reference< css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() override; diff --git a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx index d13cb0827cf7..35ea9b85292c 100644 --- a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx +++ b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx @@ -61,7 +61,7 @@ Sequence<sal_Int8> SAL_CALL ODBTypeWizDialogSetup::getImplementationId( ) return css::uno::Sequence<sal_Int8>(); } -Reference< XInterface > SAL_CALL ODBTypeWizDialogSetup::Create(const Reference< XMultiServiceFactory >& _rxFactory) +Reference< XInterface > ODBTypeWizDialogSetup::Create(const Reference< XMultiServiceFactory >& _rxFactory) { Reference < XInterface > xDBWizard = *(new ODBTypeWizDialogSetup( comphelper::getComponentContext(_rxFactory) )); return xDBWizard; diff --git a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx index 12f81aad6232..9c8be2e76b8c 100644 --- a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx +++ b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx @@ -47,7 +47,7 @@ public: /// @throws css::uno::RuntimeException static OUString getImplementationName_Static(); static css::uno::Reference< css::uno::XInterface > - SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&); + Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&); // XPropertySet virtual css::uno::Reference< css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() override; diff --git a/dbaccess/source/ui/uno/TableFilterDlg.cxx b/dbaccess/source/ui/uno/TableFilterDlg.cxx index c5420fa10a49..dc3462871a0d 100644 --- a/dbaccess/source/ui/uno/TableFilterDlg.cxx +++ b/dbaccess/source/ui/uno/TableFilterDlg.cxx @@ -47,7 +47,7 @@ Sequence<sal_Int8> SAL_CALL OTableFilterDialog::getImplementationId( ) return css::uno::Sequence<sal_Int8>(); } -Reference< XInterface > SAL_CALL OTableFilterDialog::Create(const Reference< XMultiServiceFactory >& _rxFactory) +Reference< XInterface > OTableFilterDialog::Create(const Reference< XMultiServiceFactory >& _rxFactory) { return *(new OTableFilterDialog( comphelper::getComponentContext(_rxFactory) )); } diff --git a/dbaccess/source/ui/uno/TableFilterDlg.hxx b/dbaccess/source/ui/uno/TableFilterDlg.hxx index 114698dab832..3faf9dde83a1 100644 --- a/dbaccess/source/ui/uno/TableFilterDlg.hxx +++ b/dbaccess/source/ui/uno/TableFilterDlg.hxx @@ -46,7 +46,7 @@ public: /// @throws css::uno::RuntimeException static OUString getImplementationName_Static(); static css::uno::Reference< css::uno::XInterface > - SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&); + Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&); // XPropertySet virtual css::uno::Reference< css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() override; diff --git a/dbaccess/source/ui/uno/UserSettingsDlg.cxx b/dbaccess/source/ui/uno/UserSettingsDlg.cxx index e340956961bb..ce7be4598215 100644 --- a/dbaccess/source/ui/uno/UserSettingsDlg.cxx +++ b/dbaccess/source/ui/uno/UserSettingsDlg.cxx @@ -47,7 +47,7 @@ Sequence<sal_Int8> SAL_CALL OUserSettingsDialog::getImplementationId( ) return css::uno::Sequence<sal_Int8>(); } -Reference< XInterface > SAL_CALL OUserSettingsDialog::Create(const Reference< XMultiServiceFactory >& _rxFactory) +Reference< XInterface > OUserSettingsDialog::Create(const Reference< XMultiServiceFactory >& _rxFactory) { return *(new OUserSettingsDialog( comphelper::getComponentContext(_rxFactory) )); } diff --git a/dbaccess/source/ui/uno/UserSettingsDlg.hxx b/dbaccess/source/ui/uno/UserSettingsDlg.hxx index 75aba227b0ca..931d1c77a701 100644 --- a/dbaccess/source/ui/uno/UserSettingsDlg.hxx +++ b/dbaccess/source/ui/uno/UserSettingsDlg.hxx @@ -46,7 +46,7 @@ public: /// @throws css::uno::RuntimeException static OUString getImplementationName_Static(); static css::uno::Reference< css::uno::XInterface > - SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&); + Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&); // XPropertySet virtual css::uno::Reference< css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() override; diff --git a/dbaccess/source/ui/uno/admindlg.cxx b/dbaccess/source/ui/uno/admindlg.cxx index 530cd12f7b81..e5ac2b416a4b 100644 --- a/dbaccess/source/ui/uno/admindlg.cxx +++ b/dbaccess/source/ui/uno/admindlg.cxx @@ -47,7 +47,7 @@ Sequence<sal_Int8> SAL_CALL ODataSourcePropertyDialog::getImplementationId( ) return css::uno::Sequence<sal_Int8>(); } -Reference< XInterface > SAL_CALL ODataSourcePropertyDialog::Create(const Reference< XMultiServiceFactory >& _rxFactory) +Reference< XInterface > ODataSourcePropertyDialog::Create(const Reference< XMultiServiceFactory >& _rxFactory) { return *(new ODataSourcePropertyDialog( comphelper::getComponentContext(_rxFactory) )); } diff --git a/dbaccess/source/ui/uno/admindlg.hxx b/dbaccess/source/ui/uno/admindlg.hxx index f2941fe3a00c..38b2bf632c3e 100644 --- a/dbaccess/source/ui/uno/admindlg.hxx +++ b/dbaccess/source/ui/uno/admindlg.hxx @@ -45,7 +45,7 @@ public: /// @throws css::uno::RuntimeException static OUString getImplementationName_Static(); static css::uno::Reference< css::uno::XInterface > - SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&); + Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&); // XPropertySet virtual css::uno::Reference< css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() override; diff --git a/dbaccess/source/ui/uno/composerdialogs.cxx b/dbaccess/source/ui/uno/composerdialogs.cxx index 5b2aa150563b..0af4b19d97ee 100644 --- a/dbaccess/source/ui/uno/composerdialogs.cxx +++ b/dbaccess/source/ui/uno/composerdialogs.cxx @@ -134,7 +134,7 @@ namespace dbaui IMPLEMENT_SERVICE_INFO_GETSUPPORTED1_STATIC(RowsetFilterDialog, "com.sun.star.sdb.FilterDialog") css::uno::Reference< css::uno::XInterface > - SAL_CALL RowsetFilterDialog::Create(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxORB) + RowsetFilterDialog::Create(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxORB) { return static_cast< XServiceInfo* >(new RowsetFilterDialog( comphelper::getComponentContext(_rxORB))); } @@ -182,7 +182,7 @@ namespace dbaui IMPLEMENT_SERVICE_INFO_GETSUPPORTED1_STATIC(RowsetOrderDialog, "com.sun.star.sdb.OrderDialog") css::uno::Reference< css::uno::XInterface > - SAL_CALL RowsetOrderDialog::Create(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxORB) + RowsetOrderDialog::Create(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxORB) { return static_cast< XServiceInfo* >(new RowsetOrderDialog( comphelper::getComponentContext(_rxORB))); } diff --git a/dbaccess/source/ui/uno/composerdialogs.hxx b/dbaccess/source/ui/uno/composerdialogs.hxx index 3238db70f1a5..7647a1f4d5b6 100644 --- a/dbaccess/source/ui/uno/composerdialogs.hxx +++ b/dbaccess/source/ui/uno/composerdialogs.hxx @@ -81,11 +81,11 @@ namespace dbaui DECLARE_SERVICE_INFO(); /// @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( ); static css::uno::Reference< css::uno::XInterface > - SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&); + Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&); protected: // own overridables @@ -111,11 +111,11 @@ namespace dbaui DECLARE_SERVICE_INFO(); /// @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( ); static css::uno::Reference< css::uno::XInterface > - SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&); + Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&); protected: // own overridables diff --git a/dbaccess/source/ui/uno/dbinteraction.cxx b/dbaccess/source/ui/uno/dbinteraction.cxx index b6371ad59eb8..1aac50fbf4f6 100644 --- a/dbaccess/source/ui/uno/dbinteraction.cxx +++ b/dbaccess/source/ui/uno/dbinteraction.cxx @@ -341,7 +341,7 @@ namespace dbaui IMPLEMENT_SERVICE_INFO_GETSUPPORTED1_STATIC(SQLExceptionInteractionHandler, "com.sun.star.sdb.DatabaseInteractionHandler") Reference< XInterface > - SAL_CALL SQLExceptionInteractionHandler::Create(const Reference< XMultiServiceFactory >& _rxORB) + SQLExceptionInteractionHandler::Create(const Reference< XMultiServiceFactory >& _rxORB) { return static_cast< XServiceInfo* >(new SQLExceptionInteractionHandler(comphelper::getComponentContext(_rxORB))); } @@ -352,7 +352,7 @@ namespace dbaui IMPLEMENT_SERVICE_INFO_GETSUPPORTED1_STATIC(LegacyInteractionHandler, "com.sun.star.sdb.InteractionHandler") Reference< XInterface > - SAL_CALL LegacyInteractionHandler::Create(const Reference< XMultiServiceFactory >& _rxORB) + LegacyInteractionHandler::Create(const Reference< XMultiServiceFactory >& _rxORB) { return static_cast< XServiceInfo* >(new LegacyInteractionHandler(comphelper::getComponentContext(_rxORB))); } diff --git a/dbaccess/source/ui/uno/dbinteraction.hxx b/dbaccess/source/ui/uno/dbinteraction.hxx index 09e59ca95349..19fa98b88369 100644 --- a/dbaccess/source/ui/uno/dbinteraction.hxx +++ b/dbaccess/source/ui/uno/dbinteraction.hxx @@ -134,11 +134,11 @@ namespace dbaui // XServiceInfo DECLARE_SERVICE_INFO(); /// @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( ); static css::uno::Reference< css::uno::XInterface > - SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&); + Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&); }; // SQLExceptionInteractionHandler @@ -168,11 +168,11 @@ namespace dbaui // XServiceInfo DECLARE_SERVICE_INFO(); /// @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( ); static css::uno::Reference< css::uno::XInterface > - SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&); + Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&); }; } // namespace dbaui diff --git a/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx b/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx index 4c4034334b0f..609ad0362747 100644 --- a/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx +++ b/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx @@ -74,11 +74,11 @@ namespace dbaui DECLARE_SERVICE_INFO(); /// @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( ); static css::uno::Reference< css::uno::XInterface > - SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&); + Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&); DECLARE_PROPERTYCONTAINER_DEFAULTS( ); virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) override; @@ -131,7 +131,7 @@ namespace dbaui IMPLEMENT_SERVICE_INFO_GETSUPPORTED1_STATIC(OTextConnectionSettingsDialog, "com.sun.star.sdb.TextConnectionSettings") css::uno::Reference< css::uno::XInterface > - SAL_CALL OTextConnectionSettingsDialog::Create(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxORB) + OTextConnectionSettingsDialog::Create(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxORB) { return static_cast< XServiceInfo* >(new OTextConnectionSettingsDialog( comphelper::getComponentContext(_rxORB))); } diff --git a/dbaccess/source/ui/uno/unoDirectSql.cxx b/dbaccess/source/ui/uno/unoDirectSql.cxx index 5f7163dc7d88..56723e7a1f95 100644 --- a/dbaccess/source/ui/uno/unoDirectSql.cxx +++ b/dbaccess/source/ui/uno/unoDirectSql.cxx @@ -70,7 +70,7 @@ namespace dbaui IMPLEMENT_SERVICE_INFO_GETSUPPORTED1_STATIC(ODirectSQLDialog, SERVICE_SDB_DIRECTSQLDIALOG) css::uno::Reference< css::uno::XInterface > - SAL_CALL ODirectSQLDialog::Create(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxORB) + ODirectSQLDialog::Create(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxORB) { return static_cast< XServiceInfo* >(new ODirectSQLDialog( comphelper::getComponentContext(_rxORB))); } diff --git a/dbaccess/source/ui/uno/unoDirectSql.hxx b/dbaccess/source/ui/uno/unoDirectSql.hxx index a6f7b827b570..c0e2a63b914a 100644 --- a/dbaccess/source/ui/uno/unoDirectSql.hxx +++ b/dbaccess/source/ui/uno/unoDirectSql.hxx @@ -51,11 +51,11 @@ namespace dbaui DECLARE_SERVICE_INFO(); /// @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( ); static css::uno::Reference< css::uno::XInterface > - SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&); + Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&); DECLARE_PROPERTYCONTAINER_DEFAULTS( ); diff --git a/dbaccess/source/ui/uno/unosqlmessage.cxx b/dbaccess/source/ui/uno/unosqlmessage.cxx index 8b01455fdd11..a9f9791cc316 100644 --- a/dbaccess/source/ui/uno/unosqlmessage.cxx +++ b/dbaccess/source/ui/uno/unosqlmessage.cxx @@ -60,7 +60,7 @@ Sequence<sal_Int8> SAL_CALL OSQLMessageDialog::getImplementationId( ) return css::uno::Sequence<sal_Int8>(); } -Reference< XInterface > SAL_CALL OSQLMessageDialog::Create(const Reference< XMultiServiceFactory >& _rxFactory) +Reference< XInterface > OSQLMessageDialog::Create(const Reference< XMultiServiceFactory >& _rxFactory) { return *(new OSQLMessageDialog( comphelper::getComponentContext(_rxFactory) )); } diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx index 9f744e3270a0..82a90486bc65 100644 --- a/editeng/source/uno/unotext.cxx +++ b/editeng/source/uno/unotext.cxx @@ -1465,7 +1465,7 @@ uno::Sequence< OUString > SAL_CALL SvxUnoTextRangeBase::getSupportedServiceNames return getSupportedServiceNames_Static(); } -uno::Sequence< OUString > SAL_CALL SvxUnoTextRangeBase::getSupportedServiceNames_Static() +uno::Sequence< OUString > SvxUnoTextRangeBase::getSupportedServiceNames_Static() { uno::Sequence< OUString > aSeq(3); aSeq[0] = "com.sun.star.style.CharacterProperties"; diff --git a/embeddedobj/source/commonembedding/xfactory.cxx b/embeddedobj/source/commonembedding/xfactory.cxx index 8dea70f16ca5..6fdb9e925144 100644 --- a/embeddedobj/source/commonembedding/xfactory.cxx +++ b/embeddedobj/source/commonembedding/xfactory.cxx @@ -36,7 +36,7 @@ using namespace ::com::sun::star; -uno::Sequence< OUString > SAL_CALL OOoEmbeddedObjectFactory::impl_staticGetSupportedServiceNames() +uno::Sequence< OUString > OOoEmbeddedObjectFactory::impl_staticGetSupportedServiceNames() { uno::Sequence< OUString > aRet(2); aRet[0] = "com.sun.star.embed.OOoEmbeddedObjectFactory"; @@ -44,12 +44,12 @@ uno::Sequence< OUString > SAL_CALL OOoEmbeddedObjectFactory::impl_staticGetSuppo return aRet; } -OUString SAL_CALL OOoEmbeddedObjectFactory::impl_staticGetImplementationName() +OUString OOoEmbeddedObjectFactory::impl_staticGetImplementationName() { return OUString("com.sun.star.comp.embed.OOoEmbeddedObjectFactory"); } -uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::impl_staticCreateSelfInstance( +uno::Reference< uno::XInterface > OOoEmbeddedObjectFactory::impl_staticCreateSelfInstance( const uno::Reference< lang::XMultiServiceFactory >& xServiceManager ) { return uno::Reference< uno::XInterface >( *new OOoEmbeddedObjectFactory( comphelper::getComponentContext(xServiceManager) ) ); @@ -385,7 +385,7 @@ uno::Sequence< OUString > SAL_CALL OOoEmbeddedObjectFactory::getSupportedService return impl_staticGetSupportedServiceNames(); } -uno::Sequence< OUString > SAL_CALL OOoSpecialEmbeddedObjectFactory::impl_staticGetSupportedServiceNames() +uno::Sequence< OUString > OOoSpecialEmbeddedObjectFactory::impl_staticGetSupportedServiceNames() { uno::Sequence< OUString > aRet(2); aRet[0] = "com.sun.star.embed.OOoSpecialEmbeddedObjectFactory"; @@ -393,12 +393,12 @@ uno::Sequence< OUString > SAL_CALL OOoSpecialEmbeddedObjectFactory::impl_staticG return aRet; } -OUString SAL_CALL OOoSpecialEmbeddedObjectFactory::impl_staticGetImplementationName() +OUString OOoSpecialEmbeddedObjectFactory::impl_staticGetImplementationName() { return OUString("com.sun.star.comp.embed.OOoSpecialEmbeddedObjectFactory"); } -uno::Reference< uno::XInterface > SAL_CALL OOoSpecialEmbeddedObjectFactory::impl_staticCreateSelfInstance( +uno::Reference< uno::XInterface > OOoSpecialEmbeddedObjectFactory::impl_staticCreateSelfInstance( const uno::Reference< lang::XMultiServiceFactory >& xServiceManager ) { return uno::Reference< uno::XInterface >( *new OOoSpecialEmbeddedObjectFactory( comphelper::getComponentContext(xServiceManager) ) ); diff --git a/embeddedobj/source/commonembedding/xfactory.hxx b/embeddedobj/source/commonembedding/xfactory.hxx index 951de92170c3..48bef30ea79d 100644 --- a/embeddedobj/source/commonembedding/xfactory.hxx +++ b/embeddedobj/source/commonembedding/xfactory.hxx @@ -45,11 +45,11 @@ public: OSL_ENSURE( rxContext.is(), "No service manager is provided!" ); } - static css::uno::Sequence< OUString > SAL_CALL impl_staticGetSupportedServiceNames(); + static css::uno::Sequence< OUString > impl_staticGetSupportedServiceNames(); - static OUString SAL_CALL impl_staticGetImplementationName(); + static OUString impl_staticGetImplementationName(); - static css::uno::Reference< css::uno::XInterface > SAL_CALL + static css::uno::Reference< css::uno::XInterface > impl_staticCreateSelfInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ); @@ -92,11 +92,11 @@ public: OSL_ENSURE( rxContext.is(), "No service manager is provided!" ); } - static css::uno::Sequence< OUString > SAL_CALL impl_staticGetSupportedServiceNames(); + static css::uno::Sequence< OUString > impl_staticGetSupportedServiceNames(); - static OUString SAL_CALL impl_staticGetImplementationName(); + static OUString impl_staticGetImplementationName(); - static css::uno::Reference< css::uno::XInterface > SAL_CALL + static css::uno::Reference< css::uno::XInterface > impl_staticCreateSelfInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ); diff --git a/embeddedobj/source/general/xcreator.cxx b/embeddedobj/source/general/xcreator.cxx index 492e02b4a7b4..54d8476d5471 100644 --- a/embeddedobj/source/general/xcreator.cxx +++ b/embeddedobj/source/general/xcreator.cxx @@ -40,7 +40,7 @@ using namespace ::com::sun::star; -uno::Sequence< OUString > SAL_CALL UNOEmbeddedObjectCreator::impl_staticGetSupportedServiceNames() +uno::Sequence< OUString > UNOEmbeddedObjectCreator::impl_staticGetSupportedServiceNames() { uno::Sequence< OUString > aRet(2); aRet[0] = "com.sun.star.embed.EmbeddedObjectCreator"; @@ -49,13 +49,13 @@ uno::Sequence< OUString > SAL_CALL UNOEmbeddedObjectCreator::impl_staticGetSuppo } -OUString SAL_CALL UNOEmbeddedObjectCreator::impl_staticGetImplementationName() +OUString UNOEmbeddedObjectCreator::impl_staticGetImplementationName() { return OUString("com.sun.star.comp.embed.EmbeddedObjectCreator"); } -uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::impl_staticCreateSelfInstance( +uno::Reference< uno::XInterface > UNOEmbeddedObjectCreator::impl_staticCreateSelfInstance( const uno::Reference< lang::XMultiServiceFactory >& xServiceManager ) { return uno::Reference< uno::XInterface >( *new UNOEmbeddedObjectCreator( comphelper::getComponentContext(xServiceManager) ) ); diff --git a/embeddedobj/source/inc/xcreator.hxx b/embeddedobj/source/inc/xcreator.hxx index 23bc62b282e3..3c0118fde37f 100644 --- a/embeddedobj/source/inc/xcreator.hxx +++ b/embeddedobj/source/inc/xcreator.hxx @@ -43,11 +43,11 @@ public: OSL_ENSURE( rxContext.is(), "No service manager is provided!" ); } - static css::uno::Sequence< OUString > SAL_CALL impl_staticGetSupportedServiceNames(); + static css::uno::Sequence< OUString > impl_staticGetSupportedServiceNames(); - static OUString SAL_CALL impl_staticGetImplementationName(); + static OUString impl_staticGetImplementationName(); - static css::uno::Reference< css::uno::XInterface > SAL_CALL + static css::uno::Reference< css::uno::XInterface > impl_staticCreateSelfInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ); diff --git a/embeddedobj/source/msole/xolefactory.cxx b/embeddedobj/source/msole/xolefactory.cxx index 9ddf028ae4f1..9049cf024db0 100644 --- a/embeddedobj/source/msole/xolefactory.cxx +++ b/embeddedobj/source/msole/xolefactory.cxx @@ -35,7 +35,7 @@ using namespace ::com::sun::star; // TODO: do not create OLE objects that represent OOo documents -uno::Sequence< OUString > SAL_CALL OleEmbeddedObjectFactory::impl_staticGetSupportedServiceNames() +uno::Sequence< OUString > OleEmbeddedObjectFactory::impl_staticGetSupportedServiceNames() { uno::Sequence< OUString > aRet(2); aRet[0] = "com.sun.star.embed.OLEEmbeddedObjectFactory"; @@ -44,13 +44,13 @@ uno::Sequence< OUString > SAL_CALL OleEmbeddedObjectFactory::impl_staticGetSuppo } -OUString SAL_CALL OleEmbeddedObjectFactory::impl_staticGetImplementationName() +OUString OleEmbeddedObjectFactory::impl_staticGetImplementationName() { return OUString("com.sun.star.comp.embed.OLEEmbeddedObjectFactory"); } -uno::Reference< uno::XInterface > SAL_CALL OleEmbeddedObjectFactory::impl_staticCreateSelfInstance( +uno::Reference< uno::XInterface > OleEmbeddedObjectFactory::impl_staticCreateSelfInstance( const uno::Reference< lang::XMultiServiceFactory >& xServiceManager ) { return uno::Reference< uno::XInterface >( *new OleEmbeddedObjectFactory( xServiceManager ) ); diff --git a/embeddedobj/source/msole/xolefactory.hxx b/embeddedobj/source/msole/xolefactory.hxx index bff4ed6c6d5e..bd58f1080fc7 100644 --- a/embeddedobj/source/msole/xolefactory.hxx +++ b/embeddedobj/source/msole/xolefactory.hxx @@ -42,11 +42,11 @@ public: OSL_ENSURE( xFactory.is(), "No service manager is provided!" ); } - static css::uno::Sequence< OUString > SAL_CALL impl_staticGetSupportedServiceNames(); + static css::uno::Sequence< OUString > impl_staticGetSupportedServiceNames(); - static OUString SAL_CALL impl_staticGetImplementationName(); + static OUString impl_staticGetImplementationName(); - static css::uno::Reference< css::uno::XInterface > SAL_CALL + static css::uno::Reference< css::uno::XInterface > impl_staticCreateSelfInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ); diff --git a/eventattacher/source/eventattacher.cxx b/eventattacher/source/eventattacher.cxx index aad3cce70981..758189f65307 100644 --- a/eventattacher/source/eventattacher.cxx +++ b/eventattacher/source/eventattacher.cxx @@ -207,7 +207,7 @@ public: virtual OUString SAL_CALL getImplementationName( ) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; - static Sequence< OUString > SAL_CALL getSupportedServiceNames_Static( ); + static Sequence< OUString > getSupportedServiceNames_Static( ); // XInitialization virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) override; @@ -301,7 +301,7 @@ Sequence<OUString> SAL_CALL EventAttacherImpl::getSupportedServiceNames( ) } -Sequence<OUString> SAL_CALL EventAttacherImpl::getSupportedServiceNames_Static( ) +Sequence<OUString> EventAttacherImpl::getSupportedServiceNames_Static( ) { OUString aStr( SERVICENAME ); return Sequence< OUString >( &aStr, 1 ); diff --git a/extensions/source/bibliography/bibload.cxx b/extensions/source/bibliography/bibload.cxx index bcc2c0be4f6c..0f20d8bf4694 100644 --- a/extensions/source/bibliography/bibload.cxx +++ b/extensions/source/bibliography/bibload.cxx @@ -125,7 +125,7 @@ public: virtual void SAL_CALL addVetoableChangeListener(const OUString& PropertyName, const Reference< XVetoableChangeListener > & aListener) override; virtual void SAL_CALL removeVetoableChangeListener(const OUString& PropertyName, const Reference< XVetoableChangeListener > & aListener) override; - static Sequence<OUString> SAL_CALL getSupportedServiceNames_Static() throw( ); + static Sequence<OUString> getSupportedServiceNames_Static() throw( ); /// @throws Exception friend Reference< XInterface > BibliographyLoader_CreateInstance( const Reference< XMultiServiceFactory > & rSMgr ); diff --git a/extensions/source/config/ldap/ldapuserprofilebe.cxx b/extensions/source/config/ldap/ldapuserprofilebe.cxx index a9ce79ebefce..00fdf01e22df 100644 --- a/extensions/source/config/ldap/ldapuserprofilebe.cxx +++ b/extensions/source/config/ldap/ldapuserprofilebe.cxx @@ -201,7 +201,7 @@ css::uno::Any LdapUserProfileBe::getPropertyValue( } -OUString SAL_CALL LdapUserProfileBe::getLdapUserProfileBeName() { +OUString LdapUserProfileBe::getLdapUserProfileBeName() { return OUString("com.sun.star.comp.configuration.backend.LdapUserProfileBe"); } @@ -212,7 +212,7 @@ OUString SAL_CALL LdapUserProfileBe::getImplementationName() } -uno::Sequence<OUString> SAL_CALL LdapUserProfileBe::getLdapUserProfileBeServiceNames() +uno::Sequence<OUString> LdapUserProfileBe::getLdapUserProfileBeServiceNames() { uno::Sequence<OUString> aServices { "com.sun.star.configuration.backend.LdapUserProfileBe" }; return aServices ; diff --git a/extensions/source/config/ldap/ldapuserprofilebe.hxx b/extensions/source/config/ldap/ldapuserprofilebe.hxx index 5cca247809b2..235511cd2986 100644 --- a/extensions/source/config/ldap/ldapuserprofilebe.hxx +++ b/extensions/source/config/ldap/ldapuserprofilebe.hxx @@ -102,12 +102,12 @@ class LdapUserProfileBe : private LdapProfileMutexHolder, public BackendBase Provides the implementation name. @return implementation name */ - static OUString SAL_CALL getLdapUserProfileBeName() ; + static OUString getLdapUserProfileBeName() ; /** Provides the supported services names @return service names */ - static uno::Sequence<OUString> SAL_CALL + static uno::Sequence<OUString> getLdapUserProfileBeServiceNames() ; private: diff --git a/extensions/source/propctrlr/MasterDetailLinkDialog.cxx b/extensions/source/propctrlr/MasterDetailLinkDialog.cxx index 812d4e345d64..31f49eb29df7 100644 --- a/extensions/source/propctrlr/MasterDetailLinkDialog.cxx +++ b/extensions/source/propctrlr/MasterDetailLinkDialog.cxx @@ -46,7 +46,7 @@ namespace pcr } - Reference< XInterface > SAL_CALL MasterDetailLinkDialog::Create( const Reference< XComponentContext >& _rxContext ) + Reference< XInterface > MasterDetailLinkDialog::Create( const Reference< XComponentContext >& _rxContext ) { return *( new MasterDetailLinkDialog( _rxContext ) ); } diff --git a/extensions/source/propctrlr/MasterDetailLinkDialog.hxx b/extensions/source/propctrlr/MasterDetailLinkDialog.hxx index 88f1ab689957..e23fac7b4958 100644 --- a/extensions/source/propctrlr/MasterDetailLinkDialog.hxx +++ b/extensions/source/propctrlr/MasterDetailLinkDialog.hxx @@ -41,7 +41,7 @@ namespace pcr /// @throws css::uno::RuntimeException static OUString getImplementationName_static(); static css::uno::Reference< css::uno::XInterface > - SAL_CALL Create(const css::uno::Reference< css::uno::XComponentContext >&); + Create(const css::uno::Reference< css::uno::XComponentContext >&); private: // XTypeProvider virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) override; diff --git a/extensions/source/propctrlr/buttonnavigationhandler.cxx b/extensions/source/propctrlr/buttonnavigationhandler.cxx index bf37fffc4aaa..8ffe59cc144d 100644 --- a/extensions/source/propctrlr/buttonnavigationhandler.cxx +++ b/extensions/source/propctrlr/buttonnavigationhandler.cxx @@ -55,13 +55,13 @@ namespace pcr } - OUString SAL_CALL ButtonNavigationHandler::getImplementationName_static( ) + OUString ButtonNavigationHandler::getImplementationName_static( ) { return OUString( "com.sun.star.comp.extensions.ButtonNavigationHandler" ); } - Sequence< OUString > SAL_CALL ButtonNavigationHandler::getSupportedServiceNames_static( ) + Sequence< OUString > ButtonNavigationHandler::getSupportedServiceNames_static( ) { Sequence<OUString> aSupported { "com.sun.star.form.inspection.ButtonNavigationHandler" }; return aSupported; diff --git a/extensions/source/propctrlr/buttonnavigationhandler.hxx b/extensions/source/propctrlr/buttonnavigationhandler.hxx index fed4722a56fb..79ae7910aaf2 100644 --- a/extensions/source/propctrlr/buttonnavigationhandler.hxx +++ b/extensions/source/propctrlr/buttonnavigationhandler.hxx @@ -41,9 +41,9 @@ namespace pcr const css::uno::Reference< css::uno::XComponentContext >& _rxContext ); /// @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( ); protected: virtual ~ButtonNavigationHandler() override; diff --git a/extensions/source/propctrlr/cellbindinghandler.cxx b/extensions/source/propctrlr/cellbindinghandler.cxx index 29f5ed30a791..a419eaa5aa31 100644 --- a/extensions/source/propctrlr/cellbindinghandler.cxx +++ b/extensions/source/propctrlr/cellbindinghandler.cxx @@ -57,13 +57,13 @@ namespace pcr } - OUString SAL_CALL CellBindingPropertyHandler::getImplementationName_static( ) + OUString CellBindingPropertyHandler::getImplementationName_static( ) { return OUString( "com.sun.star.comp.extensions.CellBindingPropertyHandler" ); } - Sequence< OUString > SAL_CALL CellBindingPropertyHandler::getSupportedServiceNames_static( ) + Sequence< OUString > CellBindingPropertyHandler::getSupportedServiceNames_static( ) { Sequence<OUString> aSupported { "com.sun.star.form.inspection.CellBindingPropertyHandler" }; return aSupported; diff --git a/extensions/source/propctrlr/cellbindinghandler.hxx b/extensions/source/propctrlr/cellbindinghandler.hxx index af42adb0281b..9dec4bcd5169 100644 --- a/extensions/source/propctrlr/cellbindinghandler.hxx +++ b/extensions/source/propctrlr/cellbindinghandler.hxx @@ -49,9 +49,9 @@ namespace pcr ); /// @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( ); protected: virtual ~CellBindingPropertyHandler() override; diff --git a/extensions/source/propctrlr/controlfontdialog.cxx b/extensions/source/propctrlr/controlfontdialog.cxx index a007d2600a0a..53d3f7fcf432 100644 --- a/extensions/source/propctrlr/controlfontdialog.cxx +++ b/extensions/source/propctrlr/controlfontdialog.cxx @@ -71,7 +71,7 @@ namespace pcr } - Reference< XInterface > SAL_CALL OControlFontDialog::Create( const Reference< XComponentContext >& _rxContext ) + Reference< XInterface > OControlFontDialog::Create( const Reference< XComponentContext >& _rxContext ) { return *( new OControlFontDialog( _rxContext ) ); } diff --git a/extensions/source/propctrlr/controlfontdialog.hxx b/extensions/source/propctrlr/controlfontdialog.hxx index 2b94c58d8c8c..576614baa1cb 100644 --- a/extensions/source/propctrlr/controlfontdialog.hxx +++ b/extensions/source/propctrlr/controlfontdialog.hxx @@ -66,7 +66,7 @@ namespace pcr /// @throws css::uno::RuntimeException static OUString getImplementationName_static(); static css::uno::Reference< css::uno::XInterface > - SAL_CALL Create(const css::uno::Reference< css::uno::XComponentContext >&); + Create(const css::uno::Reference< css::uno::XComponentContext >&); // XInitialization virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override; diff --git a/extensions/source/propctrlr/defaultforminspection.cxx b/extensions/source/propctrlr/defaultforminspection.cxx index 765c50b274bf..999798518417 100644 --- a/extensions/source/propctrlr/defaultforminspection.cxx +++ b/extensions/source/propctrlr/defaultforminspection.cxx @@ -91,7 +91,7 @@ namespace pcr } - Reference< XInterface > SAL_CALL DefaultFormComponentInspectorModel::Create( const Reference< XComponentContext >& ) + Reference< XInterface > DefaultFormComponentInspectorModel::Create( const Reference< XComponentContext >& ) { return *new DefaultFormComponentInspectorModel(); } diff --git a/extensions/source/propctrlr/defaultforminspection.hxx b/extensions/source/propctrlr/defaultforminspection.hxx index cd55848bfc09..c21292f1bd2e 100644 --- a/extensions/source/propctrlr/defaultforminspection.hxx +++ b/extensions/source/propctrlr/defaultforminspection.hxx @@ -58,7 +58,7 @@ namespace pcr static OUString getImplementationName_static( ); /// @throws css::uno::RuntimeException static css::uno::Sequence< OUString > getSupportedServiceNames_static( ); - static css::uno::Reference< css::uno::XInterface > SAL_CALL + static css::uno::Reference< css::uno::XInterface > Create(const css::uno::Reference< css::uno::XComponentContext >&); explicit DefaultFormComponentInspectorModel( bool _bUseFormFormComponentHandlers = true ); diff --git a/extensions/source/propctrlr/defaulthelpprovider.cxx b/extensions/source/propctrlr/defaulthelpprovider.cxx index f4efb7b92993..e24f6c0bdc9b 100644 --- a/extensions/source/propctrlr/defaulthelpprovider.cxx +++ b/extensions/source/propctrlr/defaulthelpprovider.cxx @@ -80,7 +80,7 @@ namespace pcr } - Reference< XInterface > SAL_CALL DefaultHelpProvider::Create( const Reference< XComponentContext >& ) + Reference< XInterface > DefaultHelpProvider::Create( const Reference< XComponentContext >& ) { return *new DefaultHelpProvider; } diff --git a/extensions/source/propctrlr/defaulthelpprovider.hxx b/extensions/source/propctrlr/defaulthelpprovider.hxx index 702e2b7ee2a2..95ccc1d53d8c 100644 --- a/extensions/source/propctrlr/defaulthelpprovider.hxx +++ b/extensions/source/propctrlr/defaulthelpprovider.hxx @@ -54,7 +54,7 @@ namespace pcr static OUString getImplementationName_static( ); /// @throws css::uno::RuntimeException static css::uno::Sequence< OUString > getSupportedServiceNames_static( ); - static css::uno::Reference< css::uno::XInterface > SAL_CALL + static css::uno::Reference< css::uno::XInterface > Create(const css::uno::Reference< css::uno::XComponentContext >&); private: diff --git a/extensions/source/propctrlr/editpropertyhandler.cxx b/extensions/source/propctrlr/editpropertyhandler.cxx index 87610f0450cd..18b66c8894fd 100644 --- a/extensions/source/propctrlr/editpropertyhandler.cxx +++ b/extensions/source/propctrlr/editpropertyhandler.cxx @@ -62,13 +62,13 @@ namespace pcr } - OUString SAL_CALL EditPropertyHandler::getImplementationName_static( ) + OUString EditPropertyHandler::getImplementationName_static( ) { return OUString( "com.sun.star.comp.extensions.EditPropertyHandler" ); } - Sequence< OUString > SAL_CALL EditPropertyHandler::getSupportedServiceNames_static( ) + Sequence< OUString > EditPropertyHandler::getSupportedServiceNames_static( ) { Sequence<OUString> aSupported { "com.sun.star.form.inspection.EditPropertyHandler" }; return aSupported; diff --git a/extensions/source/propctrlr/editpropertyhandler.hxx b/extensions/source/propctrlr/editpropertyhandler.hxx index cd15c8a7d6d0..3e1478efa57f 100644 --- a/extensions/source/propctrlr/editpropertyhandler.hxx +++ b/extensions/source/propctrlr/editpropertyhandler.hxx @@ -41,9 +41,9 @@ namespace pcr ); /// @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( ); protected: virtual ~EditPropertyHandler() override; diff --git a/extensions/source/propctrlr/eformspropertyhandler.cxx b/extensions/source/propctrlr/eformspropertyhandler.cxx index f93e49bc0898..478d0674c930 100644 --- a/extensions/source/propctrlr/eformspropertyhandler.cxx +++ b/extensions/source/propctrlr/eformspropertyhandler.cxx @@ -71,13 +71,13 @@ namespace pcr } - OUString SAL_CALL EFormsPropertyHandler::getImplementationName_static( ) + OUString EFormsPropertyHandler::getImplementationName_static( ) { return OUString( "com.sun.star.comp.extensions.EFormsPropertyHandler" ); } - Sequence< OUString > SAL_CALL EFormsPropertyHandler::getSupportedServiceNames_static( ) + Sequence< OUString > EFormsPropertyHandler::getSupportedServiceNames_static( ) { Sequence<OUString> aSupported { "com.sun.star.form.inspection.XMLFormsPropertyHandler" }; return aSupported; diff --git a/extensions/source/propctrlr/eformspropertyhandler.hxx b/extensions/source/propctrlr/eformspropertyhandler.hxx index ede7bee9819d..b099ead7ec5d 100644 --- a/extensions/source/propctrlr/eformspropertyhandler.hxx +++ b/extensions/source/propctrlr/eformspropertyhandler.hxx @@ -52,9 +52,9 @@ namespace pcr ); /// @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( ); protected: virtual ~EFormsPropertyHandler() override; diff --git a/extensions/source/propctrlr/eventhandler.cxx b/extensions/source/propctrlr/eventhandler.cxx index 7b35e6e79edb..90df51b7c7ac 100644 --- a/extensions/source/propctrlr/eventhandler.cxx +++ b/extensions/source/propctrlr/eventhandler.cxx @@ -468,18 +468,18 @@ namespace pcr return getSupportedServiceNames_static(); } - OUString SAL_CALL EventHandler::getImplementationName_static( ) + OUString EventHandler::getImplementationName_static( ) { return OUString( "com.sun.star.comp.extensions.EventHandler" ); } - Sequence< OUString > SAL_CALL EventHandler::getSupportedServiceNames_static( ) + Sequence< OUString > EventHandler::getSupportedServiceNames_static( ) { Sequence<OUString> aSupported { "com.sun.star.form.inspection.EventHandler" }; return aSupported; } - Reference< XInterface > SAL_CALL EventHandler::Create( const Reference< XComponentContext >& _rxContext ) + Reference< XInterface > EventHandler::Create( const Reference< XComponentContext >& _rxContext ) { return *( new EventHandler( _rxContext ) ); } diff --git a/extensions/source/propctrlr/eventhandler.hxx b/extensions/source/propctrlr/eventhandler.hxx index 57274d235d75..82aff7da34b0 100644 --- a/extensions/source/propctrlr/eventhandler.hxx +++ b/extensions/source/propctrlr/eventhandler.hxx @@ -97,10 +97,10 @@ namespace pcr public: // XServiceInfo - static versions /// @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::Reference< css::uno::XInterface > SAL_CALL Create( const css::uno::Reference< css::uno::XComponentContext >& _rxContext ); + static css::uno::Sequence< OUString > getSupportedServiceNames_static( ); + static css::uno::Reference< css::uno::XInterface > Create( const css::uno::Reference< css::uno::XComponentContext >& _rxContext ); private: explicit EventHandler( diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx index 37255b5275c2..0f7ebacb8689 100644 --- a/extensions/source/propctrlr/formcomponenthandler.cxx +++ b/extensions/source/propctrlr/formcomponenthandler.cxx @@ -161,13 +161,13 @@ namespace pcr IMPLEMENT_FORWARD_XINTERFACE2(FormComponentPropertyHandler,FormComponentPropertyHandler_Base,::comphelper::OPropertyContainer) - OUString SAL_CALL FormComponentPropertyHandler::getImplementationName_static( ) + OUString FormComponentPropertyHandler::getImplementationName_static( ) { return OUString( "com.sun.star.comp.extensions.FormComponentPropertyHandler" ); } - Sequence< OUString > SAL_CALL FormComponentPropertyHandler::getSupportedServiceNames_static( ) + Sequence< OUString > FormComponentPropertyHandler::getSupportedServiceNames_static( ) { Sequence<OUString> aSupported { "com.sun.star.form.inspection.FormComponentPropertyHandler" }; return aSupported; diff --git a/extensions/source/propctrlr/formcomponenthandler.hxx b/extensions/source/propctrlr/formcomponenthandler.hxx index 991449992de6..6c564c24a34c 100644 --- a/extensions/source/propctrlr/formcomponenthandler.hxx +++ b/extensions/source/propctrlr/formcomponenthandler.hxx @@ -104,9 +104,9 @@ namespace pcr virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; /// @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( ); protected: virtual ~FormComponentPropertyHandler() override; diff --git a/extensions/source/propctrlr/formcontroller.cxx b/extensions/source/propctrlr/formcontroller.cxx index a6afe300d830..a6532f8c0d83 100644 --- a/extensions/source/propctrlr/formcontroller.cxx +++ b/extensions/source/propctrlr/formcontroller.cxx @@ -135,7 +135,7 @@ namespace pcr } - Reference< XInterface > SAL_CALL FormController::Create(const Reference< XComponentContext >& _rxContext ) + Reference< XInterface > FormController::Create(const Reference< XComponentContext >& _rxContext ) { ServiceDescriptor aService; aService.GetImplementationName = &FormController::getImplementationName_static; @@ -262,7 +262,7 @@ namespace pcr } - Reference< XInterface > SAL_CALL DialogController::Create(const Reference< XComponentContext >& _rxContext) + Reference< XInterface > DialogController::Create(const Reference< XComponentContext >& _rxContext) { ServiceDescriptor aService; aService.GetImplementationName = &DialogController::getImplementationName_static; diff --git a/extensions/source/propctrlr/formcontroller.hxx b/extensions/source/propctrlr/formcontroller.hxx index 480e278b7ecc..82dd842ef8b4 100644 --- a/extensions/source/propctrlr/formcontroller.hxx +++ b/extensions/source/propctrlr/formcontroller.hxx @@ -72,7 +72,7 @@ namespace pcr static OUString getImplementationName_static( ); /// @throws css::uno::RuntimeException static css::uno::Sequence< OUString > getSupportedServiceNames_static( ); - static css::uno::Reference< css::uno::XInterface > SAL_CALL + static css::uno::Reference< css::uno::XInterface > Create(const css::uno::Reference< css::uno::XComponentContext >&); protected: @@ -116,7 +116,7 @@ namespace pcr static OUString getImplementationName_static( ); /// @throws css::uno::RuntimeException static css::uno::Sequence< OUString > getSupportedServiceNames_static( ); - static css::uno::Reference< css::uno::XInterface > SAL_CALL + static css::uno::Reference< css::uno::XInterface > Create(const css::uno::Reference< css::uno::XComponentContext >&); private: diff --git a/extensions/source/propctrlr/formgeometryhandler.cxx b/extensions/source/propctrlr/formgeometryhandler.cxx index 05b63a8e9faf..926f5aa12237 100644 --- a/extensions/source/propctrlr/formgeometryhandler.cxx +++ b/extensions/source/propctrlr/formgeometryhandler.cxx @@ -211,9 +211,9 @@ namespace pcr ); /// @throws RuntimeException - static OUString SAL_CALL getImplementationName_static( ); + static OUString getImplementationName_static( ); /// @throws RuntimeException - static Sequence< OUString > SAL_CALL getSupportedServiceNames_static( ); + static Sequence< OUString > getSupportedServiceNames_static( ); protected: virtual ~FormGeometryHandler() override; @@ -309,13 +309,13 @@ namespace pcr } - OUString SAL_CALL FormGeometryHandler::getImplementationName_static( ) + OUString FormGeometryHandler::getImplementationName_static( ) { return OUString( "com.sun.star.comp.extensions.FormGeometryHandler" ); } - Sequence< OUString > SAL_CALL FormGeometryHandler::getSupportedServiceNames_static( ) + Sequence< OUString > FormGeometryHandler::getSupportedServiceNames_static( ) { Sequence<OUString> aSupported { "com.sun.star.form.inspection.FormGeometryHandler" }; return aSupported; diff --git a/extensions/source/propctrlr/genericpropertyhandler.cxx b/extensions/source/propctrlr/genericpropertyhandler.cxx index 2cfa948a9787..3e8bddacbb6c 100644 --- a/extensions/source/propctrlr/genericpropertyhandler.cxx +++ b/extensions/source/propctrlr/genericpropertyhandler.cxx @@ -280,18 +280,18 @@ namespace pcr return getSupportedServiceNames_static(); } - OUString SAL_CALL GenericPropertyHandler::getImplementationName_static( ) + OUString GenericPropertyHandler::getImplementationName_static( ) { return OUString( "com.sun.star.comp.extensions.GenericPropertyHandler" ); } - Sequence< OUString > SAL_CALL GenericPropertyHandler::getSupportedServiceNames_static( ) + Sequence< OUString > GenericPropertyHandler::getSupportedServiceNames_static( ) { Sequence<OUString> aSupported { "com.sun.star.inspection.GenericPropertyHandler" }; return aSupported; } - Reference< XInterface > SAL_CALL GenericPropertyHandler::Create( const Reference< XComponentContext >& _rxContext ) + Reference< XInterface > GenericPropertyHandler::Create( const Reference< XComponentContext >& _rxContext ) { return *( new GenericPropertyHandler( _rxContext ) ); } diff --git a/extensions/source/propctrlr/genericpropertyhandler.hxx b/extensions/source/propctrlr/genericpropertyhandler.hxx index 51ac2f61e1a2..9f2fceca768d 100644 --- a/extensions/source/propctrlr/genericpropertyhandler.hxx +++ b/extensions/source/propctrlr/genericpropertyhandler.hxx @@ -80,10 +80,10 @@ namespace pcr public: // XServiceInfo - static versions /// @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::Reference< css::uno::XInterface > SAL_CALL Create( const css::uno::Reference< css::uno::XComponentContext >& _rxContext ); + static css::uno::Sequence< OUString > getSupportedServiceNames_static( ); + static css::uno::Reference< css::uno::XInterface > Create( const css::uno::Reference< css::uno::XComponentContext >& _rxContext ); private: explicit GenericPropertyHandler( diff --git a/extensions/source/propctrlr/objectinspectormodel.cxx b/extensions/source/propctrlr/objectinspectormodel.cxx index 9a295b5e3d73..224d23f483ad 100644 --- a/extensions/source/propctrlr/objectinspectormodel.cxx +++ b/extensions/source/propctrlr/objectinspectormodel.cxx @@ -75,7 +75,7 @@ namespace pcr static OUString getImplementationName_static( ); /// @throws RuntimeException static Sequence< OUString > getSupportedServiceNames_static( ); - static Reference< XInterface > SAL_CALL + static Reference< XInterface > Create(const Reference< XComponentContext >&); protected: @@ -178,7 +178,7 @@ namespace pcr } - Reference< XInterface > SAL_CALL ObjectInspectorModel::Create(const Reference< XComponentContext >& /* _rxContext */ ) + Reference< XInterface > ObjectInspectorModel::Create(const Reference< XComponentContext >& /* _rxContext */ ) { return *( new ObjectInspectorModel() ); } diff --git a/extensions/source/propctrlr/pcrunodialogs.cxx b/extensions/source/propctrlr/pcrunodialogs.cxx index 011777176463..c2b1d6f08396 100644 --- a/extensions/source/propctrlr/pcrunodialogs.cxx +++ b/extensions/source/propctrlr/pcrunodialogs.cxx @@ -76,7 +76,7 @@ namespace pcr } - Reference< XInterface > SAL_CALL OTabOrderDialog::Create( const Reference< XComponentContext >& _rxContext ) + Reference< XInterface > OTabOrderDialog::Create( const Reference< XComponentContext >& _rxContext ) { return *( new OTabOrderDialog( _rxContext ) ); } diff --git a/extensions/source/propctrlr/pcrunodialogs.hxx b/extensions/source/propctrlr/pcrunodialogs.hxx index fc3b1189bb3f..1eb7375abba5 100644 --- a/extensions/source/propctrlr/pcrunodialogs.hxx +++ b/extensions/source/propctrlr/pcrunodialogs.hxx @@ -64,7 +64,7 @@ namespace pcr /// @throws css::uno::RuntimeException static OUString getImplementationName_static(); static css::uno::Reference< css::uno::XInterface > - SAL_CALL Create(const css::uno::Reference< css::uno::XComponentContext >&); + Create(const css::uno::Reference< css::uno::XComponentContext >&); // XInitialization virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override; diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx index 4fb6c295faef..f728b315250f 100644 --- a/extensions/source/propctrlr/propcontroller.cxx +++ b/extensions/source/propctrlr/propcontroller.cxx @@ -570,7 +570,7 @@ namespace pcr } - Reference< XInterface > SAL_CALL OPropertyBrowserController::Create(const Reference< XComponentContext >& _rxContext) + Reference< XInterface > OPropertyBrowserController::Create(const Reference< XComponentContext >& _rxContext) { return *(new OPropertyBrowserController( _rxContext ) ); } diff --git a/extensions/source/propctrlr/propcontroller.hxx b/extensions/source/propctrlr/propcontroller.hxx index e8358856c43e..7068ec6dbeea 100644 --- a/extensions/source/propctrlr/propcontroller.hxx +++ b/extensions/source/propctrlr/propcontroller.hxx @@ -192,7 +192,7 @@ namespace pcr static OUString getImplementationName_static( ); /// @throws css::uno::RuntimeException static css::uno::Sequence< OUString > getSupportedServiceNames_static( ); - static css::uno::Reference< css::uno::XInterface > SAL_CALL + static css::uno::Reference< css::uno::XInterface > Create(const css::uno::Reference< css::uno::XComponentContext >&); protected: diff --git a/extensions/source/propctrlr/submissionhandler.cxx b/extensions/source/propctrlr/submissionhandler.cxx index 853659bd5b3f..664c9c9725b3 100644 --- a/extensions/source/propctrlr/submissionhandler.cxx +++ b/extensions/source/propctrlr/submissionhandler.cxx @@ -104,13 +104,13 @@ namespace pcr } - OUString SAL_CALL SubmissionPropertyHandler::getImplementationName_static( ) + OUString SubmissionPropertyHandler::getImplementationName_static( ) { return OUString( "com.sun.star.comp.extensions.SubmissionPropertyHandler" ); } - Sequence< OUString > SAL_CALL SubmissionPropertyHandler::getSupportedServiceNames_static( ) + Sequence< OUString > SubmissionPropertyHandler::getSupportedServiceNames_static( ) { Sequence<OUString> aSupported { "com.sun.star.form.inspection.SubmissionPropertyHandler" }; return aSupported; diff --git a/extensions/source/propctrlr/submissionhandler.hxx b/extensions/source/propctrlr/submissionhandler.hxx index 9ce01a2f1d19..2832852fe459 100644 --- a/extensions/source/propctrlr/submissionhandler.hxx +++ b/extensions/source/propctrlr/submissionhandler.hxx @@ -79,9 +79,9 @@ namespace pcr ); /// @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( ); virtual ~SubmissionPropertyHandler() override; diff --git a/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx b/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx index 84a7e0d99a90..7203c638f353 100644 --- a/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx +++ b/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx @@ -84,13 +84,13 @@ namespace pcr } - OUString SAL_CALL XSDValidationPropertyHandler::getImplementationName_static( ) + OUString XSDValidationPropertyHandler::getImplementationName_static( ) { return OUString( "com.sun.star.comp.extensions.XSDValidationPropertyHandler" ); } - Sequence< OUString > SAL_CALL XSDValidationPropertyHandler::getSupportedServiceNames_static( ) + Sequence< OUString > XSDValidationPropertyHandler::getSupportedServiceNames_static( ) { Sequence<OUString> aSupported { "com.sun.star.form.inspection.XSDValidationPropertyHandler" }; return aSupported; diff --git a/extensions/source/propctrlr/xsdvalidationpropertyhandler.hxx b/extensions/source/propctrlr/xsdvalidationpropertyhandler.hxx index e49be9b60843..1e192a63e379 100644 --- a/extensions/source/propctrlr/xsdvalidationpropertyhandler.hxx +++ b/extensions/source/propctrlr/xsdvalidationpropertyhandler.hxx @@ -46,9 +46,9 @@ namespace pcr ); /// @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( ); protected: virtual ~XSDValidationPropertyHandler() override; diff --git a/filter/source/config/cache/contenthandlerfactory.cxx b/filter/source/config/cache/contenthandlerfactory.cxx index f43129405f55..56b9252cafbb 100644 --- a/filter/source/config/cache/contenthandlerfactory.cxx +++ b/filter/source/config/cache/contenthandlerfactory.cxx @@ -144,7 +144,7 @@ css::uno::Sequence< OUString > ContentHandlerFactory::impl_getSupportedServiceNa } -css::uno::Reference< css::uno::XInterface > SAL_CALL ContentHandlerFactory::impl_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR) +css::uno::Reference< css::uno::XInterface > ContentHandlerFactory::impl_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR) { ContentHandlerFactory* pNew = new ContentHandlerFactory( comphelper::getComponentContext(xSMGR) ); return css::uno::Reference< css::uno::XInterface >(static_cast< css::lang::XMultiServiceFactory* >(pNew), css::uno::UNO_QUERY); diff --git a/filter/source/config/cache/contenthandlerfactory.hxx b/filter/source/config/cache/contenthandlerfactory.hxx index 82bf415810cc..f684b4048667 100644 --- a/filter/source/config/cache/contenthandlerfactory.hxx +++ b/filter/source/config/cache/contenthandlerfactory.hxx @@ -113,7 +113,7 @@ class ContentHandlerFactory : public ::cppu::ImplInheritanceHelper< BaseContaine @return The new instance of this service as an uno reference. */ - static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR); + static css::uno::Reference< css::uno::XInterface > impl_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR); // Overrides to resolve ambiguity diff --git a/filter/source/config/cache/filterfactory.cxx b/filter/source/config/cache/filterfactory.cxx index ea743e08f865..2e425c27ed63 100644 --- a/filter/source/config/cache/filterfactory.cxx +++ b/filter/source/config/cache/filterfactory.cxx @@ -563,7 +563,7 @@ css::uno::Sequence< OUString > FilterFactory::impl_getSupportedServiceNames() } -css::uno::Reference< css::uno::XInterface > SAL_CALL FilterFactory::impl_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR) +css::uno::Reference< css::uno::XInterface > FilterFactory::impl_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR) { FilterFactory* pNew = new FilterFactory( comphelper::getComponentContext(xSMGR) ); return css::uno::Reference< css::uno::XInterface >(static_cast< css::lang::XMultiServiceFactory* >(pNew), css::uno::UNO_QUERY); diff --git a/filter/source/config/cache/filterfactory.hxx b/filter/source/config/cache/filterfactory.hxx index bf211ac102d9..c0e9a34d5aa3 100644 --- a/filter/source/config/cache/filterfactory.hxx +++ b/filter/source/config/cache/filterfactory.hxx @@ -171,7 +171,7 @@ class FilterFactory : public ::cppu::ImplInheritanceHelper< BaseContainer @return The new instance of this service as an uno reference. */ - static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR); + static css::uno::Reference< css::uno::XInterface > impl_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR); }; } // namespace config diff --git a/filter/source/config/cache/frameloaderfactory.cxx b/filter/source/config/cache/frameloaderfactory.cxx index 3d1d5bb84d55..cbb727aebd79 100644 --- a/filter/source/config/cache/frameloaderfactory.cxx +++ b/filter/source/config/cache/frameloaderfactory.cxx @@ -141,7 +141,7 @@ css::uno::Sequence< OUString > FrameLoaderFactory::impl_getSupportedServiceNames } -css::uno::Reference< css::uno::XInterface > SAL_CALL FrameLoaderFactory::impl_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR) +css::uno::Reference< css::uno::XInterface > FrameLoaderFactory::impl_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR) { FrameLoaderFactory* pNew = new FrameLoaderFactory( comphelper::getComponentContext(xSMGR) ); return css::uno::Reference< css::uno::XInterface >(static_cast< css::lang::XMultiServiceFactory* >(pNew), css::uno::UNO_QUERY); diff --git a/filter/source/config/cache/frameloaderfactory.hxx b/filter/source/config/cache/frameloaderfactory.hxx index bf05fc920af3..7dab5e02b0d9 100644 --- a/filter/source/config/cache/frameloaderfactory.hxx +++ b/filter/source/config/cache/frameloaderfactory.hxx @@ -113,7 +113,7 @@ class FrameLoaderFactory : public ::cppu::ImplInheritanceHelper< BaseContainer @return The new instance of this service as an uno reference. */ - static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR); + static css::uno::Reference< css::uno::XInterface > impl_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR); // Overrides to resolve ambiguity virtual css::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) override diff --git a/filter/source/config/cache/typedetection.cxx b/filter/source/config/cache/typedetection.cxx index 7b867177412c..fee03066ed83 100644 --- a/filter/source/config/cache/typedetection.cxx +++ b/filter/source/config/cache/typedetection.cxx @@ -1231,7 +1231,7 @@ css::uno::Sequence< OUString > TypeDetection::impl_getSupportedServiceNames() } -css::uno::Reference< css::uno::XInterface > SAL_CALL TypeDetection::impl_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR) +css::uno::Reference< css::uno::XInterface > TypeDetection::impl_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR) { TypeDetection* pNew = new TypeDetection( comphelper::getComponentContext(xSMGR) ); return css::uno::Reference< css::uno::XInterface >(static_cast< css::document::XTypeDetection* >(pNew), css::uno::UNO_QUERY); diff --git a/filter/source/config/cache/typedetection.hxx b/filter/source/config/cache/typedetection.hxx index 78f8964e66ea..830badc54f63 100644 --- a/filter/source/config/cache/typedetection.hxx +++ b/filter/source/config/cache/typedetection.hxx @@ -368,7 +368,7 @@ public: @return The new instance of this service as an uno reference. */ - static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR); + static css::uno::Reference< css::uno::XInterface > impl_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR); }; class TerminateDetection : public cppu::WeakComponentImplHelper<css::frame::XTerminateListener> diff --git a/forms/source/component/FormComponent.cxx b/forms/source/component/FormComponent.cxx index 9de32950f657..5f970008b50a 100644 --- a/forms/source/component/FormComponent.cxx +++ b/forms/source/component/FormComponent.cxx @@ -678,7 +678,7 @@ Sequence<OUString> SAL_CALL OControlModel::getSupportedServiceNames() ); } -Sequence< OUString > SAL_CALL OControlModel::getSupportedServiceNames_Static() +Sequence< OUString > OControlModel::getSupportedServiceNames_Static() { Sequence< OUString > aServiceNames( 2 ); aServiceNames[ 0 ] = FRM_SUN_FORMCOMPONENT; @@ -1511,7 +1511,7 @@ css::uno::Sequence<OUString> SAL_CALL OBoundControlModel::getSupportedServiceNam ); } -Sequence< OUString > SAL_CALL OBoundControlModel::getSupportedServiceNames_Static() +Sequence< OUString > OBoundControlModel::getSupportedServiceNames_Static() { Sequence<OUString> aOwnServiceNames { "com.sun.star.form.DataAwareControlModel" }; return ::comphelper::concatSequences( diff --git a/forms/source/inc/FormComponent.hxx b/forms/source/inc/FormComponent.hxx index ff82e1a33357..bef6e81ec25d 100644 --- a/forms/source/inc/FormComponent.hxx +++ b/forms/source/inc/FormComponent.hxx @@ -400,7 +400,7 @@ public: // XSericeInfo - static version(s) /// @throws css::uno::RuntimeException - static css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames_Static(); + static css::uno::Sequence<OUString> getSupportedServiceNames_Static(); // XPersistObject virtual OUString SAL_CALL getServiceName() override = 0; @@ -976,7 +976,7 @@ public: // XServiceInfo - static version /// @throws css::uno::RuntimeException - static css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames_Static(); + static css::uno::Sequence<OUString> getSupportedServiceNames_Static(); // XChild virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) override; diff --git a/formula/source/core/api/FormulaOpCodeMapperObj.cxx b/formula/source/core/api/FormulaOpCodeMapperObj.cxx index cba96993df4c..9c13ac0c81c0 100644 --- a/formula/source/core/api/FormulaOpCodeMapperObj.cxx +++ b/formula/source/core/api/FormulaOpCodeMapperObj.cxx @@ -86,7 +86,7 @@ OUString SAL_CALL FormulaOpCodeMapperObj::getImplementationName( ) return getImplementationName_Static(); } -OUString SAL_CALL FormulaOpCodeMapperObj::getImplementationName_Static() +OUString FormulaOpCodeMapperObj::getImplementationName_Static() { return OUString( "simple.formula.FormulaOpCodeMapperObj" ); } @@ -95,13 +95,13 @@ uno::Sequence< OUString > SAL_CALL FormulaOpCodeMapperObj::getSupportedServiceNa { return getSupportedServiceNames_Static(); } -uno::Sequence< OUString > SAL_CALL FormulaOpCodeMapperObj::getSupportedServiceNames_Static() +uno::Sequence< OUString > FormulaOpCodeMapperObj::getSupportedServiceNames_Static() { uno::Sequence<OUString> aSeq { "com.sun.star.sheet.FormulaOpCodeMapper" }; return aSeq; } -uno::Reference< uno::XInterface > SAL_CALL FormulaOpCodeMapperObj::create( +uno::Reference< uno::XInterface > FormulaOpCodeMapperObj::create( uno::Reference< uno::XComponentContext > const & /*_xContext*/) { return static_cast<sheet::XFormulaOpCodeMapper*>(new FormulaOpCodeMapperObj(o3tl::make_unique<FormulaCompiler>())); diff --git a/fpicker/source/office/OfficeFilePicker.cxx b/fpicker/source/office/OfficeFilePicker.cxx index fc9a65b8e7e0..27b6b905b006 100644 --- a/fpicker/source/office/OfficeFilePicker.cxx +++ b/fpicker/source/office/OfficeFilePicker.cxx @@ -1121,7 +1121,7 @@ OUString SvtFilePicker::impl_getStaticImplementationName() } /* Helper for registry */ -Reference< XInterface > SAL_CALL SvtFilePicker::impl_createInstance( +Reference< XInterface > SvtFilePicker::impl_createInstance( const Reference< XComponentContext >& ) { return Reference< XInterface >( *new SvtFilePicker ); @@ -1185,7 +1185,7 @@ OUString SvtRemoteFilePicker::impl_getStaticImplementationName() } /* Helper for registry */ -Reference< XInterface > SAL_CALL SvtRemoteFilePicker::impl_createInstance( +Reference< XInterface > SvtRemoteFilePicker::impl_createInstance( const Reference< XComponentContext >& ) { return Reference< XInterface >( *new SvtRemoteFilePicker ); diff --git a/fpicker/source/office/OfficeFilePicker.hxx b/fpicker/source/office/OfficeFilePicker.hxx index be50fc211e8f..27e761f39f05 100644 --- a/fpicker/source/office/OfficeFilePicker.hxx +++ b/fpicker/source/office/OfficeFilePicker.hxx @@ -195,7 +195,7 @@ public: /* Helper for registry */ /// @throws css::uno::Exception - static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_createInstance ( + static css::uno::Reference< css::uno::XInterface > impl_createInstance ( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); protected: @@ -252,7 +252,7 @@ public: /* Helper for registry */ /// @throws css::uno::Exception - static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_createInstance ( + static css::uno::Reference< css::uno::XInterface > impl_createInstance ( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); }; diff --git a/fpicker/source/office/OfficeFolderPicker.cxx b/fpicker/source/office/OfficeFolderPicker.cxx index adc7203a304a..5ace5400eedf 100644 --- a/fpicker/source/office/OfficeFolderPicker.cxx +++ b/fpicker/source/office/OfficeFolderPicker.cxx @@ -180,7 +180,7 @@ OUString SvtFolderPicker::impl_getStaticImplementationName() } /* Helper for registry */ -Reference< XInterface > SAL_CALL SvtFolderPicker::impl_createInstance( const Reference< XComponentContext >& ) +Reference< XInterface > SvtFolderPicker::impl_createInstance( const Reference< XComponentContext >& ) { return Reference< XInterface >( *new SvtFolderPicker ); } diff --git a/fpicker/source/office/OfficeFolderPicker.hxx b/fpicker/source/office/OfficeFolderPicker.hxx index 3883bd6c46ba..4dd96a833151 100644 --- a/fpicker/source/office/OfficeFolderPicker.hxx +++ b/fpicker/source/office/OfficeFolderPicker.hxx @@ -91,7 +91,7 @@ public: /* Helper for registry */ /// @throws css::uno::Exception - static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_createInstance ( + static css::uno::Reference< css::uno::XInterface > impl_createInstance ( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); protected: diff --git a/framework/inc/macros/xserviceinfo.hxx b/framework/inc/macros/xserviceinfo.hxx index dd159460dcab..37274b44eb8d 100644 --- a/framework/inc/macros/xserviceinfo.hxx +++ b/framework/inc/macros/xserviceinfo.hxx @@ -144,8 +144,8 @@ namespace framework{ virtual sal_Bool SAL_CALL supportsService ( const OUString& sServiceName ) override; \ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames ( ) override; \ /* Helper for XServiceInfo */ \ - static css::uno::Sequence< OUString > SAL_CALL impl_getStaticSupportedServiceNames( ); \ - static OUString SAL_CALL impl_getStaticImplementationName ( ); \ + static css::uno::Sequence< OUString > impl_getStaticSupportedServiceNames( ); \ + static OUString impl_getStaticImplementationName ( ); \ /* Helper for initialization of service by using own reference! */ \ void impl_initService ( ); \ diff --git a/framework/inc/uielement/footermenucontroller.hxx b/framework/inc/uielement/footermenucontroller.hxx index 1609ca557c5d..c560e89b9022 100644 --- a/framework/inc/uielement/footermenucontroller.hxx +++ b/framework/inc/uielement/footermenucontroller.hxx @@ -35,8 +35,8 @@ namespace framework virtual sal_Bool SAL_CALL supportsService ( const OUString& sServiceName ) override; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames ( ) override; /* Helper for XServiceInfo */ - static css::uno::Sequence< OUString > SAL_CALL impl_getStaticSupportedServiceNames( ); - static OUString SAL_CALL impl_getStaticImplementationName ( ); + static css::uno::Sequence< OUString > impl_getStaticSupportedServiceNames( ); + static OUString impl_getStaticImplementationName ( ); /* Helper for registry */ /// @throws css::uno::Exception static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_createInstance ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ); diff --git a/include/editeng/unotext.hxx b/include/editeng/unotext.hxx index 87953d7df413..db20ac34c695 100644 --- a/include/editeng/unotext.hxx +++ b/include/editeng/unotext.hxx @@ -373,7 +373,7 @@ public: // css::lang::XServiceInfo virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; - static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_Static( ); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static( ); }; diff --git a/include/formula/FormulaOpCodeMapperObj.hxx b/include/formula/FormulaOpCodeMapperObj.hxx index 0d3c94330f45..af74100d2165 100644 --- a/include/formula/FormulaOpCodeMapperObj.hxx +++ b/include/formula/FormulaOpCodeMapperObj.hxx @@ -52,9 +52,9 @@ class FORMULA_DLLPUBLIC FormulaOpCodeMapperObj : public cppu::WeakImplHelper< { ::std::unique_ptr<FormulaCompiler> m_pCompiler; public: - static OUString SAL_CALL getImplementationName_Static(); - static css::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames_Static(); - static css::uno::Reference< css::uno::XInterface > SAL_CALL create(const css::uno::Reference< css::uno::XComponentContext >& _xContext); + static OUString getImplementationName_Static(); + static css::uno::Sequence< OUString> getSupportedServiceNames_Static(); + static css::uno::Reference< css::uno::XInterface > create(const css::uno::Reference< css::uno::XComponentContext >& _xContext); protected: FormulaOpCodeMapperObj(::std::unique_ptr<FormulaCompiler> && _pCompiler); diff --git a/include/framework/dispatchhelper.hxx b/include/framework/dispatchhelper.hxx index 7805a83d89aa..8838a5c902e0 100644 --- a/include/framework/dispatchhelper.hxx +++ b/include/framework/dispatchhelper.hxx @@ -77,8 +77,8 @@ class FWE_DLLPUBLIC DispatchHelper : public ::cppu::WeakImplHelper< css::lang::X virtual sal_Bool SAL_CALL supportsService ( const OUString& sServiceName ) override; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames ( ) override; - static css::uno::Sequence< OUString > SAL_CALL impl_getStaticSupportedServiceNames( ); - static OUString SAL_CALL impl_getStaticImplementationName ( ); + static css::uno::Sequence< OUString > impl_getStaticSupportedServiceNames( ); + static OUString impl_getStaticImplementationName ( ); // Helper for initialization of service by using own reference! void impl_initService ( ); diff --git a/lingucomponent/source/languageguessing/guesslang.cxx b/lingucomponent/source/languageguessing/guesslang.cxx index 930b1cd1c13f..3d2107956c7c 100644 --- a/lingucomponent/source/languageguessing/guesslang.cxx +++ b/lingucomponent/source/languageguessing/guesslang.cxx @@ -92,7 +92,7 @@ public: virtual OUString SAL_CALL getImplementationName( ) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; - static Sequence< OUString > SAL_CALL getSupportedServiceNames_Static( ); + static Sequence< OUString > getSupportedServiceNames_Static( ); // XLanguageGuessing implementation virtual css::lang::Locale SAL_CALL guessPrimaryLanguage( const OUString& aText, ::sal_Int32 nStartPos, ::sal_Int32 nLen ) override; @@ -326,7 +326,7 @@ Sequence<OUString> SAL_CALL LangGuess_Impl::getSupportedServiceNames( ) return getSupportedServiceNames_Static(); } -Sequence<OUString> SAL_CALL LangGuess_Impl::getSupportedServiceNames_Static( ) +Sequence<OUString> LangGuess_Impl::getSupportedServiceNames_Static( ) { OUString aName( SERVICENAME ); return Sequence< OUString >( &aName, 1 ); diff --git a/package/inc/zipfileaccess.hxx b/package/inc/zipfileaccess.hxx index 34e58b95a619..380e3428dd8b 100644 --- a/package/inc/zipfileaccess.hxx +++ b/package/inc/zipfileaccess.hxx @@ -61,11 +61,11 @@ public: static bool StringGoodForPattern_Impl( const OUString& aString, const css::uno::Sequence< OUString >& aPattern ); - static css::uno::Sequence< OUString > SAL_CALL impl_staticGetSupportedServiceNames(); + static css::uno::Sequence< OUString > impl_staticGetSupportedServiceNames(); - static OUString SAL_CALL impl_staticGetImplementationName(); + static OUString impl_staticGetImplementationName(); - static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_staticCreateSelfInstance( + static css::uno::Reference< css::uno::XInterface > impl_staticCreateSelfInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& rxMSF ); // XInitialization diff --git a/package/source/xstor/xfactory.cxx b/package/source/xstor/xfactory.cxx index bc956e0e362b..58cff685cd06 100644 --- a/package/source/xstor/xfactory.cxx +++ b/package/source/xstor/xfactory.cxx @@ -65,7 +65,7 @@ bool CheckPackageSignature_Impl( const uno::Reference< io::XInputStream >& xInpu return true; // allow to create a storage based on empty stream } -uno::Sequence< OUString > SAL_CALL OStorageFactory::impl_staticGetSupportedServiceNames() +uno::Sequence< OUString > OStorageFactory::impl_staticGetSupportedServiceNames() { uno::Sequence< OUString > aRet(2); aRet[0] = "com.sun.star.embed.StorageFactory"; @@ -73,12 +73,12 @@ uno::Sequence< OUString > SAL_CALL OStorageFactory::impl_staticGetSupportedServi return aRet; } -OUString SAL_CALL OStorageFactory::impl_staticGetImplementationName() +OUString OStorageFactory::impl_staticGetImplementationName() { return OUString("com.sun.star.comp.embed.StorageFactory"); } -uno::Reference< uno::XInterface > SAL_CALL OStorageFactory::impl_staticCreateSelfInstance( +uno::Reference< uno::XInterface > OStorageFactory::impl_staticCreateSelfInstance( const uno::Reference< lang::XMultiServiceFactory >& xServiceManager ) { return uno::Reference< uno::XInterface >( *new OStorageFactory( comphelper::getComponentContext(xServiceManager) ) ); diff --git a/package/source/xstor/xfactory.hxx b/package/source/xstor/xfactory.hxx index a1e60271287e..a445f6a4c97a 100644 --- a/package/source/xstor/xfactory.hxx +++ b/package/source/xstor/xfactory.hxx @@ -38,12 +38,12 @@ public: OSL_ENSURE( xContext.is(), "No service manager is provided!" ); } - static css::uno::Sequence< OUString > SAL_CALL + static css::uno::Sequence< OUString > impl_staticGetSupportedServiceNames(); - static OUString SAL_CALL impl_staticGetImplementationName(); + static OUString impl_staticGetImplementationName(); - static css::uno::Reference< css::uno::XInterface > SAL_CALL + static css::uno::Reference< css::uno::XInterface > impl_staticCreateSelfInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ); diff --git a/package/source/zippackage/zipfileaccess.cxx b/package/source/zippackage/zipfileaccess.cxx index 8fe79b85e051..9bef00cafca6 100644 --- a/package/source/zippackage/zipfileaccess.cxx +++ b/package/source/zippackage/zipfileaccess.cxx @@ -451,7 +451,7 @@ void SAL_CALL OZipFileAccess::removeEventListener( const uno::Reference< lang::X m_pListenersContainer->removeInterface( xListener ); } -uno::Sequence< OUString > SAL_CALL OZipFileAccess::impl_staticGetSupportedServiceNames() +uno::Sequence< OUString > OZipFileAccess::impl_staticGetSupportedServiceNames() { uno::Sequence< OUString > aRet(2); aRet[0] = "com.sun.star.packages.zip.ZipFileAccess"; @@ -459,12 +459,12 @@ uno::Sequence< OUString > SAL_CALL OZipFileAccess::impl_staticGetSupportedServic return aRet; } -OUString SAL_CALL OZipFileAccess::impl_staticGetImplementationName() +OUString OZipFileAccess::impl_staticGetImplementationName() { return OUString("com.sun.star.comp.package.zip.ZipFileAccess"); } -uno::Reference< uno::XInterface > SAL_CALL OZipFileAccess::impl_staticCreateSelfInstance( +uno::Reference< uno::XInterface > OZipFileAccess::impl_staticCreateSelfInstance( const uno::Reference< lang::XMultiServiceFactory >& rxMSF ) { return uno::Reference< uno::XInterface >( *new OZipFileAccess( comphelper::getComponentContext(rxMSF) ) ); diff --git a/reportdesign/inc/ReportDefinition.hxx b/reportdesign/inc/ReportDefinition.hxx index f09433a216aa..6c0883c92a4a 100644 --- a/reportdesign/inc/ReportDefinition.hxx +++ b/reportdesign/inc/ReportDefinition.hxx @@ -181,7 +181,7 @@ namespace reportdesign static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); /// @throws css::uno::RuntimeException static OUString getImplementationName_Static(); - static css::uno::Reference< css::uno::XInterface > SAL_CALL + static css::uno::Reference< css::uno::XInterface > create(css::uno::Reference< css::uno::XComponentContext > const & xContext); css::uno::Reference< css::uno::XComponentContext > getContext(); diff --git a/reportdesign/source/core/inc/FixedLine.hxx b/reportdesign/source/core/inc/FixedLine.hxx index 90a30284f8b9..fdb7c2f89e98 100644 --- a/reportdesign/source/core/inc/FixedLine.hxx +++ b/reportdesign/source/core/inc/FixedLine.hxx @@ -86,7 +86,7 @@ namespace reportdesign static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); /// @throws css::uno::RuntimeException static OUString getImplementationName_Static(); - static css::uno::Reference< css::uno::XInterface > SAL_CALL + static css::uno::Reference< css::uno::XInterface > create(css::uno::Reference< css::uno::XComponentContext > const & xContext); // css::beans::XPropertySet virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; diff --git a/reportdesign/source/core/inc/FixedText.hxx b/reportdesign/source/core/inc/FixedText.hxx index ff95757fcee9..e72d9f93541b 100644 --- a/reportdesign/source/core/inc/FixedText.hxx +++ b/reportdesign/source/core/inc/FixedText.hxx @@ -98,7 +98,7 @@ namespace reportdesign static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); /// @throws css::uno::RuntimeException static OUString getImplementationName_Static(); - static css::uno::Reference< css::uno::XInterface > SAL_CALL + static css::uno::Reference< css::uno::XInterface > create(css::uno::Reference< css::uno::XComponentContext > const & xContext); // css::beans::XPropertySet virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; diff --git a/reportdesign/source/core/inc/FormatCondition.hxx b/reportdesign/source/core/inc/FormatCondition.hxx index ab460f030d88..ca2fec4d727b 100644 --- a/reportdesign/source/core/inc/FormatCondition.hxx +++ b/reportdesign/source/core/inc/FormatCondition.hxx @@ -88,7 +88,7 @@ namespace reportdesign static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); /// @throws css::uno::RuntimeException static OUString getImplementationName_Static(); - static css::uno::Reference< css::uno::XInterface > SAL_CALL + static css::uno::Reference< css::uno::XInterface > create(css::uno::Reference< css::uno::XComponentContext > const & xContext); // css::beans::XPropertySet virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; diff --git a/reportdesign/source/core/inc/FormattedField.hxx b/reportdesign/source/core/inc/FormattedField.hxx index 6ffe6f7a2e2c..227088615436 100644 --- a/reportdesign/source/core/inc/FormattedField.hxx +++ b/reportdesign/source/core/inc/FormattedField.hxx @@ -101,7 +101,7 @@ namespace reportdesign static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); /// @throws css::uno::RuntimeException static OUString getImplementationName_Static(); - static css::uno::Reference< css::uno::XInterface > SAL_CALL + static css::uno::Reference< css::uno::XInterface > create(css::uno::Reference< css::uno::XComponentContext > const & xContext); // css::beans::XPropertySet virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; diff --git a/reportdesign/source/core/inc/Function.hxx b/reportdesign/source/core/inc/Function.hxx index fc9878b355f5..d4b1012ee70a 100644 --- a/reportdesign/source/core/inc/Function.hxx +++ b/reportdesign/source/core/inc/Function.hxx @@ -89,7 +89,7 @@ namespace reportdesign static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); /// @throws css::uno::RuntimeException static OUString getImplementationName_Static(); - static css::uno::Reference< css::uno::XInterface > SAL_CALL + static css::uno::Reference< css::uno::XInterface > create(css::uno::Reference< css::uno::XComponentContext > const & xContext); // css::beans::XPropertySet virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; diff --git a/reportdesign/source/core/inc/ImageControl.hxx b/reportdesign/source/core/inc/ImageControl.hxx index 400161891bab..88ffa14461b0 100644 --- a/reportdesign/source/core/inc/ImageControl.hxx +++ b/reportdesign/source/core/inc/ImageControl.hxx @@ -92,7 +92,7 @@ namespace reportdesign static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); /// @throws css::uno::RuntimeException static OUString getImplementationName_Static(); - static css::uno::Reference< css::uno::XInterface > SAL_CALL + static css::uno::Reference< css::uno::XInterface > create(css::uno::Reference< css::uno::XComponentContext > const & xContext); // css::beans::XPropertySet virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; diff --git a/reportdesign/source/core/inc/ReportEngineJFree.hxx b/reportdesign/source/core/inc/ReportEngineJFree.hxx index 9653e454986b..bc4ae7c6043d 100644 --- a/reportdesign/source/core/inc/ReportEngineJFree.hxx +++ b/reportdesign/source/core/inc/ReportEngineJFree.hxx @@ -92,7 +92,7 @@ namespace reportdesign static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); /// @throws css::uno::RuntimeException static OUString getImplementationName_Static(); - static css::uno::Reference< css::uno::XInterface > SAL_CALL + static css::uno::Reference< css::uno::XInterface > create(css::uno::Reference< css::uno::XComponentContext > const & xContext); private: // css::beans::XPropertySet diff --git a/reportdesign/source/core/inc/Shape.hxx b/reportdesign/source/core/inc/Shape.hxx index ae28b48d2060..7d56822fc64f 100644 --- a/reportdesign/source/core/inc/Shape.hxx +++ b/reportdesign/source/core/inc/Shape.hxx @@ -103,7 +103,7 @@ namespace reportdesign static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); /// @throws css::uno::RuntimeException static OUString getImplementationName_Static(); - static css::uno::Reference< css::uno::XInterface > SAL_CALL + static css::uno::Reference< css::uno::XInterface > create(css::uno::Reference< css::uno::XComponentContext > const & xContext); // css::beans::XPropertySet virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; diff --git a/reportdesign/source/filter/xml/dbloader2.cxx b/reportdesign/source/filter/xml/dbloader2.cxx index 0ffc8ecd7a43..d723d5809b07 100644 --- a/reportdesign/source/filter/xml/dbloader2.cxx +++ b/reportdesign/source/filter/xml/dbloader2.cxx @@ -76,7 +76,7 @@ OUString SAL_CALL ORptTypeDetection::detect( Sequence< css::beans::PropertyValue return OUString(); } -Reference< XInterface > SAL_CALL +Reference< XInterface > ORptTypeDetection::create(Reference< XComponentContext > const & xContext) { return *(new ORptTypeDetection(xContext)); diff --git a/reportdesign/source/filter/xml/dbloader2.hxx b/reportdesign/source/filter/xml/dbloader2.hxx index cd53be77a13d..3cf929369ada 100644 --- a/reportdesign/source/filter/xml/dbloader2.hxx +++ b/reportdesign/source/filter/xml/dbloader2.hxx @@ -78,7 +78,7 @@ public: } /// @throws css::uno::RuntimeException static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); - static css::uno::Reference< css::uno::XInterface > SAL_CALL + static css::uno::Reference< css::uno::XInterface > create(css::uno::Reference< css::uno::XComponentContext > const & xContext); virtual OUString SAL_CALL detect( css::uno::Sequence< css::beans::PropertyValue >& Descriptor ) override; diff --git a/reportdesign/source/filter/xml/xmlExport.hxx b/reportdesign/source/filter/xml/xmlExport.hxx index 102af7a03cf1..d082c7d9bf6f 100644 --- a/reportdesign/source/filter/xml/xmlExport.hxx +++ b/reportdesign/source/filter/xml/xmlExport.hxx @@ -159,7 +159,7 @@ public: static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); /// @throws css::uno::RuntimeException static OUString getImplementationName_Static(); - static css::uno::Reference< css::uno::XInterface > SAL_CALL + static css::uno::Reference< css::uno::XInterface > create(css::uno::Reference< css::uno::XComponentContext > const & xContext); // XExporter @@ -181,7 +181,7 @@ public: static OUString getImplementationName_Static( ); /// @throws css::uno::RuntimeException static Sequence< OUString > getSupportedServiceNames_Static( ); - static css::uno::Reference< css::uno::XInterface > SAL_CALL + static css::uno::Reference< css::uno::XInterface > create(css::uno::Reference< css::uno::XComponentContext > const & xContext); }; @@ -196,7 +196,7 @@ public: static OUString getImplementationName_Static( ); /// @throws css::uno::RuntimeException static Sequence< OUString > getSupportedServiceNames_Static( ); - static css::uno::Reference< css::uno::XInterface > SAL_CALL + static css::uno::Reference< css::uno::XInterface > create(css::uno::Reference< css::uno::XComponentContext > const & xContext); }; @@ -211,7 +211,7 @@ public: static OUString getImplementationName_Static( ); /// @throws css::uno::RuntimeException static Sequence< OUString > getSupportedServiceNames_Static( ); - static css::uno::Reference< css::uno::XInterface > SAL_CALL + static css::uno::Reference< css::uno::XInterface > create(css::uno::Reference< css::uno::XComponentContext > const & xContext); }; @@ -226,7 +226,7 @@ public: static OUString getImplementationName_Static( ); /// @throws css::uno::RuntimeException static Sequence< OUString > getSupportedServiceNames_Static( ); - static css::uno::Reference< css::uno::XInterface > SAL_CALL + static css::uno::Reference< css::uno::XInterface > create(css::uno::Reference< css::uno::XComponentContext > const & xContext); }; /** Exports all @@ -240,7 +240,7 @@ public: static OUString getImplementationName_Static( ); /// @throws css::uno::RuntimeException static Sequence< OUString > getSupportedServiceNames_Static( ); - static css::uno::Reference< css::uno::XInterface > SAL_CALL + static css::uno::Reference< css::uno::XInterface > create(css::uno::Reference< css::uno::XComponentContext > const & xContext); }; diff --git a/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx b/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx index f68dc4d9e554..cee792543ef1 100644 --- a/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx +++ b/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx @@ -120,7 +120,7 @@ uno::Sequence< OUString > ExportDocumentHandler::getSupportedServiceNames_static } -uno::Reference< uno::XInterface > SAL_CALL ExportDocumentHandler::create( const uno::Reference< uno::XComponentContext >& _rxContext ) +uno::Reference< uno::XInterface > ExportDocumentHandler::create( const uno::Reference< uno::XComponentContext >& _rxContext ) { return *(new ExportDocumentHandler( _rxContext )); } diff --git a/reportdesign/source/filter/xml/xmlExportDocumentHandler.hxx b/reportdesign/source/filter/xml/xmlExportDocumentHandler.hxx index b411b475fcdd..2c6a3c9524f6 100644 --- a/reportdesign/source/filter/xml/xmlExportDocumentHandler.hxx +++ b/reportdesign/source/filter/xml/xmlExportDocumentHandler.hxx @@ -48,7 +48,7 @@ public: static OUString getImplementationName_Static( ); /// @throws css::uno::RuntimeException static css::uno::Sequence< OUString > getSupportedServiceNames_static( ); - static css::uno::Reference< css::uno::XInterface > SAL_CALL + static css::uno::Reference< css::uno::XInterface > create(const css::uno::Reference< css::uno::XComponentContext >&); public: explicit ExportDocumentHandler(css::uno::Reference< css::uno::XComponentContext > const & context); diff --git a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx index 315883a300a6..af3b1787360f 100644 --- a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx +++ b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx @@ -94,7 +94,7 @@ uno::Sequence< OUString > ImportDocumentHandler::getSupportedServiceNames_static } -uno::Reference< uno::XInterface > SAL_CALL ImportDocumentHandler::create( const uno::Reference< uno::XComponentContext >& _rxContext ) +uno::Reference< uno::XInterface > ImportDocumentHandler::create( const uno::Reference< uno::XComponentContext >& _rxContext ) { return *(new ImportDocumentHandler( _rxContext )); } diff --git a/reportdesign/source/filter/xml/xmlImportDocumentHandler.hxx b/reportdesign/source/filter/xml/xmlImportDocumentHandler.hxx index 9bc49ea247f8..64b4b9f23c3d 100644 --- a/reportdesign/source/filter/xml/xmlImportDocumentHandler.hxx +++ b/reportdesign/source/filter/xml/xmlImportDocumentHandler.hxx @@ -46,7 +46,7 @@ public: static OUString getImplementationName_Static( ); /// @throws css::uno::RuntimeException static css::uno::Sequence< OUString > getSupportedServiceNames_static( ); - static css::uno::Reference< css::uno::XInterface > SAL_CALL + static css::uno::Reference< css::uno::XInterface > create(const css::uno::Reference< css::uno::XComponentContext >&); public: explicit ImportDocumentHandler(css::uno::Reference< css::uno::XComponentContext > const & context); diff --git a/reportdesign/source/filter/xml/xmlfilter.hxx b/reportdesign/source/filter/xml/xmlfilter.hxx index 1f6531a9b795..eacb74e83969 100644 --- a/reportdesign/source/filter/xml/xmlfilter.hxx +++ b/reportdesign/source/filter/xml/xmlfilter.hxx @@ -122,7 +122,7 @@ public: static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); /// @throws css::uno::RuntimeException static OUString getImplementationName_Static(); - static css::uno::Reference< css::uno::XInterface > SAL_CALL + static css::uno::Reference< css::uno::XInterface > create(css::uno::Reference< css::uno::XComponentContext > const & xContext); const Reference<XReportDefinition>& getReportDefinition() const { @@ -182,7 +182,7 @@ public: static OUString getImplementationName_Static( ); /// @throws css::uno::RuntimeException static Sequence< OUString > getSupportedServiceNames_Static( ); - static css::uno::Reference< css::uno::XInterface > SAL_CALL + static css::uno::Reference< css::uno::XInterface > create(css::uno::Reference< css::uno::XComponentContext > const & xContext); }; @@ -197,7 +197,7 @@ public: static OUString getImplementationName_Static( ); /// @throws css::uno::RuntimeException static Sequence< OUString > getSupportedServiceNames_Static( ); - static css::uno::Reference< css::uno::XInterface > SAL_CALL + static css::uno::Reference< css::uno::XInterface > create(css::uno::Reference< css::uno::XComponentContext > const & xContext); }; @@ -212,7 +212,7 @@ public: static OUString getImplementationName_Static( ); /// @throws css::uno::RuntimeException static Sequence< OUString > getSupportedServiceNames_Static( ); - static css::uno::Reference< css::uno::XInterface > SAL_CALL + static css::uno::Reference< css::uno::XInterface > create(css::uno::Reference< css::uno::XComponentContext > const & xContext); }; @@ -227,7 +227,7 @@ public: static OUString getImplementationName_Static( ); /// @throws css::uno::RuntimeException static Sequence< OUString > getSupportedServiceNames_Static( ); - static css::uno::Reference< css::uno::XInterface > SAL_CALL + static css::uno::Reference< css::uno::XInterface > create(css::uno::Reference< css::uno::XComponentContext > const & xContext); }; diff --git a/reportdesign/source/ui/inc/DataProviderHandler.hxx b/reportdesign/source/ui/inc/DataProviderHandler.hxx index a0786b897a78..8382b7ab1c0c 100644 --- a/reportdesign/source/ui/inc/DataProviderHandler.hxx +++ b/reportdesign/source/ui/inc/DataProviderHandler.hxx @@ -55,7 +55,7 @@ namespace rptui static OUString getImplementationName_Static( ); /// @throws css::uno::RuntimeException static css::uno::Sequence< OUString > getSupportedServiceNames_static( ); - static css::uno::Reference< css::uno::XInterface > SAL_CALL + static css::uno::Reference< css::uno::XInterface > create(const css::uno::Reference< css::uno::XComponentContext >&); explicit DataProviderHandler(css::uno::Reference< css::uno::XComponentContext > const & context); diff --git a/reportdesign/source/ui/inc/DefaultInspection.hxx b/reportdesign/source/ui/inc/DefaultInspection.hxx index e11e366d8b13..8116986cb608 100644 --- a/reportdesign/source/ui/inc/DefaultInspection.hxx +++ b/reportdesign/source/ui/inc/DefaultInspection.hxx @@ -84,7 +84,7 @@ namespace rptui static OUString getImplementationName_Static( ); /// @throws css::uno::RuntimeException static css::uno::Sequence< OUString > getSupportedServiceNames_static( ); - static css::uno::Reference< css::uno::XInterface > SAL_CALL + static css::uno::Reference< css::uno::XInterface > create(const css::uno::Reference< css::uno::XComponentContext >&); DefaultComponentInspectorModel( const css::uno::Reference< css::uno::XComponentContext >& _rxContext); diff --git a/reportdesign/source/ui/inc/GeometryHandler.hxx b/reportdesign/source/ui/inc/GeometryHandler.hxx index 58e1270a974e..a6839475de78 100644 --- a/reportdesign/source/ui/inc/GeometryHandler.hxx +++ b/reportdesign/source/ui/inc/GeometryHandler.hxx @@ -242,7 +242,7 @@ namespace rptui static OUString getImplementationName_Static( ); /// @throws css::uno::RuntimeException static css::uno::Sequence< OUString > getSupportedServiceNames_static( ); - static css::uno::Reference< css::uno::XInterface > SAL_CALL + static css::uno::Reference< css::uno::XInterface > create(const css::uno::Reference< css::uno::XComponentContext >&); public: diff --git a/reportdesign/source/ui/inc/ReportComponentHandler.hxx b/reportdesign/source/ui/inc/ReportComponentHandler.hxx index 3f7d50466c72..ade41bf6ad2e 100644 --- a/reportdesign/source/ui/inc/ReportComponentHandler.hxx +++ b/reportdesign/source/ui/inc/ReportComponentHandler.hxx @@ -49,7 +49,7 @@ namespace rptui static OUString getImplementationName_Static( ); /// @throws css::uno::RuntimeException static css::uno::Sequence< OUString > getSupportedServiceNames_static( ); - static css::uno::Reference< css::uno::XInterface > SAL_CALL + static css::uno::Reference< css::uno::XInterface > create(const css::uno::Reference< css::uno::XComponentContext >&); public: diff --git a/reportdesign/source/ui/inc/ReportController.hxx b/reportdesign/source/ui/inc/ReportController.hxx index 483ef5379c5e..3cca358adc0b 100644 --- a/reportdesign/source/ui/inc/ReportController.hxx +++ b/reportdesign/source/ui/inc/ReportController.hxx @@ -357,7 +357,7 @@ namespace rptui static OUString getImplementationName_Static(); /// @throws css::uno::RuntimeException static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); - static css::uno::Reference< css::uno::XInterface > SAL_CALL + static css::uno::Reference< css::uno::XInterface > create(css::uno::Reference< css::uno::XComponentContext > const & xContext); // css::container::XContainerListener diff --git a/reportdesign/source/ui/inc/statusbarcontroller.hxx b/reportdesign/source/ui/inc/statusbarcontroller.hxx index 86f336effed3..be539ec25e3c 100644 --- a/reportdesign/source/ui/inc/statusbarcontroller.hxx +++ b/reportdesign/source/ui/inc/statusbarcontroller.hxx @@ -41,7 +41,7 @@ namespace rptui static OUString getImplementationName_Static(); /// @throws css::uno::RuntimeException static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); - static css::uno::Reference< css::uno::XInterface > SAL_CALL + static css::uno::Reference< css::uno::XInterface > create(css::uno::Reference< css::uno::XComponentContext > const & xContext); private: diff --git a/reportdesign/source/ui/inspection/DataProviderHandler.cxx b/reportdesign/source/ui/inspection/DataProviderHandler.cxx index d02a936e8909..da2a70cff388 100644 --- a/reportdesign/source/ui/inspection/DataProviderHandler.cxx +++ b/reportdesign/source/ui/inspection/DataProviderHandler.cxx @@ -98,7 +98,7 @@ uno::Sequence< OUString > DataProviderHandler::getSupportedServiceNames_static( return aSupported; } -uno::Reference< uno::XInterface > SAL_CALL DataProviderHandler::create( const uno::Reference< uno::XComponentContext >& _rxContext ) +uno::Reference< uno::XInterface > DataProviderHandler::create( const uno::Reference< uno::XComponentContext >& _rxContext ) { return *(new DataProviderHandler( _rxContext )); } diff --git a/reportdesign/source/ui/inspection/DefaultInspection.cxx b/reportdesign/source/ui/inspection/DefaultInspection.cxx index e66a45a2ace8..b1479e1401a2 100644 --- a/reportdesign/source/ui/inspection/DefaultInspection.cxx +++ b/reportdesign/source/ui/inspection/DefaultInspection.cxx @@ -86,7 +86,7 @@ namespace rptui return aSupported; } - Reference< XInterface > SAL_CALL DefaultComponentInspectorModel::create( const Reference< XComponentContext >& _rxContext ) + Reference< XInterface > DefaultComponentInspectorModel::create( const Reference< XComponentContext >& _rxContext ) { return *(new DefaultComponentInspectorModel( _rxContext )); } diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx index 1c80a32ae1c7..50fc1ceba86c 100644 --- a/reportdesign/source/ui/inspection/GeometryHandler.cxx +++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx @@ -263,7 +263,7 @@ uno::Sequence< OUString > GeometryHandler::getSupportedServiceNames_static( ) return aSupported; } -uno::Reference< uno::XInterface > SAL_CALL GeometryHandler::create( const uno::Reference< uno::XComponentContext >& _rxContext ) +uno::Reference< uno::XInterface > GeometryHandler::create( const uno::Reference< uno::XComponentContext >& _rxContext ) { return *(new GeometryHandler( _rxContext )); } diff --git a/reportdesign/source/ui/inspection/ReportComponentHandler.cxx b/reportdesign/source/ui/inspection/ReportComponentHandler.cxx index a929f4c286c8..7f65e22a4525 100644 --- a/reportdesign/source/ui/inspection/ReportComponentHandler.cxx +++ b/reportdesign/source/ui/inspection/ReportComponentHandler.cxx @@ -76,7 +76,7 @@ uno::Sequence< OUString > ReportComponentHandler::getSupportedServiceNames_stati return aSupported; } -uno::Reference< uno::XInterface > SAL_CALL ReportComponentHandler::create( const uno::Reference< uno::XComponentContext >& _rxContext ) +uno::Reference< uno::XInterface > ReportComponentHandler::create( const uno::Reference< uno::XComponentContext >& _rxContext ) { return *(new ReportComponentHandler( _rxContext )); } diff --git a/shell/source/backends/localebe/localebackend.cxx b/shell/source/backends/localebe/localebackend.cxx index 3392bb73cfc0..056d8a48bb32 100644 --- a/shell/source/backends/localebe/localebackend.cxx +++ b/shell/source/backends/localebe/localebackend.cxx @@ -320,7 +320,7 @@ css::uno::Any LocaleBackend::getPropertyValue( } -OUString SAL_CALL LocaleBackend::getBackendName() { +OUString LocaleBackend::getBackendName() { return OUString("com.sun.star.comp.configuration.backend.LocaleBackend") ; } @@ -329,7 +329,7 @@ OUString SAL_CALL LocaleBackend::getImplementationName() return getBackendName() ; } -uno::Sequence<OUString> SAL_CALL LocaleBackend::getBackendServiceNames() +uno::Sequence<OUString> LocaleBackend::getBackendServiceNames() { uno::Sequence<OUString> aServiceNameList { "com.sun.star.configuration.backend.LocaleBackend" }; return aServiceNameList ; diff --git a/shell/source/backends/localebe/localebackend.hxx b/shell/source/backends/localebe/localebackend.hxx index 4fd0e75b593b..006d669db0ee 100644 --- a/shell/source/backends/localebe/localebackend.hxx +++ b/shell/source/backends/localebe/localebackend.hxx @@ -56,13 +56,13 @@ class LocaleBackend final : public ::cppu::WeakImplHelper < @return implementation name */ - static OUString SAL_CALL getBackendName() ; + static OUString getBackendName() ; /** Provides the supported services names @return service names */ - static uno::Sequence<OUString> SAL_CALL getBackendServiceNames() ; + static uno::Sequence<OUString> getBackendServiceNames() ; // XPropertySet virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL diff --git a/starmath/source/smdetect.cxx b/starmath/source/smdetect.cxx index 107509f8caa1..c3e903575111 100644 --- a/starmath/source/smdetect.cxx +++ b/starmath/source/smdetect.cxx @@ -147,7 +147,7 @@ OUString SmFilterDetect::impl_getStaticImplementationName() } /* Helper for registry */ -Reference< XInterface > SAL_CALL SmFilterDetect::impl_createInstance( const Reference< XMultiServiceFactory >& xServiceManager ) +Reference< XInterface > SmFilterDetect::impl_createInstance( const Reference< XMultiServiceFactory >& xServiceManager ) { return Reference< XInterface >( *new SmFilterDetect( xServiceManager ) ); } diff --git a/starmath/source/smdetect.hxx b/starmath/source/smdetect.hxx index a228e5666e0d..3386365e2759 100644 --- a/starmath/source/smdetect.hxx +++ b/starmath/source/smdetect.hxx @@ -63,7 +63,7 @@ public: /* Helper for registry */ /// @throws css::uno::Exception - static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ); + static css::uno::Reference< css::uno::XInterface > impl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ); // XExtendedFilterDetect virtual OUString SAL_CALL detect( css::uno::Sequence< css::beans::PropertyValue >& lDescriptor ) override; diff --git a/svl/source/fsstor/fsfactory.cxx b/svl/source/fsstor/fsfactory.cxx index 1efb63ecf8bb..816de07b201c 100644 --- a/svl/source/fsstor/fsfactory.cxx +++ b/svl/source/fsstor/fsfactory.cxx @@ -37,7 +37,7 @@ using namespace ::com::sun::star; -uno::Sequence< OUString > SAL_CALL FSStorageFactory::impl_staticGetSupportedServiceNames() +uno::Sequence< OUString > FSStorageFactory::impl_staticGetSupportedServiceNames() { uno::Sequence< OUString > aRet(2); aRet[0] = "com.sun.star.embed.FileSystemStorageFactory"; @@ -45,7 +45,7 @@ uno::Sequence< OUString > SAL_CALL FSStorageFactory::impl_staticGetSupportedServ return aRet; } -OUString SAL_CALL FSStorageFactory::impl_staticGetImplementationName() +OUString FSStorageFactory::impl_staticGetImplementationName() { return OUString("com.sun.star.comp.embed.FileSystemStorageFactory"); } diff --git a/svl/source/inc/fsfactory.hxx b/svl/source/inc/fsfactory.hxx index 86a921f06fa1..579ab67ece54 100644 --- a/svl/source/inc/fsfactory.hxx +++ b/svl/source/inc/fsfactory.hxx @@ -39,10 +39,10 @@ public: OSL_ENSURE( xContext.is(), "No service manager is provided!" ); } - static css::uno::Sequence< OUString > SAL_CALL + static css::uno::Sequence< OUString > impl_staticGetSupportedServiceNames(); - static OUString SAL_CALL impl_staticGetImplementationName(); + static OUString impl_staticGetImplementationName(); static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_staticCreateSelfInstance( diff --git a/svl/source/passwordcontainer/passwordcontainer.cxx b/svl/source/passwordcontainer/passwordcontainer.cxx index 00e1f0fa13b6..90b66090ce48 100644 --- a/svl/source/passwordcontainer/passwordcontainer.cxx +++ b/svl/source/passwordcontainer/passwordcontainer.cxx @@ -1323,13 +1323,13 @@ Sequence< OUString > SAL_CALL PasswordContainer::getSupportedServiceNames( ) return impl_getStaticSupportedServiceNames(); } -Sequence< OUString > SAL_CALL PasswordContainer::impl_getStaticSupportedServiceNames( ) +Sequence< OUString > PasswordContainer::impl_getStaticSupportedServiceNames( ) { Sequence< OUString > aRet { "com.sun.star.task.PasswordContainer" }; return aRet; } -OUString SAL_CALL PasswordContainer::impl_getStaticImplementationName() +OUString PasswordContainer::impl_getStaticImplementationName() { return OUString("stardiv.svl.PasswordContainer"); } diff --git a/svl/source/passwordcontainer/passwordcontainer.hxx b/svl/source/passwordcontainer/passwordcontainer.hxx index 6ce7bb9bcba3..9a65f0fe92d4 100644 --- a/svl/source/passwordcontainer/passwordcontainer.hxx +++ b/svl/source/passwordcontainer/passwordcontainer.hxx @@ -310,9 +310,9 @@ public: // provide factory /// @throws css::uno::RuntimeException - static OUString SAL_CALL impl_getStaticImplementationName( ); + static OUString impl_getStaticImplementationName( ); /// @throws css::uno::RuntimeException - static css::uno::Sequence< OUString > SAL_CALL + static css::uno::Sequence< OUString > impl_getStaticSupportedServiceNames( ); /// @throws css::uno::RuntimeException static css::uno::Reference< css::lang::XSingleServiceFactory > diff --git a/svx/source/form/xfm_addcondition.cxx b/svx/source/form/xfm_addcondition.cxx index 1ab50fa3007f..8cbe432c395f 100644 --- a/svx/source/form/xfm_addcondition.cxx +++ b/svx/source/form/xfm_addcondition.cxx @@ -105,7 +105,7 @@ namespace svxform } - Reference< XInterface > SAL_CALL OAddConditionDialog::Create( const Reference< XMultiServiceFactory >& _rxFactory ) + Reference< XInterface > OAddConditionDialog::Create( const Reference< XMultiServiceFactory >& _rxFactory ) { return *( new OAddConditionDialog( comphelper::getComponentContext(_rxFactory) ) ); } diff --git a/svx/source/inc/xfm_addcondition.hxx b/svx/source/inc/xfm_addcondition.hxx index bb50d3871d3d..d55e16bb8084 100644 --- a/svx/source/inc/xfm_addcondition.hxx +++ b/svx/source/inc/xfm_addcondition.hxx @@ -36,7 +36,7 @@ namespace svxform { public: static css::uno::Reference< css::uno::XInterface > - SAL_CALL Create( const css::uno::Reference< css::lang::XMultiServiceFactory >& ); + Create( const css::uno::Reference< css::lang::XMultiServiceFactory >& ); private: OAddConditionDialog( const css::uno::Reference< css::uno::XComponentContext >& _rxORB ); diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx index 2ccd40356451..cd73f0912ff8 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx @@ -79,7 +79,7 @@ public: static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); /// @throws css::uno::Exception - static css::uno::Reference< css::uno::XInterface > SAL_CALL + static css::uno::Reference< css::uno::XInterface > create( css::uno::Reference< css::uno::XComponentContext > const & ) { return static_cast<cppu::OWeakObject *>( new ChineseTranslation_UnoDialog ); diff --git a/ucb/source/ucp/ext/ucpext_provider.cxx b/ucb/source/ucp/ext/ucpext_provider.cxx index 46e37a3f93dc..88d00cade588 100644 --- a/ucb/source/ucp/ext/ucpext_provider.cxx +++ b/ucb/source/ucp/ext/ucpext_provider.cxx @@ -54,7 +54,7 @@ namespace ucb { namespace ucp { namespace ext } - OUString SAL_CALL ContentProvider::getImplementationName_static() + OUString ContentProvider::getImplementationName_static() { return OUString( "org.openoffice.comp.ucp.ext.ContentProvider" ); } @@ -66,7 +66,7 @@ namespace ucb { namespace ucp { namespace ext } - Sequence< OUString > SAL_CALL ContentProvider::getSupportedServiceNames_static( ) + Sequence< OUString > ContentProvider::getSupportedServiceNames_static( ) { Sequence< OUString > aServiceNames(2); aServiceNames[0] = "com.sun.star.ucb.ContentProvider"; diff --git a/ucb/source/ucp/ext/ucpext_provider.hxx b/ucb/source/ucp/ext/ucpext_provider.hxx index e69f827b33aa..77f98f8f48b7 100644 --- a/ucb/source/ucp/ext/ucpext_provider.hxx +++ b/ucb/source/ucp/ext/ucpext_provider.hxx @@ -42,10 +42,10 @@ namespace ucb { namespace ucp { namespace ext // XServiceInfo - static versions /// @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::Reference< css::uno::XInterface > SAL_CALL Create( const css::uno::Reference< css::uno::XComponentContext >& i_rContext ); + static css::uno::Sequence< OUString > getSupportedServiceNames_static(); + static css::uno::Reference< css::uno::XInterface > Create( const css::uno::Reference< css::uno::XComponentContext >& i_rContext ); // XContentProvider virtual css::uno::Reference< css::ucb::XContent > SAL_CALL queryContent( const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier ) override; diff --git a/ucb/source/ucp/file/filtask.cxx b/ucb/source/ucp/file/filtask.cxx index 5f0186c8ee75..ca8c7cc954be 100644 --- a/ucb/source/ucp/file/filtask.cxx +++ b/ucb/source/ucp/file/filtask.cxx @@ -3067,14 +3067,14 @@ TaskManager::getScheme( OUString& Scheme ) Scheme = "file"; } -OUString SAL_CALL +OUString TaskManager::getImplementationName_static() { return OUString("com.sun.star.comp.ucb.FileProvider"); } -uno::Sequence< OUString > SAL_CALL +uno::Sequence< OUString > TaskManager::getSupportedServiceNames_static() { OUString Supported("com.sun.star.ucb.FileContentProvider"); diff --git a/ucb/source/ucp/file/filtask.hxx b/ucb/source/ucp/file/filtask.hxx index e89ca36e2a72..05802f259db5 100644 --- a/ucb/source/ucp/file/filtask.hxx +++ b/ucb/source/ucp/file/filtask.hxx @@ -682,9 +682,9 @@ namespace fileaccess static void getScheme( OUString& Scheme ); - static OUString SAL_CALL getImplementationName_static(); + static OUString getImplementationName_static(); - static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static(); + static css::uno::Sequence< OUString > getSupportedServiceNames_static(); }; } // end namespace TaskHandling diff --git a/xmlhelp/source/cxxhelp/inc/tvfactory.hxx b/xmlhelp/source/cxxhelp/inc/tvfactory.hxx index 86dc3a8cf6b6..0f34599542a4 100644 --- a/xmlhelp/source/cxxhelp/inc/tvfactory.hxx +++ b/xmlhelp/source/cxxhelp/inc/tvfactory.hxx @@ -69,9 +69,9 @@ class TVFactory: public cppu::WeakImplHelper < // Other - static OUString SAL_CALL getImplementationName_static(); + static OUString getImplementationName_static(); - static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static(); + static css::uno::Sequence< OUString > getSupportedServiceNames_static(); static css::uno::Reference< css::lang::XSingleServiceFactory > createServiceFactory( diff --git a/xmlhelp/source/treeview/tvfactory.cxx b/xmlhelp/source/treeview/tvfactory.cxx index 6bb587703cfd..9edb304cd791 100644 --- a/xmlhelp/source/treeview/tvfactory.cxx +++ b/xmlhelp/source/treeview/tvfactory.cxx @@ -123,13 +123,13 @@ TVFactory::getAvailableServiceNames( ) // static -OUString SAL_CALL +OUString TVFactory::getImplementationName_static() { return OUString( "com.sun.star.help.TreeViewImpl" ); } -Sequence< OUString > SAL_CALL +Sequence< OUString > TVFactory::getSupportedServiceNames_static() { Sequence< OUString > seq( 2 ); diff --git a/xmlsecurity/inc/framework/xmlsignaturetemplateimpl.hxx b/xmlsecurity/inc/framework/xmlsignaturetemplateimpl.hxx index bb6452c0256e..e0c9fcaf40c1 100644 --- a/xmlsecurity/inc/framework/xmlsignaturetemplateimpl.hxx +++ b/xmlsecurity/inc/framework/xmlsignaturetemplateimpl.hxx @@ -91,7 +91,7 @@ class XMLSignatureTemplateImpl : public ::cppu::WeakImplHelper< //Helper for registry /// @throws css::uno::RuntimeException - static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& aServiceManager ) ; + static css::uno::Reference< css::uno::XInterface > impl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& aServiceManager ) ; }; #endif // INCLUDED_XMLSECURITY_INC_FRAMEWORK_XMLSIGNATURETEMPLATEIMPL_HXX diff --git a/xmlsecurity/qa/unit/signing/data/.gpg-v21-migrated b/xmlsecurity/qa/unit/signing/data/.gpg-v21-migrated new file mode 100644 index 000000000000..e69de29bb2d1 --- /dev/null +++ b/xmlsecurity/qa/unit/signing/data/.gpg-v21-migrated diff --git a/xmlsecurity/source/component/certificatecontainer.cxx b/xmlsecurity/source/component/certificatecontainer.cxx index ac52bbf6fde1..bdbaa68b0a94 100644 --- a/xmlsecurity/source/component/certificatecontainer.cxx +++ b/xmlsecurity/source/component/certificatecontainer.cxx @@ -101,20 +101,20 @@ CertificateContainer::getSupportedServiceNames( ) return impl_getStaticSupportedServiceNames(); } -Sequence< OUString > SAL_CALL +Sequence< OUString > CertificateContainer::impl_getStaticSupportedServiceNames( ) { Sequence< OUString > aRet { "com.sun.star.security.CertificateContainer" }; return aRet; } -OUString SAL_CALL +OUString CertificateContainer::impl_getStaticImplementationName() { return OUString("com.sun.star.security.CertificateContainer"); } -Reference< XInterface > SAL_CALL CertificateContainer::impl_createInstance( const Reference< XMultiServiceFactory >& xServiceManager ) +Reference< XInterface > CertificateContainer::impl_createInstance( const Reference< XMultiServiceFactory >& xServiceManager ) { return Reference< XInterface >( *new CertificateContainer( xServiceManager ) ); } diff --git a/xmlsecurity/source/component/certificatecontainer.hxx b/xmlsecurity/source/component/certificatecontainer.hxx index 6bd64f524930..58c3ef82d00a 100644 --- a/xmlsecurity/source/component/certificatecontainer.hxx +++ b/xmlsecurity/source/component/certificatecontainer.hxx @@ -54,14 +54,14 @@ class CertificateContainer : public ::cppu::WeakImplHelper< css::lang::XServiceI // provide factory /// @throws css::uno::RuntimeException - static OUString SAL_CALL impl_getStaticImplementationName( ); + static OUString impl_getStaticImplementationName( ); /// @throws css::uno::RuntimeException - static css::uno::Sequence< OUString > SAL_CALL + static css::uno::Sequence< OUString > impl_getStaticSupportedServiceNames( ); /// @throws css::uno::RuntimeException - static css::uno::Reference< css::uno::XInterface > SAL_CALL + static css::uno::Reference< css::uno::XInterface > impl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ); // XServiceInfo diff --git a/xmlsecurity/source/framework/xmlsignaturetemplateimpl.cxx b/xmlsecurity/source/framework/xmlsignaturetemplateimpl.cxx index 5e20ce85f0ca..6e3b0939cebf 100644 --- a/xmlsecurity/source/framework/xmlsignaturetemplateimpl.cxx +++ b/xmlsecurity/source/framework/xmlsignaturetemplateimpl.cxx @@ -125,7 +125,7 @@ OUString XMLSignatureTemplateImpl::impl_getImplementationName() { } //Helper for registry -Reference< XInterface > SAL_CALL XMLSignatureTemplateImpl::impl_createInstance( const Reference< XMultiServiceFactory >& ) { +Reference< XInterface > XMLSignatureTemplateImpl::impl_createInstance( const Reference< XMultiServiceFactory >& ) { return Reference< XInterface >( *new XMLSignatureTemplateImpl ) ; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |