diff options
author | Noel Grandin <noel@peralex.com> | 2016-03-03 13:08:30 +0200 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2016-03-03 12:06:57 +0000 |
commit | 337f517af60d25351bc89f3814dcaf48f3aaa5b6 (patch) | |
tree | 05f3c6f01adb538ca9bc2f10601be068feda7e6b /comphelper | |
parent | 944cdf5fa830e1d85b72c0d815e8fee29410e742 (diff) |
loplugin:unuseddefaultparams comphelper
Change-Id: I78280a13fc0d82fc87041b5dad0c3f2f7d462652
Reviewed-on: https://gerrit.libreoffice.org/22853
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'comphelper')
-rw-r--r-- | comphelper/source/container/embeddedobjectcontainer.cxx | 4 | ||||
-rw-r--r-- | comphelper/source/misc/accessiblewrapper.cxx | 4 | ||||
-rw-r--r-- | comphelper/source/misc/componentmodule.cxx | 4 | ||||
-rw-r--r-- | comphelper/source/misc/docpasswordhelper.cxx | 5 | ||||
-rw-r--r-- | comphelper/source/misc/storagehelper.cxx | 9 |
5 files changed, 9 insertions, 17 deletions
diff --git a/comphelper/source/container/embeddedobjectcontainer.cxx b/comphelper/source/container/embeddedobjectcontainer.cxx index 6c373e2c03af..a37b2f0da85e 100644 --- a/comphelper/source/container/embeddedobjectcontainer.cxx +++ b/comphelper/source/container/embeddedobjectcontainer.cxx @@ -1206,10 +1206,10 @@ uno::Reference < io::XInputStream > EmbeddedObjectContainer::GetObjectStream( co return xInputStream; } -uno::Reference < io::XInputStream > EmbeddedObjectContainer::GetObjectStream( const uno::Reference < embed::XEmbeddedObject >& xObj, OUString* pMediaType ) +uno::Reference < io::XInputStream > EmbeddedObjectContainer::GetObjectStream( const uno::Reference < embed::XEmbeddedObject >& xObj ) { // try to load it from the container storage - return GetObjectStream( GetEmbeddedObjectName( xObj ), pMediaType ); + return GetObjectStream( GetEmbeddedObjectName( xObj ), nullptr ); } bool EmbeddedObjectContainer::InsertGraphicStream( const css::uno::Reference < css::io::XInputStream >& rStream, const OUString& rObjectName, const OUString& rMediaType ) diff --git a/comphelper/source/misc/accessiblewrapper.cxx b/comphelper/source/misc/accessiblewrapper.cxx index 75cad7fdb3a9..e106b9dd14e1 100644 --- a/comphelper/source/misc/accessiblewrapper.cxx +++ b/comphelper/source/misc/accessiblewrapper.cxx @@ -88,7 +88,7 @@ namespace comphelper Reference< XAccessible > OWrappedAccessibleChildrenManager::getAccessibleWrapperFor( - const Reference< XAccessible >& _rxKey, bool _bCreate ) + const Reference< XAccessible >& _rxKey ) { Reference< XAccessible > xValue; @@ -104,7 +104,7 @@ namespace comphelper { xValue = aPos->second; } - else if ( _bCreate ) + else { // not found in the cache, and allowed to create // -> new wrapper xValue = new OAccessibleWrapper( m_xContext, _rxKey, m_aOwningAccessible ); diff --git a/comphelper/source/misc/componentmodule.cxx b/comphelper/source/misc/componentmodule.cxx index 24c9a72c60a6..7e91b3cd45de 100644 --- a/comphelper/source/misc/componentmodule.cxx +++ b/comphelper/source/misc/componentmodule.cxx @@ -105,9 +105,9 @@ namespace comphelper void OModule::registerImplementation( const OUString& _rImplementationName, const css::uno::Sequence< OUString >& _rServiceNames, - ::cppu::ComponentFactoryFunc _pCreateFunction, FactoryInstantiation _pFactoryFunction ) + ::cppu::ComponentFactoryFunc _pCreateFunction ) { - ComponentDescription aComponent( _rImplementationName, _rServiceNames, _pCreateFunction, _pFactoryFunction ); + ComponentDescription aComponent( _rImplementationName, _rServiceNames, _pCreateFunction, ::cppu::createSingleComponentFactory ); registerImplementation( aComponent ); } diff --git a/comphelper/source/misc/docpasswordhelper.cxx b/comphelper/source/misc/docpasswordhelper.cxx index 301612cbaade..825176830e89 100644 --- a/comphelper/source/misc/docpasswordhelper.cxx +++ b/comphelper/source/misc/docpasswordhelper.cxx @@ -235,10 +235,9 @@ sal_uInt16 DocPasswordHelper::GetXLHashAsUINT16( Sequence< sal_Int8 > DocPasswordHelper::GetXLHashAsSequence( - const OUString& aUString, - rtl_TextEncoding nEnc ) + const OUString& aUString ) { - sal_uInt16 nHash = GetXLHashAsUINT16( aUString, nEnc ); + sal_uInt16 nHash = GetXLHashAsUINT16( aUString ); Sequence< sal_Int8 > aResult( 2 ); aResult[0] = ( nHash >> 8 ); aResult[1] = ( nHash & 0xFF ); diff --git a/comphelper/source/misc/storagehelper.cxx b/comphelper/source/misc/storagehelper.cxx index 4e7a035b9e2c..35756dcad229 100644 --- a/comphelper/source/misc/storagehelper.cxx +++ b/comphelper/source/misc/storagehelper.cxx @@ -292,19 +292,12 @@ uno::Reference< embed::XStorage > OStorageHelper::GetStorageOfFormatFromURL( const OUString& aFormat, const OUString& aURL, sal_Int32 nStorageMode, - const uno::Reference< uno::XComponentContext >& rxContext, - bool bRepairStorage ) + const uno::Reference< uno::XComponentContext >& rxContext ) throw ( uno::Exception ) { uno::Sequence< beans::PropertyValue > aProps( 1 ); aProps[0].Name = "StorageFormat"; aProps[0].Value <<= aFormat; - if ( bRepairStorage ) - { - aProps.realloc( 2 ); - aProps[1].Name = "RepairPackage"; - aProps[1].Value <<= bRepairStorage; - } uno::Sequence< uno::Any > aArgs( 3 ); aArgs[0] <<= aURL; |