[Libreoffice-commits] core.git: ucb/source

[Michael Stahl (via logerrit)]

 ucb/source/ucp/webdav-curl/webdavcontent.cxx |   21 ++-------------------
 1 file changed, 2 insertions(+), 19 deletions(-)

New commits:
commit 028a6932a697c3f8087cf6a32ce39bde9b945b39
Author:     Michael Stahl <michael.st...@allotropia.de>
AuthorDate: Thu Oct 7 12:53:32 2021 +0200
Commit:     Michael Stahl <michael.st...@allotropia.de>
CommitDate: Mon Nov 1 18:25:52 2021 +0100

    ucb: webdav-curl: Remove redundant comparisons, copy properties 
unconditionally
    
    [ replicate commit 39bbfa61653ba7c3cca0aed739559914c78edc89 ]
    
    Change-Id: I28730c1fc7f6808bf9657855cf1d65369b695c4e
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123227
    Tested-by: Michael Stahl <michael.st...@allotropia.de>
    Reviewed-by: Michael Stahl <michael.st...@allotropia.de>

diff --git a/ucb/source/ucp/webdav-curl/webdavcontent.cxx 
b/ucb/source/ucp/webdav-curl/webdavcontent.cxx
index d63fc7356669..d0756cdb634d 100644
--- a/ucb/source/ucp/webdav-curl/webdavcontent.cxx
+++ b/ucb/source/ucp/webdav-curl/webdavcontent.cxx
@@ -1318,26 +1318,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;
-
-                        if (!std::any_of(m_aFailedPropNames.begin(), 
m_aFailedPropNames.end(),
-                                [&](const OUString& rPropName) {
-                                    bool const isFound(rPropName == rName);
-                                    if (isFound)
-                                    {
-                                        // 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++;
-                                    }
-                                    return isFound;
-                                }) )
-                        {
-                            aProperties[ nProps ] = rProperties[ n ];
-                            nProps++;
-                        }
+                        aProperties[ nProps ] = rProperties[ n ];
                     }
 
                     aProperties.realloc( nProps );