diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-12-06 08:59:44 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-12-07 11:25:55 +0100 |
commit | dd0dceb51122b4e8e969f848d9f046e91962d254 (patch) | |
tree | f927f0870a54ad7cb887e6e7d5bb7956d44d0665 /ucb/source | |
parent | caf1eb15838729e05a70d2fcb8de6834394b5764 (diff) |
loplugin:salcall handle static methods
Change-Id: Id6820abec4b8ca8bee26d62b333fd30b42a14aec
Reviewed-on: https://gerrit.libreoffice.org/46007
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'ucb/source')
-rw-r--r-- | ucb/source/cacher/cachedcontentresultset.cxx | 4 | ||||
-rw-r--r-- | ucb/source/cacher/cachedcontentresultsetstub.cxx | 6 | ||||
-rw-r--r-- | ucb/source/cacher/cachedcontentresultsetstub.hxx | 6 | ||||
-rw-r--r-- | ucb/source/ucp/file/filtask.cxx | 20 | ||||
-rw-r--r-- | ucb/source/ucp/file/filtask.hxx | 20 | ||||
-rw-r--r-- | ucb/source/ucp/file/prov.cxx | 2 | ||||
-rw-r--r-- | ucb/source/ucp/file/prov.hxx | 2 |
7 files changed, 30 insertions, 30 deletions
diff --git a/ucb/source/cacher/cachedcontentresultset.cxx b/ucb/source/cacher/cachedcontentresultset.cxx index 9bca9c11b76f..1497ed15071d 100644 --- a/ucb/source/cacher/cachedcontentresultset.cxx +++ b/ucb/source/cacher/cachedcontentresultset.cxx @@ -381,7 +381,7 @@ private: sal_Int32 impl_getPos( const OUString& rName ) const; - static bool SAL_CALL + static bool impl_isMyPropertyName( const OUString& rName ); public: @@ -585,7 +585,7 @@ bool CCRS_PropertySetInfo } //static -bool SAL_CALL CCRS_PropertySetInfo +bool CCRS_PropertySetInfo ::impl_isMyPropertyName( const OUString& rPropertyName ) { return ( rPropertyName == g_sPropertyNameForCount diff --git a/ucb/source/cacher/cachedcontentresultsetstub.cxx b/ucb/source/cacher/cachedcontentresultsetstub.cxx index 93dfbbadc65c..cc0f41fbe598 100644 --- a/ucb/source/cacher/cachedcontentresultsetstub.cxx +++ b/ucb/source/cacher/cachedcontentresultsetstub.cxx @@ -432,21 +432,21 @@ void CachedContentResultSetStub // XFetchProviderForContentAccess methods. -void SAL_CALL CachedContentResultSetStub +void CachedContentResultSetStub ::impl_getCurrentContentIdentifierString( Any& rAny , const Reference< XContentAccess >& xContentAccess ) { rAny <<= xContentAccess->queryContentIdentifierString(); } -void SAL_CALL CachedContentResultSetStub +void CachedContentResultSetStub ::impl_getCurrentContentIdentifier( Any& rAny , const Reference< XContentAccess >& xContentAccess ) { rAny <<= xContentAccess->queryContentIdentifier(); } -void SAL_CALL CachedContentResultSetStub +void CachedContentResultSetStub ::impl_getCurrentContent( Any& rAny , const Reference< XContentAccess >& xContentAccess ) { diff --git a/ucb/source/cacher/cachedcontentresultsetstub.hxx b/ucb/source/cacher/cachedcontentresultsetstub.hxx index 485952e8b573..65f120086604 100644 --- a/ucb/source/cacher/cachedcontentresultsetstub.hxx +++ b/ucb/source/cacher/cachedcontentresultsetstub.hxx @@ -61,19 +61,19 @@ private: impl_getColumnCount(); /// @throws css::uno::RuntimeException - static void SAL_CALL + static void impl_getCurrentContentIdentifierString( css::uno::Any& rAny , const css::uno::Reference< css::ucb::XContentAccess >& xContentAccess ); /// @throws css::uno::RuntimeException - static void SAL_CALL + static void impl_getCurrentContentIdentifier( css::uno::Any& rAny , const css::uno::Reference< css::ucb::XContentAccess >& xContentAccess ); /// @throws css::uno::RuntimeException - static void SAL_CALL + static void impl_getCurrentContent( css::uno::Any& rAny , const css::uno::Reference< css::ucb::XContentAccess >& xContentAccess ); diff --git a/ucb/source/ucp/file/filtask.cxx b/ucb/source/ucp/file/filtask.cxx index 738628a8e495..5f0186c8ee75 100644 --- a/ucb/source/ucp/file/filtask.cxx +++ b/ucb/source/ucp/file/filtask.cxx @@ -2007,7 +2007,7 @@ void TaskManager::insertDefaultProperties( const OUString& aUnqPath ) /******************************************************************************/ -bool SAL_CALL TaskManager::getUnqFromUrl( const OUString& Url, OUString& Unq ) +bool TaskManager::getUnqFromUrl( const OUString& Url, OUString& Unq ) { if ( Url == "file:///" || Url == "file://localhost/" || Url == "file://127.0.0.1/" ) { @@ -2028,7 +2028,7 @@ bool SAL_CALL TaskManager::getUnqFromUrl( const OUString& Url, OUString& Unq ) } -bool SAL_CALL TaskManager::getUrlFromUnq( const OUString& Unq,OUString& Url ) +bool TaskManager::getUrlFromUnq( const OUString& Unq,OUString& Url ) { bool err = osl::FileBase::E_None != osl::FileBase::getSystemPathFromFileURL( Unq,Url ); @@ -2650,7 +2650,7 @@ TaskManager::getContentDeletedEventListeners( const OUString& aName ) } -void SAL_CALL +void TaskManager::notifyInsert( std::vector< ContentEventNotifier* >* listeners,const OUString& aChildName ) { std::vector< ContentEventNotifier* >::iterator it = listeners->begin(); @@ -2664,7 +2664,7 @@ TaskManager::notifyInsert( std::vector< ContentEventNotifier* >* listeners,const } -void SAL_CALL +void TaskManager::notifyContentDeleted( std::vector< ContentEventNotifier* >* listeners ) { std::vector< ContentEventNotifier* >::iterator it = listeners->begin(); @@ -2678,7 +2678,7 @@ TaskManager::notifyContentDeleted( std::vector< ContentEventNotifier* >* listene } -void SAL_CALL +void TaskManager::notifyContentRemoved( std::vector< ContentEventNotifier* >* listeners, const OUString& aChildName ) { @@ -2716,7 +2716,7 @@ TaskManager::getPropertySetListeners( const OUString& aName ) } -void SAL_CALL +void TaskManager::notifyPropertyAdded( std::vector< PropertySetInfoChangeNotifier* >* listeners, const OUString& aPropertyName ) { @@ -2731,7 +2731,7 @@ TaskManager::notifyPropertyAdded( std::vector< PropertySetInfoChangeNotifier* >* } -void SAL_CALL +void TaskManager::notifyPropertyRemoved( std::vector< PropertySetInfoChangeNotifier* >* listeners, const OUString& aPropertyName ) { @@ -2844,7 +2844,7 @@ TaskManager::getContentExchangedEventListeners( const OUString& aOldPrefix, } -void SAL_CALL +void TaskManager::notifyContentExchanged( std::vector< std::vector< ContentEventNotifier* >* >* listeners_vec ) { for( std::vector< ContentEventNotifier* >* listeners : *listeners_vec) @@ -2885,7 +2885,7 @@ TaskManager::getPropertyChangeNotifier( const OUString& aName ) } -void SAL_CALL TaskManager::notifyPropertyChanges( std::vector< PropertyChangeNotifier* >* listeners, +void TaskManager::notifyPropertyChanges( std::vector< PropertyChangeNotifier* >* listeners, const uno::Sequence< beans::PropertyChangeEvent >& seqChanged ) { std::vector< PropertyChangeNotifier* >::iterator it = listeners->begin(); @@ -3061,7 +3061,7 @@ uno::Sequence< ucb::ContentInfo > TaskManager::queryCreatableContentsInfo() /* */ /*******************************************************************************/ -void SAL_CALL +void TaskManager::getScheme( OUString& Scheme ) { Scheme = "file"; diff --git a/ucb/source/ucp/file/filtask.hxx b/ucb/source/ucp/file/filtask.hxx index 73d85afaeca1..e89ca36e2a72 100644 --- a/ucb/source/ucp/file/filtask.hxx +++ b/ucb/source/ucp/file/filtask.hxx @@ -499,9 +499,9 @@ namespace fileaccess /* */ /******************************************************************************/ - static bool SAL_CALL getUnqFromUrl( const OUString& Url, OUString& Unq ); + static bool getUnqFromUrl( const OUString& Url, OUString& Unq ); - static bool SAL_CALL getUrlFromUnq( const OUString& Unq, OUString& Url ); + static bool getUrlFromUnq( const OUString& Unq, OUString& Url ); bool m_bWithConfig; @@ -537,28 +537,28 @@ namespace fileaccess /* notify eventListeners */ /********************************************************************************/ - static void SAL_CALL notifyPropertyChanges( + static void notifyPropertyChanges( std::vector< PropertyChangeNotifier* >* listeners, const css::uno::Sequence< css::beans::PropertyChangeEvent >& seqChanged ); - static void SAL_CALL notifyContentExchanged( + static void notifyContentExchanged( std::vector< std::vector< ContentEventNotifier* >* >* listeners_vec ); - static void SAL_CALL notifyInsert( + static void notifyInsert( std::vector< ContentEventNotifier* >* listeners,const OUString& aChildName ); - static void SAL_CALL notifyContentDeleted( + static void notifyContentDeleted( std::vector< ContentEventNotifier* >* listeners ); - static void SAL_CALL notifyContentRemoved( + static void notifyContentRemoved( std::vector< ContentEventNotifier* >* listeners, const OUString& aChildName ); - static void SAL_CALL notifyPropertyAdded( + static void notifyPropertyAdded( std::vector< PropertySetInfoChangeNotifier* >* listeners, const OUString& aPropertyName ); - static void SAL_CALL notifyPropertyRemoved( + static void notifyPropertyRemoved( std::vector< PropertySetInfoChangeNotifier* >* listeners, const OUString& aPropertyName ); @@ -680,7 +680,7 @@ namespace fileaccess // Miscellaneous: // Methods for "writeComponentInfo" and "createComponentFactory" - static void SAL_CALL getScheme( OUString& Scheme ); + static void getScheme( OUString& Scheme ); static OUString SAL_CALL getImplementationName_static(); diff --git a/ucb/source/ucp/file/prov.cxx b/ucb/source/ucp/file/prov.cxx index 281ab149e67a..2cfcc149e336 100644 --- a/ucb/source/ucp/file/prov.cxx +++ b/ucb/source/ucp/file/prov.cxx @@ -136,7 +136,7 @@ FileProvider::getSupportedServiceNames() return fileaccess::TaskManager::getSupportedServiceNames_static(); } -Reference< XSingleServiceFactory > SAL_CALL +Reference< XSingleServiceFactory > FileProvider::createServiceFactory( const Reference< XMultiServiceFactory >& rxServiceMgr ) { diff --git a/ucb/source/ucp/file/prov.hxx b/ucb/source/ucp/file/prov.hxx index 9b336a108bce..30979e275c3c 100644 --- a/ucb/source/ucp/file/prov.hxx +++ b/ucb/source/ucp/file/prov.hxx @@ -73,7 +73,7 @@ namespace fileaccess { getSupportedServiceNames() override; - static css::uno::Reference< css::lang::XSingleServiceFactory > SAL_CALL + static css::uno::Reference< css::lang::XSingleServiceFactory > createServiceFactory( const css::uno::Reference< css::lang::XMultiServiceFactory >& rxServiceMgr ); |