diff options
| author | Arkadiy Illarionov <qarkai@gmail.com> | 2018-10-22 21:42:09 +0300 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-10-23 07:39:01 +0200 |
| commit | 39bbfa61653ba7c3cca0aed739559914c78edc89 (patch) | |
| tree | bb93cb75d5de237e0d8fbf42072cb72034a3493c | |
| parent | 2995a95d8efa727ea53b06323c0b2bdc52e1aed0 (diff) | |
Remove redundant comparisons, copy properties unconditionally
e06afb0c9546ddcde1cedd75f59001396ac6fdf2 follow-up
Change-Id: Ic4449c9424c622aeabbf5be49826d68d95dd93eb
Reviewed-on: https://gerrit.libreoffice.org/62195
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
| -rw-r--r-- | ucb/source/ucp/webdav-neon/webdavcontent.cxx | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/ucb/source/ucp/webdav-neon/webdavcontent.cxx b/ucb/source/ucp/webdav-neon/webdavcontent.cxx index 0c4267e9a728..247b75f990e8 100644 --- a/ucb/source/ucp/webdav-neon/webdavcontent.cxx +++ b/ucb/source/ucp/webdav-neon/webdavcontent.cxx @@ -1380,28 +1380,9 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( { sal_Int32 nProps = 0; sal_Int32 nCount = rProperties.getLength(); - for ( sal_Int32 n = 0; n < nCount; ++n ) + for ( sal_Int32 n = 0; n < nCount; ++n, ++nProps ) { - const OUString & rName = rProperties[ n ].Name; - - std::vector< OUString >::const_iterator end - = m_aFailedPropNames.end(); - - auto it = std::find(m_aFailedPropNames.cbegin(), end, rName); - if ( it != end ) - { - // the failed property in cache is the same as the requested one, - // so add it to the requested properties list - aProperties[ nProps ] = rProperties[ n ]; - nProps++; - } - - // XXX something strange happens here: identical code for different conditions - if ( it == end ) - { - aProperties[ nProps ] = rProperties[ n ]; - nProps++; - } + aProperties[ nProps ] = rProperties[ n ]; } aProperties.realloc( nProps ); |