diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-08-01 08:40:47 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-08-01 11:06:26 +0200 |
commit | 612b489d3e05b24c1b6690082e8518bac033e9d2 (patch) | |
tree | 23a6c556989071385d1c64730ed72bdbae7c239c /dbaccess | |
parent | 17e14d459dea201b57be2d8e677fa776ead03291 (diff) |
loplugin:checkunusedparams
the "check for taking address of function" part was generating false+
Change-Id: Iad6203850901229b7b1b2f8938c68ec703cd343f
Reviewed-on: https://gerrit.libreoffice.org/40613
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'dbaccess')
-rw-r--r-- | dbaccess/source/core/dataaccess/ContentHelper.cxx | 4 | ||||
-rw-r--r-- | dbaccess/source/core/inc/ContentHelper.hxx | 3 | ||||
-rw-r--r-- | dbaccess/source/ui/browser/genericcontroller.cxx | 16 |
3 files changed, 7 insertions, 16 deletions
diff --git a/dbaccess/source/core/dataaccess/ContentHelper.cxx b/dbaccess/source/core/dataaccess/ContentHelper.cxx index 01d7d7b811d2..37d1cbb2b48b 100644 --- a/dbaccess/source/core/dataaccess/ContentHelper.cxx +++ b/dbaccess/source/core/dataaccess/ContentHelper.cxx @@ -202,7 +202,7 @@ Any SAL_CALL OContentHelper::execute( const Command& aCommand, sal_Int32 /*Comma // Unreachable } - aRet <<= setPropertyValues( aProperties, Environment ); + aRet <<= setPropertyValues( aProperties ); } else if ( aCommand.Name == "getPropertySetInfo" ) { @@ -314,7 +314,7 @@ void SAL_CALL OContentHelper::initialize( const Sequence< Any >& _aArguments ) } } -Sequence< Any > OContentHelper::setPropertyValues(const Sequence< PropertyValue >& rValues,const Reference< XCommandEnvironment >& /*xEnv*/ ) +Sequence< Any > OContentHelper::setPropertyValues(const Sequence< PropertyValue >& rValues ) { osl::ClearableGuard< osl::Mutex > aGuard( m_aMutex ); diff --git a/dbaccess/source/core/inc/ContentHelper.hxx b/dbaccess/source/core/inc/ContentHelper.hxx index 14c68000ade8..d7ec3ac89a57 100644 --- a/dbaccess/source/core/inc/ContentHelper.hxx +++ b/dbaccess/source/core/inc/ContentHelper.hxx @@ -96,8 +96,7 @@ namespace dbaccess ,public OContentHelper_COMPBASE { css::uno::Sequence< css::uno::Any > - setPropertyValues( const css::uno::Sequence< css::beans::PropertyValue >& rValues, - const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ); + setPropertyValues( const css::uno::Sequence< css::beans::PropertyValue >& rValues ); void impl_rename_throw(const OUString& _sNewName,bool _bNotify = true); diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx index 576289f3fb42..227fe0c5491c 100644 --- a/dbaccess/source/ui/browser/genericcontroller.cxx +++ b/dbaccess/source/ui/browser/genericcontroller.cxx @@ -92,7 +92,6 @@ class UserDefinedFeatures public: explicit UserDefinedFeatures( const Reference< XController >& _rxController ); - static FeatureState getState( const URL& _rFeatureURL ); void execute( const URL& _rFeatureURL, const Sequence< PropertyValue>& _rArgs ); private: @@ -104,16 +103,6 @@ UserDefinedFeatures::UserDefinedFeatures( const Reference< XController >& _rxCon { } -FeatureState UserDefinedFeatures::getState( const URL& /*_rFeatureURL*/ ) -{ - // for now, enable all the time - // TODO: we should ask the dispatcher. However, this is laborious, since you cannot ask a dispatcher - // directly, but need to add a status listener. - FeatureState aState; - aState.bEnabled = true; - return aState; -} - void UserDefinedFeatures::execute( const URL& _rFeatureURL, const Sequence< PropertyValue>& _rArgs ) { try @@ -874,7 +863,10 @@ FeatureState OGenericUnoController::GetState( sal_uInt16 _nId ) const aReturn.bEnabled = true; break; default: - aReturn = UserDefinedFeatures::getState( getURLForId( _nId ) ); + // for now, enable all the time + // TODO: we should ask the dispatcher. However, this is laborious, since you cannot ask a dispatcher + // directly, but need to add a status listener. + aReturn.bEnabled = true; break; } |