diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-07-30 15:35:13 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-07-31 14:59:41 +0200 |
commit | 7d13fe52bdb31d1263148567fec009df1de6e330 (patch) | |
tree | a511686caf8313a6fbe457b813019f89a41aece8 /ucb | |
parent | f2fb91390c443248e9c70363ef3038b1e2265e45 (diff) |
loplugin:returnconstant in ucb
Change-Id: I2810468e64bba8bc9f8af4dff170bc1ab310fe2f
Reviewed-on: https://gerrit.libreoffice.org/58337
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'ucb')
-rw-r--r-- | ucb/source/ucp/cmis/cmis_datasupplier.cxx | 9 | ||||
-rw-r--r-- | ucb/source/ucp/cmis/cmis_datasupplier.hxx | 2 | ||||
-rw-r--r-- | ucb/source/ucp/ftp/ftpdirp.cxx | 3 | ||||
-rw-r--r-- | ucb/source/ucp/ftp/ftpdirp.hxx | 2 | ||||
-rw-r--r-- | ucb/source/ucp/webdav-neon/webdavcontent.cxx | 4 | ||||
-rw-r--r-- | ucb/source/ucp/webdav-neon/webdavcontentcaps.cxx | 4 | ||||
-rw-r--r-- | ucb/source/ucp/webdav-neon/webdavprovider.hxx | 2 |
7 files changed, 11 insertions, 15 deletions
diff --git a/ucb/source/ucp/cmis/cmis_datasupplier.cxx b/ucb/source/ucp/cmis/cmis_datasupplier.cxx index 13133a2d27ad..01819ad36a03 100644 --- a/ucb/source/ucp/cmis/cmis_datasupplier.cxx +++ b/ucb/source/ucp/cmis/cmis_datasupplier.cxx @@ -30,10 +30,10 @@ namespace cmis { } - bool DataSupplier::getData() + void DataSupplier::getData() { if ( mbCountFinal ) - return true; + return; std::vector< uno::Reference< ucb::XContent > > aChildren = m_pChildrenProvider->getChildren( ); @@ -51,8 +51,6 @@ namespace cmis } } mbCountFinal = true; - - return true; } DataSupplier::~DataSupplier() @@ -90,7 +88,8 @@ namespace cmis if ( maResults.size() > nIndex ) // Result already present. return true; - if ( getData() && maResults.size() > nIndex ) + getData(); + if ( maResults.size() > nIndex ) return true; return false; diff --git a/ucb/source/ucp/cmis/cmis_datasupplier.hxx b/ucb/source/ucp/cmis/cmis_datasupplier.hxx index 619af90e355c..0f618f04bc54 100644 --- a/ucb/source/ucp/cmis/cmis_datasupplier.hxx +++ b/ucb/source/ucp/cmis/cmis_datasupplier.hxx @@ -39,7 +39,7 @@ namespace cmis ChildrenProvider* m_pChildrenProvider; sal_Int32 mnOpenMode; bool mbCountFinal; - bool getData(); + void getData(); ResultList maResults; public: diff --git a/ucb/source/ucp/ftp/ftpdirp.cxx b/ucb/source/ucp/ftp/ftpdirp.cxx index f4ab59afbbe8..ca439aa31a8a 100644 --- a/ucb/source/ucp/ftp/ftpdirp.cxx +++ b/ucb/source/ucp/ftp/ftpdirp.cxx @@ -1219,7 +1219,7 @@ bool FTPDirectoryParser::parseUNIX_isTime ( * checked for validity of the given day in the given month and year. * */ -bool FTPDirectoryParser::setYear ( +void FTPDirectoryParser::setYear ( DateTime &rDateTime, sal_uInt16 nYear) { if (nYear < 100) @@ -1249,7 +1249,6 @@ bool FTPDirectoryParser::setYear ( } rDateTime.SetYear(nYear); - return true; } /* diff --git a/ucb/source/ucp/ftp/ftpdirp.hxx b/ucb/source/ucp/ftp/ftpdirp.hxx index 3284c7357fb4..983fab1d29ae 100644 --- a/ucb/source/ucp/ftp/ftpdirp.hxx +++ b/ucb/source/ucp/ftp/ftpdirp.hxx @@ -143,7 +143,7 @@ namespace ftp { sal_uInt16 nHour, DateTime& rDateTime); - static bool setYear ( + static void setYear ( DateTime& rDateTime, sal_uInt16 nYear); diff --git a/ucb/source/ucp/webdav-neon/webdavcontent.cxx b/ucb/source/ucp/webdav-neon/webdavcontent.cxx index 3113b3c1f5f1..db25abd32205 100644 --- a/ucb/source/ucp/webdav-neon/webdavcontent.cxx +++ b/ucb/source/ucp/webdav-neon/webdavcontent.cxx @@ -1256,8 +1256,8 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( while ( it != end ) { - if ( pProvider->getProperty( (*it).first, aProp ) ) - xRow->appendObject( aProp, (*it).second.value() ); + pProvider->getProperty( (*it).first, aProp ); + xRow->appendObject( aProp, (*it).second.value() ); ++it; } diff --git a/ucb/source/ucp/webdav-neon/webdavcontentcaps.cxx b/ucb/source/ucp/webdav-neon/webdavcontentcaps.cxx index 5599b04ff65f..38b840bcbc15 100644 --- a/ucb/source/ucp/webdav-neon/webdavcontentcaps.cxx +++ b/ucb/source/ucp/webdav-neon/webdavcontentcaps.cxx @@ -62,7 +62,7 @@ using namespace webdav_ucp; // ContentProvider implementation. -bool ContentProvider::getProperty( +void ContentProvider::getProperty( const OUString & rPropName, beans::Property & rProp ) { if ( !m_pProps ) @@ -277,8 +277,6 @@ bool ContentProvider::getProperty( cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND ); } - - return true; } diff --git a/ucb/source/ucp/webdav-neon/webdavprovider.hxx b/ucb/source/ucp/webdav-neon/webdavprovider.hxx index e90d5364a742..06639ff3ba62 100644 --- a/ucb/source/ucp/webdav-neon/webdavprovider.hxx +++ b/ucb/source/ucp/webdav-neon/webdavprovider.hxx @@ -103,7 +103,7 @@ public: // Non-interface methods. - bool getProperty( const OUString & rPropName, + void getProperty( const OUString & rPropName, css::beans::Property & rProp ); }; |