ucb/source/ucp/webdav-curl/ContentProperties.cxx | 12 ++++-------- ucb/source/ucp/webdav-curl/ContentProperties.hxx | 10 ++++------ ucb/source/ucp/webdav-curl/webdavcontent.cxx | 3 +-- ucb/source/ucp/webdav-curl/webdavcontentcaps.cxx | 5 +---- ucb/source/ucp/webdav-curl/webdavprovider.hxx | 3 +-- 5 files changed, 11 insertions(+), 22 deletions(-)
New commits: commit 14c7381438a4d0f2cd6b660c72f4ff8d03834fba Author: Noel Grandin <[email protected]> AuthorDate: Fri Feb 26 14:48:09 2016 +0200 Commit: Michael Stahl <[email protected]> CommitDate: Mon Nov 1 18:30:00 2021 +0100 ucb: webdav-curl: loplugin:unuseddefaultparam in ucb [ port of commit 83911dd753fbfd0328bae2dfa37d19f514d4b2f9 ] Change-Id: I5a57b7af9cd231e89fc93cc1a5f277cae23a1427 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123279 Tested-by: Michael Stahl <[email protected]> Reviewed-by: Michael Stahl <[email protected]> diff --git a/ucb/source/ucp/webdav-curl/ContentProperties.cxx b/ucb/source/ucp/webdav-curl/ContentProperties.cxx index 54d6bcc75df2..59773db1cbdc 100644 --- a/ucb/source/ucp/webdav-curl/ContentProperties.cxx +++ b/ucb/source/ucp/webdav-curl/ContentProperties.cxx @@ -194,8 +194,7 @@ const PropertyValue * ContentProperties::get( // static void ContentProperties::UCBNamesToDAVNames( const uno::Sequence< beans::Property > & rProps, - std::vector< OUString > & propertyNames, - bool bIncludeUnmatched /* = true */ ) + std::vector< OUString > & propertyNames ) { // Assemble list of DAV properties to obtain from server. @@ -278,8 +277,7 @@ void ContentProperties::UCBNamesToDAVNames( } else { - if ( bIncludeUnmatched ) - propertyNames.push_back( rProp.Name ); + propertyNames.push_back( rProp.Name ); } } } @@ -288,8 +286,7 @@ void ContentProperties::UCBNamesToDAVNames( // static void ContentProperties::UCBNamesToHTTPNames( const uno::Sequence< beans::Property > & rProps, - std::vector< OUString > & propertyNames, - bool bIncludeUnmatched /* = true */ ) + std::vector< OUString > & propertyNames ) { // Assemble list of HTTP header names to obtain from server. @@ -320,8 +317,7 @@ void ContentProperties::UCBNamesToHTTPNames( } else { - if ( bIncludeUnmatched ) - propertyNames.push_back( rProp.Name ); + propertyNames.push_back( rProp.Name ); } } } diff --git a/ucb/source/ucp/webdav-curl/ContentProperties.hxx b/ucb/source/ucp/webdav-curl/ContentProperties.hxx index a4588f5214f6..0256450c2f90 100644 --- a/ucb/source/ucp/webdav-curl/ContentProperties.hxx +++ b/ucb/source/ucp/webdav-curl/ContentProperties.hxx @@ -81,25 +81,23 @@ public: // Maps the UCB property names contained in rProps with their DAV property // counterparts, if possible. All unmappable properties will be included - // unchanged in resulting vector unless bIncludeUnmatched is set to false. + // unchanged in resulting vector. // The vector filled by this method can directly be handed over to // DAVResourceAccess::PROPFIND. The result from PROPFIND // (vector< DAVResource >) can be used to create a ContentProperties // instance which can map DAV properties back to UCB properties. static void UCBNamesToDAVNames( const css::uno::Sequence< css::beans::Property > & rProps, - std::vector< OUString > & resources, - bool bIncludeUnmatched = true ); + std::vector< OUString > & resources ); // Maps the UCB property names contained in rProps with their HTTP header // counterparts, if possible. All unmappable properties will be included - // unchanged in resulting vector unless bIncludeUnmatched is set to false. + // unchanged in resulting vector. // The vector filled by this method can directly be handed over to // DAVResourceAccess::HEAD. The result from HEAD (vector< DAVResource >) // can be used to create a ContentProperties instance which can map header // names back to UCB properties. static void UCBNamesToHTTPNames( const css::uno::Sequence< css::beans::Property > & rProps, - std::vector< OUString > & resources, - bool bIncludeUnmatched = true ); + std::vector< OUString > & resources ); // return true, if all properties contained in rProps are contained in // this ContentProperties instance. Otherwise, false will be returned. diff --git a/ucb/source/ucp/webdav-curl/webdavcontent.cxx b/ucb/source/ucp/webdav-curl/webdavcontent.cxx index 040b0df99214..8bb0e5e82b15 100644 --- a/ucb/source/ucp/webdav-curl/webdavcontent.cxx +++ b/ucb/source/ucp/webdav-curl/webdavcontent.cxx @@ -1395,8 +1395,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( std::vector< OUString > aHeaderNames; ContentProperties::UCBNamesToHTTPNames( rProperties, - aHeaderNames, - true /* bIncludeUnmatched */ ); + aHeaderNames ); if ( !aHeaderNames.empty() ) { diff --git a/ucb/source/ucp/webdav-curl/webdavcontentcaps.cxx b/ucb/source/ucp/webdav-curl/webdavcontentcaps.cxx index 0db3cb3a7ad0..d89f9431b6d4 100644 --- a/ucb/source/ucp/webdav-curl/webdavcontentcaps.cxx +++ b/ucb/source/ucp/webdav-curl/webdavcontentcaps.cxx @@ -46,7 +46,7 @@ using namespace http_dav_ucp; bool ContentProvider::getProperty( - const OUString & rPropName, beans::Property & rProp, bool bStrict ) + const OUString & rPropName, beans::Property & rProp ) { if ( !m_pProps ) { @@ -244,9 +244,6 @@ bool ContentProvider::getProperty( } else { - if ( bStrict ) - return false; - // All unknown props are treated as: rProp = beans::Property( rPropName, diff --git a/ucb/source/ucp/webdav-curl/webdavprovider.hxx b/ucb/source/ucp/webdav-curl/webdavprovider.hxx index 5468057f012d..e9e065007417 100644 --- a/ucb/source/ucp/webdav-curl/webdavprovider.hxx +++ b/ucb/source/ucp/webdav-curl/webdavprovider.hxx @@ -92,8 +92,7 @@ public: // Non-interface methods. bool getProperty( const OUString & rPropName, - css::beans::Property & rProp, - bool bStrict = false ); + css::beans::Property & rProp ); }; }
