[Libreoffice-commits] core.git: Branch 'libreoffice-7-4-7' - ucb/source

[Michael Stahl (via logerrit)]

 ucb/source/ucp/webdav-curl/DAVTypes.cxx |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 8c749403156fa0af6d6b61a40aaf438ff3671b90
Author:     Michael Stahl <michael.st...@allotropia.de>
AuthorDate: Tue Apr 18 14:25:37 2023 +0200
Commit:     Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Tue May 2 15:55:04 2023 +0200

    Fix tdf#155004: ucb: webdav-curl: carry over Class1 bit only if set
    
    With d6182cb6704c06f33d284874b9fe96c85cce5bf5 there are cases when a
    webdav server inadvertendly releases the lock. Lets apply the fix only
    if the Class1 flag is actually set.
    
    Change-Id: I85e5253c7df0980f373d2dea788c331b81ed4a82
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150552
    Tested-by: László Németh <nem...@numbertext.org>
    Reviewed-by: László Németh <nem...@numbertext.org>
    Tested-by: Jenkins
    (cherry picked from commit 5e8c27e2dbb47a207364f3c44b5ea8e7ec3be73a)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150929
    Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
    (cherry picked from commit d14d54c7895c4e4f66ae6ebb4b34a51f2e6f6a5e)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151017
    Reviewed-by: Thorsten Behrens <thorsten.behr...@allotropia.de>
    Tested-by: Xisco Fauli <xiscofa...@libreoffice.org>

diff --git a/ucb/source/ucp/webdav-curl/DAVTypes.cxx 
b/ucb/source/ucp/webdav-curl/DAVTypes.cxx
index d5b255c175cd..e41c5426e959 100644
--- a/ucb/source/ucp/webdav-curl/DAVTypes.cxx
+++ b/ucb/source/ucp/webdav-curl/DAVTypes.cxx
@@ -168,7 +168,10 @@ void DAVOptionsCache::addDAVOptions( DAVOptions & 
rDAVOptions, const sal_uInt32
         // tdf#153642 keep cached Class1 bit at aDAVOptionsException to avoid 
of
         // losing the ability to resave the document within the lifetime 
because
         // of disabled DAV detection in getResourceType()
-        rDAVOptions.setClass1( (*it).second.isClass1() );
+        if ((*it).second.isClass1())
+        {
+            rDAVOptions.setClass1( (*it).second.isClass1() );
+        }
     }
     // not in cache, add it
     TimeValue t1;